Mercurial > audlegacy
diff src/audacious/ui_main.c @ 3351:7a4fcf84a34f trunk
Removed the hardcoded Add/Play CD menu entry
author | Calin Crisan ccrisan@gmail.com |
---|---|
date | Mon, 13 Aug 2007 23:24:50 +0300 |
parents | 1292e4ca0f08 |
children | ac752b5db631 |
line wrap: on
line diff
--- a/src/audacious/ui_main.c Mon Aug 13 18:49:34 2007 +0200 +++ b/src/audacious/ui_main.c Mon Aug 13 23:24:50 2007 +0300 @@ -1778,12 +1778,6 @@ case MAINWIN_GENERAL_PLAYFILE: run_filebrowser(NO_PLAY_BUTTON); break; - case MAINWIN_GENERAL_PLAYCD: - play_medium(); - break; - case MAINWIN_GENERAL_ADDCD: - add_medium(); - break; case MAINWIN_GENERAL_PLAYLOCATION: mainwin_show_add_url_window(); break; @@ -1955,23 +1949,6 @@ mainwin_release_info_text(); } -static void -run_no_audiocd_dialog(void) -{ - const gchar *markup = - N_("<b><big>No playable CD found.</big></b>\n\n" - "No CD inserted, or inserted CD is not an audio CD.\n"); - - GtkWidget *dialog = - gtk_message_dialog_new_with_markup(GTK_WINDOW(mainwin), - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_OK, - _(markup)); - gtk_dialog_run(GTK_DIALOG(dialog)); - gtk_widget_destroy(dialog); -} - void run_no_output_device_dialog(gpointer hook_data, gpointer user_data) { @@ -1994,84 +1971,6 @@ GDK_THREADS_LEAVE(); } - -void -add_medium(void) -{ - GList *list, *node; - gchar *filename; - - /* - gchar *path; - ConfigDb *db; - - db = bmp_cfg_db_open(); - - if ( bmp_cfg_db_get_string(db, "CDDA", "directory", &path) != TRUE ) - { - bmp_cfg_db_close(db); - run_no_audiocd_dialog(); - return; - } - else - bmp_cfg_db_close(db); - */ - - if (!(list = input_scan_dir(CDDA_DUMMY_PATH))) { - run_no_audiocd_dialog(); - return; - } - - for (node = list; node; node = g_list_next(node)) { - filename = g_build_filename(CDDA_DUMMY_PATH, node->data, NULL); - playlist_add(playlist_get_active(), filename); - g_free(filename); - g_free(node->data); - } - - /*g_free(path);*/ - g_list_free(list); - -} - -void -play_medium(void) -{ - GList *list, *node; - gchar *filename; - /* - gchar *path; - ConfigDb *db; - */ - Playlist *playlist = playlist_get_active(); - - /* - db = bmp_cfg_db_open(); - bmp_cfg_db_get_string(db, "CDDA", "directory", &path); - bmp_cfg_db_close(db); - */ - - if (!(list = input_scan_dir(CDDA_DUMMY_PATH))) { - run_no_audiocd_dialog(); - return; - } - - playlist_clear(playlist); - - for (node = list; node; node = g_list_next(node)) { - filename = g_build_filename(CDDA_DUMMY_PATH, node->data, NULL); - playlist_add(playlist, filename); - g_free(filename); - g_free(node->data); - } - - /*g_free(path);*/ - g_list_free(list); - - playlist_set_position(playlist, 0); - playback_initiate(); -} - void read_volume(gint when) { @@ -3103,12 +3002,6 @@ } void -action_playback_playcd( void ) -{ - play_medium(); -} - -void action_playback_pause( void ) { playback_pause();