[MPlayer-cvslog] CVS: main/libao2 afmt.c, 1.7, 1.8 afmt.h, 1.8, 1.9 ao_alsa.c, 1.9, 1.10 ao_alsa5.c, 1.19, 1.20 ao_arts.c, 1.8, 1.9 ao_dsound.c, 1.3, 1.4 ao_dxr2.c, 1.7, 1.8 ao_esd.c, 1.7, 1.8 ao_jack.c, 1.4, 1.5 ao_macosx.c, 1.5, 1.6 ao_mpegpes.c, 1.20, 1.21 ao_nas.c, 1.15, 1.16 ao_oss.c, 1.44, 1.45 ao_pcm.c, 1.21, 1.22 ao_plugin.c, 1.25, 1.26 ao_polyp.c, 1.1, 1.2 ao_sdl.c, 1.37, 1.38 ao_sgi.c, 1.7, 1.8 ao_sun.c, 1.29, 1.30 ao_win32.c, 1.16, 1.17 audio_out.c, 1.44, 1.45

Diego Biurrun CVS syncmail at mplayerhq.hu
Tue Dec 7 03:24:18 CET 2004 

CVS change done by Diego Biurrun CVS

Update of /cvsroot/mplayer/main/libao2
In directory mail:/var2/tmp/cvs-serv18556/libao2

Modified Files:
	afmt.c afmt.h ao_alsa.c ao_alsa5.c ao_arts.c ao_dsound.c 
	ao_dxr2.c ao_esd.c ao_jack.c ao_macosx.c ao_mpegpes.c ao_nas.c 
	ao_oss.c ao_pcm.c ao_plugin.c ao_polyp.c ao_sdl.c ao_sgi.c 
	ao_sun.c ao_win32.c audio_out.c 
Log Message:
Make include paths consistent.


Index: afmt.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/afmt.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- afmt.c	5 Oct 2004 19:18:22 -0000	1.7
+++ afmt.c	7 Dec 2004 02:24:15 -0000	1.8
@@ -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)

Index: afmt.h
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/afmt.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- afmt.h	23 Oct 2004 18:26:04 -0000	1.8
+++ afmt.h	7 Dec 2004 02:24:15 -0000	1.9
@@ -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

Index: ao_alsa.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/ao_alsa.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ao_alsa.c	17 Oct 2004 20:03:54 -0000	1.9
+++ ao_alsa.c	7 Dec 2004 02:24:15 -0000	1.10
@@ -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

Index: ao_alsa5.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/ao_alsa5.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ao_alsa5.c	18 Sep 2004 20:31:27 -0000	1.19
+++ ao_alsa5.c	7 Dec 2004 02:24:15 -0000	1.20
@@ -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 = 
 {

Index: ao_arts.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/ao_arts.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ao_arts.c	18 Sep 2004 20:31:27 -0000	1.8
+++ ao_arts.c	7 Dec 2004 02:24:15 -0000	1.9
@@ -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)
 

Index: ao_dsound.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/ao_dsound.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ao_dsound.c	18 Oct 2004 19:23:13 -0000	1.3
+++ ao_dsound.c	7 Dec 2004 02:24:15 -0000	1.4
@@ -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"
 
 

Index: ao_dxr2.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/ao_dxr2.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ao_dxr2.c	28 Nov 2004 10:18:01 -0000	1.7
+++ ao_dxr2.c	7 Dec 2004 02:24:15 -0000	1.8
@@ -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"

Index: ao_esd.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/ao_esd.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ao_esd.c	18 Sep 2004 20:31:27 -0000	1.7
+++ ao_esd.c	7 Dec 2004 02:24:15 -0000	1.8
@@ -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

Index: ao_jack.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/ao_jack.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ao_jack.c	7 Nov 2004 11:03:50 -0000	1.4
+++ ao_jack.c	7 Dec 2004 02:24:15 -0000	1.5
@@ -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"
 

Index: ao_macosx.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/ao_macosx.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ao_macosx.c	16 Oct 2004 00:56:40 -0000	1.5
+++ ao_macosx.c	7 Dec 2004 02:24:15 -0000	1.6
@@ -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"

Index: ao_mpegpes.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/ao_mpegpes.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ao_mpegpes.c	18 Sep 2004 20:31:27 -0000	1.20
+++ ao_mpegpes.c	7 Dec 2004 02:24:15 -0000	1.21
@@ -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

Index: ao_nas.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/ao_nas.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ao_nas.c	6 Apr 2004 17:55:36 -0000	1.15
+++ ao_nas.c	7 Dec 2004 02:24:15 -0000	1.16
@@ -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"

Index: ao_oss.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/ao_oss.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- ao_oss.c	18 Sep 2004 20:31:27 -0000	1.44
+++ ao_oss.c	7 Dec 2004 02:24:15 -0000	1.45
@@ -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"
 

Index: ao_pcm.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/ao_pcm.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ao_pcm.c	18 Sep 2004 20:31:27 -0000	1.21
+++ ao_pcm.c	7 Dec 2004 02:24:15 -0000	1.22
@@ -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 = 

Index: ao_plugin.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/ao_plugin.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ao_plugin.c	25 Sep 2004 22:18:41 -0000	1.25
+++ ao_plugin.c	7 Dec 2004 02:24:15 -0000	1.26
@@ -1,4 +1,4 @@
-#include "../config.h"
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>

Index: ao_polyp.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/ao_polyp.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ao_polyp.c	5 Nov 2004 14:02:41 -0000	1.1
+++ ao_polyp.c	7 Dec 2004 02:24:15 -0000	1.2
@@ -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"
 

Index: ao_sdl.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/ao_sdl.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- ao_sdl.c	6 Nov 2004 22:33:17 -0000	1.37
+++ ao_sdl.c	7 Dec 2004 02:24:15 -0000	1.38
@@ -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 = 
 {

Index: ao_sgi.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/ao_sgi.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ao_sgi.c	4 Oct 2004 19:07:09 -0000	1.7
+++ ao_sgi.c	7 Dec 2004 02:24:15 -0000	1.8
@@ -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 = 
 {

Index: ao_sun.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/ao_sun.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ao_sun.c	4 Oct 2004 19:07:09 -0000	1.29
+++ ao_sun.c	7 Dec 2004 02:24:15 -0000	1.30
@@ -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 = 
 {

Index: ao_win32.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/ao_win32.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ao_win32.c	22 Oct 2004 12:43:34 -0000	1.16
+++ ao_win32.c	7 Dec 2004 02:24:15 -0000	1.17
@@ -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

Index: audio_out.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/audio_out.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- audio_out.c	5 Nov 2004 14:02:41 -0000	1.44
+++ audio_out.c	7 Dec 2004 02:24:15 -0000	1.45
@@ -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};

More information about the MPlayer-cvslog mailing list