# HG changeset patch
# User mf0102 <0102@gmx.at>
# Date 1215532559 -7200
# Node ID 08ec4e638c2d62ef02ff9a3ba62db4becd0f7fcf
# Parent  804a026057d7ecb5e24342163cf7d9e200b060d5
- make stop button
- don't show slider / time when no song is playing

diff -r 804a026057d7 -r 08ec4e638c2d src/audacious/ui_new.c
--- a/src/audacious/ui_new.c	Tue Jul 08 18:26:34 2008 +0300
+++ b/src/audacious/ui_new.c	Tue Jul 08 17:55:59 2008 +0200
@@ -73,6 +73,12 @@
 }
 
 static void
+button_stop_pressed()
+{
+    playback_stop();
+}
+
+static void
 button_previous_pressed()
 {
     playlist_prev(playlist_get_active());
@@ -94,6 +100,8 @@
 
     gtk_label_set_markup(GTK_LABEL(label_current), title);
     gtk_range_set_range(GTK_RANGE(slider), 0.0, (gdouble)length);
+    gtk_widget_show(slider);
+    gtk_widget_show(label_time);
 
     g_free(esc_title);
     g_free(title);
@@ -146,6 +154,13 @@
     return TRUE;
 }
 
+static void
+ui_clear_song_info()
+{
+    gtk_widget_hide(slider);
+    gtk_widget_hide(label_time);
+}
+
 static gboolean
 ui_slider_value_changed_cb(GtkRange *range, gpointer user_data)
 {
@@ -196,6 +211,8 @@
         g_source_remove(update_song_timeout_source);
         update_song_timeout_source = 0;
     }
+
+    ui_clear_song_info();
 }
 
 static void
@@ -261,7 +278,7 @@
     GtkWidget *shbox;   /* box for slider + time combo --nenolod */
 
     GtkToolItem *button_open, *button_add,
-                *button_play, *button_pause,
+                *button_play, *button_pause, *button_stop,
                 *button_previous, *button_next;
 
     window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
@@ -286,6 +303,8 @@
                                          GTK_STOCK_MEDIA_PLAY);
     button_pause = gtk_toolbar_button_add(toolbar, button_pause_pressed,
                                           GTK_STOCK_MEDIA_PAUSE);
+    button_stop = gtk_toolbar_button_add(toolbar, button_stop_pressed,
+                                         GTK_STOCK_MEDIA_STOP);
     button_previous = gtk_toolbar_button_add(toolbar, button_previous_pressed,
                                              GTK_STOCK_MEDIA_PREVIOUS);
     button_next = gtk_toolbar_button_add(toolbar, button_next_pressed,
@@ -321,7 +340,7 @@
     gtk_range_set_update_policy(GTK_RANGE(slider), GTK_UPDATE_DISCONTINUOUS);
     gtk_box_pack_start(GTK_BOX(shbox), slider, TRUE, TRUE, 0);
 
-    label_time = gtk_markup_label_new("<tt><b>0:00/0:00</b></tt>");
+    label_time = gtk_markup_label_new(NULL);
     gtk_box_pack_start(GTK_BOX(shbox), label_time, FALSE, FALSE, 0);
 
     ui_hooks_associate();
@@ -340,6 +359,9 @@
     ui_playlist_update(playlist_get_active(), NULL);
 
     gtk_widget_show_all(window);
+
+    ui_clear_song_info();
+
     gtk_main();
 
     return TRUE;