Merge branch 'master' into gregoa

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

diff --git a/src/zavai.vala b/src/zavai.vala
index b99d55140f9d05b67b69f8fe116bf44d41789b59..408dfa5540659a208f6adeede6dba34ee834cf50 100644 (file)
--- a/src/zavai.vala
+++ b/src/zavai.vala
@@ -205,6 +205,7 @@ static int main (string[] args) {
        zavai.clock.init();
        zavai.audio.init();
        zavai.log.init();
+       zavai.led.init();
        zavai.wifi.init();
        zavai.bluetooth.init();
 
@@ -223,7 +224,6 @@ static int main (string[] args) {
        zavai.ui.gsm.init();
        zavai.config.find_and_run_script("display", "init");
        zavai.ui.power.init();
-       zavai.ui.aux.init();
        zavai.ui.kbd.init();
        zavai.ui.wm.init();
        zavai.ui.calendar.init();
@@ -298,14 +298,25 @@ static int main (string[] args) {
     {
         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();