# HG changeset patch
# User yaz
# Date 1166455911 28800
# Node ID fe6e7b9b4aac14acc076f8d4ac22db82de3390ef
# Parent  35bdfcd17ba79254770039ae6decf140fcffcd7d
[svn] - suppress noise on transition from pause to stop.

diff -r 35bdfcd17ba7 -r fe6e7b9b4aac ChangeLog
--- a/ChangeLog	Mon Dec 18 06:53:52 2006 -0800
+++ b/ChangeLog	Mon Dec 18 07:31:51 2006 -0800
@@ -1,3 +1,13 @@
+2006-12-18 14:53:52 +0000  Yoshiki Yazawa <yaz@cc.rim.or.jp>
+  revision [3323]
+  - change the cleanup order in mainwin_quit_cb() to avoid freeze on quit.
+  - replace deprecated g_main_iteration() with g_main_context_iteration().
+  
+  trunk/audacious/mainwin.c    |    4 ++--
+  trunk/audacious/pluginenum.c |   16 ++++++++--------
+  2 files changed, 10 insertions(+), 10 deletions(-)
+
+
 2006-12-18 12:15:09 +0000  William Pitcock <nenolod@nenolod.net>
   revision [3321]
   - damn SVN reverted this to some old version
diff -r 35bdfcd17ba7 -r fe6e7b9b4aac audacious/playback.c
--- a/audacious/playback.c	Mon Dec 18 06:53:52 2006 -0800
+++ b/audacious/playback.c	Mon Dec 18 07:31:51 2006 -0800
@@ -167,8 +167,10 @@
 {
     if (ip_data.playing && get_current_input_plugin()) {
 
-        if (bmp_playback_get_paused())
+        if (bmp_playback_get_paused()) {
+            output_flush(get_written_time()); /* to avoid noise */
             bmp_playback_pause();
+        }
 
         ip_data.playing = FALSE; 
 
@@ -187,9 +189,8 @@
 
     ip_data.buffering = FALSE;
     ip_data.playing = FALSE;
-
+    
     g_return_if_fail(mainwin_playstatus != NULL);
-
     playstatus_set_status_buffering(mainwin_playstatus, FALSE);
 }
 
@@ -197,11 +198,12 @@
 bmp_playback_stop_reentrant(void)
 {
     if (ip_data.playing && get_current_input_plugin()) {
-        ip_data.playing = FALSE;
 
         if (bmp_playback_get_paused())
             bmp_playback_pause();
 
+        ip_data.playing = FALSE;
+
         free_vis_data();
         ip_data.paused = FALSE;