[Swfdec-commits] 4 commits - swfdec/swfdec_player.c test/swfdec_test_plugin.c test/trace vivified/code

[Pekka Lampila]

 swfdec/swfdec_player.c    |    2 +-
 test/swfdec_test_plugin.c |    4 +++-
 test/trace/Makefile.am    |    1 +
 vivified/code/rewrite.c   |   10 ++++++++++
 4 files changed, 15 insertions(+), 2 deletions(-)

New commits:
commit a87c74c77dccf8ed054356bb72cc7e2f64fa4373
Author: Pekka Lampila <pekka.lampila at iki.fi>
Date:   Fri Jun 27 02:28:23 2008 +0300

    Update swfdec_test_plugin_swfdec_launch to match the new launch signal

diff --git a/test/swfdec_test_plugin.c b/test/swfdec_test_plugin.c
index 5bf4adb..352dd41 100644
--- a/test/swfdec_test_plugin.c
+++ b/test/swfdec_test_plugin.c
@@ -101,7 +101,9 @@ swfdec_test_plugin_swfdec_trace (SwfdecPlayer *player, const char *message,
 
 static void
 swfdec_test_plugin_swfdec_launch (SwfdecPlayer *player, const char *url,
-    const char *target, SwfdecBuffer *data, SwfdecTestPlugin *plugin)
+    const char *target, SwfdecBuffer *data, guint header_count,
+    const char **header_names, const char **header_values,
+    SwfdecTestPlugin *plugin)
 {
   plugin->launch (plugin, url);
 }
commit c2d7d046a4f514d652cdf283cad0b6f4e489c589
Author: Pekka Lampila <pekka.lampila at iki.fi>
Date:   Fri Jun 27 02:26:27 2008 +0300

    Fix the number of arguments for launch signal's g_signal_new call
    
    Ouch, it wasn't updated when adding headers...

diff --git a/swfdec/swfdec_player.c b/swfdec/swfdec_player.c
index 5d02b09..6c34da2 100644
--- a/swfdec/swfdec_player.c
+++ b/swfdec/swfdec_player.c
@@ -2315,7 +2315,7 @@ swfdec_player_class_init (SwfdecPlayerClass *klass)
    */
   signals[LAUNCH] = g_signal_new ("launch", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0, NULL, NULL, swfdec_marshal_VOID__STRING_STRING_BOXED_UINT_BOXED_BOXED,
-      G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_STRING, SWFDEC_TYPE_BUFFER, G_TYPE_UINT, G_TYPE_STRV, G_TYPE_STRV);
+      G_TYPE_NONE, 6, G_TYPE_STRING, G_TYPE_STRING, SWFDEC_TYPE_BUFFER, G_TYPE_UINT, G_TYPE_STRV, G_TYPE_STRV);
   /**
    * SwfdecPlayer::missing-plugins:
    * @player: the #SwfdecPlayer missing plugins
commit d539315a5db1bf4e29182023f43176cbccd11051
Author: Pekka Lampila <pekka.lampila at iki.fi>
Date:   Thu Jun 26 16:06:00 2008 +0300

    Add test/trace/test.mp3 to Makefile.am, it was forgotten earlier

diff --git a/test/trace/Makefile.am b/test/trace/Makefile.am
index fe4ac51..49dd6ec 100644
--- a/test/trace/Makefile.am
+++ b/test/trace/Makefile.am
@@ -3542,6 +3542,7 @@ EXTRA_DIST = \
 	targetpath-6.swf.trace \
 	targetpath-7.swf \
 	targetpath-7.swf.trace \
+	test.mp3 \
 	text-field-autosize-layout-update-5.swf \
 	text-field-autosize-layout-update-5.swf.trace \
 	text-field-autosize-layout-update-6.swf \
commit 1b57a267c304a2d23ff56116b8a4283fdd31ec0e
Author: Pekka Lampila <pekka.lampila at iki.fi>
Date:   Thu Jun 26 13:33:52 2008 +0300

    Don't overwrite reg 0 in vivi-rewrite's --sort-enumerate
    
    Now it overwrites $_vivi_rewrite_sort_enumerate instead

diff --git a/vivified/code/rewrite.c b/vivified/code/rewrite.c
index 1df0a7e..24497ac 100644
--- a/vivified/code/rewrite.c
+++ b/vivified/code/rewrite.c
@@ -181,6 +181,10 @@ sort_enumerate (ViviCodeAssembler *assembler)
       // FIXME: compile once and use multiple times (problem is the labels)
       statement = vivi_parse_string (
 	  "asm {"
+	  "  push reg 0;"
+	  "  push '$_vivi_rewrite_sort_enumerate';"
+	  "  define_local;"
+
 	  "  push 0;"
 	  "  init_array;"
 	  "  store 0;"
@@ -216,6 +220,12 @@ sort_enumerate (ViviCodeAssembler *assembler)
 	  "  jump write_start;"
 
 	  "write_end:"
+	  "  push '$_vivi_rewrite_sort_enumerate';"
+	  "  get_variable;"
+	  "  store 0;"
+	  "  pop;"
+	  "  push '$_vivi_rewrite_sort_enumerate';"
+	  "  delete2;"
 	  "}"
 	  );
       g_assert (statement);