config: api cleanup

prefix the api with module name : srs_xxx_config() -> srs_config_xxx()

diff --git a/src/daemon/config.c b/src/daemon/config.c
index fa3df3b..5044f9c 100644 (file)
--- a/src/daemon/config.c
+++ b/src/daemon/config.c
@@ -88,10 +88,9 @@ static void config_set_defaults(srs_context_t *srs, const char *bin)
     if ((e = strstr(bin, "/src/srs-daemon")) != NULL ||
         (e = strstr(bin, "/src/.libs/lt-srs-daemon")) != NULL) {
         static int     warned = 0;
-        mrp_log_mask_t saved;
 
         if (!warned) {
-            saved = mrp_log_set_mask(MRP_LOG_MASK_WARNING);
+            mrp_log_mask_t saved = mrp_log_set_mask(MRP_LOG_MASK_WARNING);
             mrp_log_warning("***");
             mrp_log_warning("*** Looks like we are run from the source tree.");
             mrp_log_warning("*** Runtime defaults will be set accordingly...");
@@ -607,7 +606,7 @@ static srs_cfg_t *find_config(srs_cfg_t *settings, const char *key)
 }
 
 
-const char *srs_get_string_config(srs_cfg_t *settings, const char *key,
+const char *srs_config_get_string(srs_cfg_t *settings, const char *key,
                                   const char *defval)
 {
     srs_cfg_t *cfg = find_config(settings, key);
@@ -622,7 +621,7 @@ const char *srs_get_string_config(srs_cfg_t *settings, const char *key,
 }
 
 
-int srs_get_bool_config(srs_cfg_t *settings, const char *key, int defval)
+int srs_config_get_bool(srs_cfg_t *settings, const char *key, int defval)
 {
     srs_cfg_t *cfg = find_config(settings, key);
 
@@ -643,7 +642,7 @@ int srs_get_bool_config(srs_cfg_t *settings, const char *key, int defval)
 }
 
 
-int32_t srs_get_int32_config(srs_cfg_t *settings, const char *key,
+int32_t srs_config_get_int32(srs_cfg_t *settings, const char *key,
                              int32_t defval)
 {
     srs_cfg_t *cfg = find_config(settings, key);
@@ -668,7 +667,7 @@ int32_t srs_get_int32_config(srs_cfg_t *settings, const char *key,
 }
 
 
-uint32_t srs_get_uint32_config(srs_cfg_t *settings, const char *key,
+uint32_t srs_config_get_uint32(srs_cfg_t *settings, const char *key,
                                uint32_t defval)
 {
     srs_cfg_t *cfg = find_config(settings, key);
@@ -693,7 +692,7 @@ uint32_t srs_get_uint32_config(srs_cfg_t *settings, const char *key,
 }
 
 
-int srs_collect_config(srs_cfg_t *settings, const char *prefix,
+int srs_config_collect(srs_cfg_t *settings, const char *prefix,
                        srs_cfg_t **matching)
 {
     srs_cfg_t *m = NULL;
@@ -753,7 +752,7 @@ int srs_collect_config(srs_cfg_t *settings, const char *prefix,
 }
 
 
-void srs_free_config(srs_cfg_t *settings)
+void srs_config_free(srs_cfg_t *settings)
 {
     srs_cfg_t *s;
 

diff --git a/src/daemon/config.h b/src/daemon/config.h
index 2e29071..05f637b 100644 (file)
--- a/src/daemon/config.h
+++ b/src/daemon/config.h
@@ -68,26 +68,26 @@ void config_parse_cmdline(srs_context_t *srs, int argc, char **argv,
                           char **env);
 
 /** Get the value of a string configuration variable. */
-const char *srs_get_string_config(srs_cfg_t *settings, const char *key,
+const char *srs_config_get_string(srs_cfg_t *settings, const char *key,
                                   const char *defval);
 
 /** Get the value of a boolean configuration variable. */
-int srs_get_bool_config(srs_cfg_t *settings, const char *key, int defval);
+int srs_config_get_bool(srs_cfg_t *settings, const char *key, int defval);
 
 /** Get the value of a 32-bit signed integer configuration variable. */
-int32_t srs_get_int32_config(srs_cfg_t *settings, const char *key,
+int32_t srs_config_get_int32(srs_cfg_t *settings, const char *key,
                              int32_t defval);
 
 /** Get the value of a 32-bit unsigned integer configuration variable. */
-uint32_t srs_get_uint32_config(srs_cfg_t *settings, const char *key,
+uint32_t srs_config_get_uint32(srs_cfg_t *settings, const char *key,
                                uint32_t defval);
 
 /** Collect configuration variable matching the given prefix. */
-int srs_collect_config(srs_cfg_t *settings, const char *prefix,
+int srs_config_collect(srs_cfg_t *settings, const char *prefix,
                        srs_cfg_t **matching);
 
 /** Free an array of configuration variables. */
-void srs_free_config(srs_cfg_t *settings);
+void srs_config_free(srs_cfg_t *settings);
 
 /** Set a configuration variable to the given value. */
 void srs_set_config(srs_context_t *srs, const char *key, const char *value);

diff --git a/src/daemon/daemon.c b/src/daemon/daemon.c
index c85c350..c1a447c 100644 (file)
--- a/src/daemon/daemon.c
+++ b/src/daemon/daemon.c
@@ -106,7 +106,7 @@ static void daemonize(srs_context_t *srs)
 
 static void create_mainloop(srs_context_t *srs)
 {
-    if (srs_get_bool_config(srs->settings, "gmainloop", FALSE)) {
+    if (srs_config_get_bool(srs->settings, "gmainloop", FALSE)) {
         mrp_log_info("Configured to run with glib mainloop.");
 
 #ifndef GLIB_VERSION_2_36
@@ -270,7 +270,7 @@ int main(int argc, char *argv[], char *env[])
         }
 
         cfg  = srs->settings;
-        srec = srs_get_string_config(cfg, "daemon.speech-backend", NULL);
+        srec = srs_config_get_string(cfg, "daemon.speech-backend", NULL);
         srs_activate_srec(srs, srec);
 
         daemonize(srs);

diff --git a/src/daemon/recognizer.c b/src/daemon/recognizer.c
index d66391b..3a3ed59 100644 (file)
--- a/src/daemon/recognizer.c
+++ b/src/daemon/recognizer.c
@@ -412,7 +412,7 @@ static int get_effect_config(srs_context_t *srs, effect_t **cfgp)
     }
 
 
-    cnt = srs_collect_config(srs->settings, "feedback.tts.", &cfg);
+    cnt = srs_config_collect(srs->settings, "feedback.tts.", &cfg);
 
     if (cnt > (int)MRP_ARRAY_SIZE(effects))
         cnt = (int)MRP_ARRAY_SIZE(effects);
@@ -424,7 +424,7 @@ static int get_effect_config(srs_context_t *srs, effect_t **cfgp)
         mrp_log_info("Configured TTS effect '%s'.", cfg[i].value);
     }
 
-    cnt = srs_collect_config(srs->settings, "feedback.sound.", &cfg);
+    cnt = srs_config_collect(srs->settings, "feedback.sound.", &cfg);
 
     if (n + cnt > (int)MRP_ARRAY_SIZE(effects))
         cnt = (int)MRP_ARRAY_SIZE(effects) - n;

diff --git a/src/daemon/resctl.c b/src/daemon/resctl.c
index 40b1351..fc635ba 100644 (file)
--- a/src/daemon/resctl.c
+++ b/src/daemon/resctl.c
@@ -76,8 +76,8 @@ static const char *name_ssyn;
 
 static void get_resource_names(srs_cfg_t *cfg)
 {
-    name_srec = srs_get_string_config(cfg, CONFIG_SREC, DEFAULT_SREC);
-    name_ssyn = srs_get_string_config(cfg, CONFIG_SSYN, DEFAULT_SSYN);
+    name_srec = srs_config_get_string(cfg, CONFIG_SREC, DEFAULT_SREC);
+    name_ssyn = srs_config_get_string(cfg, CONFIG_SSYN, DEFAULT_SSYN);
 
     mrp_log_info("Using resource '%s' for speech recognition.", name_srec);
     mrp_log_info("Using resoruce '%s' for speech synthesis.", name_ssyn);

diff --git a/src/plugins/client-api/dbus/dbus-client.c b/src/plugins/client-api/dbus/dbus-client.c
index dad9fc8..3cbc46b 100644 (file)
--- a/src/plugins/client-api/dbus/dbus-client.c
+++ b/src/plugins/client-api/dbus/dbus-client.c
@@ -853,7 +853,7 @@ static int config_dbusif(srs_plugin_t *plugin, srs_cfg_t *settings)
 
     mrp_debug("configure D-Bus client interface plugin");
 
-    bus->address = srs_get_string_config(settings, BUS_CONFIG, BUS_DEFAULT);
+    bus->address = srs_config_get_string(settings, BUS_CONFIG, BUS_DEFAULT);
 
     mrp_log_info("Client interface D-Bus address: '%s'", bus->address);
 

diff --git a/src/plugins/client-api/native/native-server.c b/src/plugins/client-api/native/native-server.c
index b9e0c06..1a7f66a 100644 (file)
--- a/src/plugins/client-api/native/native-server.c
+++ b/src/plugins/client-api/native/native-server.c
@@ -532,8 +532,8 @@ static int config_native(srs_plugin_t *plugin, srs_cfg_t *cfg)
 
     mrp_debug("configure native client interface plugin");
 
-    s->address = srs_get_string_config(cfg, CONFIG_ADDRESS, DEFAULT_ADDRESS);
-    s->sock    = srs_get_int32_config (cfg, CONFIG_SOCKET , DEFAULT_SOCKET);
+    s->address = srs_config_get_string(cfg, CONFIG_ADDRESS, DEFAULT_ADDRESS);
+    s->sock    = srs_config_get_int32(cfg, CONFIG_SOCKET , DEFAULT_SOCKET);
 
     if (s->sock < 0)
         mrp_log_info("Using native client transport: '%s'.", s->address);

diff --git a/src/plugins/client-api/wrt-media-client/wrt-media-client.c b/src/plugins/client-api/wrt-media-client/wrt-media-client.c
index 2344a8f..1c470b1 100644 (file)
--- a/src/plugins/client-api/wrt-media-client/wrt-media-client.c
+++ b/src/plugins/client-api/wrt-media-client/wrt-media-client.c
@@ -387,7 +387,7 @@ static int config_wrtc(srs_plugin_t *plugin, srs_cfg_t *settings)
     }
 
     for (cfg = config; cfg->key; cfg++)
-        *cfg->addr = srs_get_string_config(settings, cfg->key, cfg->def);
+        *cfg->addr = srs_config_get_string(settings, cfg->key, cfg->def);
 
     mrp_log_info("WRT media client configuration:");
     mrp_log_info("    D-Bus: '%s'", wrtc->config.bus);

diff --git a/src/plugins/mpris2-client/mpris2-plugin.c b/src/plugins/mpris2-client/mpris2-plugin.c
index 63e2104..3ff6884 100644 (file)
--- a/src/plugins/mpris2-client/mpris2-plugin.c
+++ b/src/plugins/mpris2-client/mpris2-plugin.c
@@ -86,7 +86,7 @@ static int config_mpris2(srs_plugin_t *plugin, srs_cfg_t *settings)
 
     mrp_debug("configuring Mpris2 client plugin");
 
-    n = srs_collect_config(settings, MPRIS2_PREFIX, &cfgs);
+    n = srs_config_collect(settings, MPRIS2_PREFIX, &cfgs);
     pfxlen = strlen(MPRIS2_PREFIX);
 
     mrp_log_info("Found %d Mpris2 configuration keys.", n);
@@ -122,7 +122,7 @@ static int config_mpris2(srs_plugin_t *plugin, srs_cfg_t *settings)
         }
     }
 
-    srs_free_config(cfgs);
+    srs_config_free(cfgs);
 
     return TRUE;
 }

diff --git a/src/plugins/search-client/search-plugin.c b/src/plugins/search-client/search-plugin.c
index 5e27968..add4b0a 100644 (file)
--- a/src/plugins/search-client/search-plugin.c
+++ b/src/plugins/search-client/search-plugin.c
@@ -202,8 +202,8 @@ static int config_search(srs_plugin_t *plugin, srs_cfg_t *settings)
 
     mrp_debug("configure search plugin");
 
-    dict = srs_get_string_config(settings, "search.dictionary", DICTIONARY);
-    cmd  = srs_get_string_config(settings, "search.command"   , COMMAND);
+    dict = srs_config_get_string(settings, "search.dictionary", DICTIONARY);
+    cmd  = srs_config_get_string(settings, "search.command"   , COMMAND);
 
     q = (char *)cmd + strlen(cmd);
     while (q > cmd && (*q == ' ' || *q == '\t'))

diff --git a/src/plugins/simple-disambiguator/disambiguator.c b/src/plugins/simple-disambiguator/disambiguator.c
index 137246d..653b863 100644 (file)
--- a/src/plugins/simple-disambiguator/disambiguator.c
+++ b/src/plugins/simple-disambiguator/disambiguator.c
@@ -725,13 +725,13 @@ static int config_disamb(srs_plugin_t *plugin, srs_cfg_t *settings)
 
     mrp_debug("configuring disambiguator");
 
-    n = srs_collect_config(settings, "disambiguator.", &cfg);
+    n = srs_config_collect(settings, "disambiguator.", &cfg);
 
     mrp_debug("found %d configuration keys%s", n, n ? ":" : "");
     for (i = 0; i < n; i++)
         mrp_debug("    %s = %s", cfg[i].key, cfg[i].value);
 
-    srs_free_config(cfg);
+    srs_config_free(cfg);
 
     return TRUE;
 }

diff --git a/src/plugins/speech-to-text/fake/fake.c b/src/plugins/speech-to-text/fake/fake.c
index f1b3762..8969762 100644 (file)
--- a/src/plugins/speech-to-text/fake/fake.c
+++ b/src/plugins/speech-to-text/fake/fake.c
@@ -367,11 +367,11 @@ static int config_fake(srs_plugin_t *plugin, srs_cfg_t *settings)
         }
     }
 
-    n = srs_collect_config(settings, "fake.", &cfg);
+    n = srs_config_collect(settings, "fake.", &cfg);
     mrp_debug("Found %d own configuration keys.", n);
     for (i = 0; i < n; i++)
         mrp_debug("    %s = %s", cfg[i].key, cfg[i].value);
-    srs_free_config(cfg);
+    srs_config_free(cfg);
 
     return TRUE;
 }

diff --git a/src/plugins/speech-to-text/nuance/nuance.c b/src/plugins/speech-to-text/nuance/nuance.c
index 842c0ed..a7f1a43 100644 (file)
--- a/src/plugins/speech-to-text/nuance/nuance.c
+++ b/src/plugins/speech-to-text/nuance/nuance.c
@@ -195,13 +195,13 @@ static int config_nuance(srs_plugin_t *plugin, srs_cfg_t *settings)
 
     mrp_debug("configuring Nuance speech recognition backend plugin");
 
-    n = srs_collect_config(settings, NUANCE_PREFIX, &cfg);
+    n = srs_config_collect(settings, NUANCE_PREFIX, &cfg);
 
     mrp_log_info("Found %d Nuance plugin configuration keys.", n);
     for (i = 0; i < n; i++)
         mrp_log_info("    %s = %s", cfg[i].key, cfg[i].value);
 
-    srs_free_config(cfg);
+    srs_config_free(cfg);
 
     return TRUE;
 }

diff --git a/src/plugins/speech-to-text/sphinx/sphinx-plugin.c b/src/plugins/speech-to-text/sphinx/sphinx-plugin.c
index 50bc0e7..5d17edb 100644 (file)
--- a/src/plugins/speech-to-text/sphinx/sphinx-plugin.c
+++ b/src/plugins/speech-to-text/sphinx/sphinx-plugin.c
@@ -251,7 +251,7 @@ static int config_sphinx(srs_plugin_t *plugin, srs_cfg_t *settings)
 
     mrp_debug("configuring CMU Sphinx speech recognition backend plugin");
 
-    n = srs_collect_config(settings, SPHINX_PREFIX, &cfg);
+    n = srs_config_collect(settings, SPHINX_PREFIX, &cfg);
 
     mrp_log_info("Found %d CMU Sphinx plugin configuration keys.", n);
 
@@ -264,7 +264,7 @@ static int config_sphinx(srs_plugin_t *plugin, srs_cfg_t *settings)
         return FALSE;
     }
 
-    srs_free_config(cfg);
+    srs_config_free(cfg);
 
     return TRUE;
 }

diff --git a/src/plugins/text-to-speech/espeak/espeak-voice.c b/src/plugins/text-to-speech/espeak/espeak-voice.c
index 40a3155..27db37b 100644 (file)
--- a/src/plugins/text-to-speech/espeak/espeak-voice.c
+++ b/src/plugins/text-to-speech/espeak/espeak-voice.c
@@ -230,7 +230,7 @@ static int config_espeak(srs_plugin_t *plugin, srs_cfg_t *cfg)
 
     mrp_debug("configure espeak voice plugin");
 
-    e->config.voicedir = srs_get_string_config(cfg, CONFIG_VOICEDIR, NULL);
+    e->config.voicedir = srs_config_get_string(cfg, CONFIG_VOICEDIR, NULL);
 
     out  = AUDIO_OUTPUT_SYNCHRONOUS;
     path = e->config.voicedir;

diff --git a/src/plugins/text-to-speech/festival/festival-voice.c b/src/plugins/text-to-speech/festival/festival-voice.c
index 9a4fefd..a3819cf 100644 (file)
--- a/src/plugins/text-to-speech/festival/festival-voice.c
+++ b/src/plugins/text-to-speech/festival/festival-voice.c
@@ -133,7 +133,7 @@ static int config_festival(srs_plugin_t *plugin, srs_cfg_t *cfg)
         return FALSE;
     }
 
-    f->config.voices = srs_get_string_config(cfg, CONFIG_VOICES, DEFVAL_VOICES);
+    f->config.voices = srs_config_get_string(cfg, CONFIG_VOICES, DEFVAL_VOICES);
 
     if (!strcmp(f->config.voices, AUTOLOAD)) {
         if (carnival_available_voices(&voices, &nvoice) == 0) {

diff --git a/src/plugins/text-to-speech/simple-voice/simple-voice.c b/src/plugins/text-to-speech/simple-voice/simple-voice.c
index 0c5b395..4daf027 100644 (file)
--- a/src/plugins/text-to-speech/simple-voice/simple-voice.c
+++ b/src/plugins/text-to-speech/simple-voice/simple-voice.c
@@ -371,8 +371,8 @@ static int config_synth(srs_plugin_t *plugin, srs_cfg_t *settings)
 
     mrp_debug("configure simple voice plugin");
 
-    tts  = srs_get_string_config(settings, "voice.say" , FESTIVAL);
-    play = srs_get_string_config(settings, "voice.play", PAPLAY);
+    tts  = srs_config_get_string(settings, "voice.say" , FESTIVAL);
+    play = srs_config_get_string(settings, "voice.play", PAPLAY);
 
     mrp_log_info("voice plugin TTS play command: '%s'", tts);
     mrp_log_info("voice plugin sound command: '%s'"   , play);