[xiph-commits] r17716 - in trunk/ao: doc src/plugins/roar

[xiphmont at svn.xiph.org]

Author: xiphmont
Date: 2010-12-06 12:00:10 -0800 (Mon, 06 Dec 2010)
New Revision: 17716

Modified:
   trunk/ao/doc/drivers.html
   trunk/ao/src/plugins/roar/ao_roar.c
Log:
Correct use of client name to the what Philipp originally wrote



Modified: trunk/ao/doc/drivers.html
===================================================================
--- trunk/ao/doc/drivers.html	2010-12-06 19:42:00 UTC (rev 17715)
+++ trunk/ao/doc/drivers.html	2010-12-06 20:00:10 UTC (rev 17716)
@@ -227,7 +227,7 @@
 <li>"host" - Specifies Roar server to use (legacy synonym for 'server').
 <li>"id" - Selects audio device to use for playback by number.  For a roar server, this is mapped to a given output mixer.
 <li>"dev" - Selects audio device to use for playback by name.  For a roar server, this is a number and thus synonymous with 'id' above.
-<li>"stream_name" - descriptive name for this playback stream (eg, the application name).
+<li>"client_name" - descriptive name for this client (eg, the application name).
 <li>"role" - stream type as enumerated by Roar; see RoarAudio documentation.
 
 </ul>

Modified: trunk/ao/src/plugins/roar/ao_roar.c
===================================================================
--- trunk/ao/src/plugins/roar/ao_roar.c	2010-12-06 19:42:00 UTC (rev 17715)
+++ trunk/ao/src/plugins/roar/ao_roar.c	2010-12-06 20:00:10 UTC (rev 17716)
@@ -37,7 +37,7 @@
 
 static char *ao_roar_options[] = {
   "host", "server",
-  "stream_name",
+  "client_name",
   "id", "dev",
   "role"
   "verbose", "quiet", "matrix", "debug"
@@ -153,7 +153,7 @@
   } else if ( !strcmp(key, "id") || !strcmp(key, "dev") ) {
     if(internal->mixer) free(internal->mixer);
     internal->mixer = strdup(value);
-  } else if ( !strcmp(key, "stream_name") ) {
+  } else if ( !strcmp(key, "client_name") ) {
     if(internal->client_name) free(internal->client_name);
     internal->client_name = strdup(value);
   } else if ( !strcmp(key, "role") ) {