aboutsummaryrefslogtreecommitdiffstats
path: root/fsodeviced
diff options
context:
space:
mode:
authorMichael 'Mickey' Lauer <mickey@vanille-media.de>2009-09-12 21:13:09 +0200
committerMichael 'Mickey' Lauer <mickey@vanille-media.de>2009-09-12 21:13:09 +0200
commit543b1568331e416863dfb98deb9263dcb6f18c38 (patch)
tree243b3c565d58c441897634ffd390984f3e1480e0 /fsodeviced
parentc2163ff77bda32b417710819f802b8767c69cc2d (diff)
downloadcornucopia-543b1568331e416863dfb98deb9263dcb6f18c38.tar.gz
cornucopia-543b1568331e416863dfb98deb9263dcb6f18c38.tar.bz2
cornucopia-543b1568331e416863dfb98deb9263dcb6f18c38.zip
fsodeviced: add data to subdirs
Diffstat (limited to 'fsodeviced')
-rw-r--r--fsodeviced/Makefile.am1
-rw-r--r--fsodeviced/src/plugins/alsa_audio/plugin.vala4
2 files changed, 3 insertions, 2 deletions
diff --git a/fsodeviced/Makefile.am b/fsodeviced/Makefile.am
index 7bbe5630..1abf1b36 100644
--- a/fsodeviced/Makefile.am
+++ b/fsodeviced/Makefile.am
@@ -3,6 +3,7 @@ include $(top_srcdir)/Makefile.decl
NULL =
SUBDIRS = \
+ data \
src \
tests \
$(NULL)
diff --git a/fsodeviced/src/plugins/alsa_audio/plugin.vala b/fsodeviced/src/plugins/alsa_audio/plugin.vala
index 6ae472e1..731c9817 100644
--- a/fsodeviced/src/plugins/alsa_audio/plugin.vala
+++ b/fsodeviced/src/plugins/alsa_audio/plugin.vala
@@ -83,7 +83,7 @@ class AudioPlayer : FreeSmartphone.Device.Audio, FsoFramework.AbstractObject
private FsoFramework.SoundDevice device;
private HashMap<string,BunchOfMixerControls> allscenarios;
private string currentscenario;
- private Queue<string> scenarios;
+ private GLib.Queue<string> scenarios;
//private Mutex mutex;
@@ -381,4 +381,4 @@ public static void fso_register_function( TypeModule module )
var ok = FsoFramework.FileHandling.isPresent( Kernel26.SYS_CLASS_LEDS );
return (!ok);
}
-*/ \ No newline at end of file
+*/