Mercurial > audlegacy-plugins
changeset 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 | e6992f15513a |
| children | 366acb77c853 |
| files | ChangeLog src/cdaudio/cdaudio.c src/cdaudio/cdaudio.h src/cdaudio/cdinfo.c src/cdaudio/configure.c |
| diffstat | 5 files changed, 9 insertions(+), 72 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Nov 13 13:36:27 2006 -0800 +++ b/ChangeLog Tue Nov 14 12:03:25 2006 -0800 @@ -1,3 +1,11 @@ +2006-11-13 21:36:27 +0000 William Pitcock <nenolod@nenolod.net> + revision [506] + - actually 210 and 211 can be treated the same. + + trunk/src/cdaudio/cddb.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + + 2006-11-13 21:25:21 +0000 William Pitcock <nenolod@nenolod.net> revision [504] - fix CDDB bug where exact matches are found, treat it like a 200 OK response.
--- 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);
--- a/src/cdaudio/cdaudio.h Mon Nov 13 13:36:27 2006 -0800 +++ b/src/cdaudio/cdaudio.h Tue Nov 14 12:03:25 2006 -0800 @@ -108,9 +108,6 @@ gint cddb_protocol_level; gboolean use_cddb; - gchar *cdin_server; - gboolean use_cdin; - gboolean title_override; char *name_format; } CDDAConfig; @@ -155,7 +152,6 @@ gboolean cdda_get_toc(cdda_disc_toc_t * info, const gchar *device); guint32 cdda_cddb_compute_discid(cdda_disc_toc_t * info); void cdda_cddb_get_info(cdda_disc_toc_t * toc, cdinfo_t * info); -void cdda_cdindex_get_idx(cdda_disc_toc_t * toc, cdinfo_t * cdinfo); struct driveinfo *cdda_find_drive(gchar *filename); void cdda_cddb_show_server_dialog(GtkWidget * w, gpointer data);
--- a/src/cdaudio/cdinfo.c Mon Nov 13 13:36:27 2006 -0800 +++ b/src/cdaudio/cdinfo.c Tue Nov 14 12:03:25 2006 -0800 @@ -171,11 +171,6 @@ void cdda_cdinfo_write_file(guint32 cddb_discid, cdinfo_t * cdinfo) { - /* - * We currently identify cdinfo on disk with the CDDB-discid. - * Maybe it would be smarter to use the cdindex id instead? - */ - gchar *filename; RcFile *rcfile; gchar sectionname[10], trackstr[16]; @@ -232,8 +227,6 @@ sprintf(sectionname, "%08x", cddb_discid); -// filename = g_strconcat(g_get_home_dir(), "/.audacious/cdinfo", NULL); - filename = g_strconcat(g_get_home_dir(), "/", BMP_RCPATH, "/cdinfo", NULL); if ((rcfile = bmp_rcfile_open(filename)) == NULL) {
--- a/src/cdaudio/configure.c Mon Nov 13 13:36:27 2006 -0800 +++ b/src/cdaudio/configure.c Tue Nov 14 12:03:25 2006 -0800 @@ -49,8 +49,7 @@ static GtkWidget *cdda_configure_win; static GtkWidget *cdi_name, *cdi_name_override; -static GtkWidget *cdi_use_cddb, *cdi_cddb_server, *cdi_use_cdin, - *cdi_cdin_server; +static GtkWidget *cdi_use_cddb, *cdi_cddb_server; void cdda_cddb_show_server_dialog(GtkWidget * w, gpointer data); void cdda_cddb_show_network_window(GtkWidget * w, gpointer data); @@ -114,21 +113,11 @@ cdda_cfg.use_cddb = GET_TB(cdi_use_cddb); cdda_cddb_set_server(gtk_entry_get_text(GTK_ENTRY(cdi_cddb_server))); - cdda_cfg.use_cdin = GET_TB(cdi_use_cdin); - if (strcmp - (cdda_cfg.cdin_server, - gtk_entry_get_text(GTK_ENTRY(cdi_cdin_server)))) { - g_free(cdda_cfg.cdin_server); - cdda_cfg.cdin_server = - g_strdup(gtk_entry_get_text(GTK_ENTRY(cdi_cdin_server))); - } - db = bmp_cfg_db_open(); drive = cdda_cfg.drives->data; bmp_cfg_db_set_string(db, "CDDA", "device", drive->device); bmp_cfg_db_set_string(db, "CDDA", "directory", drive->directory); -// bmp_cfg_db_set_string(db, "CDDA", "directory", "CD_AUDIO"); bmp_cfg_db_set_int(db, "CDDA", "mixer", drive->mixer); bmp_cfg_db_set_int(db, "CDDA", "readmode", drive->dae); @@ -142,7 +131,6 @@ bmp_cfg_db_set_string(db, "CDDA", label, drive->device); sprintf(label, "directory%d", i); -// bmp_cfg_db_set_string(db, "CDDA", label, "CD_AUDIO"); bmp_cfg_db_set_string(db, "CDDA", label, drive->directory); sprintf(label, "mixer%d", i); @@ -166,8 +154,6 @@ bmp_cfg_db_set_string(db, "CDDA", "cddb_server", cdda_cfg.cddb_server); bmp_cfg_db_set_int(db, "CDDA", "cddb_protocol_level", cdda_cfg.cddb_protocol_level); - bmp_cfg_db_set_bool(db, "CDDA", "use_cdin", cdda_cfg.use_cdin); - bmp_cfg_db_set_string(db, "CDDA", "cdin_server", cdda_cfg.cdin_server); bmp_cfg_db_close(db); } @@ -495,8 +481,6 @@ GtkWidget *cdi_cddb_frame, *cdi_cddb_vbox, *cdi_cddb_hbox; GtkWidget *cdi_cddb_server_hbox, *cdi_cddb_server_label; GtkWidget *cdi_cddb_server_list, *cdi_cddb_debug_win; - GtkWidget *cdi_cdin_frame, *cdi_cdin_vbox; - GtkWidget *cdi_cdin_server_hbox, *cdi_cdin_server_label; GtkWidget *cdi_name_frame, *cdi_name_vbox, *cdi_name_hbox; GtkWidget *cdi_name_label, *cdi_desc; GtkWidget *cdi_name_enable_vbox; @@ -609,37 +593,6 @@ cdi_cddb_server); /* - * CDindex - */ - cdi_cdin_frame = gtk_frame_new(_("CD Index:")); - gtk_box_pack_start(GTK_BOX(cdi_vbox), cdi_cdin_frame, FALSE, FALSE, 0); - - cdi_cdin_vbox = gtk_vbox_new(FALSE, 10); - gtk_container_border_width(GTK_CONTAINER(cdi_cdin_vbox), 5); - gtk_container_add(GTK_CONTAINER(cdi_cdin_frame), cdi_cdin_vbox); - - cdi_use_cdin = gtk_check_button_new_with_label(_("Use CD Index")); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cdi_use_cdin), - cdda_cfg.use_cdin); - gtk_box_pack_start(GTK_BOX(cdi_cdin_vbox), cdi_use_cdin, FALSE, FALSE, 0); - - cdi_cdin_server_hbox = gtk_hbox_new(FALSE, 5); - gtk_box_pack_start(GTK_BOX(cdi_cdin_vbox), cdi_cdin_server_hbox, FALSE, - FALSE, 0); - - cdi_cdin_server_label = gtk_label_new(_("CD Index server:")); - gtk_box_pack_start(GTK_BOX(cdi_cdin_server_hbox), - cdi_cdin_server_label, FALSE, FALSE, 0); - - cdi_cdin_server = gtk_entry_new(); - gtk_entry_set_text(GTK_ENTRY(cdi_cdin_server), cdda_cfg.cdin_server); - gtk_box_pack_start(GTK_BOX(cdi_cdin_server_hbox), cdi_cdin_server, - TRUE, TRUE, 0); -#ifndef WITH_CDINDEX - gtk_widget_set_sensitive(cdi_cdin_frame, FALSE); -#endif - - /* * Track names */ cdi_name_frame = gtk_frame_new(_("Track names:"));