diff Plugins/Input/mpg123/mpg123.c @ 1071:592ef16386aa trunk

[svn] - use global proxy configuration instead of individual configurations (chainsaw)
author nenolod
date Tue, 16 May 2006 21:52:56 -0700
parents e64eb333b63f
children 09eb2c83097a
line wrap: on
line diff
--- a/Plugins/Input/mpg123/mpg123.c	Tue May 16 21:52:31 2006 -0700
+++ b/Plugins/Input/mpg123/mpg123.c	Tue May 16 21:52:56 2006 -0700
@@ -189,16 +189,6 @@
     bmp_cfg_db_get_bool(db, "MPG123", "use_udp_channel",
                         &mpg123_cfg.use_udp_channel);
 
-    bmp_cfg_db_get_bool(db, "MPG123", "use_proxy", &mpg123_cfg.use_proxy);
-    if (!bmp_cfg_db_get_string
-        (db, "MPG123", "proxy_host", &mpg123_cfg.proxy_host))
-        mpg123_cfg.proxy_host = g_strdup("localhost");
-    bmp_cfg_db_get_int(db, "MPG123", "proxy_port", &mpg123_cfg.proxy_port);
-    bmp_cfg_db_get_bool(db, "MPG123", "proxy_use_auth",
-                        &mpg123_cfg.proxy_use_auth);
-    bmp_cfg_db_get_string(db, "MPG123", "proxy_user", &mpg123_cfg.proxy_user);
-    bmp_cfg_db_get_string(db, "MPG123", "proxy_pass", &mpg123_cfg.proxy_pass);
-
     bmp_cfg_db_get_bool(db, "MPG123", "title_override",
                         &mpg123_cfg.title_override);
     bmp_cfg_db_get_bool(db, "MPG123", "disable_id3v2",
@@ -214,6 +204,13 @@
     if (mpg123_cfg.title_encoding_enabled)
         mpg123_id3_encoding_list = g_strsplit_set(mpg123_cfg.title_encoding, ENCODING_SEPARATOR, 0);
 
+    bmp_cfg_db_get_bool(db, NULL, "use_proxy", &mpg123_cfg.use_proxy);
+    bmp_cfg_db_get_string(db, NULL, "proxy_host", &mpg123_cfg.proxy_host);
+    bmp_cfg_db_get_int(db, NULL, "proxy_port", &mpg123_cfg.proxy_port);
+    bmp_cfg_db_get_bool(db, NULL, "proxy_use_auth", &mpg123_cfg.proxy_use_auth);
+    bmp_cfg_db_get_string(db, NULL, "proxy_user", &mpg123_cfg.proxy_user);
+    bmp_cfg_db_get_string(db, NULL, "proxy_pass", &mpg123_cfg.proxy_pass);
+
     bmp_cfg_db_close(db);
 
     if (mpg123_cfg.resolution != 16 && mpg123_cfg.resolution != 8)