Revert "Revert "Split non-ui functions in separate lib""

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

diff --git a/src/zavai.vala b/src/zavai.vala
index 396fb7aed947da74c9d063346a4d569ffaa82c4d..d1dede55f8208a3884af2d800873aa3f899bb98e 100644 (file)
--- a/src/zavai.vala
+++ b/src/zavai.vala
@@ -24,6 +24,7 @@ using GLib;
 
 static int main (string[] args) {
        Gtk.init (ref args);
+    Gst.init (ref args);
 
        // parser = Parser(usage="usage: %prog [options]",
        //                 version="%prog "+ VERSION,
@@ -100,6 +101,9 @@ static int main (string[] args) {
        zavai.gsm.init();
        zavai.clock.init();
        zavai.audio.init();
+       zavai.log.init();
+       zavai.wifi.init();
+       zavai.bluetooth.init();
 
        /*
        zavai.clock.clock.schedule(new zavai.clock.Alarm(123456, "Second"));
@@ -109,15 +113,19 @@ static int main (string[] args) {
        */
 
        // User interface
+       zavai.ui.music.init();
        zavai.ui.main.init();
        zavai.ui.gps.init();
        zavai.ui.gsm.init();
-       zavai.app.run_script(zavai.config.homedir + "/display init");
+       zavai.config.run_script(zavai.config.homedir + "/display init");
        zavai.ui.power.init();
+       zavai.ui.aux.init();
        zavai.ui.kbd.init();
        zavai.ui.wm.init();
        zavai.ui.calendar.init();
        zavai.ui.alarm.init();
+       zavai.ui.wifi.init();
+       zavai.ui.bluetooth.init();
        zavai.ui.debug.init();
 
        //zavai.app.show_applet("menu.main");
@@ -166,6 +174,20 @@ static int main (string[] args) {
         zavai.clock.alarm_trigger_queue.enqueue_trigger(alarm);
     }
 
+       if (args.length > 2 && args[1] == "play")
+    {
+        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;
+        // });
+    }
+
        Gtk.main();
 
        // zavai.info("Shutting down")