make this compile with the loader changes.linear

Error handling for broken files does not work yet.

3 files changed, 15 insertions, 17 deletions

diff --git a/player/swfdec-window.c b/player/swfdec-window.c
index 30b6cb1..fb458e1 100644
--- a/player/swfdec-window.c
+++ b/player/swfdec-window.c
@@ -86,6 +86,7 @@ swfdec_window_player_aborted (SwfdecPlayer *player, GParamSpec *pspec, SwfdecWin
 static void
 swfdec_window_player_next_event (SwfdecPlayer *player, GParamSpec *pspec, SwfdecWindow *window)
 {
+#if 0
   gboolean eof, error;
 
   g_object_get (window->loader, "error", &error, "eof", &eof, NULL);
@@ -98,6 +99,7 @@ swfdec_window_player_next_event (SwfdecPlayer *player, GParamSpec *pspec, Swfdec
     swfdec_window_error (window, _("<i>%s</i> is not a Flash file."), 
 	swfdec_loader_get_filename (window->loader));
   }
+#endif
 }
 
 static void
@@ -110,7 +112,7 @@ swfdec_window_player_initialized (SwfdecPlayer *player, GParamSpec *pspec, Swfde
 
   if (swfdec_player_is_initialized (player)) {
     gtk_recent_manager_add_full (gtk_recent_manager_get_default (),
-	swfdec_url_get_url (swfdec_loader_get_url (window->loader)),
+	swfdec_url_get_url (swfdec_player_get_url (window->player)),
 	&data);
     g_signal_handlers_disconnect_by_func (player, swfdec_window_player_next_event, window);
   }
@@ -131,6 +133,7 @@ gboolean
 swfdec_window_set_url (SwfdecWindow *window, const char *url)
 {
   SwfdecWindowSettings settings;
+  SwfdecURL *u;
   GObject *o;
   char *s;
 
@@ -140,7 +143,6 @@ swfdec_window_set_url (SwfdecWindow *window, const char *url)
   if (window->player || window->error)
     return FALSE;
 
-  window->loader = swfdec_gtk_loader_new (url);
   window->player = swfdec_gtk_player_new (NULL);
   g_signal_connect (window->player, "notify::aborted", 
       G_CALLBACK (swfdec_window_player_aborted), window);
@@ -148,12 +150,14 @@ swfdec_window_set_url (SwfdecWindow *window, const char *url)
       G_CALLBACK (swfdec_window_player_initialized), window);
   g_signal_connect (window->player, "notify::next-event", 
       G_CALLBACK (swfdec_window_player_next_event), window);
-  swfdec_player_set_loader (window->player, window->loader);
+  u = swfdec_url_new_from_input (url);
+  swfdec_player_set_url (window->player, u);
+  s = swfdec_url_format_for_display (u);
+  swfdec_url_free (u);
   swfdec_gtk_player_set_audio_enabled (SWFDEC_GTK_PLAYER (window->player), 
       window->settings.sound);
   o = gtk_builder_get_object (window->builder, "player-widget");
   swfdec_gtk_widget_set_player (SWFDEC_GTK_WIDGET (o), window->player);
-  s = swfdec_loader_get_filename (window->loader);
   gtk_window_set_title (GTK_WINDOW (window->window), s);
   g_free (s);
   /* do this at the end to not get lag */
diff --git a/player/swfdec-window.h b/player/swfdec-window.h
index 5d84b06..932520f 100644
--- a/player/swfdec-window.h
+++ b/player/swfdec-window.h
@@ -18,8 +18,8 @@
  */
 
 #include <gtk/gtk.h>
-#include <libswfdec/swfdec.h>
-#include <libswfdec-gtk/swfdec-gtk.h>
+#include <swfdec/swfdec.h>
+#include <swfdec-gtk/swfdec-gtk.h>
 
 #ifndef __SWFDEC_WINDOW_H__
 #define __SWFDEC_WINDOW_H__
@@ -50,7 +50,6 @@ struct _SwfdecWindow
   GtkBuilder *		builder;	/* builder instance to load from */
   GtkWidget *		window;		/* the toplevel window */
   SwfdecPlayer *	player;		/* the player we show or NULL if not initialized yet */
-  SwfdecLoader *	loader;		/* the loader we use to load the content or NULL if not initialized yet */
   SwfdecWindowSettings	settings;	/* the settings that apply to this window */
 };
 
diff --git a/thumbnailer/swfdec-thumbnailer.c b/thumbnailer/swfdec-thumbnailer.c
index 0867285..62d4249 100644
--- a/thumbnailer/swfdec-thumbnailer.c
+++ b/thumbnailer/swfdec-thumbnailer.c
@@ -23,7 +23,7 @@
 #include "config.h"
 #endif
 
-#include <libswfdec/swfdec.h>
+#include <swfdec/swfdec.h>
 
 #define BORING_IMAGE_VARIANCE 256.0		/* Tweak this if necessary */
 
@@ -99,7 +99,7 @@ main (int argc, char **argv)
   GOptionContext *context;
   GError *err;
   SwfdecPlayer *player;
-  SwfdecLoader *loader;
+  SwfdecURL *url;
   guint width, height;
   double scale, scaled_size, x, y, w, h;
   guint try;
@@ -141,16 +141,11 @@ main (int argc, char **argv)
     return 1;
   }
 
-  loader = swfdec_file_loader_new (filenames[0]);
-  if (loader->error) {
-    g_printerr ("Error loading %s: %s\n", filenames[0], loader->error);
-    g_object_unref (loader);
-    return 1;
-  }
-
   timer = g_timer_new ();
   player = swfdec_player_new (NULL);
-  swfdec_player_set_loader (player, loader);
+  url = swfdec_url_new_from_input (filenames[0]);
+  swfdec_player_set_url (player, url);
+  swfdec_url_free (url);
   g_timer_start (timer);
 
   /* Skip the first 10 seconds */