search for: loader_class

...Date: Sun Oct 21 19:09:58 2007 +0200 only call g_thread_init() once diff --git a/libswfdec-gtk/swfdec_gtk_loader.c b/libswfdec-gtk/swfdec_gtk_loader.c index 0e860b9..f61a999 100644 --- a/libswfdec-gtk/swfdec_gtk_loader.c +++ b/libswfdec-gtk/swfdec_gtk_loader.c @@ -206,7 +206,8 @@ swfdec_gtk_loader_class_init (SwfdecGtkLoaderClass *klass) loader_class->load = swfdec_gtk_loader_load; loader_class->close = swfdec_gtk_loader_close; - g_thread_init (NULL); + if (!g_thread_supported ()) + g_thread_init (NULL); klass->session = soup_session_async_new (); #endif } commit 3dd18...

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

...to file or NULL when done */ - SwfdecBuffer * current_buffer; /* current buffer we're reading into */ + SoupMessage * message; /* the message we're sending */ + gboolean opened; /* set after first bytes of data have arrived */ }; struct _SwfdecGtkLoaderClass { SwfdecLoaderClass loader_class; + + SoupSession * session; /* the session used by the loader */ }; /*** SwfdecGtkLoader ***/ -G_DEFINE_TYPE (SwfdecGtkLoader, swfdec_gtk_loader, SWFDEC_TYPE_LOADER) +G_DEFINE_TYPE (SwfdecGtkLoader, swfdec_gtk_loader, SWFDEC_TYPE_FILE_LOADER) -static void swfdec_gtk_loader_start_read (Swf...

...dec_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); SwfdecLoaderClass *loader_class = SWFDEC_LOADER_CLASS (klass); - object_class->dispose = swfdec_file_loader_dispose; - loader_class->load = swfdec_file_loader_load; } @@ -269,8 +255,10 @...

...FDEC_GTK_LOADER (loader); + + if (gtk->message) { + SwfdecGtkLoaderClass *klass = SWFDEC_GTK_LOADER_GET_CLASS (gtk); + + soup_session_cancel_message (klass->session, gtk->message); + g_object_unref (gtk->message); + gtk->message = NULL; + } +} + +static void swfdec_gtk_loader_class_init (SwfdecGtkLoaderClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); @@ -149,6 +163,7 @@ swfdec_gtk_loader_class_init (SwfdecGtkL object_class->dispose = swfdec_gtk_loader_dispose; loader_class->load = swfdec_gtk_loader_load; + loader_class->close = swfdec...

...SS SWFDEC_TYPE_GTK_WIDGET </SECTION> + +<SECTION> +<FILE>SwfdecGtkLoader</FILE> +<TITLE>SwfdecGtkLoader</TITLE> +SwfdecGtkLoader +swfdec_gtk_loader_new +<SUBSECTION Standard> +swfdec_gtk_loader_get_type +SwfdecGtkLoaderClass +SWFDEC_GTK_LOADER +SWFDEC_GTK_LOADER_CLASS +SWFDEC_GTK_LOADER_GET_CLASS +SWFDEC_IS_GTK_LOADER +SWFDEC_IS_GTK_LOADER_CLASS +SWFDEC_TYPE_GTK_LOADER +</SECTION> diff --git a/doc/swfdec.types b/doc/swfdec.types index dbd39e4..9b70671 100644 --- a/doc/swfdec.types +++ b/doc/swfdec.types @@ -1,8 +1,10 @@ #include <libswfdec/swfdec.h>...

...thread_init() is called by swfdec_init() already, no need to call it again diff --git a/libswfdec-gtk/swfdec_gtk_loader.c b/libswfdec-gtk/swfdec_gtk_loader.c index 9836e3f..80d95c7 100644 --- a/libswfdec-gtk/swfdec_gtk_loader.c +++ b/libswfdec-gtk/swfdec_gtk_loader.c @@ -209,8 +209,6 @@ swfdec_gtk_loader_class_init (SwfdecGtkLoaderClass *klass) loader_class->load = swfdec_gtk_loader_load; loader_class->close = swfdec_gtk_loader_close; - if (!g_thread_supported ()) - g_thread_init (NULL); klass->session = soup_session_async_new (); #endif }

...ation with gnome-vfs disabled diff --git a/libswfdec/swfdec_loader_internal.h b/libswfdec/swfdec_loader_internal.h index 303088a..028f868 100644 --- a/libswfdec/swfdec_loader_internal.h +++ b/libswfdec/swfdec_loader_internal.h @@ -47,6 +47,7 @@ struct _SwfdecFileLoaderClass SwfdecLoaderClass loader_class; }; +GType swfdec_file_loader_get_type (void); SwfdecLoader * swfdec_loader_load (SwfdecLoader * loader, const char * url); diff --git a/player/swfplay.c b/player/swfplay.c index 7cc4dbe..0c2e062 100644 --- a/player/swfplay.c +++ b/player/swfplay.c @@ -79,7 +79,6 @@ main (int a...

...SS SWFDEC_TYPE_GTK_WIDGET </SECTION> + +<SECTION> +<FILE>SwfdecGtkLoader</FILE> +<TITLE>SwfdecGtkLoader</TITLE> +SwfdecGtkLoader +swfdec_gtk_loader_new +<SUBSECTION Standard> +swfdec_gtk_loader_get_type +SwfdecGtkLoaderClass +SWFDEC_GTK_LOADER +SWFDEC_GTK_LOADER_CLASS +SWFDEC_GTK_LOADER_GET_CLASS +SWFDEC_IS_GTK_LOADER +SWFDEC_IS_GTK_LOADER_CLASS +SWFDEC_TYPE_GTK_LOADER +</SECTION> diff --git a/doc/swfdec.types b/doc/swfdec.types index dbd39e4..9b70671 100644 --- a/doc/swfdec.types +++ b/doc/swfdec.types @@ -1,8 +1,10 @@ #include <libswfdec/swfdec.h>...

...licy_loader->loader, NULL); - g_object_unref (policy_loader->loader); - policy_loader->loader = NULL; - - g_assert (policy_loader->host); - g_free (policy_loader->host); - - G_OBJECT_CLASS (swfdec_policy_loader_parent_class)->dispose (object); -} - -static void -swfdec_policy_loader_class_init (SwfdecPolicyLoaderClass *klass) -{ - GObjectClass *object_class = G_OBJECT_CLASS (klass); - - object_class->dispose = swfdec_policy_loader_dispose; -} - -static void -swfdec_policy_loader_init (SwfdecPolicyLoader *policy_loader) -{ -} - -SwfdecPolicyLoader * -swfdec_policy_loader_new (Sw...