Merge lp:~wingpanel-devs/audience/sound-indicator-in-fullscreen into lp:~audience-members/audience/trunk

[Marcus Wichelmann]

Show sound indicator in fullscreen mode

Use the new wingpanel library to show a sound indicator in fullscreen mode like requested in #953272.

[Viko Adi Rahmawan (vikoadi)]

depending on wingpanel sounds overkill
can we just copy the code?

[Marcus Wichelmann (l-admin-3)]

Of course we can copy the code, but duplicated code is imo never the right choice.
Why is depending on wingpanel overkill? The wingpanel api is built for being able to be integrated into different parts of the desktop enviroment. ;-)

[Viko Adi Rahmawan (vikoadi)]

i think the inclusion of wingpanel itself just for sound indicator is just too much, beside that audience dont have control over it, like we dont need the mpris, setting link and cant remove it.
Also we the hide observer cant get the status, is it toggle or shown

[Marcus Wichelmann (l-admin-3)]

The sound indigator is able to decide which contents are shown for audience.

[Viko Adi Rahmawan (vikoadi)]

i still got mpris and setting link here.
how to hide it?

[Viko Adi Rahmawan (vikoadi)]

otherwise i still think depending on wingpanel is a bad move as the dependency will be coupled together. if i want to have audience, then i need wingpanel, then wingpanel need gala, then gala need plank. i would go for minimum dependency as possible espessially if it only use in small portion of apps.
to overcome code duplication, if we can upload a stable indicator-sound tar.gz, we can script cmake to download and extract those tar.gz then we can simply include the class we want. of course its depend on how loosely sound indicator class

[Viko Adi Rahmawan (vikoadi)]

review: Disapprove

[Adam Bieńkowski (donadigo)]

As Viko said there shouldn't be a strict dependency on wingpanel. I suggest to define cmake variable, something like #HAS_WINGPANEL and then check it in the code.

[Viko Adi Rahmawan (vikoadi)]

check this out guys https://code.launchpad.net/~vikoadi/audience/volume-control
it need a compressed wingpanel-indicator-sound.tar.gz uploaded somewhere, which usually are done when its released. for the time being I just compressed sound indicator into wingpanel-indicator-sound-0.1.tar.gz and put it audience project directory. bzr will handle downloading and decompressing.

maybe we can upload an alpha tar.gz somewhere?

[Marcus Wichelmann (l-admin-3)]

Hi, I don't see how that fixes the problem. You're still duplicating code and since it looked like you added the wingpanel-indicator-sound dependency, wingpanel is a dependency, too.
Please explain what exactly the code in src/Volume is for and why that isn't a duplication.

[Viko Adi Rahmawan (vikoadi)]

the wingpanel-indicator-sound refer to cmake target that is created using ExternalProject_Add, not sound indicator package. It can be compiled event without libwingpanel installed.

So those ExternalProject_Add will download and extract the tar.gz file into wingpanel-indicator-sound folder. Then we can add the class that we need into vala_precompile package. Here i can only reuse Sound.Widget.Scale, Service.VolumeControl, and Service.Setting. I need to have a controller to wire up Widget.Scale view into VolumeControl model, thats why i need to write all that src/Volume class.

If we can abstract out the volume controller part of Indicator.vala into its own class, we can always reuse it in Audience.

Unmerged revisions

550. By Marcus Wichelmann on 2015-10-22

Show sound indicator in fullscreen mode

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2015-09-04 11:10:22 +0000
+++ src/CMakeLists.txt	2015-10-22 11:44:48 +0000
@@ -11,7 +11,7 @@
 # pkgconfig, real C code
 find_package (PkgConfig)
 
-set (PKG_DEPS granite>=0.3.0 clutter-gtk-1.0 gstreamer-1.0 gstreamer-pbutils-1.0 gstreamer-video-1.0 gstreamer-tag-1.0)
+set (PKG_DEPS granite>=0.3.0 clutter-gtk-1.0 gstreamer-1.0 gstreamer-pbutils-1.0 gstreamer-video-1.0 gstreamer-tag-1.0 wingpanel-2.0)
 set (VALA_DEPS
     granite>=0.3.0
     clutter-gtk-1.0
@@ -20,6 +20,7 @@
     gstreamer-pbutils-1.0
     gstreamer-video-1.0
     gstreamer-tag-1.0
+    wingpanel-2.0
 )
 
 pkg_check_modules (DEPS REQUIRED ${PKG_DEPS})
@@ -65,6 +66,7 @@
     Widgets/VideoPlayer.vala
     Widgets/WelcomePage.vala
     Widgets/PlayerPage.vala
+    Widgets/IndicatorContainer.vala
   PACKAGES
     ${VALA_DEPS}
   OPTIONS

=== modified file 'src/Widgets/BottomBar.vala'
--- src/Widgets/BottomBar.vala	2015-06-14 07:02:09 +0000
+++ src/Widgets/BottomBar.vala	2015-10-22 11:44:48 +0000
@@ -34,6 +34,7 @@
     private Gtk.Button play_button;
     private Gtk.Button preferences_button;
     private Gtk.Revealer unfullscreen_revealer;
+    private Gtk.Revealer indicator_revealer;
     private bool is_playing = false;
     private uint hiding_timer = 0;
 
@@ -91,8 +92,10 @@
         notify["fullscreen"].connect (() => {
             if (fullscreen == true && child_revealed == true) {
                 unfullscreen_revealer.set_reveal_child (true);
+                indicator_revealer.set_reveal_child (true);
             } else if (fullscreen == false && child_revealed == true) {
                 unfullscreen_revealer.set_reveal_child (false);
+                indicator_revealer.set_reveal_child (false);
             }
         });
 
@@ -123,6 +126,16 @@
         return unfullscreen_revealer;
     }
 
+    public Gtk.Revealer get_indicator_container () {
+        indicator_revealer = new Gtk.Revealer ();
+        indicator_revealer.opacity = GLOBAL_OPACITY;
+        indicator_revealer.transition_type = Gtk.RevealerTransitionType.CROSSFADE;
+        var indicator_container = new IndicatorContainer ();
+        indicator_revealer.add (indicator_container);
+        indicator_revealer.show_all ();
+        return indicator_revealer;
+    }
+
     public void toggle_play_pause () {
         is_playing = !is_playing;
         if (is_playing == true) {
@@ -140,8 +153,10 @@
         base.set_reveal_child (reveal);
         if (reveal == true && fullscreen == true) {
             unfullscreen_revealer.set_reveal_child (reveal);
+            indicator_revealer.set_reveal_child (reveal);
         } else if (reveal == false) {
             unfullscreen_revealer.set_reveal_child (reveal);
+            indicator_revealer.set_reveal_child (reveal);
         }
     }
 
@@ -174,6 +189,7 @@
             }
             set_reveal_child (false);
             unfullscreen_revealer.set_reveal_child (false);
+            indicator_revealer.set_reveal_child (false);
             hiding_timer = 0;
             return false;
         });

=== added file 'src/Widgets/IndicatorContainer.vala'
--- src/Widgets/IndicatorContainer.vala	1970-01-01 00:00:00 +0000
+++ src/Widgets/IndicatorContainer.vala	2015-10-22 11:44:48 +0000
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2011-2015 Marcus Wichelmann ([e-mail])
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+public class Audience.Widgets.IndicatorContainer : Gtk.Grid {
+    public IndicatorContainer () {
+        Wingpanel.IndicatorManager indicator_manager = Wingpanel.IndicatorManager.get_default ();
+        indicator_manager.initialize (Wingpanel.IndicatorManager.ServerType.SESSION);
+
+        if (!indicator_manager.has_indicators ()) {
+            return;
+        }
+
+        foreach (Wingpanel.Indicator indicator in indicator_manager.get_indicators ()) {
+            if (indicator.code_name == Wingpanel.Indicator.SOUND) {
+                add_indicator (indicator);
+            }
+        }
+    }
+
+    private void add_indicator (Wingpanel.Indicator indicator) {
+        Gtk.Widget display_widget = indicator.get_display_widget ();
+        display_widget.add_events (Gdk.EventMask.BUTTON_PRESS_MASK | Gdk.EventMask.SCROLL_MASK);
+        display_widget.valign = Gtk.Align.START;
+
+        Gtk.Popover popover = new Gtk.Popover (display_widget);
+        popover.add (indicator.get_widget ());
+
+        display_widget.button_press_event.connect ((e) => {
+            if ((e.button == Gdk.BUTTON_PRIMARY || e.button == Gdk.BUTTON_SECONDARY) && e.type == Gdk.EventType.BUTTON_PRESS) {
+                if (popover.get_visible ()) {
+                    popover.hide ();
+                } else {
+                    popover.show_all ();
+                }
+
+                return Gdk.EVENT_STOP;
+            }
+
+            display_widget.button_press_event (e);
+
+            return Gdk.EVENT_PROPAGATE;
+        });
+
+        this.add (display_widget);
+    }
+}
\ No newline at end of file

=== modified file 'src/Widgets/PlayerPage.vala'
--- src/Widgets/PlayerPage.vala	2015-09-12 20:11:41 +0000
+++ src/Widgets/PlayerPage.vala	2015-10-22 11:44:48 +0000
@@ -14,6 +14,8 @@
         private Clutter.Stage stage;
         private Gtk.Revealer unfullscreen_bar;
         private GtkClutter.Actor unfullscreen_actor;
+        private Gtk.Revealer indicator_bar;
+        private GtkClutter.Actor indicator_actor;
         private GtkClutter.Actor bottom_actor;
         private GnomeMediaKeys             mediakeys;
 
@@ -56,6 +58,7 @@
             bottom_bar.set_repeat (false);
 
             unfullscreen_bar = bottom_bar.get_unfullscreen_button ();
+            indicator_bar = bottom_bar.get_indicator_container ();
 
             bottom_actor = new GtkClutter.Actor.with_contents (bottom_bar);
             bottom_actor.opacity = GLOBAL_OPACITY;
@@ -65,6 +68,10 @@
             unfullscreen_actor.opacity = GLOBAL_OPACITY;
             stage.add_child (unfullscreen_actor);
 
+            indicator_actor = new GtkClutter.Actor.with_contents (indicator_bar);
+            indicator_actor.opacity = GLOBAL_OPACITY;
+            stage.add_child (indicator_actor);
+
             this.size_allocate.connect (on_size_allocate);
             App.get_instance ().mainwindow.key_press_event.connect (on_key_press_event);
             App.get_instance ().mainwindow.window_state_event.connect (on_window_state_event);
@@ -338,6 +345,8 @@
             bottom_actor.y = stage.get_height () - bottom_bar_size;
             unfullscreen_actor.y = 6;
             unfullscreen_actor.x = stage.get_width () - bottom_bar_size - 6;
+            indicator_actor.y = 6;
+            indicator_actor.x = 6;
         }
 
         public bool update_pointer_position (double y, int window_height) {