search for: swfdecurl

...rame); for (i = 0; i < script->n_arguments; i++) { if (cur == NULL) diff-tree ca750ef4ead8812a0aeff906a2b48f54ad43cb37 (from c7fb0f56f3782d11b9f438043fbc070dae1947d5) Author: Benjamin Otte <otte at gnome.org> Date: Tue Jul 31 13:03:48 2007 +0200 move SwfdecLoader to use a SwfdecURL instead of a char * diff --git a/libswfdec-gtk/swfdec_gtk_loader.c b/libswfdec-gtk/swfdec_gtk_loader.c index 69dc143..77ffd29 100644 --- a/libswfdec-gtk/swfdec_gtk_loader.c +++ b/libswfdec-gtk/swfdec_gtk_loader.c @@ -105,7 +105,8 @@ swfdec_gtk_loader_read_cb (GnomeVFSAsync gtk->handle = NU...

...return; } if (g_slist_find_custom (sec->crossdomain_denied, host, (GCompareFunc)g_ascii_strcasecmp)) { - callback (url, FALSE, user_data); + callback (url, 0, user_data); return; } @@ -183,17 +183,17 @@ swfdec_flash_security_allow_url (SwfdecSecurity *guard, const SwfdecURL *url, SwfdecURLAllowFunc callback, gpointer user_data) { SwfdecFlashSecurity *sec = SWFDEC_FLASH_SECURITY (guard); - gboolean allowed; + int status; switch (sec->sandbox) { case SWFDEC_SANDBOX_NONE: - allowed = FALSE; + status = 0; break; case SWFDEC_SA...

...player, @@ -221,6 +223,15 @@ void swfdec_player_global_to_stage (SwfdecPlayer * player, double * x, double * y); void swfdec_player_update_scale (SwfdecPlayer * player); + +/* in swfdec_policy_file.c */ +gboolean swfdec_player_allow_now (SwfdecPlayer * player, + const SwfdecURL * url); +void swfdec_player_allow_or_load (SwfdecPlayer * player, + const SwfdecURL * url, + const SwfdecURL * load_url, + SwfdecPolicyFunc func, + gpointer data); /* in swfdec_as_interpret.c */ SwfdecMovie * swfdec_player_get_movie_from_value (SwfdecPlaye...

...tk/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_LOADER_CLASS (swfdec_gtk_loader_parent_class)->load (loader, reque...

...-de.org> Date: Thu Aug 2 19:53:54 2007 +0200 fix compile issues diff --git a/libswfdec/swfdec_loader.c b/libswfdec/swfdec_loader.c index 9193f0b..c5b4de5 100644 --- a/libswfdec/swfdec_loader.c +++ b/libswfdec/swfdec_loader.c @@ -246,7 +246,7 @@ swfdec_loader_load (SwfdecLoader *loader SwfdecURL *url; g_return_val_if_fail (SWFDEC_IS_LOADER (loader), NULL); - g_return_val_if_fail (url != NULL, NULL); + g_return_val_if_fail (url_string != NULL, NULL); g_return_val_if_fail (data != NULL || data_len == 0, NULL); klass = SWFDEC_LOADER_GET_CLASS (loader); @@ -422,7 +422,7 @@ swfde...

...er->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); + if (version > 7) { + allow_local = FALSE; + allow_remote = swfdec_url_has_protocol (url, "http"); + } else { + allow_local = swfdec_url_has_protocol (url, "file");...

...55b943 100644 --- a/libswfdec/swfdec_loader.c +++ b/libswfdec/swfdec_loader.c @@ -240,22 +240,19 @@ swfdec_loader_perform_push (gpointer loaderp, gpointer unused) } SwfdecLoader * -swfdec_loader_load (SwfdecLoader *loader, const char *url_string, +swfdec_loader_load (SwfdecLoader *loader, const SwfdecURL *url, SwfdecLoaderRequest request, const char *data, gsize data_len) { SwfdecLoader *ret; SwfdecLoaderClass *klass; - SwfdecURL *url; g_return_val_if_fail (SWFDEC_IS_LOADER (loader), NULL); - g_return_val_if_fail (url_string != NULL, NULL); + g_return_val_if_fail (url != NULL, N...

...; #include "swfdec_as_strings.h" #include "swfdec_audio_internal.h" @@ -1656,10 +1657,29 @@ SwfdecLoader * swfdec_player_load (SwfdecPlayer *player, const char *url, SwfdecLoaderRequest request, SwfdecBuffer *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...

...ec_player_render (player, cr); cairo_destroy (cr); cairo_surface_write_to_png (surface, filename); cairo_surface_destroy (surface); } int main(int argc, char *argv[]) { char *input = argv[1]; char *output = argv[2]; SwfdecPlayer *player = swfdec_player_new(NULL); SwfdecURL *url = swfdec_url_new_from_input(input); swfdec_player_set_url(player, url); swfdec_url_free (url); swfdec_player_set_size (player, 800, 480); swfdec_player_advance(player, swfdec_player_get_next_event (player)); swfdec_player_save(player, 800, 480, output); return 0;...

...wfdecPlayer *player, gboolean allowed, gpointer streamp } void -swfdec_net_stream_set_url (SwfdecNetStream *stream, SwfdecSandbox *sandbox, const char *url_string) +swfdec_net_stream_set_url (SwfdecNetStream *stream, const char *url_string) { SwfdecPlayer *player; SwfdecAsContext *cx; - SwfdecURL *url; g_return_if_fail (SWFDEC_IS_NET_STREAM (stream)); - g_return_if_fail (SWFDEC_IS_SANDBOX (sandbox)); + g_return_if_fail (url_string != NULL); cx = SWFDEC_AS_OBJECT (stream)->context; player = SWFDEC_PLAYER (cx); @@ -588,52 +587,9 @@ swfdec_net_stream_set_url (SwfdecNetStream...

...ze swfdec_as_frame_preload() order to match tests add tests for swfdec_as_frame_preload order allow running scripts in NEW state run initialization scripts in NEW state ignore (automatic) breakpoints during initialization remove code that got rid of gnome-vfs add SwfdecURL type no need to document FOO_TYPE macros include the right header append the right string here move SwfdecLoader to use a SwfdecURL instead of a char * make sure excess function parameters are st to undefined wrong check bugfixes make swfdec_url_new a...

...curity.h @@ -44,7 +44,7 @@ struct _SwfdecSecurityClass { GObjectClass object_class; - SwfdecSecurity * (* allow) (SwfdecSecurity * guard, + gboolean (* allow) (SwfdecSecurity * guard, SwfdecSecurity * from); gboolean (* allow_url) (SwfdecSecurity * guard, const SwfdecURL * url); @@ -52,7 +52,7 @@ struct _SwfdecSecurityClass GType swfdec_security_get_type (void); -SwfdecSecurity * swfdec_security_allow (SwfdecSecurity * guard, +gboolean swfdec_security_allow (SwfdecSecurity * guard, SwfdecSecurity * key); gboolean swfdec_security_allow_url (Swfd...

...ire complete URLs diff --git a/player/swfplay.c b/player/swfplay.c index 4ebf668..c4f8523 100644 --- a/player/swfplay.c +++ b/player/swfplay.c @@ -64,6 +64,26 @@ print_trace (SwfdecPlayer *player, const g_print ("%s\n", message); } +static char * +sanitize_url (const char *s) +{ + SwfdecURL *url; + + url = swfdec_url_new (s); + if (g_str_equal (swfdec_url_get_protocol (url), "error")) { + char *dir, *full; + if (g_path_is_absolute (s)) + return g_strconcat ("file://", s, NULL); + dir = g_get_current_dir (); + full = g_strconcat ("file://&quo...

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

...; diff --git a/libswfdec/swfdec_loader.h b/libswfdec/swfdec_loader.h index 61e0b31..614907a 100644 --- a/libswfdec/swfdec_loader.h +++ b/libswfdec/swfdec_loader.h @@ -58,7 +58,7 @@ struct _SwfdecLoader /*< private >*/ guint state; /* SwfdecLoaderState the loader is currently in */ SwfdecURL * url; /* the URL for this loader in UTF-8 - must be set on creation */ - gulong size; /* number of bytes in stream or 0 if unknown */ + glong size; /* number of bytes in stream or -1 if unknown */ char * error; /* error message if in error state or NULL */ gpointer target; /* Sw...

...r_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_PRIORITY_DEFAULT, swfdec_gtk_loader_open_cb, gtk); + if (g_ascii_strcasecmp (swfdec_url_get_protocol (url), "http&...

...7 @@ 0.5.1 ("Heeeeelium") Features! This release got some. And they even give you the long awaited -embedded Youtube support. At the cost of lost of API changes, but who cares? +embedded Youtube support. At the cost of lots of API changes, but who cares? - rewrite SwfdecLoader. Add SwfdecURL support structure in the process. - implement AsBroadcaster actionscript object. - implement Stage actionscript object. Movies can now do the scaling themselves. diff-tree d68ae26a9b84711a95c9f985b608f89e7dd2a231 (from 0fcaa45507dc974d08ac3d27814cbc72a7237e64) Author: Benjamin Otte <otte at gn...

...) +SwfdecLoader * +swfdec_player_request_resource_now (SwfdecPlayer *player, SwfdecSecurity *security, + const char *url, SwfdecLoaderRequest req, SwfdecBuffer *buffer) { - SwfdecPlayer *player = SWFDEC_PLAYER (playerp); - SwfdecResourceRequest *request = requestp; SwfdecLoader *loader; - SwfdecURL *url; + 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_rela...

...xml_node.h" diff --git a/libswfdec/swfdec_resource_request.c b/libswfdec/swfdec_resource_request.c index c4e8997..7b17d12 100644 --- a/libswfdec/swfdec_resource_request.c +++ b/libswfdec/swfdec_resource_request.c @@ -90,10 +90,9 @@ swfdec_player_request_resource_now (SwfdecPlayer *player, SwfdecURL *absolute; AllowCallbackData *data; - // FIXME - g_return_if_fail (SWFDEC_IS_PLAYER (player)); - g_return_if_fail (SWFDEC_IS_SECURITY (security)); - g_return_if_fail (url != NULL); + g_assert (SWFDEC_IS_PLAYER (player)); + g_assert (SWFDEC_IS_SECURITY (security)); + g_assert (url != NUL...

...1ec4ec..47b7142 100644 --- a/libswfdec/swfdec_url.c +++ b/libswfdec/swfdec_url.c @@ -80,7 +80,7 @@ swfdec_url_new (const char *string) g_return_val_if_fail (string != NULL, NULL); - g_print ("%s\n", string); + SWFDEC_DEBUG ("new url: %s", string); url = g_slice_new0 (SwfdecURL); url->url = g_strdup (string); s = strstr (string, "://"); diff-tree 262fa2409436f429658cf14f03169bf0ebf277bf (from 49edc7f46d99b2f9da859511a0272dd63268c24d) Author: Benjamin Otte <otte at gnome.org> Date: Wed Aug 1 15:59:06 2007 +0200 first step in loader handling...