search for: swfdec_loader_get_url

...k_loader.c @@ -105,7 +105,8 @@ swfdec_gtk_loader_read_cb (GnomeVFSAsync gtk->handle = NULL; return; } else if (result != GNOME_VFS_OK) { - char *err = g_strdup_printf ("%s: %s", loader->url, + char *err = g_strdup_printf ("%s: %s", + swfdec_url_get_url (swfdec_loader_get_url (loader)), gnome_vfs_result_to_string (result)); swfdec_loader_error (loader, err); g_free (err); @@ -144,7 +145,8 @@ swfdec_gtk_loader_open_cb (GnomeVFSAsync SwfdecLoader *loader = loaderp; if (result != GNOME_VFS_OK) { - char *err = g_strdup_printf ("%s: %s", load...

...Buffer *buffer) { + SwfdecAsContext *cx; + SwfdecSecurity *sec; + SwfdecURL *full; + g_return_val_if_fail (SWFDEC_IS_PLAYER (player), NULL); g_return_val_if_fail (url != NULL, NULL); g_assert (player->resource); + /* create absolute url first */ + full = swfdec_url_new_relative (swfdec_loader_get_url (player->resource->loader), url); + /* figure out the right security object (FIXME: let the person loading it provide it?) */ + cx = SWFDEC_AS_CONTEXT (player); + if (cx->frame) { + sec = cx->frame->security; + } else { + g_warning ("swfdec_player_load() should only be...

...stance) } static void -swfdec_resource_loader_target_open (SwfdecLoaderTarget *target, SwfdecLoader *loader) +swfdec_resource_open (SwfdecResource *instance, SwfdecLoader *loader) { - SwfdecResource *instance = SWFDEC_RESOURCE (target); const char *query; query = swfdec_url_get_query (swfdec_loader_get_url (loader)); @@ -105,9 +104,19 @@ swfdec_resource_loader_target_open (SwfdecLoaderTarget *target, SwfdecLoader *lo } static void -swfdec_resource_loader_target_parse (SwfdecLoaderTarget *target, SwfdecLoader *loader) +swfdec_resource_loader_target_open (SwfdecLoaderTarget *target, SwfdecLoader *l...

...FDEC_GTK_LOADER (loader); SwfdecGtkLoaderClass *klass = SWFDEC_GTK_LOADER_GET_CLASS (gtk); + g_print ("new %s\n", swfdec_url_get_url (url)); gtk->message = soup_message_new (request == SWFDEC_LOADER_REQUEST_POST ? "POST" : "GET", - swfdec_url_get_url (swfdec_loader_get_url (loader))); + swfdec_url_get_url (url)); soup_message_set_flags (gtk->message, SOUP_MESSAGE_OVERWRITE_CHUNKS); g_signal_connect (gtk->message, "got-headers", G_CALLBACK (swfdec_gtk_loader_open), gtk); g_signal_connect (gtk->message, "got-chunk", G_CALLBAC...

...rget + strlen (resource->target)); + if (!SWFDEC_IS_SPRITE_MOVIE (movie)) { + level = swfdec_player_get_level (player, resource->target); + if (level < 0) { + SWFDEC_WARNING ("%s does not reference a movie, not loading %s", resource->target, + swfdec_url_get_url (swfdec_loader_get_url (resource->loader))); + swfdec_loader_close (resource->loader); + swfdec_player_unroot_object (player, G_OBJECT (resource)); + return FALSE; + } + movie = swfdec_player_get_movie_at_level (player, level); + } + if (movie == NULL) { + movie = swfdec_player_create_movi...

...w_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-shockwave-flash", + (char *) g_get_application_name (), g_strjoin (" ", g_get_prgname (), "%u", NULL), + (ch...

...der.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_LOADER_CLASS (swfdec_gtk_loader_parent_class)->load (loader, request, data, data_len); + SWF...

...200 don't remove only the first directory, but all of them diff --git a/libswfdec/swfdec_loader.c b/libswfdec/swfdec_loader.c index b6885e7..9bde057 100644 --- a/libswfdec/swfdec_loader.c +++ b/libswfdec/swfdec_loader.c @@ -444,7 +444,7 @@ swfdec_loader_get_filename (SwfdecLoader url = swfdec_loader_get_url (loader); path = swfdec_url_get_path (url); if (path) { - char *s = strchr (path, '/'); + char *s = strrchr (path, '/'); if (s) path = s + 1; if (path[0] == 0) diff-tree 3a6b5c7b1cb39e13e6f1448a9dd6914555904cf3 (from 7e5f0fc97e0b8852a8856ed6b26dd48a2fcc3...

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

...Buffer *buffer) -{ - SwfdecAsContext *cx; - SwfdecSecurity *sec; - SwfdecURL *full; - - g_return_val_if_fail (SWFDEC_IS_PLAYER (player), NULL); - g_return_val_if_fail (url != NULL, NULL); - - g_assert (player->resource); - /* create absolute url first */ - full = swfdec_url_new_relative (swfdec_loader_get_url (player->resource->loader), url); - /* figure out the right security object (FIXME: let the person loading it provide it?) */ - cx = SWFDEC_AS_CONTEXT (player); - if (cx->frame) { - sec = cx->frame->security; - } else { - g_warning ("swfdec_player_load() should only be...

...amSpec *pspec, SwfdecWindow *window) { static const char *mime[2] = { "swfdec-player", NULL }; @@ -87,6 +103,7 @@ swfdec_window_player_initialized (SwfdecPlayer *player, GParamSpec *pspec, Swfde gtk_recent_manager_add_full (gtk_recent_manager_get_default (), swfdec_url_get_url (swfdec_loader_get_url (window->loader)), &data); + g_signal_handlers_disconnect_by_func (player, swfdec_window_player_next_event, window); } g_free (data.app_exec); } @@ -116,8 +133,12 @@ swfdec_window_set_url (SwfdecWindow *window, const char *url) window->loader = swfdec_gtk_loader_new (url)...

...--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_url_get_query (swfdec_loader_get_url (loader)); if (query) { SWFDEC_INFO ("set url query movie variables: %s", query); - swfdec_movie_set_variables (SWFDEC_MOVIE (instance->movie), query); + swfdec_as_object_decode (SWFDEC_AS_OBJECT (instance->movie), query); } if (instance->variables) { SWF...

...g_timeout_add (slow->tick_time, swfdec_slow_loader_tick, slow); swfdec_loader_open (SWFDEC_LOADER (slow), 0); @@ -119,7 +119,7 @@ swfdec_slow_loader_load (SwfdecLoader *loader, SwfdecLoader *parent, /* FIXME: include request and data */ new = swfdec_gtk_loader_new (swfdec_url_get_url (swfdec_loader_get_url (loader))); - swfdec_slow_loader_initialize (slow, new, slow->duration / 1000); + swfdec_slow_loader_initialize (slow, new, SWFDEC_SLOW_LOADER (parent)->duration / 1000); } static void commit 044f91160c1cdaf3919c8ad28ef404232ec9a182 Author: Benjamin Otte <otte at gnome.org> Date:...

...+ SwfdecURL *absolute; + + g_return_val_if_fail (SWFDEC_IS_PLAYER (player), NULL); + g_return_val_if_fail (SWFDEC_IS_SECURITY (security), NULL); + g_return_val_if_fail (url != NULL, NULL); - g_assert (player->resource); /* create absolute url first */ - url = swfdec_url_new_relative (swfdec_loader_get_url (player->resource->loader), request->url); - if (!swfdec_security_allow_url (request->security, url)) { + absolute = swfdec_url_new_relative (swfdec_loader_get_url (player->resource->loader), url); + if (!swfdec_security_allow_url (security, absolute)) { /* FIXME: Need to...

...--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_url_get_query (swfdec_loader_get_url (loader)); if (query) { SWFDEC_INFO ("set url query movie variables: %s", query); - swfdec_movie_set_variables (SWFDEC_MOVIE (instance->movie), query); + swfdec_as_object_decode (SWFDEC_AS_OBJECT (instance->movie), query); } if (instance->variables) { SWF...

...bytes in stream or -1 if unknown */ char * error; /* error message if in error state or NULL */ gpointer target; /* SwfdecLoaderTarget that gets notified about loading progress */ gpointer player; /* SwfdecPlayer belonging to target or %NULL */ @@ -93,7 +93,7 @@ const SwfdecURL * swfdec_loader_get_url (SwfdecLoader * loader); void swfdec_loader_set_size (SwfdecLoader * loader, gulong size); -gulong swfdec_loader_get_size (SwfdecLoader * loader); +glong swfdec_loader_get_size (SwfdecLoader * loader); gulong swfdec_loader_get_loaded (SwfdecLoader * loader); char * swfde...

...et.h" @@ -52,6 +53,21 @@ swfdec_swf_instance_loader_target_get_player (SwfdecLoaderTarget *target) } static void +swfdec_swf_instance_allow_network (SwfdecPlayer *player) +{ + SwfdecFlashSecurity *sec; + + g_print ("enabling network access for %s\n", + swfdec_url_get_url (swfdec_loader_get_url (player->loader))); + SWFDEC_INFO ("enabling network access for %s", + swfdec_url_get_url (swfdec_loader_get_url (player->loader))); + + sec = SWFDEC_FLASH_SECURITY (player->security); + sec->allow_remote = TRUE; + sec->allow_local = FALSE; +} + +static void swfde...

..._loader_target_error; iface->eof = swfdec_resource_loader_target_eof; } @@ -302,6 +345,7 @@ swfdec_resource_set_loader (SwfdecResource *resource, SwfdecLoader *loader) resource->loader = g_object_ref (loader); swfdec_flash_security_set_url (SWFDEC_FLASH_SECURITY (resource), swfdec_loader_get_url (loader)); + resource->state = SWFDEC_RESOURCE_REQUESTED; } SwfdecResource * @@ -378,6 +422,7 @@ swfdec_resource_do_load (SwfdecPlayer *player, SwfdecLoader *loader, gpointer re if (loader == NULL) { /* *** Security Sandbox Violation *** */ + swfdec_resource_emit_error (resourc...

...bswfdec/swfdec_resource_request.c index 8c3ddbf..e367993 100644 --- a/libswfdec/swfdec_resource_request.c +++ b/libswfdec/swfdec_resource_request.c @@ -114,8 +114,7 @@ swfdec_player_request_resource_now (SwfdecPlayer *player, /* create absolute url first */ absolute = swfdec_url_new_relative (swfdec_loader_get_url (player->priv->resource->loader), url); - swfdec_security_allow_url (security, absolute, - swfdec_player_request_resource_allow_callback, data); + swfdec_player_request_resource_allow_callback (absolute, TRUE, data); swfdec_url_free (absolute); } diff --git a/libswfdec/swfde...

...dec_player_get_level (player, target); - if (level < 0) - goto fail; + level = swfdec_player_get_level (player, resource->target); + if (level < 0) { + SWFDEC_WARNING ("%s does not reference a movie, not loading %s", resource->target, + swfdec_url_get_url (swfdec_loader_get_url (loader))); + swfdec_loader_close (loader); + } movie = swfdec_player_get_movie_at_level (player, level); } if (movie == NULL) { @@ -340,14 +353,6 @@ swfdec_resource_do_load (SwfdecPlayer *player, SwfdecLoader *loader, gpointer ta swfdec_movie_remove (mov); movie = SWFD...