gui/audio: Remove old pause_after combobox
Signed-off-by: Anna Schumaker <Anna@NoWheyCreamery.com>
This commit is contained in:
parent
1836104f40
commit
60e6e2a9eb
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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"));
|
||||
|
|
|
|||
|
|
@ -532,7 +532,6 @@ audio-volume-medium</property>
|
|||
<packing>
|
||||
<property name="left_attach">3</property>
|
||||
<property name="top_attach">0</property>
|
||||
<property name="width">2</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
|
|
@ -597,135 +596,6 @@ audio-volume-medium</property>
|
|||
<property name="top_attach">2</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkLabel">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="halign">end</property>
|
||||
<property name="label" translatable="yes">Pause after</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="left_attach">3</property>
|
||||
<property name="top_attach">1</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkComboBoxText" id="pause_after">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="halign">end</property>
|
||||
<property name="valign">center</property>
|
||||
<property name="active">0</property>
|
||||
<items>
|
||||
<item translatable="yes">(disabled)</item>
|
||||
<item translatable="yes">this track</item>
|
||||
<item translatable="yes">next track</item>
|
||||
<item translatable="yes">2 tracks</item>
|
||||
<item translatable="yes">3 tracks</item>
|
||||
<item translatable="yes">4 tracks</item>
|
||||
<item translatable="yes">5 tracks</item>
|
||||
<item translatable="yes">6 tracks</item>
|
||||
<item translatable="yes">7 tracks</item>
|
||||
<item translatable="yes">8 tracks</item>
|
||||
<item translatable="yes">9 tracks</item>
|
||||
<item translatable="yes">10 tracks</item>
|
||||
<item translatable="yes">11 tracks</item>
|
||||
<item translatable="yes">12 tracks</item>
|
||||
<item translatable="yes">13 tracks</item>
|
||||
<item translatable="yes">14 tracks</item>
|
||||
<item translatable="yes">15 tracks</item>
|
||||
<item translatable="yes">16 tracks</item>
|
||||
<item translatable="yes">17 tracks</item>
|
||||
<item translatable="yes">18 tracks</item>
|
||||
<item translatable="yes">19 tracks</item>
|
||||
<item translatable="yes">20 tracks</item>
|
||||
<item translatable="yes">21 tracks</item>
|
||||
<item translatable="yes">22 tracks</item>
|
||||
<item translatable="yes">23 tracks</item>
|
||||
<item translatable="yes">24 tracks</item>
|
||||
<item translatable="yes">25 tracks</item>
|
||||
<item translatable="yes">26 tracks</item>
|
||||
<item translatable="yes">27 tracks</item>
|
||||
<item translatable="yes">28 tracks</item>
|
||||
<item translatable="yes">29 tracks</item>
|
||||
<item translatable="yes">30 tracks</item>
|
||||
<item translatable="yes">31 tracks</item>
|
||||
<item translatable="yes">32 tracks</item>
|
||||
<item translatable="yes">33 tracks</item>
|
||||
<item translatable="yes">34 tracks</item>
|
||||
<item translatable="yes">35 tracks</item>
|
||||
<item translatable="yes">36 tracks</item>
|
||||
<item translatable="yes">37 tracks</item>
|
||||
<item translatable="yes">38 tracks</item>
|
||||
<item translatable="yes">39 tracks</item>
|
||||
<item translatable="yes">40 tracks</item>
|
||||
<item translatable="yes">41 tracks</item>
|
||||
<item translatable="yes">42 tracks</item>
|
||||
<item translatable="yes">43 tracks</item>
|
||||
<item translatable="yes">44 tracks</item>
|
||||
<item translatable="yes">45 tracks</item>
|
||||
<item translatable="yes">46 tracks</item>
|
||||
<item translatable="yes">47 tracks</item>
|
||||
<item translatable="yes">48 tracks</item>
|
||||
<item translatable="yes">49 tracks</item>
|
||||
<item translatable="yes">50 tracks</item>
|
||||
<item translatable="yes">51 tracks</item>
|
||||
<item translatable="yes">52 tracks</item>
|
||||
<item translatable="yes">53 tracks</item>
|
||||
<item translatable="yes">54 tracks</item>
|
||||
<item translatable="yes">55 tracks</item>
|
||||
<item translatable="yes">56 tracks</item>
|
||||
<item translatable="yes">57 tracks</item>
|
||||
<item translatable="yes">58 tracks</item>
|
||||
<item translatable="yes">59 tracks</item>
|
||||
<item translatable="yes">60 tracks</item>
|
||||
<item translatable="yes">61 tracks</item>
|
||||
<item translatable="yes">62 tracks</item>
|
||||
<item translatable="yes">63 tracks</item>
|
||||
<item translatable="yes">64 tracks</item>
|
||||
<item translatable="yes">65 tracks</item>
|
||||
<item translatable="yes">66 tracks</item>
|
||||
<item translatable="yes">67 tracks</item>
|
||||
<item translatable="yes">68 tracks</item>
|
||||
<item translatable="yes">69 tracks</item>
|
||||
<item translatable="yes">70 tracks</item>
|
||||
<item translatable="yes">71 tracks</item>
|
||||
<item translatable="yes">72 tracks</item>
|
||||
<item translatable="yes">73 tracks</item>
|
||||
<item translatable="yes">74 tracks</item>
|
||||
<item translatable="yes">75 tracks</item>
|
||||
<item translatable="yes">76 tracks</item>
|
||||
<item translatable="yes">77 tracks</item>
|
||||
<item translatable="yes">78 tracks</item>
|
||||
<item translatable="yes">79 tracks</item>
|
||||
<item translatable="yes">80 tracks</item>
|
||||
<item translatable="yes">81 tracks</item>
|
||||
<item translatable="yes">82 tracks</item>
|
||||
<item translatable="yes">83 tracks</item>
|
||||
<item translatable="yes">84 tracks</item>
|
||||
<item translatable="yes">85 tracks</item>
|
||||
<item translatable="yes">86 tracks</item>
|
||||
<item translatable="yes">87 tracks</item>
|
||||
<item translatable="yes">88 tracks</item>
|
||||
<item translatable="yes">89 tracks</item>
|
||||
<item translatable="yes">90 tracks</item>
|
||||
<item translatable="yes">91 tracks</item>
|
||||
<item translatable="yes">92 tracks</item>
|
||||
<item translatable="yes">93 tracks</item>
|
||||
<item translatable="yes">94 tracks</item>
|
||||
<item translatable="yes">95 tracks</item>
|
||||
<item translatable="yes">96 tracks</item>
|
||||
<item translatable="yes">97 tracks</item>
|
||||
<item translatable="yes">98 tracks</item>
|
||||
<item translatable="yes">99 tracks</item>
|
||||
</items>
|
||||
<signal name="changed" handler="__gui_audio_pause_changed" swapped="no"/>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="left_attach">4</property>
|
||||
<property name="top_attach">1</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkBox">
|
||||
<property name="visible">True</property>
|
||||
|
|
@ -804,8 +674,8 @@ audio-volume-medium</property>
|
|||
</object>
|
||||
<packing>
|
||||
<property name="left_attach">3</property>
|
||||
<property name="top_attach">2</property>
|
||||
<property name="width">2</property>
|
||||
<property name="top_attach">1</property>
|
||||
<property name="height">2</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
|
|
@ -1247,7 +1117,7 @@ audio-volume-medium</property>
|
|||
<packing>
|
||||
<property name="left_attach">0</property>
|
||||
<property name="top_attach">3</property>
|
||||
<property name="width">5</property>
|
||||
<property name="width">4</property>
|
||||
</packing>
|
||||
</child>
|
||||
</object>
|
||||
|
|
|
|||
|
|
@ -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");
|
||||
|
|
|
|||
Loading…
Reference in New Issue