[xiph-commits] r17718 - in trunk/ao/src: . plugins/alsa plugins/arts plugins/dsound plugins/esd plugins/irix plugins/macosx plugins/nas plugins/oss plugins/pulse plugins/sndio plugins/sun

xiphmont at svn.xiph.org xiphmont at svn.xiph.org
Mon Dec 6 12:09:29 PST 2010


Author: xiphmont
Date: 2010-12-06 12:09:29 -0800 (Mon, 06 Dec 2010)
New Revision: 17718

Modified:
   trunk/ao/src/ao_aixs.c
   trunk/ao/src/ao_au.c
   trunk/ao/src/ao_null.c
   trunk/ao/src/ao_raw.c
   trunk/ao/src/ao_wav.c
   trunk/ao/src/plugins/alsa/ao_alsa.c
   trunk/ao/src/plugins/arts/ao_arts.c
   trunk/ao/src/plugins/dsound/ao_dsound.c
   trunk/ao/src/plugins/esd/ao_esd.c
   trunk/ao/src/plugins/irix/ao_irix.c
   trunk/ao/src/plugins/macosx/ao_macosx.c
   trunk/ao/src/plugins/nas/ao_nas.c
   trunk/ao/src/plugins/oss/ao_oss.c
   trunk/ao/src/plugins/pulse/ao_pulse.c
   trunk/ao/src/plugins/sndio/ao_sndio.c
   trunk/ao/src/plugins/sun/ao_sun.c
Log:
Add sizeof calculation for options to all drivers rather than an 
explicit number that must be updated by hand



Modified: trunk/ao/src/ao_aixs.c
===================================================================
--- trunk/ao/src/ao_aixs.c	2010-12-06 20:04:43 UTC (rev 17717)
+++ trunk/ao/src/ao_aixs.c	2010-12-06 20:09:29 UTC (rev 17718)
@@ -64,7 +64,7 @@
   AO_FMT_NATIVE,
   20,
   ao_aixs_options,
-  6
+  sizeof(ao_aixs_options)/sizeof(*ao_aixs_options)
 };
 
 

Modified: trunk/ao/src/ao_au.c
===================================================================
--- trunk/ao/src/ao_au.c	2010-12-06 20:04:43 UTC (rev 17717)
+++ trunk/ao/src/ao_au.c	2010-12-06 20:09:29 UTC (rev 17718)
@@ -79,7 +79,7 @@
 	AO_FMT_BIG,
 	0,
 	ao_au_options,
-	4
+        sizeof(ao_au_options)/sizeof(*ao_au_options)
 };
 
 typedef struct ao_au_internal

Modified: trunk/ao/src/ao_null.c
===================================================================
--- trunk/ao/src/ao_null.c	2010-12-06 20:04:43 UTC (rev 17717)
+++ trunk/ao/src/ao_null.c	2010-12-06 20:09:29 UTC (rev 17718)
@@ -44,7 +44,7 @@
 	AO_FMT_NATIVE,
 	0,
 	ao_null_options,
-	4
+        sizeof(ao_null_options)/sizeof(*ao_null_options)
 };
 
 

Modified: trunk/ao/src/ao_raw.c
===================================================================
--- trunk/ao/src/ao_raw.c	2010-12-06 20:04:43 UTC (rev 17717)
+++ trunk/ao/src/ao_raw.c	2010-12-06 20:09:29 UTC (rev 17718)
@@ -44,7 +44,7 @@
 	AO_FMT_NATIVE,
 	0,
 	ao_raw_options,
-	5
+        sizeof(ao_raw_options)/sizeof(*ao_raw_options)
 };
 
 typedef struct ao_raw_internal

Modified: trunk/ao/src/ao_wav.c
===================================================================
--- trunk/ao/src/ao_wav.c	2010-12-06 20:04:43 UTC (rev 17717)
+++ trunk/ao/src/ao_wav.c	2010-12-06 20:09:29 UTC (rev 17718)
@@ -101,7 +101,7 @@
 	AO_FMT_LITTLE,
 	0,
 	ao_wav_options,
-        4
+        sizeof(ao_wav_options)/sizeof(*ao_wav_options)
 };
 
 typedef struct ao_wav_internal

Modified: trunk/ao/src/plugins/alsa/ao_alsa.c
===================================================================
--- trunk/ao/src/plugins/alsa/ao_alsa.c	2010-12-06 20:04:43 UTC (rev 17717)
+++ trunk/ao/src/plugins/alsa/ao_alsa.c	2010-12-06 20:09:29 UTC (rev 17718)
@@ -86,7 +86,7 @@
 	AO_FMT_NATIVE,
 	35,
 	ao_alsa_options,
-	9
+        sizeof(ao_alsa_options)/sizeof(*ao_alsa_options)
 };
 
 

Modified: trunk/ao/src/plugins/arts/ao_arts.c
===================================================================
--- trunk/ao/src/plugins/arts/ao_arts.c	2010-12-06 20:04:43 UTC (rev 17717)
+++ trunk/ao/src/plugins/arts/ao_arts.c	2010-12-06 20:09:29 UTC (rev 17718)
@@ -58,7 +58,7 @@
 	15,
 #endif
 	ao_arts_options,
-        5
+        sizeof(ao_arts_options)/sizeof(*ao_arts_options)
 };
 
 typedef struct ao_arts_internal

Modified: trunk/ao/src/plugins/dsound/ao_dsound.c
===================================================================
--- trunk/ao/src/plugins/dsound/ao_dsound.c	2010-12-06 20:04:43 UTC (rev 17717)
+++ trunk/ao/src/plugins/dsound/ao_dsound.c	2010-12-06 20:09:29 UTC (rev 17718)
@@ -29,7 +29,7 @@
 	AO_FMT_NATIVE,
 	10,
 	ao_dsound_options,
-	1
+	sizeof(ao_dsound_options)/sizeof(*ao_dsound_options)
 };
 
 

Modified: trunk/ao/src/plugins/esd/ao_esd.c
===================================================================
--- trunk/ao/src/plugins/esd/ao_esd.c	2010-12-06 20:04:43 UTC (rev 17717)
+++ trunk/ao/src/plugins/esd/ao_esd.c	2010-12-06 20:09:29 UTC (rev 17718)
@@ -51,7 +51,7 @@
 	AO_FMT_NATIVE,
 	40,
 	ao_esd_options,
-	5
+        sizeof(ao_esd_options)/sizeof(*ao_esd_options)
 };
 
 

Modified: trunk/ao/src/plugins/irix/ao_irix.c
===================================================================
--- trunk/ao/src/plugins/irix/ao_irix.c	2010-12-06 20:04:43 UTC (rev 17717)
+++ trunk/ao/src/plugins/irix/ao_irix.c	2010-12-06 20:09:29 UTC (rev 17718)
@@ -61,7 +61,7 @@
 	AO_FMT_NATIVE,
 	20,
 	ao_irix_options,
-	4
+        sizeof(ao_irix_options)/sizeof(*ao_irix_options)
 };
 
 int ao_plugin_test(void)

Modified: trunk/ao/src/plugins/macosx/ao_macosx.c
===================================================================
--- trunk/ao/src/plugins/macosx/ao_macosx.c	2010-12-06 20:04:43 UTC (rev 17717)
+++ trunk/ao/src/plugins/macosx/ao_macosx.c	2010-12-06 20:09:29 UTC (rev 17718)
@@ -64,7 +64,7 @@
 	AO_FMT_NATIVE,
 	30,
 	ao_macosx_options,
-	5
+	sizeof(ao_macosx_options)/sizeof(*ao_macosx_options)
 };
 
 static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;

Modified: trunk/ao/src/plugins/nas/ao_nas.c
===================================================================
--- trunk/ao/src/plugins/nas/ao_nas.c	2010-12-06 20:04:43 UTC (rev 17717)
+++ trunk/ao/src/plugins/nas/ao_nas.c	2010-12-06 20:09:29 UTC (rev 17718)
@@ -59,7 +59,7 @@
 	AO_FMT_NATIVE,
 	10,
 	ao_nas_options,
-	6
+        sizeof(ao_nas_options)/sizeof(*ao_nas_options)
 };
 
 

Modified: trunk/ao/src/plugins/oss/ao_oss.c
===================================================================
--- trunk/ao/src/plugins/oss/ao_oss.c	2010-12-06 20:04:43 UTC (rev 17717)
+++ trunk/ao/src/plugins/oss/ao_oss.c	2010-12-06 20:09:29 UTC (rev 17718)
@@ -56,7 +56,7 @@
 	AO_FMT_NATIVE,
 	20,
 	ao_oss_options,
-	7
+        sizeof(ao_oss_options)/sizeof(*ao_oss_options)
 };
 
 

Modified: trunk/ao/src/plugins/pulse/ao_pulse.c
===================================================================
--- trunk/ao/src/plugins/pulse/ao_pulse.c	2010-12-06 20:04:43 UTC (rev 17717)
+++ trunk/ao/src/plugins/pulse/ao_pulse.c	2010-12-06 20:09:29 UTC (rev 17718)
@@ -61,7 +61,7 @@
     AO_FMT_NATIVE,
     50,
     ao_pulse_options,
-    8
+    sizeof(ao_pulse_options)/sizeof(*ao_pulse_options)
 };
 
 typedef struct ao_pulse_internal {

Modified: trunk/ao/src/plugins/sndio/ao_sndio.c
===================================================================
--- trunk/ao/src/plugins/sndio/ao_sndio.c	2010-12-06 20:04:43 UTC (rev 17717)
+++ trunk/ao/src/plugins/sndio/ao_sndio.c	2010-12-06 20:09:29 UTC (rev 17718)
@@ -35,7 +35,7 @@
   AO_FMT_NATIVE,
   30,
   ao_sndio_options,
-  6
+  sizeof(ao_sndio_options)/sizeof(*ao_sndio_options)
 };
 
 typedef struct ao_sndio_internal

Modified: trunk/ao/src/plugins/sun/ao_sun.c
===================================================================
--- trunk/ao/src/plugins/sun/ao_sun.c	2010-12-06 20:04:43 UTC (rev 17717)
+++ trunk/ao/src/plugins/sun/ao_sun.c	2010-12-06 20:09:29 UTC (rev 17718)
@@ -70,7 +70,7 @@
 	AO_FMT_NATIVE,
 	20,
 	ao_sun_options,
-	6
+        sizeof(ao_sun_options)/sizeof(*ao_sun_options)
 };
 
 



More information about the commits mailing list