[Swfdec-commits] swfdec/swfdec_net_stream.c

[Benjamin Otte]

 swfdec/swfdec_net_stream.c |   19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

New commits:
commit 1040647dfd13d32660a2d21339f476533c87919e
Author: Benjamin Otte <otte at gnome.org>
Date:   Mon Jan 28 11:36:47 2008 +0100

    handle readding timeouts differently (fixes #13739)

diff --git a/swfdec/swfdec_net_stream.c b/swfdec/swfdec_net_stream.c
index a8ec140..6798c53 100644
--- a/swfdec/swfdec_net_stream.c
+++ b/swfdec/swfdec_net_stream.c
@@ -168,23 +168,16 @@ static void
 swfdec_net_stream_timeout (SwfdecTimeout *timeout)
 {
   SwfdecNetStream *stream = SWFDEC_NET_STREAM ((void *) ((guchar *) timeout - G_STRUCT_OFFSET (SwfdecNetStream, timeout)));
+  SwfdecTick timestamp;
 
   SWFDEC_LOG ("timeout fired");
-  stream->timeout.callback = NULL;
   swfdec_net_stream_video_goto (stream, stream->next_time);
-  if (stream->next_time > stream->current_time) {
+  timestamp = stream->timeout.timestamp;
+  if (stream->timeout.timestamp == timestamp &&
+      stream->timeout.callback) {
     SWFDEC_LOG ("readding timeout");
     stream->timeout.timestamp += SWFDEC_MSECS_TO_TICKS (stream->next_time - stream->current_time);
-    stream->timeout.callback = swfdec_net_stream_timeout;
     swfdec_player_add_timeout (SWFDEC_PLAYER (SWFDEC_AS_OBJECT (stream)->context), &stream->timeout);
-  } else {
-    if (stream->audio) {
-      /* FIXME: just unref and let it take care of removing itself? */
-      SWFDEC_LOG ("stopping audio due to EOS");
-      swfdec_audio_remove (stream->audio);
-      g_object_unref (stream->audio);
-      stream->audio = NULL;
-    }
   }
 }
 
@@ -218,7 +211,9 @@ swfdec_net_stream_update_playing (SwfdecNetStream *stream)
       g_object_unref (stream->audio);
       stream->audio = NULL;
     }
-    swfdec_player_remove_timeout (player, &stream->timeout);
+    /* we'll have the timeout still set, but not readded, in the timeout handler */
+    if (stream->timeout.timestamp > player->priv->time)
+      swfdec_player_remove_timeout (player, &stream->timeout);
     stream->timeout.callback = NULL;
     SWFDEC_DEBUG ("stopping playback");
   }