diff src/cdaudio/cdaudio.c @ 245:d58221dfced1 trunk

[svn] - remove dead and pointless cdindex code... CDIndex has been nonexistant since 1999
author nenolod
date Tue, 14 Nov 2006 12:03:25 -0800
parents 3da1b8942b8b
children 597c89a37d07
line wrap: on
line diff
--- a/src/cdaudio/cdaudio.c	Mon Nov 13 13:36:27 2006 -0800
+++ b/src/cdaudio/cdaudio.c	Tue Nov 14 12:03:25 2006 -0800
@@ -712,16 +712,8 @@
     bmp_cfg_db_get_string(db, "CDDA", "name_format", &cdda_cfg.name_format);
     bmp_cfg_db_get_bool(db, "CDDA", "use_cddb", &cdda_cfg.use_cddb);
     bmp_cfg_db_get_string(db, "CDDA", "cddb_server", &cdda_cfg.cddb_server);
-#ifdef WITH_CDINDEX
-    bmp_cfg_db_get_bool(db, "CDDA", "use_cdin", &cdda_cfg.use_cdin);
-#else
-    cdda_cfg.use_cdin = FALSE;
-#endif
-    bmp_cfg_db_get_string(db, "CDDA", "cdin_server", &cdda_cfg.cdin_server);
     bmp_cfg_db_close(db);
 
-    if (!cdda_cfg.cdin_server)
-        cdda_cfg.cdin_server = g_strdup("www.cdindex.org");
     if (!cdda_cfg.cddb_server)
         cdda_cfg.cddb_server = g_strdup(CDDB_DEFAULT_SERVER);
     if (!cdda_cfg.name_format)
@@ -808,11 +800,6 @@
         cdda_cfg.cddb_server = NULL;
     }
 
-    if (cdda_cfg.cdin_server) {
-        free(cdda_cfg.cdin_server);
-        cdda_cfg.cdin_server = NULL;
-    }
-
     while (timeout_list) {
         struct timeout *t = timeout_list->data;
         gtk_timeout_remove(t->id);