search for: swfdec_init

hi, attacched a couple of patches that fix: - a variable may be used unitialized in swfdec_audio_decoder.c - swfdec_init.c got referenced in swfdec/Makefile.am but it's not in git, i've removed it but maybe the right fix is to add it instead Still not able to compile swfdec (shadow warnings), will follow other patches if you don't beat me to it. cheers, rm -------------- next part -------------- A non...

...ew() diff --git a/libswfdec-gtk/swfdec_gtk_player.c b/libswfdec-gtk/swfdec_gtk_player.c index 60e7ded..485f708 100644 --- a/libswfdec-gtk/swfdec_gtk_player.c +++ b/libswfdec-gtk/swfdec_gtk_player.c @@ -173,8 +173,7 @@ swfdec_gtk_player_new (SwfdecAsDebugger *debugger) SwfdecPlayer *player; swfdec_init (); - player = g_object_new (SWFDEC_TYPE_GTK_PLAYER, "debugger", debugger, - "max-runtime", (gulong) 10 * 1000, NULL); + player = g_object_new (SWFDEC_TYPE_GTK_PLAYER, "debugger", debugger, NULL); return player; } diff --git a/libswfdec/swfdec_player.c b/...

...s + * support, it will use gnome-vfs to resolve the given URI. Note that there + * is no way to figure out if the referenced URI really references a file that + * Swfdec can play back. If you need this, you should use #SwfdecGtkLoader + * directly and use its error property. * This function calls swfdec_init () for you if it wasn't called before. * - * Returns: a new player or %NULL on error. + * Returns: a new player. **/ SwfdecPlayer * -swfdec_gtk_player_new_from_file (const char *filename, GError **error) +swfdec_gtk_player_new_from_file (const char *uri) { SwfdecLoader *loader; Swfd...

...ntime and make it really work diff --git a/libswfdec-gtk/swfdec_gtk_player.c b/libswfdec-gtk/swfdec_gtk_player.c index 55db10a..60e7ded 100644 --- a/libswfdec-gtk/swfdec_gtk_player.c +++ b/libswfdec-gtk/swfdec_gtk_player.c @@ -174,7 +174,7 @@ swfdec_gtk_player_new (SwfdecAsDebugger *debugger) swfdec_init (); player = g_object_new (SWFDEC_TYPE_GTK_PLAYER, "debugger", debugger, - "max-runtime", 10 * 1000, NULL); + "max-runtime", (gulong) 10 * 1000, NULL); return player; } diff --git a/libswfdec/swfdec_player.c b/libswfdec/swfdec_player.c index 3ed0d5a...

...list all failed tests at end of run diff --git a/test/sound/sound.c b/test/sound/sound.c index b74f9e2..f42149f 100644 --- a/test/sound/sound.c +++ b/test/sound/sound.c @@ -245,7 +245,7 @@ error: int main (int argc, char **argv) { - guint failed_tests = 0; + GList *failed_tests = NULL; swfdec_init (); @@ -253,7 +253,7 @@ main (int argc, char **argv) int i; for (i = 1; i < argc; i++) { if (!run_test (argv[i])) - failed_tests++; + failed_tests = g_list_prepend (failed_tests, g_strdup (argv[i]));; } } else { GDir *dir; @@ -263,16 +263,24 @@ main (int argc, cha...

...quot; +#include "swfdec_script_internal.h" #include "swfdec_sprite_movie.h" #include "swfdec_swf_instance.h" @@ -1432,7 +1432,7 @@ swfdec_player_initialize (SwfdecPlayer * SwfdecBits bits; SwfdecScript *script; swfdec_bits_init_data (&bits, swfdec_initialize, sizeof (swfdec_initialize)); - script = swfdec_script_new (&bits, "init", version); + script = swfdec_script_new_from_bits (&bits, "init", version); g_assert (script); swfdec_as_object_run (context->global, script); swfdec_script_...

...fdec_loader_get_data_type <SUBSECTION Standard> +SwfdecLoaderClass SWFDEC_LOADER SWFDEC_IS_LOADER SWFDEC_TYPE_LOADER @@ -34,7 +38,6 @@ SWFDEC_LOADER_GET_CLASS <SECTION> <FILE>SwfdecPlayer</FILE> <TITLE>SwfdecPlayer</TITLE> -SwfdecMouseCursor SwfdecPlayer swfdec_init swfdec_player_new @@ -53,6 +56,7 @@ swfdec_player_handle_mouse swfdec_player_render_audio swfdec_player_get_audio <SUBSECTION Standard> +SwfdecPlayerClass SWFDEC_PLAYER SWFDEC_IS_PLAYER SWFDEC_TYPE_PLAYER @@ -86,3 +90,15 @@ swfdec_buffer_queue_pull_buffer swfdec_buffer_queue_peek &lt...

...r)/swfdec- at SWFDEC_MAJORMINOR@/libswfdec-gtk libswfdec_ at SWFDEC_MAJORMINOR@include_HEADERS = \ swfdec-gtk.h \ diff --git a/libswfdec/swfdec_player.c b/libswfdec/swfdec_player.c index babd2ad..284b7f7 100644 --- a/libswfdec/swfdec_player.c +++ b/libswfdec/swfdec_player.c @@ -2059,6 +2059,8 @@ swfdec_init (void) _inited = TRUE; + if (!g_thread_supported ()) + g_thread_init (NULL); g_type_init (); oil_init (); diff --git a/test/trace/Makefile.am b/test/trace/Makefile.am index 0732b48..2086980 100644 --- a/test/trace/Makefile.am +++ b/test/trace/Makefile.am @@ -9,8 +9,8 @@ trace_SOU...

...aximum runtime in seconds allowed for each advance (default 10)", NULL + }, + { + G_OPTION_REMAINING, '\0', 0, G_OPTION_ARG_FILENAME_ARRAY, &filenames, + NULL, "<INPUT FILE> <OUTPUT FILE>" + }, + { + NULL + } + }; + + // init + swfdec_init (); + + // read command line params + context = g_option_context_new ("Run a Flash file trying to crash Swfdec"); + g_option_context_add_main_entries (context, entries, NULL); + + if (g_option_context_parse (context, &argc, &argv, &err) == FALSE) { + g_printerr ("C...

...); - -static void buffer_free (SwfdecBuffer *buffer, void *priv) -{ - g_free (buffer->data); -} - -int main (int argc, char *argv[]) -{ - gsize length; - int ret; - char *fn = "it.swf"; - SwfdecDecoder *s; - int i; - char *contents; - SwfdecBuffer *buffer; - int n_frames; - - swfdec_init (); - - if(argc>=2){ - fn = argv[1]; - } - - ret = g_file_get_contents (fn, &contents, &length, NULL); - if (!ret) { - exit(1); - } - - s = swfdec_decoder_new(); - - buffer = swfdec_buffer_new_with_data (contents, length); - buffer->free = buffer_free; - ret = swfdec_decod...

...!= NULL) { string = g_string_append_len (string, start, p - start); for (i = 0; xml_entities[i].escaped != NULL; i++) { commit 1b0c6573542709794c06462805825797d3d23888 Author: Benjamin Otte <otte at gnome.org> Date: Fri Jan 4 19:18:04 2008 +0100 g_thread_init() is called by swfdec_init() already, no need to call it again diff --git a/libswfdec-gtk/swfdec_gtk_loader.c b/libswfdec-gtk/swfdec_gtk_loader.c index 9836e3f..80d95c7 100644 --- a/libswfdec-gtk/swfdec_gtk_loader.c +++ b/libswfdec-gtk/swfdec_gtk_loader.c @@ -209,8 +209,6 @@ swfdec_gtk_loader_class_init (SwfdecGtkLoaderClas...

...ctx; + /* set the right warning levels */ + g_log_set_always_fatal (G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING); + /* by default get rid of the loads of warnings the tests produce */ + g_setenv ("SWFDEC_DEBUG", "2", FALSE); + + g_thread_init (NULL); + swfdec_init (); + ctx = g_option_context_new (""); g_option_context_add_main_entries (ctx, options, "options"); g_option_context_parse (ctx, &argc, &argv, &error); @@ -95,12 +103,6 @@ main (int argc, char **argv) return EXIT_FAILURE; } - if (argc < 2) { -...

...17:37:48 2007 +0200 be a bit more sane on command line errors diff --git a/test/parse.c b/test/parse.c index 6fa7234..48bbd2f 100644 --- a/test/parse.c +++ b/test/parse.c @@ -28,13 +28,13 @@ int main (int argc, char *argv[]) { - char *fn = "it.swf"; SwfdecPlayer *player; swfdec_init (); - if(argc>=2){ - fn = argv[1]; + if (argc < 2){ + g_print ("usage: %s FILENAME\n", argv[0]); + return 0; } player = swfdec_player_new_from_file (argv[1]); diff-tree 117ecebbdd9eab3f3227ed1a56d1bb2394789d32 (from d5d6259d8f66e4b23d19678d905aca3e58c8fc6b) Author:...

...list all failed tests at end of run diff --git a/test/sound/sound.c b/test/sound/sound.c index b74f9e2..f42149f 100644 --- a/test/sound/sound.c +++ b/test/sound/sound.c @@ -245,7 +245,7 @@ error: int main (int argc, char **argv) { - guint failed_tests = 0; + GList *failed_tests = NULL; swfdec_init (); @@ -253,7 +253,7 @@ main (int argc, char **argv) int i; for (i = 1; i < argc; i++) { if (!run_test (argv[i])) - failed_tests++; + failed_tests = g_list_prepend (failed_tests, g_strdup (argv[i]));; } } else { GDir *dir; @@ -263,16 +263,24 @@ main (int argc, cha...

...dec_loader_data_type_get_extension SwfdecAlignment +SwfdecKey SwfdecMouseCursor SwfdecScaleMode </SECTION> diff --git a/libswfdec/swfdec_player.c b/libswfdec/swfdec_player.c index 393519d..4ea85e6 100644 --- a/libswfdec/swfdec_player.c +++ b/libswfdec/swfdec_player.c @@ -1636,8 +1636,9 @@ swfdec_init (void) * probably want to call swfdec_player_advance() before to update the player to * the correct time when calling this function. * - * Returns: TRUE if the mouse event was handled. A mouse event may not be - * handled if the user clicked on a translucent area for example. + * Re...

...= JSVAL_NULL) { - insert = g_new (jsval, 1); - *insert = val; - if (!JS_AddRoot (player->jscx, insert)) { - g_free (insert); - return; - } - g_hash_table_insert (player->registered_classes, g_strdup (name), insert); - } } /** PUBLIC API ***/ @@ -1207,7 +1218,6 @@ swfdec_init (void) swfdec_debug_set_level (level); } } - swfdec_js_init (0); } /** diff --git a/libswfdec/swfdec_player_internal.h b/libswfdec/swfdec_player_internal.h index f4de1a1..7dcf8dc 100644 --- a/libswfdec/swfdec_player_internal.h +++ b/libswfdec/swfdec_player_internal.h @@ -20,11 +...

...fi -SWFDEC_LIBVERSION="1:1:0" +SWFDEC_LIBVERSION="1:2:0" AC_SUBST(SWFDEC_LIBVERSION) AM_PROG_LIBTOOL diff --git a/doc/swfdec-sections.txt b/doc/swfdec-sections.txt index 3a93f97..43457d5 100644 --- a/doc/swfdec-sections.txt +++ b/doc/swfdec-sections.txt @@ -40,6 +40,7 @@ swfdec_init swfdec_player_new swfdec_player_new_from_file swfdec_player_set_loader +swfdec_player_set_loader_with_variables swfdec_player_is_initialized swfdec_player_get_rate swfdec_player_get_image_size diff --git a/libswfdec/swfdec_player.c b/libswfdec/swfdec_player.c index 4b29d28..cbdac1b 100644 ---...

...yback speed", + G_MINDOUBLE, G_MAXDOUBLE, 1.0, G_PARAM_READWRITE)); +} + +static void +swfdec_gtk_player_init (SwfdecGtkPlayer * player) +{ + player->speed = 1.0; +} + +/*** PUBLIC API ***/ + +/** + * swfdec_gtk_player_new: + * + * Creates a new Swfdec Gtk player. + * This function calls swfdec_init () for you if it wasn't called before. + * + * Returns: The new player + **/ +SwfdecPlayer * +swfdec_gtk_player_new (void) +{ + SwfdecPlayer *player; + + swfdec_init (); + player = g_object_new (SWFDEC_TYPE_GTK_PLAYER, NULL); + + return player; +} + +/** + * swfdec_gtk_player_new_from_file:...

...f not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301 USA - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include <libswfdec/swfdec.h> - -int -main (int argc, char *argv[]) -{ - SwfdecPlayer *player; - - swfdec_init (); - - if (argc < 2){ - g_print ("usage: %s FILENAME\n", argv[0]); - return 0; - } - - player = swfdec_player_new_from_file (argv[1]); - if (!swfdec_player_is_initialized (player)) { - g_printerr ("Error parsing file \"%s\"\n", argv[1]); - g_object_...

...aximum runtime in seconds allowed for each advance (default 10)", NULL - }, - { - G_OPTION_REMAINING, '\0', 0, G_OPTION_ARG_FILENAME_ARRAY, &filenames, - NULL, "<INPUT FILE> <OUTPUT FILE>" - }, - { - NULL - } - }; - - // init - swfdec_init (); - - // read command line params - context = g_option_context_new ("Run a Flash file trying to crash Swfdec"); - g_option_context_add_main_entries (context, entries, NULL); - - if (g_option_context_parse (context, &argc, &argv, &err) == FALSE) { - g_printerr ("C...