diff --git a/src/candy/base.vala b/src/candy/base.vala
index fa5ef46..ba3125b 100644
--- a/src/candy/base.vala
+++ b/src/candy/base.vala
@@ -1,10 +1,12 @@
namespace Deskcandy.Candy {
public abstract class BaseCandy : Object {
+ public string name { get; set; }
+
protected BaseCandy() {
}
public abstract async void initialize() throws Error;
- public abstract Subprocess launch(uint socket_id, string path) throws Error;
+ public abstract Subprocess launch(uint socket_id) throws Error;
}
}
diff --git a/src/candy/video.vala b/src/candy/video.vala
index 2c18f47..1de39cd 100644
--- a/src/candy/video.vala
+++ b/src/candy/video.vala
@@ -6,9 +6,9 @@ namespace Deskcandy.Candy {
public override async void initialize() throws Error {
}
- public override Subprocess launch(uint socket_id, string path) throws Error {
+ public override Subprocess launch(uint socket_id) throws Error {
message("Launching mpv video...");
- return new Subprocess(SubprocessFlags.NONE, "mpv", @"--wid=$socket_id", "--no-audio", "--video-unscaled=downscale-big", "--video-zoom=20", path);
+ return new Subprocess(SubprocessFlags.NONE, "mpv", @"--wid=$socket_id", "--no-audio", "--video-unscaled=downscale-big", "--video-zoom=20", this.name);
}
}
}
diff --git a/src/candy/xscreensaver.vala b/src/candy/xscreensaver.vala
index ccc62a7..140cf52 100644
--- a/src/candy/xscreensaver.vala
+++ b/src/candy/xscreensaver.vala
@@ -28,9 +28,9 @@ namespace Deskcandy.Candy {
message(@"Found $(this.configs.length()) screensavers.");
}
- public override Subprocess launch(uint socket_id, string saver) throws Error {
+ public override Subprocess launch(uint socket_id) throws Error {
message("Launching XScreensaver...");
- return new Subprocess(SubprocessFlags.NONE, @"$(this.saver_path)/$saver", "-window-id", socket_id.to_string());
+ return new Subprocess(SubprocessFlags.NONE, @"$(this.saver_path)/$(this.name)", "-window-id", socket_id.to_string());
}
private async void hacky_determine_directories() {
diff --git a/src/desktop_window.vala b/src/desktop_window.vala
index bec33c5..985a593 100644
--- a/src/desktop_window.vala
+++ b/src/desktop_window.vala
@@ -28,7 +28,7 @@ namespace Deskcandy {
this.visible = true;
try {
- this.proc = candy.launch((uint)this.socket.get_id(), "unknownpleasures");
+ //this.proc = candy.launch((uint)this.socket.get_id());
} catch (Error e) {
error(e.message);
}
diff --git a/src/window.ui b/src/window.ui
index 784c065..4c1d1e2 100644
--- a/src/window.ui
+++ b/src/window.ui
@@ -314,7 +314,8 @@
True
False
5
- slide-left-right
+ over-up-down
+