[MPlayer-cvslog] r31725 - trunk/libao2/ao_coreaudio.c

12 Jul 2010

Author: adrian
Date: Mon Jul 12 22:19:09 2010
New Revision: 31725

Log:
Improve handling of the "help" suboption in coreaudio:
Avoid flagging it as an error and continue intialization if it is selected.

Modified:
   trunk/libao2/ao_coreaudio.c

Modified: trunk/libao2/ao_coreaudio.c
==============================================================================

--- trunk/libao2/ao_coreaudio.c	Mon Jul 12 20:04:05 2010	(r31724)
+++ trunk/libao2/ao_coreaudio.c	Mon Jul 12 22:19:09 2010	(r31725)
@@ -400,18 +400,20 @@ OSStatus err;
 UInt32 size, maxFrames, b_alive;
 char *psz_name;
 AudioDeviceID devid_def = 0;
-int device_id;
+int device_id, display_help = 0;
 
     const opt_t subopts[] = {
         {"device_id", OPT_ARG_INT, &device_id, NULL},
+        {"help", OPT_ARG_BOOL, &display_help, NULL},
         {NULL}
     };
 
     // set defaults
     device_id = 0;
 
-    if (subopt_parse(ao_subdevice, subopts) != 0) {
+    if (subopt_parse(ao_subdevice, subopts) != 0 || display_help) {
         print_help();
+        if (!display_help)
         return 0;
     }

    