search for: swfdecloader

...-git a/libswfdec/swfdec_loader.c b/libswfdec/swfdec_loader.c index 1fd0e65..69c460f 100644 --- a/libswfdec/swfdec_loader.c +++ b/libswfdec/swfdec_loader.c @@ -76,7 +76,8 @@ enum { PROP_ERROR, PROP_EOF, PROP_DATA_TYPE, - PROP_SIZE + PROP_SIZE, + PROP_LOADED }; G_DEFINE_ABSTRACT_TYPE (SwfdecLoader, swfdec_loader, G_TYPE_OBJECT) @@ -100,6 +101,9 @@ swfdec_loader_get_property (GObject *obj case PROP_SIZE: g_value_set_ulong (value, loader->size); break; + case PROP_LOADED: + g_value_set_ulong (value, swfdec_loader_get_loaded (loader)); + break; default:...

...c | 2 +- 5 files changed, 43 insertions(+), 23 deletions(-) New commits: diff-tree 013119a40898e8308caba54d3921d3c477f239c8 (from f39100edec77edb7207f67dea4182f8c78ac0ed0) Author: Benjamin Otte <otte at gnome.org> Date: Thu Aug 2 14:01:21 2007 +0200 pass the parent loader to SwfdecLoader->load() diff --git a/libswfdec-gtk/swfdec_gtk_loader.c b/libswfdec-gtk/swfdec_gtk_loader.c index d2ec771..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_l...

...te <otte at gnome.org> Date: Wed Aug 1 17:02:59 2007 +0200 fix up docs build diff --git a/doc/swfdec-sections.txt b/doc/swfdec-sections.txt index ccb76d4..a250b3a 100644 --- a/doc/swfdec-sections.txt +++ b/doc/swfdec-sections.txt @@ -19,9 +19,11 @@ SWFDEC_AUDIO_GET_CLASS <TITLE>SwfdecLoader</TITLE> SwfdecLoader swfdec_loader_new_from_file +swfdec_loader_open swfdec_loader_push swfdec_loader_eof swfdec_loader_error +swfdec_loader_get_url swfdec_loader_set_size swfdec_loader_get_size swfdec_loader_get_loaded @@ -52,6 +54,7 @@ swfdec_url_get_url swfdec_url_new swfdec_url_...

...oader_ensure_open (loader); - g_print ("eof\n"); swfdec_loader_eof (loader); } else { - g_print ("error %u\n", msg->status_code); swfdec_loader_error (loader, "FIXME: make useful error message"); } } @@ -133,7 +128,6 @@ swfdec_gtk_loader_load (SwfdecLoader *lo SwfdecGtkLoader *gtk = SWFDEC_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" : &quo...

...mits: diff-tree 0c7b304d2eb371c85616808e083f353e174bf263 (from 13a4101ff86efb11f43e4b28778f1d90a320b118) Author: Benjamin Otte <otte@gnome.org> Date: Fri Mar 16 16:35:10 2007 +0100 add the concept of data types so we can identify what we load Every loader now has an associated SwfdecLoaderDataType that's supposed to tell what the data is used for. New functions for using it were added. Includes an update to swfdec_loader_get_filename() that automatically adds the correct extension. diff --git a/libswfdec/swfdec_loader.c b/libswfdec/swfdec_loader.c index 4334562..8cd4...

...rguments (&iter, frame); 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...

...lename() This function is supposed to give a useful filename for the loader, so it can be used to save it locally. diff --git a/doc/swfdec-sections.txt b/doc/swfdec-sections.txt index 937b8db..3a93f97 100644 --- a/doc/swfdec-sections.txt +++ b/doc/swfdec-sections.txt @@ -20,6 +20,7 @@ SwfdecLoader swfdec_loader_new_from_file swfdec_loader_push swfdec_loader_eof +swfdec_loader_get_filename <SUBSECTION Standard> SWFDEC_LOADER SWFDEC_IS_LOADER diff --git a/libswfdec/swfdec_loader.c b/libswfdec/swfdec_loader.c index a5300b8..557fa1c 100644 --- a/libswfdec/swfdec_loader.c +++ b/libswf...

...Date: Wed Aug 8 11:04:19 2007 +0200 implement close() diff --git a/libswfdec-gtk/swfdec_gtk_loader.c b/libswfdec-gtk/swfdec_gtk_loader.c index bc3894a..aff6da1 100644 --- a/libswfdec-gtk/swfdec_gtk_loader.c +++ b/libswfdec-gtk/swfdec_gtk_loader.c @@ -141,6 +141,20 @@ swfdec_gtk_loader_load (SwfdecLoader *lo } static void +swfdec_gtk_loader_close (SwfdecLoader *loader) +{ + SwfdecGtkLoader *gtk = SWFDEC_GTK_LOADER (loader); + + if (gtk->message) { + SwfdecGtkLoaderClass *klass = SWFDEC_GTK_LOADER_GET_CLASS (gtk); + + soup_session_cancel_message (klass->session, gtk->message); +...

...0 add comment diff --git a/libswfdec/swfdec_resource.h b/libswfdec/swfdec_resource.h index f97ddaf..c5fd4e2 100644 --- a/libswfdec/swfdec_resource.h +++ b/libswfdec/swfdec_resource.h @@ -44,7 +44,7 @@ struct _SwfdecResource gboolean initial; /* TRUE if this is the initial resource */ SwfdecLoader * loader; /* the loader providing data for the decoder */ - SwfdecDecoder * decoder; /* decoder that decoded all the stuff used by us */ + SwfdecDecoder * decoder; /* decoder in use or NULL if not yet created (only happens after loadMovie()) */ char * variables; /* extra variables to be set...

...rn_val_if_fail (SWFDEC_IS_CONNECTION (conn), NULL); + stream = g_object_new (SWFDEC_TYPE_NET_STREAM, NULL); stream->player = player; + stream->conn = conn; + g_object_ref (conn); return stream; } void +swfdec_net_stream_set_url (SwfdecNetStream *stream, const char *url) +{ + SwfdecLoader *loader; + + g_return_if_fail (SWFDEC_IS_NET_STREAM (stream)); + g_return_if_fail (url != NULL); + + /* FIXME: use the connection once connections are implemented */ + loader = swfdec_player_load (stream->player, url); + swfdec_net_stream_set_loader (stream, loader); +} + +void swfdec_net_...

...-gtk/swfdec_gtk_loader.c +++ b/libswfdec-gtk/swfdec_gtk_loader.c @@ -23,6 +23,28 @@ #include "swfdec_gtk_loader.h" +/*** GTK-DOC ***/ + +/** + * SECTION:SwfdecGtkLoader + * @title: SwfdecGtkLoader + * @short_description: advanced loader able to load network ressources + * @see_also: #SwfdecLoader + * + * #SwfdecGtkLoader is a #SwfdecLoader that is intended as an easy way to be + * access ressources that are not stored in files, such as http. It can + * however be compiled with varying support for different protocols, so don't + * rely on support for a particular protocol being availab...

...ference to the message, since it's unreffed automagically diff --git a/libswfdec-gtk/swfdec_gtk_loader.c b/libswfdec-gtk/swfdec_gtk_loader.c index f676831..fa2cf44 100644 --- a/libswfdec-gtk/swfdec_gtk_loader.c +++ b/libswfdec-gtk/swfdec_gtk_loader.c @@ -135,6 +135,7 @@ swfdec_gtk_loader_load (SwfdecLoader *lo if (data) soup_message_set_request (gtk->message, "appliation/x-www-urlencoded", SOUP_BUFFER_USER_OWNED, (char *) data, data_len); + g_object_ref (gtk->message); soup_session_queue_message (klass->session, gtk->message, swfdec_gtk_loader_finish, gtk...

...enjamin Otte <otte at gnome.org> Date: Sun Oct 28 19:04:12 2007 +0100 fix docs diff --git a/libswfdec/swfdec_loader.c b/libswfdec/swfdec_loader.c index e79ba1e..ca84656 100644 --- a/libswfdec/swfdec_loader.c +++ b/libswfdec/swfdec_loader.c @@ -540,15 +540,15 @@ swfdec_loader_set_size (SwfdecLoader *loader, gulong size) * swfdec_loader_get_size: * @loader: a #SwfdecLoader * - * Queries the amount of bytes inside @loader. If the size is unknown, 0 is - * returned. + * Queries the amount of bytes inside @loader. If the size is unknown, -1 is + * returned. Otherwise the number is greater...

...\" 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 @@ Swf...

...; Date: Sat Feb 17 13:32:41 2007 +0100 apparently / doesn't get escaped either diff --git a/libswfdec/swfdec_loader.c b/libswfdec/swfdec_loader.c index 29ca92c..49d7642 100644 --- a/libswfdec/swfdec_loader.c +++ b/libswfdec/swfdec_loader.c @@ -394,7 +394,7 @@ swfdec_loader_get_filename (SwfdecLoader } /* if speed ever gets an issue, use a 256 byte array instead of strchr */ -static const char *urlencode_unescaped="0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz-_."; +static const char *urlencode_unescaped="0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqr...

...29 2007 +0100 Merge branch 'master' of ssh://company@git.freedesktop.org/git/swfdec diff-tree dae7f00125145fc3e540c5454942acbbabe800db (from 07efea41adaeeceac6f4ab3ecd9a71c5a9c8791f) Author: Benjamin Otte <otte@gnome.org> Date: Wed Mar 21 23:34:07 2007 +0100 update to new SwfdecLoader stuff diff --git a/player/swfdec_slow_loader.c b/player/swfdec_slow_loader.c index 0eb5b61..47b7723 100644 --- a/player/swfdec_slow_loader.c +++ b/player/swfdec_slow_loader.c @@ -29,10 +29,19 @@ G_DEFINE_TYPE (SwfdecSlowLoader, swfdec_slow_loader, SWFDEC_TYPE_LOADER) static void +swfdec_slow_l...

...r->rooted_objects, object); + g_return_if_fail (entry != NULL); + g_object_unref (object); + player->rooted_objects = g_list_delete_link (player->rooted_objects, entry); +} + /** PUBLIC API ***/ /** @@ -2026,7 +2071,7 @@ swfdec_player_set_loader_with_variables (SwfdecPlayer *player, SwfdecLoader *loa g_return_if_fail (player->resource == NULL); g_return_if_fail (SWFDEC_IS_LOADER (loader)); - player->resource = swfdec_resource_new (loader, variables); + player->resource = swfdec_resource_new (player, loader, variables); movie = swfdec_movie_new (player, -16384, NULL, p...

...te: Sat Nov 10 19:35:20 2007 +0100 seems I never compiled this :o diff --git a/libswfdec/swfdec_resource.c b/libswfdec/swfdec_resource.c index 9ad4105..c93d151 100644 --- a/libswfdec/swfdec_resource.c +++ b/libswfdec/swfdec_resource.c @@ -242,7 +242,7 @@ swfdec_resource_loader_target_parse (SwfdecLoaderTarget *target, SwfdecLoader *l SwfdecStatus status; guint parsed; - if (dec == NULL && swfdec_buffer_queue_get_offset (loader->queue == 0)) { + if (dec == NULL && swfdec_buffer_queue_get_offset (loader->queue) == 0) { if (swfdec_buffer_queue_get_depth (loader-&g...

...rtarget.h" #include "swfdec_player_internal.h" +#include "swfdec_resource_request.h" /*** SWFDEC_LOADER_TARGET ***/ @@ -185,24 +187,40 @@ swfdec_load_object_init (SwfdecLoadObject *load_object) { } +static void +swfdec_load_object_got_loader (SwfdecPlayer *player, SwfdecLoader *loader, gpointer obj) +{ + SwfdecLoadObject *load_object = SWFDEC_LOAD_OBJECT (obj); + + if (loader == NULL) { + return; + } + load_object->loader = loader; + + swfdec_loader_set_target (load_object->loader, + SWFDEC_LOADER_TARGET (load_object)); + swfdec_loader_set_data_type (...

...* height); void swfdec_player_get_size (SwfdecPlayer * player, int * width, int * height); diff --git a/test/image/image.c b/test/image/image.c index e50c9c6..405cfa7 100644 --- a/test/image/image.c +++ b/test/image/image.c @@ -155,7 +155,7 @@ run_test (const char *filename) SwfdecLoader *loader; SwfdecPlayer *player = NULL; guint i, msecs; - int w, h; + guint w, h; cairo_surface_t *surface; cairo_t *cr; @@ -174,7 +174,7 @@ run_test (const char *filename) msecs = swfdec_player_get_next_event (player); swfdec_player_advance (player, msecs); } - swfdec_p...