Merge lp:~vikoadi/audience/add-playlist-notification into lp:~audience-members/audience/trunk

[Viko Adi Rahmawan]

Show notification when adding playlist from file manager

[Viko Adi Rahmawan (vikoadi)]

depend on "libnotify"

[Cody Garver (codygarver)]

Can you make it combine current and future notifications into 1 notification, as seen with lp:noise when you queue tracks. Opening multiple videos would not spam the screen with multiple notifications.

[lp:~vikoadi/audience/add-playlist-notification]

368. By Viko Adi Rahmawan on 2014-09-03

merge trunk

369. By Viko Adi Rahmawan on 2014-09-03

use notification update

370. By Viko Adi Rahmawan on 2014-09-03

fix

371. By Viko Adi Rahmawan on 2014-09-03

fix plural

372. By Viko Adi Rahmawan on 2014-09-03

fix style

[Viko Adi Rahmawan (vikoadi)]

done

=== modified file 'src/Audience.vala'
--- src/Audience.vala	2014-09-03 00:07:10 +0000
+++ src/Audience.vala	2014-09-03 17:50:21 +0000
@@ -68,6 +68,7 @@
 
         public bool fullscreened { get; set; }
 
+        private static App app; // global App instance
         private Audience.Widgets.VideoPlayer video_player;
         private Audience.Widgets.BottomBar bottom_bar;
         private Clutter.Stage stage;
@@ -95,6 +96,12 @@
             this.flags |= GLib.ApplicationFlags.HANDLES_OPEN;
         }
 
+        public static App get_instance () {
+            if (app == null)
+                app = new App ();
+            return app;
+        }
+
         void build () {
             playlist = new Widgets.Playlist ();
             settings = new Settings ();
@@ -745,7 +752,12 @@
                 playlist.add_item (file);
             }
 
-            if (video_player.uri == null)
+            if (video_player.uri != null) { // we already play some file
+                if (files.length == 1)
+                    show_notification (_("File added to playlist"), files[0].get_basename ());
+                else 
+                    show_notification (_("%i files added to playlist").printf (files.length), "");
+            } else
                 open_file(files[0].get_uri ());
         }
     }
@@ -761,7 +773,7 @@
 
     Gst.init (ref args);
 
-    var app = new Audience.App ();
+    var app = Audience.App.get_instance ();
 
     app.run (args);
 }
\ No newline at end of file

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2014-06-30 14:54:30 +0000
+++ src/CMakeLists.txt	2014-09-03 17:50:21 +0000
@@ -22,6 +22,26 @@
 )
 
 pkg_check_modules (DEPS REQUIRED ${PKG_DEPS})
+
+#
+# Libnotify
+#
+pkg_check_modules (LIBNOTIFY QUIET libnotify)
+if (LIBNOTIFY_FOUND)
+  message ("-- libnotify enabled")
+
+  set (GLOBAL_VALAC_OPTIONS ${GLOBAL_VALAC_OPTIONS} --define=HAVE_LIBNOTIFY)
+
+  set (PKG_DEPS ${PKG_DEPS} libnotify)
+  set (VALA_DEPS ${VALA_DEPS} libnotify)
+
+  set (DEPS_CFLAGS ${DEPS_CFLAGS} ${LIBNOTIFY_CFLAGS})
+  set (DEPS_LIBRARIES ${DEPS_LIBRARIES} ${LIBNOTIFY_LIBRARIES})
+  set (DEPS_LIBRARY_DIRS ${DEPS_LIBRARY_DIRS} ${LIBNOTIFY_LIBRARY_DIRS})
+else ()
+  message ("-- libnotify disabled")
+endif ()
+
 set (CFLAGS ${DEPS_CFLAGS} ${DEPS_CFLAGS_OTHER})
 link_directories (${DEPS_LIBRARY_DIRS})
 add_definitions (${CFLAGS})
@@ -46,6 +66,7 @@
   PACKAGES
     ${VALA_DEPS}
   OPTIONS
+    ${GLOBAL_VALAC_OPTIONS}
     --enable-experimental
     --target-glib=2.32 # Remember to keep this updated.
     --thread

=== modified file 'src/Utils.vala'
--- src/Utils.vala	2014-08-09 01:13:20 +0000
+++ src/Utils.vala	2014-09-03 17:50:21 +0000
@@ -111,4 +111,46 @@
         var file = File.new_for_uri (uri);
         return file.query_exists ();
     }
+    
+    /**
+     * Notifications
+     */
+#if HAVE_LIBNOTIFY
+    private Notify.Notification? notification = null;
+#endif
+
+    public static void show_notification (string primary_text, string secondary_text, Gdk.Pixbuf? pixbuf = null, int urgency = -1) {
+#if HAVE_LIBNOTIFY
+        if (urgency == -1)
+            urgency = Notify.Urgency.NORMAL;
+
+        if (!Notify.is_initted ()) {
+            if (!Notify.init (App.get_instance ().application_id)) {
+                warning ("Could not init libnotify");
+                return;
+            }
+        }
+
+        if (notification == null) {
+            notification = new Notify.Notification (primary_text, secondary_text, "");
+        } else {
+            notification.clear_hints ();
+            notification.clear_actions ();
+            notification.update (primary_text, secondary_text, "");
+        }
+
+        if (pixbuf != null)
+            notification.set_image_from_pixbuf (pixbuf);
+        else
+            notification.icon_name = App.get_instance ().app_icon;
+
+        notification.set_urgency ((Notify.Urgency) urgency);
+
+        try {
+            notification.show ();
+        } catch (GLib.Error err) {
+            warning ("Could not show notification: %s", err.message);
+        }
+#endif
+    }
 }
\ No newline at end of file