[xiph-commits] r16859 - trunk/ao/src

[xiphmont at svn.xiph.org]

Author: xiphmont
Date: 2010-01-31 02:34:47 -0800 (Sun, 31 Jan 2010)
New Revision: 16859

Modified:
   trunk/ao/src/audio_out.c
   trunk/ao/src/config.c
Log:
Somehow the source commit for 16856 got missed; second half of 
config file namespace fix


Modified: trunk/ao/src/audio_out.c
===================================================================
--- trunk/ao/src/audio_out.c	2010-01-31 06:22:46 UTC (rev 16858)
+++ trunk/ao/src/audio_out.c	2010-01-31 10:34:47 UTC (rev 16859)
@@ -877,7 +877,7 @@
 	driver_list *end;
 
 	/* Read config files */
-	read_config_files(&config);
+	ao_read_config_files(&config);
 
 	if (driver_head == NULL) {
 		driver_head = _load_static_drivers(&end);

Modified: trunk/ao/src/config.c
===================================================================
--- trunk/ao/src/config.c	2010-01-31 06:22:46 UTC (rev 16858)
+++ trunk/ao/src/config.c	2010-01-31 10:34:47 UTC (rev 16859)
@@ -70,7 +70,7 @@
 	char *homedir = getenv("HOME");
 
 	/* Read the system-wide config file */
-	read_config_file(config, AO_SYSTEM_CONFIG);
+	ao_read_config_file(config, AO_SYSTEM_CONFIG);
 	
 	/* Read the user config file */
 	if ( homedir!=NULL && 
@@ -78,7 +78,7 @@
 	{
 		strncpy(userfile, homedir, FILENAME_MAX);
 		strcat(userfile, AO_USER_CONFIG);
-		read_config_file(config, userfile);
+		ao_read_config_file(config, userfile);
 	}
 }