[xiph-cvs] cvs commit: vorbis-tools/ogg123 ogg123.c

[Kenneth C. Arnold]

kcarnold    01/08/12 20:08:31

  Modified:    ogg123   Tag: kcarnold_work ogg123.c
  Log:
  Fix default device handling to allow other devices.

Revision  Changes    Path
No                   revision

No                   revision

1.39.2.17 +13 -13    vorbis-tools/ogg123/ogg123.c

Index: ogg123.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/ogg123/ogg123.c,v
retrieving revision 1.39.2.16
retrieving revision 1.39.2.17
diff -u -r1.39.2.16 -r1.39.2.17
--- ogg123.c	2001/08/13 01:46:43	1.39.2.16
+++ ogg123.c	2001/08/13 03:08:30	1.39.2.17
@@ -14,7 +14,7 @@
  *                                                                  *
  ********************************************************************
 
- last mod: $Id: ogg123.c,v 1.39.2.16 2001/08/13 01:46:43 kcarnold Exp $
+ last mod: $Id: ogg123.c,v 1.39.2.17 2001/08/13 03:08:30 kcarnold Exp $
 
  ********************************************************************/
 
@@ -456,20 +456,20 @@
         if (temp_driver_id < 0 && Options.statOpts.quiet < 2)
           fprintf (stderr, "Warning: driver %s specified in configuration file invalid.\n", Options.outputOpts.default_device);
       }
-    }
-
-    if (temp_driver_id < 0) {
-      temp_driver_id = ao_default_driver_id();
-    }
+      
+      if (temp_driver_id < 0) {
+	temp_driver_id = ao_default_driver_id();
+      }
+      
+      if (temp_driver_id < 0) {
+	fprintf(stderr,
+		"Could not load default driver and no driver specified in config file. Exiting.\n");
+	exit(1);
+      }
 
-    if (temp_driver_id < 0) {
-      fprintf(stderr,
-	      "Could not load default driver and no driver specified in config file. Exiting.\n");
-      exit(1);
+      Options.outputOpts.devices = append_device(Options.outputOpts.devices, temp_driver_id, 
+						 temp_options, NULL);
     }
-
-    Options.outputOpts.devices = append_device(Options.outputOpts.devices, temp_driver_id, 
-				   temp_options, NULL);
 
     Options.inputOpts.BufferSize *= 1024;
 

--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.