dlna: update filename in ui

5 files changed, 18 insertions, 6 deletions

diff --git a/src/dlna.c b/src/dlna.c
index af773f1..3b5137a 100644
--- a/src/dlna.c
+++ b/src/dlna.c
@@ -220,6 +220,7 @@ my_object_change_uri (SnappyMP * myobj, gchar * uri)
     g_object_set (G_OBJECT (myobj), "uri", uri, NULL);
 
     engine_open_uri (myobj->engine, uri);
+    interface_load_uri (myobj->ui, uri);
 }
 
 static void
@@ -355,15 +356,16 @@ handle_get_property (GDBusConnection * connection,
     ret = g_variant_new_boolean (TRUE);
   } else if (g_strcmp0 (property_name, "CanControl") == 0) {
     ret = g_variant_new_boolean (TRUE);
-
   } else if (g_strcmp0 (property_name, "Identity") == 0) {
-    return g_variant_new_string ("snappy");
+    ret = g_variant_new_string ("snappy");
+
   } else if (g_strcmp0 (property_name, "SupportedUriSchemes") == 0) {
     /* not planning to support this seriously */
     const char *fake_supported_schemes[] = {
       "file", "http", "cdda", "smb", "sftp", NULL
     };
     return g_variant_new_strv (fake_supported_schemes, -1);
+
   } else if (g_strcmp0 (property_name, "SupportedMimeTypes") == 0) {
     /* nor this */
     const char *fake_supported_mimetypes[] = {
@@ -449,9 +451,9 @@ get_root_property (GDBusConnection * connection,
   }
 
   if (g_strcmp0 (property_name, "CanQuit") == 0) {
-    return g_variant_new_boolean (TRUE);
+    return g_variant_new_boolean (FALSE);
   } else if (g_strcmp0 (property_name, "CanRaise") == 0) {
-    return g_variant_new_boolean (TRUE);
+    return g_variant_new_boolean (FALSE);
   } else if (g_strcmp0 (property_name, "HasTrackList") == 0) {
     return g_variant_new_boolean (FALSE);
   } else if (g_strcmp0 (property_name, "Identity") == 0) {
diff --git a/src/dlna.h b/src/dlna.h
index 159c62f..7033b2d 100644
--- a/src/dlna.h
+++ b/src/dlna.h
@@ -27,6 +27,7 @@
 #include <glib-object.h>
 
 #include "gst_engine.h"
+#include "user_interface.h"
 
 G_BEGIN_DECLS
 
@@ -74,6 +75,7 @@ struct _SnappyMP
   gchar *uri;
 
   GstEngine *engine;
+  UserInterface *ui;
 };
 
 struct _SnappyMPClass
diff --git a/src/gst_engine.c b/src/gst_engine.c
index e190c87..3a8c40d 100644
--- a/src/gst_engine.c
+++ b/src/gst_engine.c
@@ -412,6 +412,8 @@ gboolean
 engine_play (GstEngine * engine)
 {
   gst_element_set_state (engine->player, GST_STATE_PLAYING);
+  engine->has_started = TRUE;
+  engine->playing = TRUE;
 
   return TRUE;
 }
@@ -430,6 +432,7 @@ gboolean
 engine_stop (GstEngine * engine)
 {
   gst_element_set_state (engine->player, GST_STATE_READY);
+  engine->playing = FALSE;
 
   return TRUE;
 }
diff --git a/src/snappy.c b/src/snappy.c
index 3983a91..14b0bd6 100644
--- a/src/snappy.c
+++ b/src/snappy.c
@@ -197,9 +197,8 @@ main (int argc, char *argv[])
 
   mp_obj = g_new (SnappyMP, 1);
   mp_obj->engine = engine;
+  mp_obj->ui = ui;
   load_dlna (mp_obj);
-  //  g_signal_connect (mp_obj, "open-uri",
-  //    G_CALLBACK (open_uri_callback), engine);
 
   clutter_main ();
 
diff --git a/src/user_interface.c b/src/user_interface.c
index 1673a0a..1e912e3 100644
--- a/src/user_interface.c
+++ b/src/user_interface.c
@@ -844,6 +844,12 @@ gboolean
 interface_load_uri (UserInterface * ui, gchar * uri)
 {
   ui->fileuri = uri;
+  ui->filename = g_path_get_basename (ui->fileuri);
+
+  if (ui->stage != NULL) {
+    clutter_stage_set_title (CLUTTER_STAGE (ui->stage), ui->filename);
+    clutter_text_set_text (CLUTTER_TEXT (ui->control_title), ui->filename);
+  }
 }
 
 void