Added config options for call and sms ringtones

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

diff --git a/src/config.vala b/src/config.vala
index 5a982be81cb5d75cf02a99ea1a5e3162e8c2988b..92f8f93cb919da40afe45b291979a1ee8b15134f 100644 (file)
--- a/src/config.vala
+++ b/src/config.vala
@@ -152,6 +152,20 @@ public class Config
         set { _ringtone_alarm = set_string("ringtone_alarm", value); }
     }
 
+    private string _ringtone_call;
+    public string ringtone_call
+    {
+        get { return _ringtone_call; }
+        set { _ringtone_call = set_string("ringtone_call", value); }
+    }
+
+    private string _ringtone_sms;
+    public string ringtone_sms
+    {
+        get { return _ringtone_sms; }
+        set { _ringtone_sms = set_string("ringtone_sms", value); }
+    }
+
     public int backlight_max
     {
         get;
@@ -194,6 +208,8 @@ public class Config
         _power_button_keycode = get_int("power_button_keycode");
         _aux_button_keycode = get_int("aux_button_keycode");
         _ringtone_alarm = get_string("ringtone_alarm");
+        _ringtone_call = get_string("ringtone_call");
+        _ringtone_sms = get_string("ringtone_sms");
     }
 
     public Config()
@@ -219,6 +235,8 @@ public class Config
         power_button_keycode = 124;
         aux_button_keycode = 177;
         ringtone_alarm = "file:///usr/share/sounds/yue-fso/lec1.ogg";
+        ringtone_call = "file:///usr/share/sounds/yue-fso/jmf1.ogg";
+        ringtone_sms = "file:///usr/share/sounds/yue-fso/nothing4.ogg";
 
         // Read config
         if (lua.do_file(homedir + "/config"))
@@ -235,7 +253,7 @@ public class Config
      *
      * If the script is not found, NULL is returned
      */
-    public string find_script(string name)
+    public string? find_script(string name)
     {
         string candidate = homedir + "/" + name;
         if (FileUtils.test(candidate, FileTest.EXISTS))
@@ -246,34 +264,34 @@ public class Config
         return null;
     }
 
-    public void run_script(string command)
+    public void find_and_run_script(string script, string args) throws SpawnError
+    {
+        string cmd = find_script(script);
+        if (cmd == null)
+            throw new SpawnError.NOENT("hook '" + cmd + "' not found");
+        run_script(cmd + " " + args);
+    }
+
+    public void run_script(string command) throws SpawnError
     {
         zavai.log.info("Run program: " + command);
         string[] args = command.split(" ");
         Pid pid;
-        try {
-            Process.spawn_async(
-                Environment.get_home_dir(),
-                args,
-                null,
-                SpawnFlags.SEARCH_PATH,
-                null,
-                out pid);
-        } catch (SpawnError e) {
-            zavai.log.error("Running " + command + ": " + e.message);
-        }
+        Process.spawn_async(
+            Environment.get_home_dir(),
+            args,
+            null,
+            SpawnFlags.SEARCH_PATH,
+            null,
+            out pid);
     }
 
-    public int run_script_sync(string command, out string std_out, out string std_err)
+    public int run_script_sync(string command, out string std_out, out string std_err) throws SpawnError
     {
         int status = -1;
         zavai.log.info("Run program: " + command);
         string[] args = command.split(" ");
-        try {
-            bool res = Process.spawn_sync(Environment.get_home_dir(), args, null, SpawnFlags.SEARCH_PATH, null, out std_out, out std_err, out status);
-        } catch (SpawnError e) {
-            zavai.log.error("Running " + command + ": " + e.message);
-        }
+        bool res = Process.spawn_sync(Environment.get_home_dir(), args, null, SpawnFlags.SEARCH_PATH, null, out std_out, out std_err, out status);
         return status;
     }
 }