diff options
author | David Walter Seikel | 2012-01-23 23:30:42 +1000 |
---|---|---|
committer | David Walter Seikel | 2012-01-23 23:30:42 +1000 |
commit | 825a3d837a33f226c879cd02ad15c3fba57e8b2c (patch) | |
tree | 75f57bd9c4253508d338dc79ba8e57a7abc42255 /libraries/edje/src/modules/multisense_factory | |
parent | Add ability to disable the test harness, or the Lua compile test. (diff) | |
download | SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.zip SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.tar.gz SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.tar.bz2 SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.tar.xz |
Update the EFL to what I'm actually using, coz I'm using some stuff not yet released.
Diffstat (limited to 'libraries/edje/src/modules/multisense_factory')
-rw-r--r-- | libraries/edje/src/modules/multisense_factory/Makefile.in | 2 | ||||
-rw-r--r-- | libraries/edje/src/modules/multisense_factory/multisense_factory.c | 66 |
2 files changed, 33 insertions, 35 deletions
diff --git a/libraries/edje/src/modules/multisense_factory/Makefile.in b/libraries/edje/src/modules/multisense_factory/Makefile.in index ed0c3e4..8fbc0aa 100644 --- a/libraries/edje/src/modules/multisense_factory/Makefile.in +++ b/libraries/edje/src/modules/multisense_factory/Makefile.in | |||
@@ -208,8 +208,6 @@ PACKAGE_URL = @PACKAGE_URL@ | |||
208 | PACKAGE_VERSION = @PACKAGE_VERSION@ | 208 | PACKAGE_VERSION = @PACKAGE_VERSION@ |
209 | PATH_SEPARATOR = @PATH_SEPARATOR@ | 209 | PATH_SEPARATOR = @PATH_SEPARATOR@ |
210 | PKG_CONFIG = @PKG_CONFIG@ | 210 | PKG_CONFIG = @PKG_CONFIG@ |
211 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
212 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
213 | PYTHON = @PYTHON@ | 211 | PYTHON = @PYTHON@ |
214 | PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ | 212 | PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ |
215 | PYTHON_PLATFORM = @PYTHON_PLATFORM@ | 213 | PYTHON_PLATFORM = @PYTHON_PLATFORM@ |
diff --git a/libraries/edje/src/modules/multisense_factory/multisense_factory.c b/libraries/edje/src/modules/multisense_factory/multisense_factory.c index f89ae9b..8b17be1 100644 --- a/libraries/edje/src/modules/multisense_factory/multisense_factory.c +++ b/libraries/edje/src/modules/multisense_factory/multisense_factory.c | |||
@@ -1,33 +1,33 @@ | |||
1 | #include "config.h" | 1 | #include "config.h" |
2 | #include "edje_private.h" | 2 | #include "edje_private.h" |
3 | 3 | ||
4 | #define DEFAULT_SAMPLERATE 44100 | 4 | #define DEFAULT_SAMPLERATE 44100 |
5 | 5 | ||
6 | #ifdef HAVE_LIBREMIX | 6 | #ifdef HAVE_LIBREMIX |
7 | EAPI RemixBase * | 7 | EAPI RemixBase * |
8 | multisense_sound_player_get(Edje_Multisense_Env *msenv) | 8 | multisense_sound_player_get(Edje_Multisense_Env *msenv) |
9 | { | 9 | { |
10 | RemixEnv *env = msenv->remixenv; | 10 | RemixEnv *env = msenv->remixenv; |
11 | RemixPlugin *player_plugin; | 11 | RemixPlugin *player_plugin; |
12 | RemixBase *player; | 12 | RemixBase *player; |
13 | 13 | ||
14 | player_plugin = remix_find_plugin(env, "alsa_snd_player"); | 14 | player_plugin = remix_find_plugin(env, "alsa_snd_player"); |
15 | if (!player_plugin) | 15 | if (!player_plugin) |
16 | { | 16 | { |
17 | WRN("ALSA player_plugin init fail\n"); | 17 | WRN("ALSA player_plugin init fail\n"); |
18 | return remix_monitor_new(env); | 18 | return remix_monitor_new(env); |
19 | } | 19 | } |
20 | player = remix_new(env, player_plugin, NULL); | 20 | player = remix_new(env, player_plugin, NULL); |
21 | return player; | 21 | return player; |
22 | } | 22 | } |
23 | #endif | 23 | #endif |
24 | 24 | ||
25 | EAPI Eina_Bool | 25 | EAPI Eina_Bool |
26 | multisense_factory_init(Edje_Multisense_Env *env) | 26 | multisense_factory_init(Edje_Multisense_Env *env __UNUSED__) |
27 | { | 27 | { |
28 | #ifdef HAVE_LIBREMIX | 28 | #ifdef HAVE_LIBREMIX |
29 | remix_set_samplerate(env->remixenv, DEFAULT_SAMPLERATE); | 29 | remix_set_samplerate(env->remixenv, DEFAULT_SAMPLERATE); |
30 | remix_set_channels(env->remixenv, REMIX_STEREO); | 30 | remix_set_channels(env->remixenv, REMIX_STEREO); |
31 | #endif | 31 | #endif |
32 | return EINA_TRUE; | 32 | return EINA_TRUE; |
33 | } | 33 | } |