summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Reichel <sre@ring0.de>2013-04-28 21:41:46 +0200
committerSebastian Reichel <sre@ring0.de>2013-04-28 21:41:46 +0200
commitf90cc533f5bb44c73017bd0f9d2591be1e246724 (patch)
tree9bf512008c9e6c70f28675b47d694117c4dfbeb0
parent04fc88e7de0f9acec11b189522228de59403e2ef (diff)
downloadserial-barcode-scanner-f90cc533f5bb44c73017bd0f9d2591be1e246724.tar.bz2
put audio path into config
-rw-r--r--src/audio/Makefile2
-rw-r--r--src/audio/audio.vala4
-rw-r--r--src/audio/main.vala14
3 files changed, 14 insertions, 6 deletions
diff --git a/src/audio/Makefile b/src/audio/Makefile
index a6fd629..b31dc6e 100644
--- a/src/audio/Makefile
+++ b/src/audio/Makefile
@@ -1,6 +1,6 @@
all: audio
-audio: main.vala audio.vala audio-interface.vala
+audio: main.vala audio.vala audio-interface.vala ../config/config-interface.vala
valac -o $@ --pkg gstreamer-0.10 --pkg gio-2.0 $^
clean:
diff --git a/src/audio/audio.vala b/src/audio/audio.vala
index 9884d7e..a6e5007 100644
--- a/src/audio/audio.vala
+++ b/src/audio/audio.vala
@@ -30,8 +30,8 @@ public class AudioPlayerImplementation {
return true;
}
- public AudioPlayerImplementation() {
- path = Environment.get_current_dir()+"/../../sounds/";
+ public AudioPlayerImplementation(string path) {
+ this.path = path;
var alsa = Gst.ElementFactory.make("alsasink", "alsa");
p = Gst.ElementFactory.make("playbin2", "play");
diff --git a/src/audio/main.vala b/src/audio/main.vala
index 1490601..ac80c75 100644
--- a/src/audio/main.vala
+++ b/src/audio/main.vala
@@ -16,6 +16,8 @@
AudioPlayerImplementation player;
public static int main(string[] args) {
+ Gst.init(ref args);
+
Bus.own_name(
BusType.SESSION,
"io.mainframe.shopsystem.AudioPlayer",
@@ -24,9 +26,15 @@ public static int main(string[] args) {
() => {},
() => stderr.printf("Could not aquire name\n"));
- Gst.init(ref args);
-
- player = new AudioPlayerImplementation();
+ try {
+ Config cfg = Bus.get_proxy_sync(BusType.SESSION, "io.mainframe.shopsystem.Config", "/io/mainframe/shopsystem/config");
+ var path = cfg.get_string("AUDIO", "path");
+ player = new AudioPlayerImplementation(path);
+ } catch(IOError e) {
+ error("IOError: %s\n", e.message);
+ } catch(KeyFileError e) {
+ error("Config Error: %s\n", e.message);
+ }
new MainLoop().run();