diff src/esd/init.c @ 2124:b8da6a0b0da2

s/bmp_cfg_/aud_cfg_/g
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 24 Oct 2007 07:34:02 +0300
parents 3da1b8942b8b
children 7b284f323ad8
line wrap: on
line diff
--- a/src/esd/init.c	Wed Oct 24 07:32:18 2007 +0300
+++ b/src/esd/init.c	Wed Oct 24 07:34:02 2007 +0300
@@ -41,7 +41,7 @@
     esd_cfg.buffer_size = 3000;
     esd_cfg.prebuffer = 25;
 
-    db = bmp_cfg_db_open();
+    db = aud_cfg_db_open();
 
     if ((env = getenv("ESPEAKER")) != NULL) {
         char *temp;
@@ -56,20 +56,20 @@
         }
     }
     else {
-        bmp_cfg_db_get_bool(db, "ESD", "use_remote", &esd_cfg.use_remote);
-        bmp_cfg_db_get_string(db, "ESD", "remote_host", &esd_cfg.server);
-        bmp_cfg_db_get_int(db, "ESD", "remote_port", &esd_cfg.port);
+        aud_cfg_db_get_bool(db, "ESD", "use_remote", &esd_cfg.use_remote);
+        aud_cfg_db_get_string(db, "ESD", "remote_host", &esd_cfg.server);
+        aud_cfg_db_get_int(db, "ESD", "remote_port", &esd_cfg.port);
     }
-    bmp_cfg_db_get_bool(db, "ESD", "use_oss_mixer", &esd_cfg.use_oss_mixer);
-    bmp_cfg_db_get_int(db, "ESD", "buffer_size", &esd_cfg.buffer_size);
-    bmp_cfg_db_get_int(db, "ESD", "prebuffer", &esd_cfg.prebuffer);
+    aud_cfg_db_get_bool(db, "ESD", "use_oss_mixer", &esd_cfg.use_oss_mixer);
+    aud_cfg_db_get_int(db, "ESD", "buffer_size", &esd_cfg.buffer_size);
+    aud_cfg_db_get_int(db, "ESD", "prebuffer", &esd_cfg.prebuffer);
     
     /* restore volume levels */
-    bmp_cfg_db_get_int(db, "ESD", "volume_left", &lp);
-    bmp_cfg_db_get_int(db, "ESD", "volume_right", &rp);
+    aud_cfg_db_get_int(db, "ESD", "volume_left", &lp);
+    aud_cfg_db_get_int(db, "ESD", "volume_right", &rp);
     esdout_set_volume(lp, rp);
     
-    bmp_cfg_db_close(db);
+    aud_cfg_db_close(db);
 
     if (!esd_cfg.server)
         esd_cfg.server = g_strdup("localhost");