Mercurial > mplayer.hg

changeset 29586:2eff450157cd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
The suboption parser now takes a const options list, so mark them all const.
author reimar
date Wed, 02 Sep 2009 11:33:37 +0000
parents a17d4f8040f1
children b1f7d992a246
files libao2/ao_alsa.c libao2/ao_dart.c libao2/ao_dsound.c libao2/ao_jack.c libao2/ao_mpegpes.c libao2/ao_openal.c libao2/ao_pcm.c
diffstat 7 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/libao2/ao_alsa.c	Wed Sep 02 11:07:02 2009 +0000
+++ b/libao2/ao_alsa.c	Wed Sep 02 11:33:37 2009 +0000
@@ -326,7 +326,7 @@
     snd_pcm_uframes_t chunk_size;
     snd_pcm_uframes_t bufsize;
     snd_pcm_uframes_t boundary;
-    opt_t subopts[] = {
+    const opt_t subopts[] = {
       {"block", OPT_ARG_BOOL, &block, NULL},
       {"device", OPT_ARG_STR, &device, (opt_test_f)str_maxlen},
       {NULL}
--- a/libao2/ao_dart.c	Wed Sep 02 11:07:02 2009 +0000
+++ b/libao2/ao_dart.c	Wed Sep 02 11:33:37 2009 +0000
@@ -146,7 +146,7 @@
     int nDartSamples = DEFAULT_DART_SAMPLES;
     int nBytesPerSample;
 
-    opt_t subopts[] = {
+    const opt_t subopts[] = {
         {"share", OPT_ARG_BOOL, &fShare, NULL},
         {"bufsize", OPT_ARG_INT, &nDartSamples, (opt_test_f)int_non_neg},
         {NULL}
--- a/libao2/ao_dsound.c	Wed Sep 02 11:07:02 2009 +0000
+++ b/libao2/ao_dsound.c	Wed Sep 02 11:33:37 2009 +0000
@@ -223,7 +223,7 @@
     HRESULT (WINAPI *OurDirectSoundCreate)(LPGUID, LPDIRECTSOUND *, LPUNKNOWN);
 	HRESULT (WINAPI *OurDirectSoundEnumerate)(LPDSENUMCALLBACKA, LPVOID);
 	int device_index=0;
-	opt_t subopts[] = {
+	const opt_t subopts[] = {
 	  {"device", OPT_ARG_INT, &device_num,NULL},
 	  {NULL}
 	};
--- a/libao2/ao_jack.c	Wed Sep 02 11:07:02 2009 +0000
+++ b/libao2/ao_jack.c	Wed Sep 02 11:33:37 2009 +0000
@@ -208,7 +208,7 @@
   char *port_name = NULL;
   char *client_name = NULL;
   int autostart = 0;
-  opt_t subopts[] = {
+  const opt_t subopts[] = {
     {"port", OPT_ARG_MSTRZ, &port_name, NULL},
     {"name", OPT_ARG_MSTRZ, &client_name, NULL},
     {"estimate", OPT_ARG_BOOL, &estimate, NULL},
--- a/libao2/ao_mpegpes.c	Wed Sep 02 11:07:02 2009 +0000
+++ b/libao2/ao_mpegpes.c	Wed Sep 02 11:33:37 2009 +0000
@@ -158,7 +158,7 @@
 	int card = -1;
 	char *ao_file = NULL;
 
-	opt_t subopts[] = {
+	const opt_t subopts[] = {
 		{"card", OPT_ARG_INT, &card, NULL},
 		{"file", OPT_ARG_MSTRZ, &ao_file, NULL},
 		{NULL}
--- a/libao2/ao_openal.c	Wed Sep 02 11:07:02 2009 +0000
+++ b/libao2/ao_openal.c	Wed Sep 02 11:33:37 2009 +0000
@@ -106,7 +106,7 @@
   ALCint freq = 0;
   ALCint attribs[] = {ALC_FREQUENCY, rate, 0, 0};
   int i;
-  opt_t subopts[] = {
+  const opt_t subopts[] = {
     {NULL}
   };
   if (subopt_parse(ao_subdevice, subopts) != 0) {
--- a/libao2/ao_pcm.c	Wed Sep 02 11:07:02 2009 +0000
+++ b/libao2/ao_pcm.c	Wed Sep 02 11:33:37 2009 +0000
@@ -94,7 +94,7 @@
 // return: 1=success 0=fail
 static int init(int rate,int channels,int format,int flags){
     int bits;
-    opt_t subopts[] = {
+    const opt_t subopts[] = {
         {"waveheader", OPT_ARG_BOOL, &ao_pcm_waveheader, NULL},
         {"file",       OPT_ARG_MSTRZ, &ao_outputfilename, NULL},
         {"fast",       OPT_ARG_BOOL, &fast, NULL},