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

[Jack Moffitt]

jack        01/04/07 19:33:30

  Modified:    .        vorbis-tools.spec
               ogg123   ao_interface.c ogg123.c
  Log:
  Fixed bugs #3, #4, #9, #15

Revision  Changes    Path
1.14      +3 -2      vorbis-tools/vorbis-tools.spec

Index: vorbis-tools.spec
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/vorbis-tools.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- vorbis-tools.spec	2001/03/28 17:50:22	1.13
+++ vorbis-tools.spec	2001/04/08 02:33:29	1.14
@@ -41,8 +41,9 @@
 %doc ogg123/ogg123rc-example
 /usr/bin/oggenc
 /usr/bin/ogg123
-/usr/share/man/man1/ogg123.1.gz
-/usr/share/man/man1/oggenc.1.gz
+/usr/bin/vorbiscomment
+/usr/share/man/man1/ogg123.1*
+/usr/share/man/man1/oggenc.1*
 
 %clean 
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT

1.5       +3 -2      vorbis-tools/ogg123/ao_interface.c

Index: ao_interface.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/ogg123/ao_interface.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ao_interface.c	2001/02/24 01:39:19	1.4
+++ ao_interface.c	2001/04/08 02:33:30	1.5
@@ -19,6 +19,7 @@
     }
     devices_list->driver_id = driver_id;
     devices_list->options = options;
+    devices_list->device = NULL;
     devices_list->next_device = NULL;
 
     return devices_list;
@@ -75,12 +76,12 @@
 
     fp = fopen(filename, "r");
     /* if no ~/.ogg123rc can be found, try /etc/ogg123rc instead */
-    if (!fp) fp = fopen("/etc/ogg123.rc", "r");
+    if (!fp) fp = fopen("/etc/ogg123rc", "r");
 
     /* This is a very simplistic parser. If more options are ever added,
        it will need a serious overhaul. */
     if (fp) {
-      if (fgets(line, 100, fp)) {
+      while (fgets(line, 100, fp)) {
         if (strncmp(line, "default_device=", 15) == 0) {
           device = &line[15];
           for (i = 0; i < strlen(device); i++)

1.32      +3 -2      vorbis-tools/ogg123/ogg123.c

Index: ogg123.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/ogg123/ogg123.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- ogg123.c	2001/03/24 02:31:39	1.31
+++ ogg123.c	2001/04/08 02:33:30	1.32
@@ -14,7 +14,7 @@
  *                                                                  *
  ********************************************************************
 
- last mod: $Id: ogg123.c,v 1.31 2001/03/24 02:31:39 kcarnold Exp $
+ last mod: $Id: ogg123.c,v 1.32 2001/04/08 02:33:30 jack Exp $
 
  ********************************************************************/
 
@@ -213,7 +213,8 @@
     }
 
     while (opt.outdevices != NULL) {
-      ao_close(opt.outdevices->device);
+      if (opt.outdevices->device)
+        ao_close(opt.outdevices->device);
       current = opt.outdevices->next_device;
       free(opt.outdevices);
       opt.outdevices = current;

--- >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.