# HG changeset patch
# User yaz
# Date 1181199917 25200
# Node ID f22b4eb572fb37c8225e119288ccc12e13f5e425
# Parent  4bd7e72a6605b2827d5b026996d3ed308d4cc52e
[svn] - 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.

diff -r 4bd7e72a6605 -r f22b4eb572fb ChangeLog
--- a/ChangeLog	Wed Jun 06 22:58:18 2007 -0700
+++ b/ChangeLog	Thu Jun 07 00:05:17 2007 -0700
@@ -1,3 +1,11 @@
+2007-06-07 05:58:18 +0000  Yoshiki Yazawa <yaz@cc.rim.or.jp>
+  revision [2498]
+  - handle metadata in better way.
+  
+  trunk/src/tta/libtta.c |   34 +++++++++++++++++++++-------------
+  1 file changed, 21 insertions(+), 13 deletions(-)
+
+
 2007-06-07 05:34:54 +0000  Yoshiki Yazawa <yaz@cc.rim.or.jp>
   revision [2496]
   - add playback->playing code.
diff -r 4bd7e72a6605 -r f22b4eb572fb src/aac/src/libmp4.c
--- a/src/aac/src/libmp4.c	Wed Jun 06 22:58:18 2007 -0700
+++ b/src/aac/src/libmp4.c	Thu Jun 07 00:05:17 2007 -0700
@@ -66,6 +66,7 @@
     .get_song_tuple = mp4_get_song_tuple,
     .is_our_file_from_vfs = mp4_is_our_fd,
     .vfs_extensions = fmts,
+//    .get_time = mp4_get_time,
 };
 
 InputPlugin *mp4_iplist[] = { &mp4_ip, NULL };
@@ -594,6 +595,7 @@
 
             g_static_mutex_lock(&mutex);
             buffer_playing = FALSE;
+            playback->playing = 0;
             g_static_mutex_unlock(&mutex);
             g_thread_exit(NULL);
 
@@ -640,7 +642,7 @@
         }
         if (buffer_playing == FALSE)
         {
-                playback->output->close_audio();
+            playback->output->close_audio();
             return FALSE;
         }
         produce_audio(playback->output->written_time(),
@@ -678,6 +680,7 @@
         g_print("AAC: Open Decoder Error\n");
         vfs_fclose(file);
         buffer_playing = FALSE;
+        playback->playing = 0;
         g_static_mutex_unlock(&mutex);
         g_thread_exit(NULL);
     }
@@ -685,6 +688,7 @@
         g_print("AAC: Error reading file\n");
         vfs_fclose(file);
         buffer_playing = FALSE;
+        playback->playing = 0;
         faacDecClose(decoder);
         g_static_mutex_unlock(&mutex);
         g_thread_exit(NULL);
@@ -734,6 +738,7 @@
         playback->output->close_audio();
         g_free(xmmstitle);
         buffer_playing = FALSE;
+        playback->playing = 0;
         g_static_mutex_unlock(&mutex);
         g_thread_exit(NULL);
     }
@@ -820,12 +825,14 @@
     playback->output->buffer_free();
     playback->output->close_audio();
     buffer_playing = FALSE;
+    playback->playing = 0;
     faacDecClose(decoder);
     g_free(xmmstitle);
     vfs_fclose(file);
     seekPosition = -1;
 
     buffer_playing = FALSE;
+    playback->playing = 0;
     g_static_mutex_unlock(&mutex);
     g_thread_exit(NULL);
 }