# HG changeset patch # User nenolod # Date 1149471349 25200 # Node ID b851ec599ad645a0755aeaea88e85af90888a26b # Parent 8f84ecc1e1f00c332cd22a38c308ad8307591aee [svn] - "Reference FLAC Player v1.1.2" becomes "FLAC Audio Plugin" - Properly use global proxy configuration settings. diff -r 8f84ecc1e1f0 -r b851ec599ad6 Plugins/Input/flac/plugin.c --- a/Plugins/Input/flac/plugin.c Sun Jun 04 13:31:31 2006 -0700 +++ b/Plugins/Input/flac/plugin.c Sun Jun 04 18:35:49 2006 -0700 @@ -184,7 +184,7 @@ InputPlugin *get_iplugin_info() { - flac_ip.description = g_strdup_printf("Reference FLAC Player v%s", FLAC__VERSION_STRING); + flac_ip.description = g_strdup_printf(_("FLAC Audio Plugin")); return &flac_ip; } @@ -217,6 +217,7 @@ { ConfigDb *db; FLAC__uint32 test = 1; + gchar *tmp = NULL; is_big_endian_host_ = (*((FLAC__byte*)(&test)))? false : true; @@ -279,7 +280,11 @@ bmp_cfg_db_get_bool(db, NULL, "use_proxy", &flac_cfg.stream.use_proxy); bmp_cfg_db_get_string(db, NULL, "proxy_host", &flac_cfg.stream.proxy_host); - bmp_cfg_db_get_int(db, NULL, "proxy_port", &flac_cfg.stream.proxy_port); + bmp_cfg_db_get_string(db, NULL, "proxy_port", &tmp); + + if (tmp != NULL) + flac_cfg.stream.proxy_port = atoi(tmp); + bmp_cfg_db_get_bool(db, NULL, "proxy_use_auth", &flac_cfg.stream.proxy_use_auth); bmp_cfg_db_get_string(db, NULL, "proxy_user", &flac_cfg.stream.proxy_user); bmp_cfg_db_get_string(db, NULL, "proxy_pass", &flac_cfg.stream.proxy_pass);