timer23
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

edje: Fix multisense shutdown and shut up ecore thread shutdown. 

Patch from cedric during the korean e17 meeting. Thanks!


SVN revision: 73841
This commit is contained in:
Jerome Pinot 2012-07-14 06:58:42 +00:00
parent 6f2b6f9611
commit 365d29d02f
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
legacy/edje/ChangeLog
View File

@ -527,3 +527,7 @@
* Warn at compile time about forgotten image definition. * Warn at compile time about forgotten image definition.
* Stop compilation when clipping to a non RECT part. * Stop compilation when clipping to a non RECT part.
2012-07-14 Cedric Bail
* Fix Edje_Multisense shutdown.

1
legacy/edje/NEWS
View File

@ -27,6 +27,7 @@ Fixes:
* Fix table and text when fixed point is turned on. * Fix table and text when fixed point is turned on.
* Clamp image tween to never underflow also. * Clamp image tween to never underflow also.
* [entry] display preedit string even though there is no attribute * [entry] display preedit string even though there is no attribute
* Fix shutdown of Edje_Multisense.
Edje 1.2.0 Edje 1.2.0

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

@ -283,13 +283,17 @@ _player_job(void *data __UNUSED__, Ecore_Thread *th)
{ {
if (!msdata->remaining) if (!msdata->remaining)
{ {
//Cleanup already played sound sources int err;
//Cleanup already played sound sources
EINA_LIST_FREE(msdata->snd_src_list, sound) EINA_LIST_FREE(msdata->snd_src_list, sound)
{ {
remix_destroy(msdata->msenv->remixenv, sound); remix_destroy(msdata->msenv->remixenv, sound);
} }
//wait for new sound //wait for new sound
select(command_pipe[0] + 1, &wait_fds, NULL, NULL, 0); err = select(command_pipe[0] + 1, &wait_fds, NULL, NULL, 0);
if (ecore_thread_check(th))
break;
} }
//read sound command , if any //read sound command , if any
sound_command_handler(msdata); sound_command_handler(msdata);
@ -305,9 +309,6 @@ _player_job(void *data __UNUSED__, Ecore_Thread *th)
{ {
remix_destroy(msdata->msenv->remixenv, sound); remix_destroy(msdata->msenv->remixenv, sound);
} }
close(command_pipe[0]);
close(command_pipe[1]);
} }
#endif #endif
@ -400,7 +401,7 @@ _edje_multisense_init(void)
if (!msdata) msdata = init_multisense_environment(); 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_feedback_run(_player_job, NULL, _player_end, _player_cancel, NULL, EINA_TRUE);
#endif #endif
} }
@ -408,11 +409,14 @@ void
_edje_multisense_shutdown(void) _edje_multisense_shutdown(void)
{ {
#ifdef ENABLE_MULTISENSE #ifdef ENABLE_MULTISENSE
if (player_thread) ecore_thread_cancel(player_thread);
if (pipe_initialized) if (pipe_initialized)
{ {
int i = 42;
write(command_pipe[1], &i, sizeof (int));
close(command_pipe[1]); close(command_pipe[1]);
close(command_pipe[0]); close(command_pipe[0]);
} }
if (player_thread) ecore_thread_cancel(player_thread);
#endif #endif
} }