search for: swfdec_player_is_initialized

...; _private->_nextEventTimer = nil; if (millisecondsToNextEvent == -1) // nothing's going on, so do nothing return; else if (millisecondsToNextEvent == 0) // we need to trigger the next event immediately { swfdec_player_advance(_private->_player, millisecondsToNextEvent); if (swfdec_player_is_initialized(_private->_player)) { unsigned int width, height; swfdec_player_get_default_size(_private->_player, &width, &height); [self setBounds:NSMakeRect(0.0, 0.0, width, height)]; [self setNeedsDisplay:YES]; } [[NSRunLoop currentRunLoop] performSelector:@selector(sched...

...n (int argc, char *argv[]) if (do_break) g_signal_connect (player, "script-added", G_CALLBACK (do_break_cb), NULL); view_swf (player, scale, use_image); - swfdec_player_set_loader (player, loader); + swfdec_player_set_loader_with_variables (player, loader, variables); if (!swfdec_player_is_initialized (player)) { g_printerr ("File \"%s\" is not a file Swfdec can play\n", argv[1]); g_object_unref (player); diff --git a/player/swfplay.c b/player/swfplay.c index 94d82f1..6941529 100644 --- a/player/swfplay.c +++ b/player/swfplay.c @@ -90,6 +90,7 @@ main (int argc, char...

....c b/player/swfdec-window.c index c7fa72c..5b1a32e 100644 --- a/player/swfdec-window.c +++ b/player/swfdec-window.c @@ -78,11 +78,17 @@ swfdec_window_init (SwfdecWindow *window) static void swfdec_window_player_initialized (SwfdecPlayer *player, GParamSpec *pspec, SwfdecWindow *window) { - if (!swfdec_player_is_initialized (player)) - return; - - gtk_recent_manager_add_item (gtk_recent_manager_get_default (), - swfdec_url_get_url (swfdec_loader_get_url (window->loader))); + static const char *mime[2] = { "swfdec-player", NULL }; + GtkRecentData data = { NULL, NULL, (char *) "application/x...

...ot; -#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_unref (player); - player = NULL; - return 1; - } - - g_object_unref (player); - player = NULL; - - return 0; -} - diff-tree 9490205e6f41fe442872a583d4170d3f25c5a0b4 (from 9f317479647298...

...r per player, not one per frame per sprite - The background color is exported by the SwfdecPlayer, so it can be overwritten diff --git a/doc/swfdec-sections.txt b/doc/swfdec-sections.txt index 43457d5..4a45ff4 100644 --- a/doc/swfdec-sections.txt +++ b/doc/swfdec-sections.txt @@ -45,6 +45,8 @@ swfdec_player_is_initialized swfdec_player_get_rate swfdec_player_get_image_size swfdec_player_get_next_event +swfdec_player_get_background_color +swfdec_player_set_background_color swfdec_player_render swfdec_player_advance swfdec_player_handle_mouse diff --git a/libswfdec/swfdec_player.c b/libswfdec/swfdec_player.c ind...

...ault_size/ That name has annoyed me long enough now diff --git a/doc/swfdec-sections.txt b/doc/swfdec-sections.txt index 1b61f67..0916f16 100644 --- a/doc/swfdec-sections.txt +++ b/doc/swfdec-sections.txt @@ -80,7 +80,7 @@ swfdec_player_set_loader swfdec_player_set_loader_with_variables swfdec_player_is_initialized swfdec_player_get_rate -swfdec_player_get_image_size +swfdec_player_get_default_size swfdec_player_get_size swfdec_player_set_size swfdec_player_get_next_event diff --git a/libswfdec-gtk/swfdec_gtk_widget.c b/libswfdec-gtk/swfdec_gtk_widget.c index 895d5a3..8d617fd 100644 --- a/libswfdec-gtk/sw...

libswfdec/swfdec_player.c | 1 - 1 file changed, 1 deletion(-) New commits: diff-tree fd36de2f156ce685d5095aaf323e0766ea017bd7 (from c3b035ca1583a420402b965506129bd73ff3f5fe) Author: Benjamin Otte <otte at gnome.org> Date: Mon Aug 20 16:02:09 2007 +0200 no need for that header diff --git a/libswfdec/swfdec_player.c b/libswfdec/swfdec_player.c index b303408..cd58cf5 100644 ---

...); void swfdec_movie_color_init_context (SwfdecPlayer * player, diff --git a/libswfdec/swfdec_player.c b/libswfdec/swfdec_player.c index 5987382..ecdc3cf 100644 --- a/libswfdec/swfdec_player.c +++ b/libswfdec/swfdec_player.c @@ -1595,6 +1595,8 @@ swfdec_player_initialize (SwfdecPlayer * if (swfdec_player_is_initialized (player)) return; + swfdec_player_preinit_global (player, version); + context = SWFDEC_AS_CONTEXT (player); swfdec_as_context_startup (context, version); /* reset state for initialization */ diff --git a/libswfdec/swfdec_player_as.c b/libswfdec/swfdec_player_as.c index a492055..2...

...cWindow *window) +{ + if (swfdec_as_context_is_aborted (SWFDEC_AS_CONTEXT (player))) + swfdec_window_error (window, _("Broken Flash file, playback aborted.")); +} + +static void +swfdec_window_player_next_event (SwfdecPlayer *player, GParamSpec *pspec, SwfdecWindow *window) +{ + if (!swfdec_player_is_initialized (player) && swfdec_player_get_next_event (player) < 0) + swfdec_window_error (window, _("%s is not a Flash file."), + swfdec_loader_get_filename (window->loader)); +} + +static void swfdec_window_player_initialized (SwfdecPlayer *player, GParamSpec *pspec, SwfdecWindow...

...string = g_string_new (""); player = swfdec_player_new (); g_signal_connect (player, "trace", G_CALLBACK (trace_cb), string); + g_signal_connect (player, "fscommand", G_CALLBACK (fscommand_cb), &quit); swfdec_player_set_loader (player, loader); if (!swfdec_player_is_initialized (player)) { g_print (" ERROR: player is not initialized\n"); @@ -38,8 +50,17 @@ run_test (const char *filename) return FALSE; } - advance = ceil (10000 / swfdec_player_get_rate (player)); - swfdec_player_advance (player, advance); + time_left = ceil (10000 / swfdec_play...

...pt, 0); } +static gboolean +add_variables (gpointer player) +{ + const char *variables = g_object_get_data (player, "variables"); + SwfdecLoader *loader = g_object_get_data (player, "loader"); + + swfdec_player_set_loader_with_variables (player, loader, variables); + if (!swfdec_player_is_initialized (player)) { + g_printerr ("File \"%s\" is not a file Swfdec can play\n", loader->url); + g_object_unref (player); + gtk_main_quit (); + return FALSE; + } + return FALSE; +} + int main (int argc, char *argv[]) { @@ -348,13 +373,9 @@ main (int argc, char *argv...

...eturn 1; } player = swfdec_gtk_player_new (); @@ -123,13 +123,6 @@ main (int argc, char *argv[]) loader = swfdec_slow_loader_new (loader, delay); swfdec_player_set_loader_with_variables (player, loader, variables); - /* FIXME add smarter "not my file" detection */ - if (!swfdec_player_is_initialized (player) && delay == 0) { - g_printerr ("File \"%s\" is not a file Swfdec can play\n", argv[1]); - g_object_unref (player); - player = NULL; - return 1; - } if (no_sound) swfdec_gtk_player_set_audio_enabled (SWFDEC_GTK_PLAYER (player), FALSE); diff...

...ec/swfdec_player.c +++ b/libswfdec/swfdec_player.c @@ -1023,8 +1023,6 @@ void swfdec_player_initialize (SwfdecPlayer *player, guint rate, guint width, guint height) { g_return_if_fail (SWFDEC_IS_PLAYER (player)); - g_return_if_fail (width > 0); - g_return_if_fail (height > 0); if (swfdec_player_is_initialized (player)) return; @@ -1033,6 +1031,7 @@ swfdec_player_initialize (SwfdecPlayer * player->rate = rate; player->width = width; player->height = height; + player->initialized = TRUE; if (rate) { player->iterate_timeout.timestamp = player->time + SWFDEC_TICKS_PE...

..._AS_CONTEXT_CLASS (swfdec_player_parent_class)->mark (context); } @@ -1870,50 +1881,56 @@ void swfdec_player_initialize (SwfdecPlayer *player, guint version, guint rate, guint width, guint height) { - SwfdecAsContext *context; - g_return_if_fail (SWFDEC_IS_PLAYER (player)); - - if (swfdec_player_is_initialized (player)) - return; - - context = SWFDEC_AS_CONTEXT (player); - swfdec_as_context_startup (context, version); - /* reset state for initialization */ - /* FIXME: have a better way to do this */ - if (context->state == SWFDEC_AS_CONTEXT_RUNNING) { - context->state = SWFDEC_AS_CONTE...

...t (value, swfdec_player_get_background_color (player)); break; case PROP_CACHE_SIZE: - g_value_set_uint (value, player->cache->max_size); + g_value_set_uint (value, priv->cache->max_size); break; case PROP_INITIALIZED: g_value_set_boolean (value, swfdec_player_is_initialized (player)); break; case PROP_DEFAULT_WIDTH: - g_value_set_uint (value, player->width); + g_value_set_uint (value, priv->width); break; case PROP_DEFAULT_HEIGHT: - g_value_set_uint (value, player->height); + g_value_set_uint (value, priv->height...

...+ guint time_left; GError *error = NULL; char *str; GString *string; @@ -31,12 +32,22 @@ run_test (const char *filename) player = swfdec_player_new (); g_signal_connect (player, "trace", G_CALLBACK (trace_cb), string); swfdec_player_set_loader (player, loader); + if (!swfdec_player_is_initialized (player)) { + g_print (" ERROR: player is not initialized\n"); + g_object_unref (player); + return FALSE; + } + time_left = ceil (10000 / swfdec_player_get_rate (player)); /* FIXME: Make the number of iterations configurable? */ - for (i = 0; i < 10; i++) { + while (...

...}; struct _SwfdecFileLoaderClass diff --git a/player/swfdebug.c b/player/swfdebug.c index 88987a0..5c759db 100644 --- a/player/swfdebug.c +++ b/player/swfdebug.c @@ -358,7 +358,8 @@ add_variables (gpointer player) swfdec_player_set_loader_with_variables (player, loader, variables); if (!swfdec_player_is_initialized (player)) { - g_printerr ("File \"%s\" is not a file Swfdec can play\n", loader->url); + g_printerr ("File \"%s\" is not a file Swfdec can play\n", + swfdec_url_get_url (swfdec_loader_get_url (loader))); g_object_unref (player); gtk_main_q...

...rate, guint width, guint height) +swfdec_player_initialize (SwfdecPlayer *player, guint version, + guint rate, guint width, guint height) { g_return_if_fail (SWFDEC_IS_PLAYER (player)); g_return_if_fail (width > 0); @@ -1019,6 +1021,7 @@ swfdec_player_initialize (SwfdecPlayer * if (swfdec_player_is_initialized (player)) return; + swfdec_as_context_startup (SWFDEC_AS_CONTEXT (player), version); SWFDEC_INFO ("initializing player to size %ux%u", width, height); player->rate = rate; player->width = width; diff --git a/libswfdec/swfdec_player_internal.h b/libswfdec/swfdec_pl...

...r); + if (player->resource->loader->error) { + g_printerr ("Couldn't open file \"%s\": %s\n", argv[1], player->resource->loader->error); g_object_unref (player); return 1; } /* FIXME: HACK! */ swfdec_player_advance (player, 0); - if (swfdec_player_is_initialized (player)) { + if (!swfdec_player_is_initialized (player)) { g_printerr ("File \"%s\" is not a SWF file\n", argv[1]); g_object_unref (player); player = NULL; return 1; } - s = (SwfdecSwfDecoder *) SWFDEC_MOVIE (player->roots->data)->swf->decod...

...init_context (SwfdecPlayer *player, guint version); -extern void swfdec_video_movie_init_context (SwfdecPlayer *player, guint version); -extern void swfdec_xml_init_context (SwfdecPlayer *player, guint version); /** * swfdec_player_initialize: * @player: a #SwfdecPlayer @@ -1490,14 +1483,14 @@ swfdec_player_is_initialized (SwfdecPlay guint swfdec_player_get_next_event (SwfdecPlayer *player) { - SwfdecTick time; + SwfdecTick tick; guint ret; g_return_val_if_fail (SWFDEC_IS_PLAYER (player), 0); - time = swfdec_player_get_next_event_time (player); - ret = SWFDEC_TICKS_TO_MSECS (time); - if (time % (SW...