Swfdec - Aug 2007 - player/swfplay.c

player/swfplay.c |   36 +++++++++++++++++++++++++-----------
 1 files changed, 25 insertions(+), 11 deletions(-)

New commits:
diff-tree ba4f1da69d0c74c45b0b4d92330f2203d258bb49 (from
3398ec3ae1d036d76054f7ddec170dc158e47079)
Author: Benjamin Otte <otte at gnome.org>
Date:   Thu Aug 2 11:54:25 2007 +0200

    make swfplay open normal files again and not require 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://", dir, G_DIR_SEPARATOR_S, s, NULL);
+    g_free (dir);
+    return full;
+  } else {
+    swfdec_url_free (url);
+    return g_strdup (s);
+  }
+}
+
 int 
 main (int argc, char *argv[])
 {
@@ -75,6 +95,7 @@ main (int argc, char *argv[])
   gboolean use_image = FALSE, no_sound = FALSE;
   gboolean trace = FALSE;
   char *variables = NULL;
+  char *s;
   GtkWidget *window;
 
   GOptionEntry options[] = {
@@ -106,17 +127,10 @@ main (int argc, char *argv[])
     g_printerr ("Usage: %s [OPTIONS] filename\n", argv[0]);
     return 1;
   }
-
-#if HAVE_GNOMEVFS
-  {
-    char *s;
-    s = gnome_vfs_make_uri_from_shell_arg (argv[1]);
-    loader = swfdec_gtk_loader_new (s);
-    g_free (s);
-  }
-#else
-  loader = swfdec_gtk_loader_new (argv[1]);
-#endif
+  
+  s = sanitize_url (argv[1]);
+  loader = swfdec_gtk_loader_new (s);
+  g_free (s);
   if (loader->error) {
     g_printerr ("Couldn't open file \"%s\": %s\n",
argv[1], loader->error);
     g_object_unref (loader);

player/swfplay.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
diff-tree e840582fbb91f6fcd3b21a3511f0d72becc33af1 (from
672054a7dcbd5853d9381c06d5185d13273bb2a7)
Author: Benjamin Otte <otte at gnome.org>
Date:   Fri Aug 24 15:37:24 2007 +0200

    quit correctly even when it's done in init code
    
    I hate main loops...

diff --git a/player/swfplay.c b/player/swfplay.c
index 0c2ff6b..739de8c 100644
--- a/player/swfplay.c
+++ b/player/swfplay.c
@@ -171,7 +171,8 @@ main (int argc, char *argv[])
 
   swfdec_gtk_player_set_playing (SWFDEC_GTK_PLAYER (player), TRUE);
 
-  g_main_loop_run (loop);
+  if (g_main_loop_is_running (loop))
+    g_main_loop_run (loop);
 
   g_object_unref (player);
   g_main_loop_unref (loop);