[Multisense] multisense dependencies are added to debian, tizen player specific suppo...

Change-Id: Iffa2b95a8a3b2c2a2ddf3078e2e225e855017299

diff --git a/debian/control b/debian/control
index 1290cea..c3d4a5b 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,9 @@ Build-Depends: debhelper (>= 6),
  doxygen,
  pkg-config,
  libtool,
- libsndfile1-dev
+ libsndfile1-dev,
+ libremix-dev,
+ libflac-dev
 Standards-Version: 3.8.1
 Homepage: http://enlightenment.org
 

diff --git a/src/bin/edje_decc.c b/src/bin/edje_decc.c
index ac776e9..56b81b7 100644 (file)
--- a/src/bin/edje_decc.c
+++ b/src/bin/edje_decc.c
@@ -392,7 +392,7 @@ output(void)
              sound_data = (void *)eet_read_direct(tef, out, &sound_data_size);
              if (sound_data)
                {
-                  snprintf(out1, sizeof(out1), "%s/%s", outdir, sample->name);
+                  snprintf(out1, sizeof(out1), "%s/%s", outdir, sample->snd_src);
                   pp = strdup(out1);
                   p = strrchr(pp, '/');
                   *p = 0;
@@ -412,7 +412,6 @@ output(void)
                   if (fwrite(sound_data, sound_data_size, 1, f) != 1)
                     ERR("Could not write sound: %s", strerror(errno));
                   fclose(f);
-                  free(sound_data);
               }
           }
 

diff --git a/src/modules/multisense_factory/multisense_factory.c b/src/modules/multisense_factory/multisense_factory.c
index 437318a..89b58c3 100644 (file)
--- a/src/modules/multisense_factory/multisense_factory.c
+++ b/src/modules/multisense_factory/multisense_factory.c
@@ -10,12 +10,21 @@ multisense_sound_player_get(Edje_Multisense_Env *msenv)
    RemixEnv *env = msenv->remixenv;
    RemixPlugin *player_plugin = NULL;
    RemixBase *player;
+   char *ms_player_name = NULL;
 
+   ms_player_name = getenv("MULTISENSE_SND_PLAYER");
+   if (ms_player_name)
+     {
+        player_plugin = remix_find_plugin(env, ms_player_name);
+        INF("Custom player_plugin = %p \n", player_plugin);
+     }
 #ifdef HAVE_LIBPA
-   player_plugin = remix_find_plugin(env, "pa_snd_player");
-   INF("PA player_plugin = %p \n", player_plugin);
+   if (!player_plugin)
+     {
+        player_plugin = remix_find_plugin(env, "pa_snd_player");
+        INF("PA player_plugin = %p \n", player_plugin);
+     }
 #endif
-
 #ifdef HAVE_LIBALSA
    if (!player_plugin)
      {
@@ -36,7 +45,6 @@ multisense_factory_init(Edje_Multisense_Env *env __UNUSED__)
 {
 #ifdef HAVE_LIBREMIX
    remix_set_samplerate(env->remixenv, DEFAULT_SAMPLERATE);
-   remix_set_channels(env->remixenv, REMIX_STEREO);
 #endif
    return EINA_TRUE;
 }