search for: swfdec_loader_eof

...implement swfdec_loader_get_loaded to query the already loaded amount of bytes diff --git a/doc/swfdec-sections.txt b/doc/swfdec-sections.txt index 26a98ab..f8a4514 100644 --- a/doc/swfdec-sections.txt +++ b/doc/swfdec-sections.txt @@ -22,8 +22,9 @@ swfdec_loader_new_from_file swfdec_loader_push swfdec_loader_eof swfdec_loader_error -swfdec_loader_get_size swfdec_loader_set_size +swfdec_loader_get_size +swfdec_loader_get_loaded swfdec_loader_get_filename swfdec_loader_get_data_type <SUBSECTION Standard> diff --git a/libswfdec/swfdec_loader.c b/libswfdec/swfdec_loader.c index 1fd0e65..69c460f 1006...

...lename 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/libswfdec/swfdec_loader.c @@ -21,6 +21,7 @@ #include "config.h"...

...... %u bytes\n", msg->response.length); swfdec_loader_push (loader, buffer); } @@ -112,10 +109,8 @@ swfdec_gtk_loader_finish (SoupMessage *m { if (SOUP_STATUS_IS_SUCCESSFUL (msg->status_code)) { swfdec_gtk_loader_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); Swfdec...

...dec-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_new_relative <SUBSECTION Standard> +SWFDEC_TYPE_URL swfdec_url_get_type </SECTION> @@ -116,7 +119,9...

...ew_from_file (real, &error); if (buffer == NULL) { - swfdec_loader_error (ret, error->message); + swfdec_loader_error (loader, error->message); g_error_free (error); } else { - swfdec_loader_set_size (ret, buffer->length); - swfdec_loader_push (ret, buffer); - swfdec_loader_eof (ret); + swfdec_loader_set_size (loader, buffer->length); + swfdec_loader_push (loader, buffer); + swfdec_loader_eof (loader); } - - return ret; } static void swfdec_file_loader_class_init (SwfdecFileLoaderClass *klass) { - GObjectClass *object_class = G_OBJECT_CLASS (klass);...

...Make the filename be the part of the uri that sits before the first '?' and does not contain a '/' diff --git a/libswfdec/swfdec_loader.c b/libswfdec/swfdec_loader.c index 557fa1c..756e174 100644 --- a/libswfdec/swfdec_loader.c +++ b/libswfdec/swfdec_loader.c @@ -365,19 +365,28 @@ swfdec_loader_eof (SwfdecLoader *loader) char * swfdec_loader_get_filename (SwfdecLoader *loader) { - char *start, *ret; + char *start, *end, *ret; g_return_val_if_fail (SWFDEC_IS_LOADER (loader), NULL); /* every loader must set this */ g_return_val_if_fail (loader->url != NULL, NULL); - start...

...low_loader_tick (gpointer data) return TRUE; } - if (slow->loader->eof) { + if (slow->loader->error) { + swfdec_loader_error (SWFDEC_LOADER (slow), slow->loader->error); + slow->timeout_id = 0; + return FALSE; + } else if (slow->loader->eof) { swfdec_loader_eof (SWFDEC_LOADER (slow)); slow->timeout_id = 0; return FALSE; @@ -109,6 +122,7 @@ SwfdecLoader * swfdec_slow_loader_new (SwfdecLoader *loader, guint duration) { SwfdecSlowLoader *ret; + gulong size; g_return_val_if_fail (SWFDEC_IS_LOADER (loader), NULL); g_return_val_if_fai...

...tk_loader_read_cb (GnomeVFSAsyncHandle *handle, GnomeVFSResult result, + gpointer buffer, GnomeVFSFileSize bytes_requested, GnomeVFSFileSize bytes_read, + gpointer loaderp) +{ + SwfdecGtkLoader *gtk = loaderp; + SwfdecLoader *loader = loaderp; + + if (result == GNOME_VFS_ERROR_EOF) { + swfdec_loader_eof (loader); + swfdec_buffer_unref (gtk->current_buffer); + gtk->current_buffer = NULL; + gnome_vfs_async_cancel (gtk->handle); + gtk->handle = NULL; + return; + } else if (result != GNOME_VFS_OK) { + swfdec_loader_error (loader, gnome_vfs_result_to_string (result)); +...

Hey, In case someone filters commit mails or doesn't read 1MB blobs, I've just merged the result of me getting annoyed at various stuff. Unfortunately, this grew a bit out of hand and ended up being very huge. I expect this merge to have broken lots of things, so if you find stuff that used to work and now doesn't work (or even crashes), please poke me about it. What does this patch

...55f 100644 --- a/doc/swfdec-sections.txt +++ b/doc/swfdec-sections.txt @@ -4,6 +4,7 @@ SwfdecAudio swfdec_audio_render <SUBSECTION Standard> +SwfdecAudioClass SWFDEC_AUDIO SWFDEC_IS_AUDIO SWFDEC_TYPE_AUDIO @@ -20,8 +21,11 @@ SwfdecLoader swfdec_loader_new_from_file swfdec_loader_push swfdec_loader_eof +swfdec_loader_error swfdec_loader_get_filename +swfdec_loader_get_data_type <SUBSECTION Standard> +SwfdecLoaderClass SWFDEC_LOADER SWFDEC_IS_LOADER SWFDEC_TYPE_LOADER @@ -34,7 +38,6 @@ SWFDEC_LOADER_GET_CLASS <SECTION> <FILE>SwfdecPlayer</FILE> <TITLE>SwfdecPl...

...get; /* SwfdecLoaderTarget that gets notified about loading progress */ SwfdecBufferQueue * queue; /* SwfdecBufferQueue managing the input buffers */ + SwfdecLoaderDataType data_type; /* type this stream is in (identified by swfdec) */ }; struct _SwfdecLoaderClass @@ -68,6 +76,11 @@ void swfdec_loader_eof (SwfdecLoader * void swfdec_loader_error (SwfdecLoader * loader, const char * error); char * swfdec_loader_get_filename (SwfdecLoader * loader); +SwfdecLoaderDataType + swfdec_loader_get_data_type (SwfdecLoader * loader); + +const char * swfdec_loader_data_type_get_extension +...

...oader_internal.h +++ b/libswfdec/swfdec_loader_internal.h @@ -30,6 +30,7 @@ typedef enum { SWFDEC_LOADER_STATE_OPEN, /* loader is opened and has got the HTTP headers */ SWFDEC_LOADER_STATE_READING, /* loader has read some bytes of data and is still reading */ SWFDEC_LOADER_STATE_EOF, /* swfdec_loader_eof() has been called */ + SWFDEC_LOADER_STATE_CLOSED, /* loader has been closed by Swfdec */ SWFDEC_LOADER_STATE_ERROR /* loader is in error state */ } SwfdecLoaderState; diff-tree 36cb0e40b75982fd64589be06bdeebbf4957817e (from 019799d4d5320fd23cfb18e11d9c85c5c553fe8e) Author: Benjamin Otte &...

...r->message); - g_free (real_path); - g_error_free (error); - return NULL; - } ret = g_object_new (SWFDEC_TYPE_FILE_LOADER, NULL); ret->url = real_path; SWFDEC_FILE_LOADER (ret)->dir = g_strdup (SWFDEC_FILE_LOADER (loader)->dir); - swfdec_loader_push (ret, buffer); - swfdec_loader_eof (ret); + if (buffer == NULL) { + swfdec_loader_error (ret, error->message); + g_error_free (error); + } else { + swfdec_loader_push (ret, buffer); + swfdec_loader_eof (ret); + } return ret; } @@ -227,6 +226,7 @@ swfdec_file_loader_init (SwfdecFileLoade SwfdecLoader * swfde...

...OADER (object); - G_OBJECT_CLASS (swfdec_loader_parent_class)->dispose (object); + switch (param_id) { + case PROP_ERROR: + swfdec_loader_error (loader, g_value_get_string (value)); + break; + case PROP_EOF: + if (g_value_get_boolean (value) && !loader->eof) + swfdec_loader_eof (loader); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec); + break; + } } static void -swfdec_loader_do_error (SwfdecLoader *loader, const char *error) +swfdec_loader_dispose (GObject *object) { - SWFDEC_ERROR ("Error from loader %p: %...

...swfdec_player_add_external_action (loader->player, loader, - swfdec_loader_perform_push, NULL); + if (loader->processed_state == SWFDEC_LOADER_STATE_READING) + loader->processed_state = SWFDEC_LOADER_STATE_OPEN; + swfdec_loader_queue_processing (loader); } /** @@ -416,9 +402,7 @@ swfdec_loader_eof (SwfdecLoader *loader) } g_object_notify (G_OBJECT (loader), "eof"); loader->state = SWFDEC_LOADER_STATE_EOF; - if (loader->player) - swfdec_player_add_external_action (loader->player, loader, - swfdec_loader_perform_eof, NULL); + swfdec_loader_queue_processing (loa...

...tk_loader_read_cb (GnomeVFSAsyncHandle *handle, GnomeVFSResult result, + gpointer buffer, GnomeVFSFileSize bytes_requested, GnomeVFSFileSize bytes_read, + gpointer loaderp) +{ + SwfdecGtkLoader *gtk = loaderp; + SwfdecLoader *loader = loaderp; + + if (result == GNOME_VFS_ERROR_EOF) { + swfdec_loader_eof (loader); + swfdec_buffer_unref (gtk->current_buffer); + gtk->current_buffer = NULL; + gnome_vfs_async_cancel (gtk->handle); + gtk->handle = NULL; + return; + } else if (result != GNOME_VFS_OK) { + swfdec_loader_error (loader, gnome_vfs_result_to_string (result)); +...

...n TRUE; - } - - if (slow->loader->error) { - swfdec_loader_error (SWFDEC_LOADER (slow), slow->loader->error); - slow->timeout_id = 0; - return FALSE; - } else { - gboolean eof; - g_object_get (slow->loader, "eof", &eof, NULL); - if (eof) { - swfdec_loader_eof (SWFDEC_LOADER (slow)); - slow->timeout_id = 0; - return FALSE; - } else { - return TRUE; - } - } -} - -static void -swfdec_slow_loader_initialize (SwfdecSlowLoader *slow, SwfdecLoader *loader, guint duration) -{ - glong size; - - slow->tick_time = 100; - slow->dur...

...--git a/libswfdec-gtk/swfdec_gtk_loader.c b/libswfdec-gtk/swfdec_gtk_loader.c index aff6da1..415d418 100644 --- a/libswfdec-gtk/swfdec_gtk_loader.c +++ b/libswfdec-gtk/swfdec_gtk_loader.c @@ -111,7 +111,9 @@ swfdec_gtk_loader_finish (SoupMessage *m swfdec_gtk_loader_ensure_open (loader); swfdec_loader_eof (loader); } else { - swfdec_loader_error (loader, "FIXME: make useful error message"); + char *s = g_strdup_printf ("%u %s", msg->status_code, msg->reason_phrase); + swfdec_loader_error (loader, s); + g_free (s); } } diff-tree 5307f431c31026bf25f1abe9e...