enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 13 Pull Requests 2 Projects Releases Wiki Activity

try init and shut down remix outside of thread. 

SVN revision: 65002
This commit is contained in:
Carsten Haitzler 2011-11-10 05:18:43 +00:00
parent c8bfe4f0d3
commit e3b7c9b551
1 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
legacy/edje/src/lib/edje_multisense.c
View File

@ -251,13 +251,33 @@ sound_command_handler(Multisense_Data *msdata)
#endif #endif
#ifdef HAVE_LIBREMIX #ifdef HAVE_LIBREMIX
// msdata outside of thread due to thread issues in dlsym etc.
static Multisense_Data *msdata = NULL;
static void
_msdata_free(void)
{
// cleanup msdata outside of thread due to thread issues in dlsym etc.
if (!msdata) return;
//cleanup Remix stuffs
remix_destroy(msdata->msenv->remixenv, msdata->player);
remix_destroy(msdata->msenv->remixenv, msdata->deck);
remix_purge(msdata->msenv->remixenv);
free(msdata->msenv);
free(msdata);
msdata = NULL;
}
static void static void
_player_job(void *data __UNUSED__, Ecore_Thread *th) _player_job(void *data __UNUSED__, Ecore_Thread *th)
{ {
fd_set wait_fds; fd_set wait_fds;
RemixBase *sound; RemixBase *sound;
RemixCount process_len; RemixCount process_len;
Multisense_Data *msdata = init_multisense_environment(); // disable and move outside of thread due to dlsym etc. thread issues
// Multisense_Data * msdata = init_multisense_environment();
if (!msdata) return; if (!msdata) return;
fcntl(command_pipe[0], F_SETFL, O_NONBLOCK); fcntl(command_pipe[0], F_SETFL, O_NONBLOCK);
@ -291,13 +311,6 @@ _player_job(void *data __UNUSED__, Ecore_Thread *th)
remix_destroy(msdata->msenv->remixenv, sound); remix_destroy(msdata->msenv->remixenv, sound);
} }
//cleanup Remix stuffs
remix_destroy(msdata->msenv->remixenv, msdata->player);
remix_destroy(msdata->msenv->remixenv, msdata->deck);
remix_purge(msdata->msenv->remixenv);
free(msdata->msenv);
free(msdata);
close(command_pipe[0]); close(command_pipe[0]);
close(command_pipe[1]); close(command_pipe[1]);
} }
@ -307,6 +320,8 @@ _player_job(void *data __UNUSED__, Ecore_Thread *th)
static void static void
_player_cancel(void *data __UNUSED__, Ecore_Thread *th __UNUSED__) _player_cancel(void *data __UNUSED__, Ecore_Thread *th __UNUSED__)
{ {
// cleanup msdata outside of thread due to thread issues in dlsym etc.
_msdata_free();
player_thread = NULL; player_thread = NULL;
} }
#endif #endif
@ -315,6 +330,8 @@ _player_cancel(void *data __UNUSED__, Ecore_Thread *th __UNUSED__)
static void static void
_player_end(void *data __UNUSED__, Ecore_Thread *th __UNUSED__) _player_end(void *data __UNUSED__, Ecore_Thread *th __UNUSED__)
{ {
// cleanup msdata outside of thread due to thread issues in dlsym etc.
_msdata_free();
player_thread = NULL; player_thread = NULL;
} }
#endif #endif
@ -368,6 +385,9 @@ _edje_multisense_init(void)
#ifdef ENABLE_MULTISENSE #ifdef ENABLE_MULTISENSE
if (!pipe_initialized && (pipe(command_pipe) != -1)) if (!pipe_initialized && (pipe(command_pipe) != -1))
pipe_initialized = EINA_TRUE; pipe_initialized = EINA_TRUE;
// init msdata outside of thread due to thread issues in dlsym etc.
if (!msdata) msdata = init_multisense_environment();
if (!player_thread) if (!player_thread)
player_thread = ecore_thread_run(_player_job, _player_end, _player_cancel, NULL); player_thread = ecore_thread_run(_player_job, _player_end, _player_cancel, NULL);