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

[Jack Moffitt]

jack        01/02/23 17:39:19

  Modified:    ogg123   ao_interface.c ogg123.1
  Log:
  Ingo Saitz's patch for /etc/ogg123rc

Revision  Changes    Path
1.4       +3 -1      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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ao_interface.c	2001/02/20 08:10:22	1.3
+++ ao_interface.c	2001/02/24 01:39:19	1.4
@@ -73,10 +73,12 @@
     strncpy(filename, homedir, FILENAME_MAX);
     strcat(filename, "/.ogg123rc");
 
+    fp = fopen(filename, "r");
+    /* if no ~/.ogg123rc can be found, try /etc/ogg123rc instead */
+    if (!fp) fp = fopen("/etc/ogg123.rc", "r");
 
     /* This is a very simplistic parser. If more options are ever added,
        it will need a serious overhaul. */
-    fp = fopen(filename, "r");
     if (fp) {
       if (fgets(line, 100, fp)) {
         if (strncmp(line, "default_device=", 15) == 0) {

1.3       +15 -0     vorbis-tools/ogg123/ogg123.1

Index: ogg123.1
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/ogg123/ogg123.1,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ogg123.1	2000/10/30 23:27:47	1.2
+++ ogg123.1	2001/02/24 01:39:19	1.3
@@ -191,6 +191,21 @@
 .RE
 .PP
 
+.SH FILES
+
+.TP
+/etc/ogg123rc
+Can be used to set the default output device for 
+.B ogg123.
+See the included file
+.B ogg123rc-example
+for an example.
+
+.TP
+~/.ogg123rc
+Per-user config file to override the system wide output device settings.
+.PP
+
 .SH BUGS
 
 The WAV driver does not interpret the file "-" as stdout.

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