changeset 1168:940b7ded5756 trunk

[svn] - ditto. this is necessary too.
author yaz
date Thu, 07 Jun 2007 00:21:13 -0700
parents f22b4eb572fb
children 55703f60fd54
files ChangeLog src/wma/wma.c
diffstat 2 files changed, 11 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Jun 07 00:05:17 2007 -0700
+++ b/ChangeLog	Thu Jun 07 00:21:13 2007 -0700
@@ -1,3 +1,11 @@
+2007-06-07 07:05:17 +0000  Yoshiki Yazawa <yaz@cc.rim.or.jp>
+  revision [2500]
+  - add playback->playing = 0 where buffer_playing = FALSE is done. without this, playback_get_time() would be confused and playback wouldn't advance in playlist.
+  
+  trunk/src/aac/src/libmp4.c |    9 ++++++++-
+  1 file changed, 8 insertions(+), 1 deletion(-)
+
+
 2007-06-07 05:58:18 +0000  Yoshiki Yazawa <yaz@cc.rim.or.jp>
   revision [2498]
   - handle metadata in better way.
--- a/src/wma/wma.c	Thu Jun 07 00:05:17 2007 -0700
+++ b/src/wma/wma.c	Thu Jun 07 00:21:13 2007 -0700
@@ -410,6 +410,7 @@
     }
     while(wma_decode && playback->output->buffer_playing()) xmms_usleep(30000);
     wma_decode = 0;
+    playback->playing = 0;
     if(wma_s_outbuf) g_free(wma_s_outbuf);
     if(wma_outbuf) g_free(wma_outbuf);
     if(pkt.data) av_free_packet(&pkt);
@@ -455,14 +456,14 @@
 
     wma_seekpos = -1;
     wma_decode = 1;
-    playback->playing = 1; //XXX should acquire lock?
+    playback->playing = 1;
     wma_decode_thread = g_thread_create((GThreadFunc)wma_play_loop, playback, TRUE, NULL);
 }
 
 static void wma_stop(InputPlayback *playback) 
 {
     wma_decode = 0;
-    playback->playing = 0; //XXX should acquire lock?
+    playback->playing = 0;
     if(wma_pause) wma_do_pause(playback, 0);
     g_thread_join(wma_decode_thread);
     playback->output->close_audio();