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 467aab667ecd0f612473e2aa6375e85de3ed4801..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,
@@ -60,6 +61,7 @@ static int main (string[] args) {
 
        if (args.length > 1 && args[1] == "notify")
        {
+               stdout.printf("NOTIFY\n");
                DBus.Connection sbus;
                dynamic DBus.Object zav;
                try {
@@ -74,7 +76,10 @@ static int main (string[] args) {
                        "/org/enricozini/Zavai/Clock",
                        "org.enricozini.zavai.Alarm");
                if (args.length > 2)
+               {
+                       stdout.printf("NOTIFY %s\n", args[2]);
                        zav.Notify(args[2]);
+               }
                else
                        zav.Notify("Alarm");
                
@@ -83,17 +88,22 @@ static int main (string[] args) {
 
     // Core infrastructure
        zavai.config = new zavai.Config();
+       zavai.config.argv0 = args[0];
        zavai.registry = new zavai.Registry();
 
-       zavai.app = new zavai.Zavai();
-       zavai.registry.register_resource("zavai", zavai.app);
+    zavai.main.init();
 
     // Additional infrastructure
        zavai.input.init();
+       zavai.uevent.init();
+       zavai.power.init();
        zavai.gps.init();
        zavai.gsm.init();
-       zavai.audio.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"));
@@ -102,35 +112,24 @@ static int main (string[] args) {
        zavai.clock.clock.check_alarms();
        */
 
-       // Create menus
-       zavai.registry.register_menu("menu.main", new zavai.Menu("Main menu"));
-
-       var menu_gps = new zavai.Menu("GPS");
-       zavai.registry.register_menu("menu.gps", menu_gps);
-       zavai.registry.getmenu("menu.main").add_applet("menu.gps");
-
-       var menu_gsm = new zavai.Menu("GSM");
-       zavai.registry.register_menu("menu.gsm", menu_gsm);
-       zavai.registry.getmenu("menu.main").add_applet("menu.gsm");
-
-       var menu_misc = new zavai.Menu("Misc");
-       zavai.registry.register_menu("menu.misc", menu_misc);
-       zavai.registry.getmenu("menu.main").add_applet("menu.misc");
-
        // 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.polygen.init();
+       zavai.ui.alarm.init();
+       zavai.ui.wifi.init();
+       zavai.ui.bluetooth.init();
        zavai.ui.debug.init();
 
        //zavai.app.show_applet("menu.main");
-       zavai.app.show_applet("zavai.status");
+       zavai.app.show_applet(zavai.ui.main.status);
 
 /*
        zavai.clock.clock.schedule(new zavai.clock.Alarm(time_t() + 10, "Test second"));
@@ -168,6 +167,27 @@ static int main (string[] args) {
 */
 
        zavai.app.run();
+
+       if (args.length > 1 && args[1] == "alarm")
+    {
+        zavai.clock.AlarmTriggerInfo alarm = new zavai.clock.AlarmTriggerInfo("Prova");
+        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")