[MPlayer-cvslog] r28859 - in trunk/libao2: audio_out.c audio_out_internal.h

[reimar]

Author: reimar
Date: Fri Mar  6 20:58:16 2009
New Revision: 28859

Log:
Make audio_out_* structs const so they end up in .rodata

Modified:
   trunk/libao2/audio_out.c
   trunk/libao2/audio_out_internal.h

Modified: trunk/libao2/audio_out.c
==============================================================================
--- trunk/libao2/audio_out.c	Fri Mar  6 20:43:12 2009	(r28858)
+++ trunk/libao2/audio_out.c	Fri Mar  6 20:58:16 2009	(r28859)
@@ -31,29 +31,29 @@
 ao_data_t ao_data={0,0,0,0,OUTBURST,-1,0};
 char *ao_subdevice = NULL;
 
-extern ao_functions_t audio_out_oss;
-extern ao_functions_t audio_out_macosx;
-extern ao_functions_t audio_out_arts;
-extern ao_functions_t audio_out_esd;
-extern ao_functions_t audio_out_pulse;
-extern ao_functions_t audio_out_jack;
-extern ao_functions_t audio_out_openal;
-extern ao_functions_t audio_out_null;
-extern ao_functions_t audio_out_alsa5;
-extern ao_functions_t audio_out_alsa;
-extern ao_functions_t audio_out_nas;
-extern ao_functions_t audio_out_sdl;
-extern ao_functions_t audio_out_sun;
-extern ao_functions_t audio_out_sgi;
-extern ao_functions_t audio_out_win32;
-extern ao_functions_t audio_out_dsound;
-extern ao_functions_t audio_out_dart;
-extern ao_functions_t audio_out_dxr2;
-extern ao_functions_t audio_out_ivtv;
-extern ao_functions_t audio_out_v4l2;
-extern ao_functions_t audio_out_mpegpes;
-extern ao_functions_t audio_out_pcm;
-extern ao_functions_t audio_out_pss;
+extern const ao_functions_t audio_out_oss;
+extern const ao_functions_t audio_out_macosx;
+extern const ao_functions_t audio_out_arts;
+extern const ao_functions_t audio_out_esd;
+extern const ao_functions_t audio_out_pulse;
+extern const ao_functions_t audio_out_jack;
+extern const ao_functions_t audio_out_openal;
+extern const ao_functions_t audio_out_null;
+extern const ao_functions_t audio_out_alsa5;
+extern const ao_functions_t audio_out_alsa;
+extern const ao_functions_t audio_out_nas;
+extern const ao_functions_t audio_out_sdl;
+extern const ao_functions_t audio_out_sun;
+extern const ao_functions_t audio_out_sgi;
+extern const ao_functions_t audio_out_win32;
+extern const ao_functions_t audio_out_dsound;
+extern const ao_functions_t audio_out_dart;
+extern const ao_functions_t audio_out_dxr2;
+extern const ao_functions_t audio_out_ivtv;
+extern const ao_functions_t audio_out_v4l2;
+extern const ao_functions_t audio_out_mpegpes;
+extern const ao_functions_t audio_out_pcm;
+extern const ao_functions_t audio_out_pss;
 
 const ao_functions_t* const audio_out_drivers[] =
 {

Modified: trunk/libao2/audio_out_internal.h
==============================================================================
--- trunk/libao2/audio_out_internal.h	Fri Mar  6 20:43:12 2009	(r28858)
+++ trunk/libao2/audio_out_internal.h	Fri Mar  6 20:58:16 2009	(r28859)
@@ -31,7 +31,7 @@ static float get_delay(void);
 static void audio_pause(void);
 static void audio_resume(void);
 
-#define LIBAO_EXTERN(x) ao_functions_t audio_out_##x =\
+#define LIBAO_EXTERN(x) const ao_functions_t audio_out_##x =\
 {\
 	&info,\
 	control,\