diff --git a/gui/audio.c b/gui/audio.c index 52adad9a..e71cd698 100644 --- a/gui/audio.c +++ b/gui/audio.c @@ -75,7 +75,6 @@ static void __gui_audio_change_state(GstState state) static void __gui_audio_config_pause(int n) { - gtk_combo_box_set_active(GTK_COMBO_BOX(gui_pause_after()), n + 1); __gui_audio_set_pause_text(n, audio_cur_state()); } @@ -87,11 +86,6 @@ struct audio_callbacks audio_cb = { }; -void __gui_audio_pause_changed(GtkComboBox *combo, gpointer data) -{ - audio_pause_after(gtk_combo_box_get_active(combo) - 1); -} - void __gui_audio_pause_change_text(GtkEntry *entry, gpointer data) { const gchar *text = gtk_entry_get_text(entry); diff --git a/include/gui/audio.h b/include/gui/audio.h index 1eb3991f..742d0131 100644 --- a/include/gui/audio.h +++ b/include/gui/audio.h @@ -73,11 +73,6 @@ static inline GtkButton *gui_next_button(void) } /* Called to get the pause-after widgets. */ -static inline GtkComboBoxText *gui_pause_after(void) -{ - return GTK_COMBO_BOX_TEXT(gui_builder_widget("pause_after")); -} - static inline GtkEntry *gui_pause_entry(void) { return GTK_ENTRY(gui_builder_widget("pause_entry")); diff --git a/share/ocarina/ocarina.ui b/share/ocarina/ocarina.ui index 6e2569ec..dc2a7075 100644 --- a/share/ocarina/ocarina.ui +++ b/share/ocarina/ocarina.ui @@ -532,7 +532,6 @@ audio-volume-medium 3 0 - 2 @@ -597,135 +596,6 @@ audio-volume-medium 2 - - - True - False - end - Pause after - - - 3 - 1 - - - - - True - False - end - center - 0 - - (disabled) - this track - next track - 2 tracks - 3 tracks - 4 tracks - 5 tracks - 6 tracks - 7 tracks - 8 tracks - 9 tracks - 10 tracks - 11 tracks - 12 tracks - 13 tracks - 14 tracks - 15 tracks - 16 tracks - 17 tracks - 18 tracks - 19 tracks - 20 tracks - 21 tracks - 22 tracks - 23 tracks - 24 tracks - 25 tracks - 26 tracks - 27 tracks - 28 tracks - 29 tracks - 30 tracks - 31 tracks - 32 tracks - 33 tracks - 34 tracks - 35 tracks - 36 tracks - 37 tracks - 38 tracks - 39 tracks - 40 tracks - 41 tracks - 42 tracks - 43 tracks - 44 tracks - 45 tracks - 46 tracks - 47 tracks - 48 tracks - 49 tracks - 50 tracks - 51 tracks - 52 tracks - 53 tracks - 54 tracks - 55 tracks - 56 tracks - 57 tracks - 58 tracks - 59 tracks - 60 tracks - 61 tracks - 62 tracks - 63 tracks - 64 tracks - 65 tracks - 66 tracks - 67 tracks - 68 tracks - 69 tracks - 70 tracks - 71 tracks - 72 tracks - 73 tracks - 74 tracks - 75 tracks - 76 tracks - 77 tracks - 78 tracks - 79 tracks - 80 tracks - 81 tracks - 82 tracks - 83 tracks - 84 tracks - 85 tracks - 86 tracks - 87 tracks - 88 tracks - 89 tracks - 90 tracks - 91 tracks - 92 tracks - 93 tracks - 94 tracks - 95 tracks - 96 tracks - 97 tracks - 98 tracks - 99 tracks - - - - - 4 - 1 - - True @@ -804,8 +674,8 @@ audio-volume-medium 3 - 2 - 2 + 1 + 2 @@ -1247,7 +1117,7 @@ audio-volume-medium 0 3 - 5 + 4 diff --git a/tests/gui/audio.c b/tests/gui/audio.c index fa9f3b98..5dda8224 100644 --- a/tests/gui/audio.c +++ b/tests/gui/audio.c @@ -21,10 +21,6 @@ static void test_audio_init() g_assert_cmpstr(gtk_label_get_text(gui_title_tag()), ==, " "); g_assert_cmpstr(gtk_label_get_text(gui_position()), ==, "0:00"); g_assert_cmpstr(gtk_label_get_text(gui_duration()), ==, "0:00"); - g_assert_cmpstr(gtk_combo_box_text_get_active_text(gui_pause_after()), - ==, "(disabled)"); - g_assert_cmpuint(gtk_combo_box_get_active( - GTK_COMBO_BOX(gui_pause_after())), ==, 0); g_assert_cmpstr(gtk_entry_get_text(gui_pause_entry()), ==, "Paused"); g_assert_true(gtk_widget_get_sensitive(GTK_WIDGET(gui_pause_up()))); g_assert_false(gtk_widget_get_sensitive(GTK_WIDGET(gui_pause_down()))); @@ -104,8 +100,6 @@ static void test_audio_buttons() test_audio_eos(); g_assert_cmpuint(audio_cur_state(), ==, GST_STATE_PLAYING); - g_assert_cmpuint(gtk_combo_box_get_active( - GTK_COMBO_BOX(gui_pause_after())), ==, 2); g_assert_cmpstr(gtk_entry_get_text(gui_pause_entry()), ==, "Pause after next track"); g_assert_true(gtk_widget_get_sensitive(GTK_WIDGET(gui_pause_down()))); @@ -122,16 +116,11 @@ static void test_audio_buttons() test_audio_eos(); g_assert_cmpuint(audio_cur_state(), ==, GST_STATE_PLAYING); - g_assert_cmpuint(gtk_combo_box_get_active( - GTK_COMBO_BOX(gui_pause_after())), ==, 1); g_assert_cmpstr(gtk_entry_get_text(gui_pause_entry()), ==, "Pause after this track"); g_assert_true(gtk_widget_get_sensitive(GTK_WIDGET(gui_pause_down()))); test_audio_eos(); - test_main_loop(); g_assert_cmpuint(audio_cur_state(), ==, GST_STATE_PAUSED); - g_assert_cmpuint(gtk_combo_box_get_active( - GTK_COMBO_BOX(gui_pause_after())), ==, 0); g_assert_false(gtk_widget_get_sensitive(GTK_WIDGET(gui_pause_down()))); test_main_loop(); /* Give the text entry time to update */ g_assert_cmpstr(gtk_entry_get_text(gui_pause_entry()), ==, "Paused");