From 67a1fd4053b0d9114db4d7ee1a5eb7871eef18f9 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Tue, 7 Dec 2004 02:24:15 +0000
Subject: Make include paths consistent.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14124 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libao2/afmt.c       | 2 +-
 libao2/afmt.h       | 2 +-
 libao2/ao_alsa.c    | 6 +++---
 libao2/ao_alsa5.c   | 6 +++---
 libao2/ao_arts.c    | 6 +++---
 libao2/ao_dsound.c  | 4 ++--
 libao2/ao_dxr2.c    | 6 +++---
 libao2/ao_esd.c     | 8 ++++----
 libao2/ao_jack.c    | 4 ++--
 libao2/ao_macosx.c  | 2 +-
 libao2/ao_mpegpes.c | 6 +++---
 libao2/ao_nas.c     | 2 +-
 libao2/ao_oss.c     | 8 ++++----
 libao2/ao_pcm.c     | 4 ++--
 libao2/ao_plugin.c  | 2 +-
 libao2/ao_polyp.c   | 6 +++---
 libao2/ao_sdl.c     | 8 ++++----
 libao2/ao_sgi.c     | 4 ++--
 libao2/ao_sun.c     | 8 ++++----
 libao2/ao_win32.c   | 4 ++--
 libao2/audio_out.c  | 6 +++---
 21 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/libao2/afmt.c b/libao2/afmt.c
index b12ecc1f46..95cd817ca2 100644
--- a/libao2/afmt.c
+++ b/libao2/afmt.c
@@ -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)
diff --git a/libao2/afmt.h b/libao2/afmt.h
index 8a36892551..04dc762c1b 100644
--- a/libao2/afmt.h
+++ b/libao2/afmt.h
@@ -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
diff --git a/libao2/ao_alsa.c b/libao2/ao_alsa.c
index 85a13289a4..2aa6cdaebe 100644
--- a/libao2/ao_alsa.c
+++ b/libao2/ao_alsa.c
@@ -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
diff --git a/libao2/ao_alsa5.c b/libao2/ao_alsa5.c
index cc515396c3..68f2cbcaa5 100644
--- a/libao2/ao_alsa5.c
+++ b/libao2/ao_alsa5.c
@@ -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 = 
 {
diff --git a/libao2/ao_arts.c b/libao2/ao_arts.c
index 2f539b9e8a..8d2918d74f 100644
--- a/libao2/ao_arts.c
+++ b/libao2/ao_arts.c
@@ -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)
 
diff --git a/libao2/ao_dsound.c b/libao2/ao_dsound.c
index dc23824c12..21c293a380 100644
--- a/libao2/ao_dsound.c
+++ b/libao2/ao_dsound.c
@@ -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"
 
 
diff --git a/libao2/ao_dxr2.c b/libao2/ao_dxr2.c
index 56c8fc97ed..7ec4d2c499 100644
--- a/libao2/ao_dxr2.c
+++ b/libao2/ao_dxr2.c
@@ -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"
diff --git a/libao2/ao_esd.c b/libao2/ao_esd.c
index 5cca049731..65f5158f1b 100644
--- a/libao2/ao_esd.c
+++ b/libao2/ao_esd.c
@@ -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
diff --git a/libao2/ao_jack.c b/libao2/ao_jack.c
index 4b95697a71..0f4ce43061 100644
--- a/libao2/ao_jack.c
+++ b/libao2/ao_jack.c
@@ -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"
 
diff --git a/libao2/ao_macosx.c b/libao2/ao_macosx.c
index 9eaac979f1..b13fcac4c9 100644
--- a/libao2/ao_macosx.c
+++ b/libao2/ao_macosx.c
@@ -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"
diff --git a/libao2/ao_mpegpes.c b/libao2/ao_mpegpes.c
index b8e7b16406..be9ad4a7f2 100644
--- a/libao2/ao_mpegpes.c
+++ b/libao2/ao_mpegpes.c
@@ -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
diff --git a/libao2/ao_nas.c b/libao2/ao_nas.c
index b3d8f1523a..6f77bcbd9e 100644
--- a/libao2/ao_nas.c
+++ b/libao2/ao_nas.c
@@ -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"
diff --git a/libao2/ao_oss.c b/libao2/ao_oss.c
index ccca1cd9e8..8028835b81 100644
--- a/libao2/ao_oss.c
+++ b/libao2/ao_oss.c
@@ -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"
 
diff --git a/libao2/ao_pcm.c b/libao2/ao_pcm.c
index 35fac018a8..d1cf65f2a0 100644
--- a/libao2/ao_pcm.c
+++ b/libao2/ao_pcm.c
@@ -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 = 
diff --git a/libao2/ao_plugin.c b/libao2/ao_plugin.c
index e40c737de8..357d338743 100644
--- a/libao2/ao_plugin.c
+++ b/libao2/ao_plugin.c
@@ -1,4 +1,4 @@
-#include "../config.h"
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/libao2/ao_polyp.c b/libao2/ao_polyp.c
index ad27cbba7e..8794f9c274 100644
--- a/libao2/ao_polyp.c
+++ b/libao2/ao_polyp.c
@@ -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"
 
diff --git a/libao2/ao_sdl.c b/libao2/ao_sdl.c
index f21403d0db..73a2c05a3d 100644
--- a/libao2/ao_sdl.c
+++ b/libao2/ao_sdl.c
@@ -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 = 
 {
diff --git a/libao2/ao_sgi.c b/libao2/ao_sgi.c
index f8067c70f0..d1c6ef2d1d 100644
--- a/libao2/ao_sgi.c
+++ b/libao2/ao_sgi.c
@@ -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 = 
 {
diff --git a/libao2/ao_sun.c b/libao2/ao_sun.c
index 7be7e808ec..91d27fcf28 100644
--- a/libao2/ao_sun.c
+++ b/libao2/ao_sun.c
@@ -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 = 
 {
diff --git a/libao2/ao_win32.c b/libao2/ao_win32.c
index edafdc59ec..698e2d727b 100644
--- a/libao2/ao_win32.c
+++ b/libao2/ao_win32.c
@@ -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
diff --git a/libao2/audio_out.c b/libao2/audio_out.c
index fcc4fa9fec..97691bc2d7 100644
--- a/libao2/audio_out.c
+++ b/libao2/audio_out.c
@@ -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};
-- 
cgit v1.2.3