search for: swfdecloaderrequest

...1..bc3894a 100644 --- a/libswfdec-gtk/swfdec_gtk_loader.c +++ b/libswfdec-gtk/swfdec_gtk_loader.c @@ -116,14 +116,14 @@ swfdec_gtk_loader_finish (SoupMessage *m } static void -swfdec_gtk_loader_load (SwfdecLoader *loader, +swfdec_gtk_loader_load (SwfdecLoader *loader, SwfdecLoader *parent, SwfdecLoaderRequest request, const char *data, gsize data_len) { const SwfdecURL *url = swfdec_loader_get_url (loader); if (g_ascii_strcasecmp (swfdec_url_get_protocol (url), "http") != 0 && g_ascii_strcasecmp (swfdec_url_get_protocol (url), "https") != 0) { - SWFDEC_LOAD...

...loader = loader; + + swfdec_loader_set_target (load_object->loader, + SWFDEC_LOADER_TARGET (load_object)); + swfdec_loader_set_data_type (load_object->loader, SWFDEC_LOADER_DATA_TEXT); +} + static gboolean swfdec_load_object_load (SwfdecLoadObject *load_object, const char *url, SwfdecLoaderRequest request, SwfdecBuffer *data) { + SwfdecPlayer *player; + SwfdecSecurity *sec; SwfdecAsValue val; g_return_val_if_fail (SWFDEC_IS_LOAD_OBJECT (load_object), FALSE); g_return_val_if_fail (url != NULL, FALSE); + player = SWFDEC_PLAYER (SWFDEC_AS_OBJECT (load_object)->context); s...

...t;loader = NULL; } + if (player->security) { + g_object_unref (player->security); + player->security = NULL; + } if (player->system) { g_object_unref (player->system); player->system = NULL; @@ -1745,6 +1750,23 @@ swfdec_player_launch (SwfdecPlayer *player, SwfdecLoaderRequest request, const c g_signal_emit (player, signals[LAUNCH], 0, request, url, target, data); } +static void +swfdec_player_create_security (SwfdecPlayer *player, guint version) +{ + const SwfdecURL *url; + gboolean allow_local, allow_remote; + + url = swfdec_loader_get_url (player->loader);...

...FDEC_LOADER_STATE_ERROR) + loader->state = SWFDEC_LOADER_STATE_CLOSED; } void diff --git a/libswfdec/swfdec_loader.h b/libswfdec/swfdec_loader.h index 5fc561f..61e0b31 100644 --- a/libswfdec/swfdec_loader.h +++ b/libswfdec/swfdec_loader.h @@ -76,7 +76,7 @@ struct _SwfdecLoaderClass SwfdecLoaderRequest request, const char * data, gsize data_len); - /* if open, close the loader */ + /* if open, close the loader. NB: you may not call push() or eof() after the loader has been closed */ void (* close) (SwfdecLoader * loader); }; diff --git a/libswfdec/swfdec_loader_int...

...layer->resource); player->resource = NULL; } diff --git a/libswfdec/swfdec_resource_request.c b/libswfdec/swfdec_resource_request.c index 7b17d12..f5bb5fc 100644 --- a/libswfdec/swfdec_resource_request.c +++ b/libswfdec/swfdec_resource_request.c @@ -53,17 +53,25 @@ typedef struct { SwfdecLoaderRequest request; SwfdecBuffer * buffer; SwfdecResourceFunc callback; + SwfdecResourceAbortFunc abort; gpointer user_data; } AllowCallbackData; static void swfdec_player_request_resource_allow_callback (const SwfdecURL *url, - gboolean allowed, gpointer data_) + int status, gpointe...

...\" are not ascii, skipping fscommand", command); - return TRUE; - } - real_command = g_ascii_strdown (command, -1); - g_signal_emit (player, signals[FSCOMMAND], 0, real_command, value); - g_free (real_command); - return TRUE; -} - void swfdec_player_launch (SwfdecPlayer *player, SwfdecLoaderRequest request, const char *url, const char *target, SwfdecBuffer *data) diff --git a/libswfdec/swfdec_player_internal.h b/libswfdec/swfdec_player_internal.h index a30433a..a9d870a 100644 --- a/libswfdec/swfdec_player_internal.h +++ b/libswfdec/swfdec_player_internal.h @@ -216,9 +216,6 @@ SwfdecSpri...

...t) { @@ -190,18 +178,14 @@ swfdec_gtk_loader_dispose (GObject *obje G_OBJECT_CLASS (swfdec_gtk_loader_parent_class)->dispose (object); } -static SwfdecLoader * -swfdec_gtk_loader_load (SwfdecLoader *loader, const char *url, +static void +swfdec_gtk_loader_load (SwfdecLoader *loader, SwfdecLoaderRequest request, const char *data, gsize data_len) { SwfdecGtkLoader *gtk = SWFDEC_GTK_LOADER (loader); - GnomeVFSURI *parent, *new; - /* FIXME: security! */ - parent = gnome_vfs_uri_get_parent (gtk->guri); - new = gnome_vfs_uri_resolve_relative (parent, url); - gnome_vfs_uri_unref (parent);...

libswfdec-gtk/swfdec_gtk_loader.c | 1 + 1 files changed, 1 insertion(+) New commits: diff-tree 4d1ee537d4cd388a8b21003496d3511df6f0549d (from ba4f1da69d0c74c45b0b4d92330f2203d258bb49) Author: Benjamin Otte <otte at gnome.org> Date: Thu Aug 2 13:06:55 2007 +0200 keep a reference to the message, since it's unreffed automagically diff --git a/libswfdec-gtk/swfdec_gtk_loader.c

libswfdec/swfdec_player.c | 3 +++ 1 file changed, 3 insertions(+) New commits: commit f82b818ab4cf2148fafbb9eec5a27622ccd680d7 Author: Benjamin Otte <otte at gnome.org> Date: Sun Oct 14 17:04:21 2007 +0200 lock the player when handling keys ooooops diff --git a/libswfdec/swfdec_player.c b/libswfdec/swfdec_player.c index 32254ab..4980b21 100644 ---

...if (gtk->guri) { - gnome_vfs_uri_unref (gtk->guri); - gtk->guri = NULL; - } - - G_OBJECT_CLASS (swfdec_gtk_loader_parent_class)->dispose (object); + g_print ("eof\n"); + swfdec_loader_eof (loader); } static void swfdec_gtk_loader_load (SwfdecLoader *loader, SwfdecLoaderRequest request, const char *data, gsize data_len) { - SwfdecGtkLoader *gtk = SWFDEC_GTK_LOADER (loader); + const SwfdecURL *url = swfdec_loader_get_url (loader); - gnome_vfs_async_open (&gtk->handle, swfdec_url_get_url (swfdec_loader_get_url (loader)), - GNOME_VFS_OPEN_READ, GNOME_VFS_P...

...wfdec-sections.txt index db255b0..96dbcb1 100644 --- a/doc/swfdec-sections.txt +++ b/doc/swfdec-sections.txt @@ -102,6 +102,7 @@ swfdec_buffer_queue_get_type <SECTION> <FILE>Enumerations</FILE> <TITLE>Enumerations</TITLE> +SwfdecAsContextState SwfdecLoaderDataType SwfdecLoaderRequest swfdec_loader_data_type_get_extension @@ -205,6 +206,7 @@ SWFDEC_AS_VALUE_GET_OBJECT swfdec_as_value_to_object SWFDEC_AS_VALUE_SET_OBJECT swfdec_as_value_to_primitive +swfdec_as_value_to_debug swfdec_as_double_to_string swfdec_as_str_concat <SUBSECTION Standard> @@ -220,6 +222,7 @@ SWF...

...oyNotify destroy); -gboolean swfdec_player_request_fscommand (SwfdecPlayer * player, - const char * command, - const char * value); SwfdecLoader * swfdec_player_request_resource_now (SwfdecPlayer * player, SwfdecSecurity * security, const char * url, SwfdecLoaderRequest req, SwfdecBuffer * buffer); +void swfdec_player_request_unload (SwfdecPlayer * player, + const char * target); +gboolean swfdec_player_request_fscommand (SwfdecPlayer * player, + const char * command, + const char * value); /* private api for swfdec_player...

...condition); gboolean swfdec_movie_queue_script (SwfdecMovie * movie, SwfdecEventType condition); -void swfdec_movie_set_variables (SwfdecMovie * movie, - const char * variables); void swfdec_movie_load_variables (SwfdecMovie * movie, const char * url, SwfdecLoaderRequest request, diff --git a/libswfdec/swfdec_resource.c b/libswfdec/swfdec_resource.c index 6b7f540..a072108 100644 --- a/libswfdec/swfdec_resource.c +++ b/libswfdec/swfdec_resource.c @@ -223,11 +223,11 @@ swfdec_resource_loader_target_open (SwfdecLoaderTarget *target, SwfdecLoader *lo query = swfdec_...

...condition); gboolean swfdec_movie_queue_script (SwfdecMovie * movie, SwfdecEventType condition); -void swfdec_movie_set_variables (SwfdecMovie * movie, - const char * variables); void swfdec_movie_load_variables (SwfdecMovie * movie, const char * url, SwfdecLoaderRequest request, diff --git a/libswfdec/swfdec_resource.c b/libswfdec/swfdec_resource.c index e066dc4..5c666b7 100644 --- a/libswfdec/swfdec_resource.c +++ b/libswfdec/swfdec_resource.c @@ -234,11 +234,11 @@ swfdec_resource_loader_target_open (SwfdecLoaderTarget *target, SwfdecLoader *lo query = swfdec_...

...s - // FIXME: is it called even when loading fails? - if (target->context->version >= 6 && SWFDEC_IS_SPRITE_MOVIE (target)) - swfdec_as_object_call (target, SWFDEC_AS_STR_onData, 0, NULL, NULL); -} - -void -swfdec_movie_load_variables (SwfdecMovie *movie, const char *url, - SwfdecLoaderRequest request, SwfdecBuffer *data) -{ - g_return_if_fail (SWFDEC_IS_MOVIE (movie)); - g_return_if_fail (url != NULL); - - if (request != SWFDEC_LOADER_REQUEST_DEFAULT) { - SWFDEC_FIXME ("loadVariables: Different request-modes not supported"); - return; - } - - swfdec_load_object_new...

...erform_eof swfdec_loader_perform_push +static void +swfdec_loader_perform_push (gpointer loaderp, gpointer unused) +{ + SwfdecLoader *loader = loaderp; + + swfdec_loader_target_parse (loader->target, loader); +} + SwfdecLoader * swfdec_loader_load (SwfdecLoader *loader, const char *url, SwfdecLoaderRequest request, const char *data, gsize data_len) @@ -276,29 +289,40 @@ swfdec_loader_set_target (SwfdecLoader * loader->target = target; if (target) { loader->player = swfdec_loader_target_get_player (target); + switch (loader->state) { + case SWFDEC_LOADER_STATE_NEW: + break;...

....txt @@ -91,6 +91,8 @@ swfdec_player_set_alignment swfdec_player_render swfdec_player_advance swfdec_player_handle_mouse +swfdec_player_key_press +swfdec_player_key_release swfdec_player_render_audio swfdec_player_get_audio <SUBSECTION Standard> @@ -142,6 +144,7 @@ SwfdecLoaderDataType SwfdecLoaderRequest swfdec_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,...

...index 7174aa2..09ac8c8 100644 --- a/libswfdec/swfdec_load_object.c +++ b/libswfdec/swfdec_load_object.c @@ -181,18 +181,21 @@ swfdec_load_object_init (SwfdecLoadObject *load_object) { } -static void +static gboolean swfdec_load_object_load (SwfdecLoadObject *load_object, const char *url, SwfdecLoaderRequest request, SwfdecBuffer *data) { SwfdecAsValue val; - g_return_if_fail (SWFDEC_IS_LOAD_OBJECT (load_object)); - g_return_if_fail (url != NULL); + g_return_val_if_fail (SWFDEC_IS_LOAD_OBJECT (load_object), FALSE); + g_return_val_if_fail (url != NULL, FALSE); swfdec_load_object_reset (lo...

...ibswfdec/swfdec_loader.h @@ -31,7 +31,9 @@ typedef enum { SWFDEC_LOADER_DATA_SWF, SWFDEC_LOADER_DATA_FLV, SWFDEC_LOADER_DATA_XML, - SWFDEC_LOADER_DATA_TEXT + SWFDEC_LOADER_DATA_TEXT, + SWFDEC_LOADER_DATA_JPEG, + SWFDEC_LOADER_DATA_PNG } SwfdecLoaderDataType; /* NB: actal numbers in SwfdecLoaderRequest are important for GetURL2 action */ diff --git a/libswfdec/swfdec_resource.c b/libswfdec/swfdec_resource.c index 00816ca..e24c512 100644 --- a/libswfdec/swfdec_resource.c +++ b/libswfdec/swfdec_resource.c @@ -250,11 +250,8 @@ swfdec_resource_loader_target_parse (SwfdecLoaderTarget *target, SwfdecLo...

...does not reference a movie, not loading %s", target, - swfdec_url_get_url (swfdec_loader_get_url (loader))); - swfdec_loader_close (loader); g_object_unref (loader); return; } @@ -358,6 +363,7 @@ swfdec_resource_load (SwfdecPlayer *player, const char *target, const char *url, SwfdecLoaderRequest request, SwfdecBuffer *buffer, SwfdecMovieClipLoader *loader) { SwfdecSpriteMovie *movie; + SwfdecResource *resource; char *path; g_return_if_fail (SWFDEC_IS_PLAYER (player)); @@ -375,6 +381,10 @@ swfdec_resource_load (SwfdecPlayer *player, const char *target, const char *url, SWF...