Stacked sound player works

[gregoa/zavai.git] / src / audio.vala

diff --git a/src/audio.vala b/src/audio.vala
index 52beeb62fc0f0fcc124dc8fe2fcea7e7fe57cc11..51790d0aed63f4d05da2422febda74f0092175c8 100644 (file)
--- a/src/audio.vala
+++ b/src/audio.vala
@@ -25,9 +25,6 @@ namespace audio {
 
 public class Audio: zavai.Service
 {
 
 public class Audio: zavai.Service
 {

-    protected Omhacks.Led vibrator;
-    protected bool has_vibrator;
-

     /*
        protected dynamic DBus.Object audiodev;
        protected dynamic DBus.Object vibdev;
     /*
        protected dynamic DBus.Object audiodev;
        protected dynamic DBus.Object vibdev;


@@ -37,8 +34,6 @@ public class Audio: zavai.Service
     {
         Object(name: "audio");
 
     {
         Object(name: "audio");
 

-        has_vibrator = (vibrator.init("neo1973:vibrator") == 0);
-

 /*
         audiodev = zavai.registry.sbus.get_object(
                 "org.freesmartphone.odeviced",
 /*
         audiodev = zavai.registry.sbus.get_object(
                 "org.freesmartphone.odeviced",


@@ -49,158 +44,238 @@ 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 on_alarm_trigger(clock.AlarmTriggerInfo info)
+    public void register(SoundPlayer sp)

     {
     {

-        zavai.log.debug("Make noise for alarm");
-        if (has_vibrator)
+        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);
+    }
+
+    protected void on_message(Gst.Message message)
+    {
+        if (message.type == Gst.MessageType.EOS)

         {
         {

-            vibrator.brightness = 256;
-            // FIXME: is there a better way? I hope there is a better way. Please
-            // tell me there is a better way.
-            var trig = "timer";
-            for (int i = 0; ; ++i)
+            if (loop)

             {
             {

-                vibrator.trigger[i] = (char)trig[i];
-                if (trig[i] == 0) break;
+                player.seek_simple(Gst.Format.TIME, Gst.SeekFlags.FLUSH | Gst.SeekFlags.KEY_UNIT, 0);
+                player.set_state(Gst.State.PLAYING);

             }
             }

-            vibrator.delay_on = 200;
-            vibrator.delay_off = 300;
-            vibrator.set();
+            else if (soundplayer != null)
+                soundplayer.pop_state(owner);

         }
         }

-        soundplayer.play(config.ringtone_alarm, true);
+    }
+}
+
+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)
+    {
+        slave = player;
+        slave.master = this;
+    }
+
+    public bool playing()
+    {
+        return states != null;

     }
 
     }
 

-    public void on_alarm_done(clock.AlarmTriggerInfo info)
+    protected void stop_playing()

     {
     {

-        zavai.log.debug("Stop noise for alarm");
-        if (has_vibrator)
+        if (slave_was_playing)
+            slave.resume();
+    }
+
+    public void push_state(PlayerState state)
+    {
+        // Save current playing position
+        if (states == null)

         {
         {

-            var trig = "none";
-            for (int i = 0; ; ++i)
+            // 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)

             {
             {

-                vibrator.trigger[i] = (char)trig[i];
-                if (trig[i] == 0) break;
+                i.data.stop();
+                states.delete_link(i);
+                break;

             }
             }

-            vibrator.brightness = 0;
-            vibrator.set();
+
+        // 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();

         }
         }

-        soundplayer.stop();

     }
 
     }
 

-/*
-    public void notify_alarm(zavai.clock.Alarm a)
-    {
-        // Wiggle screen to turn on backlight
-        zavai.ui.power.backlight.wiggle();
-        try {
-            // Method does not exist in this frameworkd
-            vibdev.BlinkSeconds(5, 500, 200);
-        } catch (Error e) {
-            zavai.log.error("Cannot blink vibrator: " + e.message);
+    public void shutdown()
+    {
+        while (states != null)
+        {
+            states.data.stop();
+            states.delete_link(states);

         }
         }

-        // TODO: play music?
+        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 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_state(Gst.State.NULL);
+        state_changed(Gst.State.NULL);
+    }

 
 

-        player.set_property("uri", uri);
-        player.set_state(master != null && master.playing ? Gst.State.PAUSED : Gst.State.PLAYING);
-        playing = true;
-        this.loop = loop;
+    public Gst.State get_state()
+    {
+        return player.current_state;

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

+        playing = false;

         player.set_state(Gst.State.PAUSED);
         player.set_state(Gst.State.PAUSED);

+        state_changed(Gst.State.PAUSED);

     }
 
     public void resume()
     {
     }
 
     public void resume()
     {

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

     }
 
     public void restart()
     {
         player.seek_simple(Gst.Format.TIME, Gst.SeekFlags.FLUSH | Gst.SeekFlags.KEY_UNIT, 0);
         player.set_state(Gst.State.PLAYING);
     }
 
     public void restart()
     {
         player.seek_simple(Gst.Format.TIME, Gst.SeekFlags.FLUSH | Gst.SeekFlags.KEY_UNIT, 0);
         player.set_state(Gst.State.PLAYING);

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

     }
 
     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);