comparison src/adplug/adplug-xmms.cc @ 1301:df5d07d7ca7c

AdPlug database loading fix by Christian "Joker" Birchinger.
author Tony Vroon <chainsaw@gentoo.org>
date Thu, 19 Jul 2007 20:59:31 +0100
parents 4462de7be194
children 761e17b23e0c
comparison
equal deleted inserted replaced
1300:c198ae31bb74 1301:df5d07d7ca7c
1062 { 1062 {
1063 const char *homedir = getenv ("HOME"); 1063 const char *homedir = getenv ("HOME");
1064 1064
1065 if (homedir) 1065 if (homedir)
1066 { 1066 {
1067 char *userdb = 1067 std::string userdb;
1068 (char *) malloc (strlen (homedir) + strlen (ADPLUG_CONFDIR) + 1068 userdb = "file://" + std::string(g_get_home_dir()) + "/" ADPLUG_CONFDIR "/" + ADPLUGDB_FILE;
1069 strlen (ADPLUGDB_FILE) + 3);
1070 strcpy (userdb, homedir);
1071 strcat (userdb, "/" ADPLUG_CONFDIR "/");
1072 strcat (userdb, ADPLUGDB_FILE);
1073 plr.db->load (userdb); // load user's database 1069 plr.db->load (userdb); // load user's database
1074 dbg_printf (" (userdb=\"%s\")", userdb); 1070 dbg_printf (" (userdb=\"%s\")", userdb.c_str());
1075 free (userdb);
1076 } 1071 }
1077 } 1072 }
1078 CAdPlug::set_database (plr.db); 1073 CAdPlug::set_database (plr.db);
1079 dbg_printf (".\n"); 1074 dbg_printf (".\n");
1080 } 1075 }