Make include paths consistent.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14124 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2004-12-07 02:24:15 +00:00
parent fc1f2bac7c
commit 67a1fd4053
21 changed files with 52 additions and 52 deletions

View File

@ -1,7 +1,7 @@
#include <stdio.h>
#include <stdlib.h>
#include "../config.h"
#include "config.h"
#include "afmt.h"
char *audio_out_format_name(int format)

View File

@ -9,7 +9,7 @@
#endif
#endif
#include "../config.h" /* for native endianness */
#include "config.h" /* for native endianness */
/* standard, old OSS audio formats */
#ifndef AFMT_MU_LAW

View File

@ -19,9 +19,9 @@
#include <string.h>
#include <sys/poll.h>
#include "../config.h"
#include "../mixer.h"
#include "../mp_msg.h"
#include "config.h"
#include "mixer.h"
#include "mp_msg.h"
#define ALSA_PCM_NEW_HW_PARAMS_API
#define ALSA_PCM_NEW_SW_PARAMS_API

View File

@ -9,14 +9,14 @@
#include <errno.h>
#include <sys/asoundlib.h>
#include "../config.h"
#include "config.h"
#include "audio_out.h"
#include "audio_out_internal.h"
#include "afmt.h"
#include "../mp_msg.h"
#include "../help_mp.h"
#include "mp_msg.h"
#include "help_mp.h"
static ao_info_t info =
{

View File

@ -13,9 +13,9 @@
#include "audio_out.h"
#include "audio_out_internal.h"
#include "afmt.h"
#include "../config.h"
#include "../mp_msg.h"
#include "../help_mp.h"
#include "config.h"
#include "mp_msg.h"
#include "help_mp.h"
#define OBTAIN_BITRATE(a) (((a != AFMT_U8) && (a != AFMT_S8)) ? 16 : 8)

View File

@ -31,8 +31,8 @@
#include "afmt.h"
#include "audio_out.h"
#include "audio_out_internal.h"
#include "../mp_msg.h"
#include "../libvo/fastmemcpy.h"
#include "mp_msg.h"
#include "libvo/fastmemcpy.h"
#include "osdep/timer.h"

View File

@ -4,9 +4,9 @@
#include <sys/ioctl.h>
#include <inttypes.h>
#include <dxr2ioctl.h>
#include "../config.h"
#include "../mp_msg.h"
#include "../help_mp.h"
#include "config.h"
#include "mp_msg.h"
#include "help_mp.h"
#include "bswap.h"
#include "audio_out.h"

View File

@ -16,7 +16,7 @@
* most likely a linux sound card driver problem)
*/
#include "../config.h"
#include "config.h"
#include <sys/types.h>
#include <sys/time.h>
@ -35,9 +35,9 @@
#include "audio_out.h"
#include "audio_out_internal.h"
#include "afmt.h"
#include "../config.h"
#include "../mp_msg.h"
#include "../help_mp.h"
#include "config.h"
#include "mp_msg.h"
#include "help_mp.h"
#undef ESD_DEBUG

View File

@ -15,8 +15,8 @@
#include "audio_out.h"
#include "audio_out_internal.h"
#include "afmt.h"
#include "../config.h"
#include "../mp_msg.h"
#include "config.h"
#include "mp_msg.h"
//#include "bio2jack.h"

View File

@ -43,7 +43,7 @@
#include <inttypes.h>
#include <pthread.h>
#include "../mp_msg.h"
#include "mp_msg.h"
#include "audio_out.h"
#include "audio_out_internal.h"

View File

@ -2,7 +2,7 @@
#include <stdlib.h>
#include <string.h>
#include "../config.h"
#include "config.h"
#ifdef HAVE_DVB_HEAD
#define HAVE_DVB 1
@ -17,8 +17,8 @@
#include "afmt.h"
#include "../mp_msg.h"
#include "../help_mp.h"
#include "mp_msg.h"
#include "help_mp.h"
#ifdef HAVE_DVB
#ifndef HAVE_DVB_HEAD

View File

@ -33,7 +33,7 @@
#include <pthread.h>
#include <audio/audiolib.h>
#include "../mp_msg.h"
#include "mp_msg.h"
#include "audio_out.h"
#include "audio_out_internal.h"

View File

@ -11,10 +11,10 @@
#include <string.h>
//#include <sys/soundcard.h>
#include "../config.h"
#include "../mp_msg.h"
#include "../mixer.h"
#include "../help_mp.h"
#include "config.h"
#include "mp_msg.h"
#include "mixer.h"
#include "help_mp.h"
#include "afmt.h"

View File

@ -8,8 +8,8 @@
#include "afmt.h"
#include "audio_out.h"
#include "audio_out_internal.h"
#include "../mp_msg.h"
#include "../help_mp.h"
#include "mp_msg.h"
#include "help_mp.h"
static ao_info_t info =

View File

@ -1,4 +1,4 @@
#include "../config.h"
#include "config.h"
#include <stdio.h>
#include <stdlib.h>

View File

@ -1,6 +1,6 @@
#include <assert.h>
#include "../config.h"
#include "config.h"
#include <polyp/polyplib.h>
#include <polyp/polyplib-error.h>
@ -9,8 +9,8 @@
#include "audio_out.h"
#include "audio_out_internal.h"
#include "afmt.h"
#include "../config.h"
#include "../mp_msg.h"
#include "config.h"
#include "mp_msg.h"
#define POLYP_CLIENT_NAME "MPlayer"

View File

@ -14,9 +14,9 @@
#include <stdlib.h>
#include <string.h>
#include "../config.h"
#include "../mp_msg.h"
#include "../help_mp.h"
#include "config.h"
#include "mp_msg.h"
#include "help_mp.h"
#include "audio_out.h"
#include "audio_out_internal.h"
@ -24,7 +24,7 @@
#include <SDL.h>
#include "osdep/timer.h"
#include "../libvo/fastmemcpy.h"
#include "libvo/fastmemcpy.h"
static ao_info_t info =
{

View File

@ -11,8 +11,8 @@
#include "audio_out.h"
#include "audio_out_internal.h"
#include "../mp_msg.h"
#include "../help_mp.h"
#include "mp_msg.h"
#include "help_mp.h"
static ao_info_t info =
{

View File

@ -20,14 +20,14 @@
#include <stropts.h>
#endif
#include "../config.h"
#include "../mixer.h"
#include "config.h"
#include "mixer.h"
#include "audio_out.h"
#include "audio_out_internal.h"
#include "afmt.h"
#include "../mp_msg.h"
#include "../help_mp.h"
#include "mp_msg.h"
#include "help_mp.h"
static ao_info_t info =
{

View File

@ -26,8 +26,8 @@
#include "afmt.h"
#include "audio_out.h"
#include "audio_out_internal.h"
#include "../mp_msg.h"
#include "../libvo/fastmemcpy.h"
#include "mp_msg.h"
#include "libvo/fastmemcpy.h"
#include "osdep/timer.h"
#define WAVE_FORMAT_DOLBY_AC3_SPDIF 0x0092

View File

@ -2,12 +2,12 @@
#include <stdlib.h>
#include <string.h>
#include "../config.h"
#include "config.h"
#include "audio_out.h"
#include "afmt.h"
#include "../mp_msg.h"
#include "../help_mp.h"
#include "mp_msg.h"
#include "help_mp.h"
// there are some globals:
ao_data_t ao_data={0,0,0,0,OUTBURST,-1,0};