Stacked sound player works

diff --git a/src/app_alarm.vala b/src/app_alarm.vala
index 48d138bb35cb83acc161e29a8a8fd1062be361f7..8b7cfd2e763aa3e668e05966650968661d2cff0b 100644 (file)
--- a/src/app_alarm.vala
+++ b/src/app_alarm.vala
@@ -78,7 +78,9 @@ protected class AlarmNotifierDialog : ui.notify.Notifier
 
     protected virtual bool push_ringtone_state()
     {
 
     protected virtual bool push_ringtone_state()
     {

-        return false;
+        var state = new zavai.audio.PlayerState(name, config.ringtone_alarm, true);
+        zavai.audio.soundplayer.push_state(state);
+        return true;

     }
 }
 
     }
 }
 

diff --git a/src/app_music.vala b/src/app_music.vala
index d066e3c54d4f918afe57c5e190d7caa85f0ee285..8d79e84768da3c238cfec1e22f1af8808e823b6e 100644 (file)
--- a/src/app_music.vala
+++ b/src/app_music.vala
@@ -73,7 +73,7 @@ public class Player : Gtk.VBox
 {
     protected Gtk.Label l_status;
     protected PlayPauseButton b_playpause;
 {
     protected Gtk.Label l_status;
     protected PlayPauseButton b_playpause;

-    protected Gtk.Button b_stop;
+    //protected Gtk.Button b_stop;

     protected Gtk.Button b_prev;
     protected Gtk.Button b_next;
 
     protected Gtk.Button b_prev;
     protected Gtk.Button b_next;
 


@@ -82,15 +82,15 @@ public class Player : Gtk.VBox
         l_status = new Gtk.Label("");
         //l_date.modify_font(Pango.FontDescription.from_string("Sans 40"));
         b_playpause = new PlayPauseButton();
         l_status = new Gtk.Label("");
         //l_date.modify_font(Pango.FontDescription.from_string("Sans 40"));
         b_playpause = new PlayPauseButton();

-        b_stop = new Gtk.Button.from_stock(Gtk.STOCK_MEDIA_STOP);
-        b_stop.clicked += (b) => { audio.musicplayer.stop(); };
+        //b_stop = new Gtk.Button.from_stock(Gtk.STOCK_MEDIA_STOP);
+        //b_stop.clicked += (b) => { audio.musicplayer.stop(); };

         b_prev = new Gtk.Button.from_stock(Gtk.STOCK_MEDIA_PREVIOUS);
         b_next = new Gtk.Button.from_stock(Gtk.STOCK_MEDIA_NEXT);
         pack_start(l_status, false, false, 0);
         var buttons = new Gtk.HButtonBox();
         buttons.add(b_prev);
         buttons.add(b_playpause);
         b_prev = new Gtk.Button.from_stock(Gtk.STOCK_MEDIA_PREVIOUS);
         b_next = new Gtk.Button.from_stock(Gtk.STOCK_MEDIA_NEXT);
         pack_start(l_status, false, false, 0);
         var buttons = new Gtk.HButtonBox();
         buttons.add(b_prev);
         buttons.add(b_playpause);

-        buttons.add(b_stop);
+        //buttons.add(b_stop);

         buttons.add(b_next);
         pack_start(buttons, false, false, 0);
 
         buttons.add(b_next);
         pack_start(buttons, false, false, 0);
 

diff --git a/src/audio.vala b/src/audio.vala
index 0a3967c8095e6c21639e1c86a46b3e2104c6f56a..51790d0aed63f4d05da2422febda74f0092175c8 100644 (file)
--- a/src/audio.vala
+++ b/src/audio.vala
@@ -44,94 +44,205 @@ public class Audio: zavai.Service
                 "/org/freesmartphone/Device/LED/neo1973_vibrator",
                 "org.freesmartphone.Device.LED");
 */
                 "/org/freesmartphone/Device/LED/neo1973_vibrator",
                 "org.freesmartphone.Device.LED");
 */

-        clock.alarm_trigger_queue.triggered += on_alarm_trigger;
-        clock.alarm_trigger_queue.acked += on_alarm_done;
-        clock.alarm_trigger_queue.canceled += on_alarm_done;
+    }
+}
+
+public class PlayerState : Object
+{
+    protected SoundPlayer soundplayer;
+    protected Gst.Element player;
+    public string owner;
+    public string uri;
+    public bool loop;
+
+    public PlayerState(string owner, string uri, bool loop=false)
+    {
+        soundplayer = null;
+
+        this.owner = owner;
+        this.uri = uri;
+        this.loop = loop;
+
+        player = Gst.ElementFactory.make("playbin", null);
+        var bus = player.get_bus();
+        bus.add_signal_watch();
+        bus.message += on_message;
+
+        player.set_property("uri", uri);
+        player.set_state(Gst.State.PAUSED);
+    }
+
+    public void register(SoundPlayer sp)
+    {
+        soundplayer = sp;
+    }
+
+    public void stop()
+    {
+        player.set_state(Gst.State.NULL);
+    }
+
+    public void pause()
+    {
+        player.set_state(Gst.State.PAUSED);
+    }
+
+    public void resume()
+    {
+        player.set_state(Gst.State.PLAYING);

     }
 
     }
 

-    public void on_alarm_trigger(clock.AlarmTriggerInfo info)
+    protected void on_message(Gst.Message message)

     {
     {

-        zavai.log.debug("Make noise for alarm");
-        if (zavai.led.vibrator != null)
+        if (message.type == Gst.MessageType.EOS)

         {
         {

-            var state = new zavai.led.LedState("alarm");
-            state.set_blink(255);
-            zavai.led.vibrator.push_state(state);
+            if (loop)
+            {
+                player.seek_simple(Gst.Format.TIME, Gst.SeekFlags.FLUSH | Gst.SeekFlags.KEY_UNIT, 0);
+                player.set_state(Gst.State.PLAYING);
+            }
+            else if (soundplayer != null)
+                soundplayer.pop_state(owner);

         }
         }

-        soundplayer.play(config.ringtone_alarm, true);

     }
     }

+}

 
 

-    public void on_alarm_done(clock.AlarmTriggerInfo info)
+public class SoundPlayer : zavai.Resource, Object
+{
+    protected List<PlayerState> states;
+    protected MusicPlayer slave;
+    protected bool slave_was_playing;
+
+    public SoundPlayer()
+    {
+        states = new List<PlayerState>();
+    }
+
+    public void set_slave(MusicPlayer player)

     {
     {

-        zavai.log.debug("Stop noise for alarm");
-        if (zavai.led.vibrator != null)
-            zavai.led.vibrator.pop_state("alarm");
-        soundplayer.stop();
+        slave = player;
+        slave.master = this;
+    }
+
+    public bool playing()
+    {
+        return states != null;
+    }
+
+    protected void stop_playing()
+    {
+        if (slave_was_playing)
+            slave.resume();
+    }
+
+    public void push_state(PlayerState state)
+    {
+        // Save current playing position
+        if (states == null)
+        {
+            // We start playing: see about preempting slave
+            slave_was_playing = (slave != null && slave.playing);
+            if (slave_was_playing)
+                slave.pause();
+        } else
+            // We were playing: pause previous sound
+            states.data.pause();
+        state.register(this);
+        states.prepend(state);
+        states.data.resume();
+    }
+
+    public void pop_state(string owner)
+    {
+        // Handle empty list
+        if (states == null) return;
+
+        // Track if the list head changed
+        weak List<PlayerState> old_top = states;
+
+        // Remove state "name" from the stack
+        for (weak List<PlayerState> i = states; i != null; i = i.next)
+            if (i.data.owner == owner)
+            {
+                i.data.stop();
+                states.delete_link(i);
+                break;
+            }
+
+        // If the list head changed, put into action the new top state
+        if (states != old_top)
+        {
+            if (states == null)
+                stop_playing();
+            else
+                states.data.resume();
+        }
+    }
+
+    public void shutdown()
+    {
+        while (states != null)
+        {
+            states.data.stop();
+            states.delete_link(states);
+        }
+        stop_playing();

     }
 }
 
     }
 }
 

-public class Player: zavai.Resource, Object
+public class MusicPlayer: zavai.Resource, Object

 {
     protected Gst.Element player;
 {
     protected Gst.Element player;

-    protected bool playing;
-    protected Player slave;
-    protected Player master;
-    protected bool loop;
-    protected string uri;
+    public SoundPlayer master;

     public signal void state_changed(Gst.State new_state);
     public signal void state_changed(Gst.State new_state);

+    public string uri;
+    public bool playing;

 
 

-    public Player()
+    public MusicPlayer()

     {
     {

-        slave = null;

         master = null;
         master = null;

-        player = Gst.ElementFactory.make("playbin", null);
+        uri = null;

         playing = false;
         playing = false;

-        loop = false;
+        player = Gst.ElementFactory.make("playbin", null);

         var bus = player.get_bus();
         bus.add_signal_watch();
         bus.message += on_message;
     }
 
         var bus = player.get_bus();
         bus.add_signal_watch();
         bus.message += on_message;
     }
 

-    public void set_slave(Player player)
+    public void play(string uri)

     {
     {

-        slave = player;
-        slave.master = this;
+        this.uri = uri;
+        playing = true;
+        player.set_property("uri", uri);
+        player.set_state(master != null && master.playing() ? Gst.State.PAUSED : Gst.State.PLAYING);

     }
 
     }
 

-    public void play(string uri, bool loop = false)
+    protected void stop_playing()

     {
     {

-stderr.printf("Playing %s\n", uri);
-        this.uri = uri;
-
-        if (slave != null && slave.playing)
-            slave.pause();
-
-        player.set_property("uri", uri);
-        player.set_state(master != null && master.playing ? Gst.State.PAUSED : Gst.State.PLAYING);
-        playing = true;
-        this.loop = loop;
+        player.set_state(Gst.State.NULL);
+        state_changed(Gst.State.NULL);

     }
 
     public Gst.State get_state()
     {
     }
 
     public Gst.State get_state()
     {

-        Gst.State state;
-        Gst.State pending;
-
-        player.get_state(out state, out pending, (Gst.ClockType)Gst.CLOCK_TIME_NONE);
-
-        return state;
+        return player.current_state;

     }
 
     public void pause()
     {
     }
 
     public void pause()
     {

+        playing = false;

         player.set_state(Gst.State.PAUSED);
         state_changed(Gst.State.PAUSED);
     }
 
     public void resume()
     {
         player.set_state(Gst.State.PAUSED);
         state_changed(Gst.State.PAUSED);
     }
 
     public void resume()
     {

-        player.set_state(Gst.State.PLAYING);
-        state_changed(Gst.State.PLAYING);
+        playing = true;
+        if (master == null || !master.playing())
+        {
+            player.set_state(Gst.State.PLAYING);
+            state_changed(Gst.State.PLAYING);
+        }

     }
 
     public void restart()
     }
 
     public void restart()


@@ -141,43 +252,30 @@ stderr.printf("Playing %s\n", uri);
         state_changed(Gst.State.PLAYING);
     }
 
         state_changed(Gst.State.PLAYING);
     }
 

-    public void stop()
-    {
-        playing = false;
-        player.set_state(Gst.State.NULL);
-        state_changed(Gst.State.NULL);
-
-        // Resume slave after we are done
-        if (slave != null && slave.playing)
-            slave.resume();
-    }
-

     protected void on_message(Gst.Message message)
     {
         if (message.type == Gst.MessageType.EOS)
         {
     protected void on_message(Gst.Message message)
     {
         if (message.type == Gst.MessageType.EOS)
         {

-            if (loop)
-                restart();
-            else
-                stop();
+            playing = false;
+            stop_playing();

         }
     }
 
     public void shutdown()
     {
         }
     }
 
     public void shutdown()
     {

-        stop();
+        stop_playing();

     }
 }
 
 public Audio audio = null;
     }
 }
 
 public Audio audio = null;

-public Player musicplayer = null;
-public Player soundplayer = null;
+public SoundPlayer soundplayer = null;
+public MusicPlayer musicplayer = null;

 
 public void init()
 {
     audio = new Audio();
 
 public void init()
 {
     audio = new Audio();

-    musicplayer = new Player();
-    soundplayer = new Player();
+    musicplayer = new MusicPlayer();
+    soundplayer = new SoundPlayer();

     soundplayer.set_slave(musicplayer);
     zavai.registry.register(musicplayer);
     zavai.registry.register(soundplayer);
     soundplayer.set_slave(musicplayer);
     zavai.registry.register(musicplayer);
     zavai.registry.register(soundplayer);

diff --git a/src/zavai.vala b/src/zavai.vala
index 7e6f9fab221abf7f293b0c0bcd94a736e03e0ca8..408dfa5540659a208f6adeede6dba34ee834cf50 100644 (file)
--- a/src/zavai.vala
+++ b/src/zavai.vala
@@ -298,14 +298,25 @@ static int main (string[] args) {
     {
         zavai.audio.musicplayer.play("file://" + args[2]);
 
     {
         zavai.audio.musicplayer.play("file://" + args[2]);
 

-        // Timeout.add(3 * 1000, () => {
-        //     zavai.audio.soundplayer.play("file:///backup/ciapino/src/openmoocow/data/moo.wav", true);
-        //     Timeout.add(4 * 1000, () => {
-        //         zavai.audio.soundplayer.stop();
-        //         return false;
-        //     });
-        //     return false;
-        // });
+        Timeout.add(2 * 1000, () => {
+            var ps = new zavai.audio.PlayerState("zavai", "file:///backup/ciapino/src/openmoocow/data/moo.wav", true);
+            zavai.audio.soundplayer.push_state(ps);
+            Timeout.add(8 * 1000, () => {
+                zavai.audio.soundplayer.pop_state("zavai");
+                return false;
+            });
+            return false;
+        });
+
+        Timeout.add(3 * 1000, () => {
+            var ps = new zavai.audio.PlayerState("zavai", zavai.config.ringtone_alarm, false);
+            zavai.audio.soundplayer.push_state(ps);
+            Timeout.add(4 * 1000, () => {
+                zavai.audio.soundplayer.pop_state("zavai");
+                return false;
+            });
+            return false;
+        });

     }
 
        Gtk.main();
     }
 
        Gtk.main();