summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordavemds <dave@gurumeditation.it>2014-02-22 11:22:43 +0100
committerdavemds <dave@gurumeditation.it>2014-02-22 11:29:16 +0100
commita1ed4cf9d8e947e94323b5ce19dbde2677bda33b (patch)
tree7957a5ff4fe183022996ec3386b9eeb0800f795a /src
parentf5f9e4421992f63c23245ae1c4b24316093a9f1a (diff)
Emotion generic: remove the player restart hack.
The player restart (when reached the end) is a specific VLC issue, it need to be managed inside the player, not here.
Diffstat (limited to 'src')
-rw-r--r--src/modules/emotion/generic/emotion_generic.c18
-rw-r--r--src/modules/emotion/generic/emotion_generic.h1
2 files changed, 2 insertions, 17 deletions
diff --git a/src/modules/emotion/generic/emotion_generic.c b/src/modules/emotion/generic/emotion_generic.c
index 212d80dde8..a824029a76 100644
--- a/src/modules/emotion/generic/emotion_generic.c
+++ b/src/modules/emotion/generic/emotion_generic.c
@@ -51,15 +51,6 @@ static int _emotion_generic_log_domain = -1;
51static Eina_Bool _fork_and_exec(Emotion_Generic_Video *ev); 51static Eina_Bool _fork_and_exec(Emotion_Generic_Video *ev);
52static void em_partial_shutdown(Emotion_Generic_Video *ev); 52static void em_partial_shutdown(Emotion_Generic_Video *ev);
53 53
54static Eina_Bool
55_player_restart(void *data)
56{
57 Emotion_Generic_Video *ev = data;
58
59 _fork_and_exec(ev);
60 ev->player_restart = NULL;
61 return EINA_FALSE;
62}
63 54
64static void 55static void
65_player_send_cmd(Emotion_Generic_Video *ev, int cmd) 56_player_send_cmd(Emotion_Generic_Video *ev, int cmd)
@@ -299,7 +290,7 @@ _player_position_changed(Emotion_Generic_Video *ev)
299{ 290{
300 float position = ev->cmd.param.f_num; 291 float position = ev->cmd.param.f_num;
301 292
302 INF("received position changed: %0.3f", position); 293 // INF("received position changed: %0.3f", position);
303 294
304 ev->pos = position; 295 ev->pos = position;
305 _emotion_video_pos_update(ev->obj, ev->pos, ev->len); 296 _emotion_video_pos_update(ev->obj, ev->pos, ev->len);
@@ -535,12 +526,9 @@ _player_cmd_process(Emotion_Generic_Video *ev)
535 _emotion_playback_started(ev->obj); 526 _emotion_playback_started(ev->obj);
536 break; 527 break;
537 case EM_RESULT_PLAYBACK_STOPPED: 528 case EM_RESULT_PLAYBACK_STOPPED:
538 ev->pos = 0; 529 ev->play = 0;
539 _emotion_playback_finished(ev->obj); 530 _emotion_playback_finished(ev->obj);
540 _emotion_decode_stop(ev->obj); 531 _emotion_decode_stop(ev->obj);
541
542 em_partial_shutdown(ev);
543 ev->player_restart = ecore_idler_add(_player_restart, ev);
544 break; 532 break;
545 case EM_RESULT_FRAME_SIZE: 533 case EM_RESULT_FRAME_SIZE:
546 _player_frame_resize(ev); 534 _player_frame_resize(ev);
@@ -1027,8 +1015,6 @@ em_partial_shutdown(Emotion_Generic_Video *ev)
1027 ev->player_data = NULL; 1015 ev->player_data = NULL;
1028 if (ev->player_del) ecore_event_handler_del(ev->player_del); 1016 if (ev->player_del) ecore_event_handler_del(ev->player_del);
1029 ev->player_del = NULL; 1017 ev->player_del = NULL;
1030 if (ev->player_restart) ecore_idler_del(ev->player_restart);
1031 ev->player_restart = NULL;
1032} 1018}
1033 1019
1034 1020
diff --git a/src/modules/emotion/generic/emotion_generic.h b/src/modules/emotion/generic/emotion_generic.h
index 833c85d982..4dfc91eba5 100644
--- a/src/modules/emotion/generic/emotion_generic.h
+++ b/src/modules/emotion/generic/emotion_generic.h
@@ -73,7 +73,6 @@ struct _Emotion_Generic_Video
73 Emotion_Generic_Player player; 73 Emotion_Generic_Player player;
74 Emotion_Generic_Cmd_Buffer cmd; 74 Emotion_Generic_Cmd_Buffer cmd;
75 Ecore_Event_Handler *player_add, *player_del, *player_data; 75 Ecore_Event_Handler *player_add, *player_del, *player_data;
76 Ecore_Idler *player_restart;
77 int drop; 76 int drop;
78 Ecore_Pipe *fd_read; 77 Ecore_Pipe *fd_read;
79 Ecore_Pipe *fd_write; 78 Ecore_Pipe *fd_write;