[Swfdec-commits] 5 commits - doc/swfdec-sections.txt swfdec/swfdec_buffer.c swfdec/swfdec_buffer.h swfdec/swfdec_internal.h swfdec/swfdec_load_object.c swfdec/swfdec_player.c swfdec/swfdec_policy_file.c swfdec/swfdec_sprite_movie.c
Benjamin Otte
company at kemper.freedesktop.org
Wed Feb 20 01:26:49 PST 2008
doc/swfdec-sections.txt | 8 ++++++--
swfdec/swfdec_buffer.c | 3 ++-
swfdec/swfdec_buffer.h | 1 -
swfdec/swfdec_internal.h | 6 ++++++
swfdec/swfdec_load_object.c | 1 +
swfdec/swfdec_player.c | 8 +++++++-
swfdec/swfdec_policy_file.c | 1 +
swfdec/swfdec_sprite_movie.c | 4 +---
8 files changed, 24 insertions(+), 8 deletions(-)
New commits:
commit bb4637249b9fcf81815483a3610d7e87150188c2
Author: Benjamin Otte <otte at gnome.org>
Date: Wed Feb 20 10:23:09 2008 +0100
that assertion is just plain wrong
diff --git a/swfdec/swfdec_sprite_movie.c b/swfdec/swfdec_sprite_movie.c
index e014ece..943bc15 100644
--- a/swfdec/swfdec_sprite_movie.c
+++ b/swfdec/swfdec_sprite_movie.c
@@ -684,10 +684,8 @@ swfdec_sprite_movie_iterate_end (SwfdecMovie *mov)
SwfdecSpriteFrame *current;
SwfdecPlayer *player = SWFDEC_PLAYER (SWFDEC_AS_OBJECT (mov)->context);
- if (!SWFDEC_MOVIE_CLASS (swfdec_sprite_movie_parent_class)->iterate_end (mov)) {
- g_assert (movie->sound_stream == NULL);
+ if (!SWFDEC_MOVIE_CLASS (swfdec_sprite_movie_parent_class)->iterate_end (mov))
return FALSE;
- }
if (movie->sprite == NULL)
return TRUE;
commit 28d9132e6a7a0967785671029f5767cfe095e5c7
Author: Benjamin Otte <otte at gnome.org>
Date: Wed Feb 20 10:20:08 2008 +0100
document SWFDEC_TYPE_TIME_VAL
diff --git a/swfdec/swfdec_player.c b/swfdec/swfdec_player.c
index 61977f2..e0e8ff9 100644
--- a/swfdec/swfdec_player.c
+++ b/swfdec/swfdec_player.c
@@ -239,6 +239,11 @@
/*** timeval type mapping ***/
+/**
+ * SWFDEC_TYPE_TIME_VAL:
+ * This type wraps a @GTimeVal object as a boxed type and makes it available
+ * for use in object properties.
+ */
static gpointer
swfdec_time_val_copy (gpointer boxed)
{
commit 52beaac4b71b5a1f58d41baf07c728099903f1f1
Author: Benjamin Otte <otte at gnome.org>
Date: Wed Feb 20 10:04:20 2008 +0100
make swfdec_buffer_queue_pull_text() private
diff --git a/swfdec/swfdec_buffer.c b/swfdec/swfdec_buffer.c
index 46befc7..76a496a 100644
--- a/swfdec/swfdec_buffer.c
+++ b/swfdec/swfdec_buffer.c
@@ -24,10 +24,11 @@
#endif
#include <swfdec_buffer.h>
+#include <liboil/liboil.h>
#include <glib.h>
#include <string.h>
#include <swfdec_debug.h>
-#include <liboil/liboil.h>
+#include <swfdec_internal.h> /* for buffer_queue_pull_text */
/*** gtk-doc ***/
diff --git a/swfdec/swfdec_buffer.h b/swfdec/swfdec_buffer.h
index 210678d..37e6da4 100644
--- a/swfdec/swfdec_buffer.h
+++ b/swfdec/swfdec_buffer.h
@@ -81,7 +81,6 @@ void swfdec_buffer_queue_push (SwfdecBufferQueue * queue,
SwfdecBuffer * buffer);
SwfdecBuffer *swfdec_buffer_queue_pull (SwfdecBufferQueue * queue, gsize length);
SwfdecBuffer *swfdec_buffer_queue_pull_buffer (SwfdecBufferQueue * queue);
-char *swfdec_buffer_queue_pull_text (SwfdecBufferQueue *queue, guint version);
SwfdecBuffer *swfdec_buffer_queue_peek (SwfdecBufferQueue * queue, gsize length);
SwfdecBuffer *swfdec_buffer_queue_peek_buffer (SwfdecBufferQueue * queue);
SwfdecBufferQueue *swfdec_buffer_queue_ref (SwfdecBufferQueue * queue);
diff --git a/swfdec/swfdec_internal.h b/swfdec/swfdec_internal.h
index 30a7404..b82ccf2 100644
--- a/swfdec/swfdec_internal.h
+++ b/swfdec/swfdec_internal.h
@@ -77,5 +77,11 @@ void swfdec_net_stream_init_context (SwfdecPlayer * player);
void swfdec_sprite_movie_init_context (SwfdecPlayer * player);
void swfdec_video_movie_init_context (SwfdecPlayer * player);
+/* functions that shouldn't go into public headers */
+
+char * swfdec_buffer_queue_pull_text (SwfdecBufferQueue * queue,
+ guint version);
+
+
G_END_DECLS
#endif
diff --git a/swfdec/swfdec_load_object.c b/swfdec/swfdec_load_object.c
index 1bb1eba..d7bc0ce 100644
--- a/swfdec/swfdec_load_object.c
+++ b/swfdec/swfdec_load_object.c
@@ -27,6 +27,7 @@
#include "swfdec_as_frame_internal.h"
#include "swfdec_as_strings.h"
#include "swfdec_debug.h"
+#include "swfdec_internal.h"
#include "swfdec_loader_internal.h"
#include "swfdec_stream_target.h"
#include "swfdec_player_internal.h"
diff --git a/swfdec/swfdec_policy_file.c b/swfdec/swfdec_policy_file.c
index 21d29ae..941aaa4 100644
--- a/swfdec/swfdec_policy_file.c
+++ b/swfdec/swfdec_policy_file.c
@@ -28,6 +28,7 @@
#include "swfdec_resource.h"
#include "swfdec_as_strings.h"
#include "swfdec_debug.h"
+#include "swfdec_internal.h"
#include "swfdec_loader_internal.h"
#include "swfdec_player_internal.h"
#include "swfdec_xml.h"
commit 47e932959261fa3530d486134af8a37012598efe
Author: Benjamin Otte <otte at gnome.org>
Date: Wed Feb 20 10:03:52 2008 +0100
this check can now fail, since we only advance in msec steps
diff --git a/swfdec/swfdec_player.c b/swfdec/swfdec_player.c
index e056149..61977f2 100644
--- a/swfdec/swfdec_player.c
+++ b/swfdec/swfdec_player.c
@@ -345,7 +345,8 @@ swfdec_player_remove_timeout (SwfdecPlayer *player, SwfdecTimeout *timeout)
g_return_if_fail (SWFDEC_IS_PLAYER (player));
g_return_if_fail (timeout != NULL);
- g_return_if_fail (timeout->timestamp >= player->priv->time);
+ /* FIXME: can't use that due to rounding issues */
+ //g_return_if_fail (timeout->timestamp >= player->priv->time);
g_return_if_fail (timeout->callback != NULL);
SWFDEC_LOG ("removing timeout %p", timeout);
commit 5e766de523ff38188d4597340a4825d680d85834
Author: Benjamin Otte <otte at gnome.org>
Date: Wed Feb 20 10:03:22 2008 +0100
update docs
diff --git a/doc/swfdec-sections.txt b/doc/swfdec-sections.txt
index db569cf..e0f6649 100644
--- a/doc/swfdec-sections.txt
+++ b/doc/swfdec-sections.txt
@@ -229,7 +229,8 @@ swfdec_buffer_queue_get_type
<SECTION>
<FILE>Enumerations</FILE>
-<TITLE>Enumerations</TITLE>
+<TITLE>Enumerations and Types</TITLE>
+SWFDEC_TYPE_TIME_VAL
SwfdecAsContextState
SwfdecAsDeleteReturn
SwfdecLoaderDataType
@@ -239,6 +240,8 @@ SwfdecAlignment
SwfdecKey
SwfdecMouseCursor
SwfdecScaleMode
+<SUBSECTION Standard>
+swfdec_time_val_get_type
</SECTION>
<SECTION>
@@ -388,12 +391,13 @@ swfdec_as_context_is_aborted
swfdec_as_context_get_string
swfdec_as_context_give_string
swfdec_as_context_use_mem
+swfdec_as_context_try_use_mem
+swfdec_as_context_unuse_mem
swfdec_as_context_gc
swfdec_as_context_maybe_gc
swfdec_as_context_run
swfdec_as_context_throw
swfdec_as_context_catch
-swfdec_as_context_unuse_mem
swfdec_as_context_eval
swfdec_as_context_eval_set
swfdec_as_context_get_time
More information about the Swfdec-commits
mailing list