summaryrefslogtreecommitdiff
path: root/legacy/emotion/src
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@free.fr>2012-08-21 09:20:08 +0000
committerCedric BAIL <cedric.bail@free.fr>2012-08-21 09:20:08 +0000
commit593f82e3165c11caa2d2442eb63a4ec661e5ddf2 (patch)
tree35f4fd3da480b34d619c994882e00d9ce8dee1bd /legacy/emotion/src
parent36bc7b270b9a50ad274699362b9986681e7a8210 (diff)
emotion: oops, this files should never have gotten in.
SVN revision: 75496
Diffstat (limited to 'legacy/emotion/src')
-rw-r--r--legacy/emotion/src/generic_players/vlc/emotion_generic_vlc.c14
-rw-r--r--legacy/emotion/src/modules/generic/Emotion_Generic_Plugin.h1
-rw-r--r--legacy/emotion/src/modules/generic/emotion_generic.c4
3 files changed, 3 insertions, 16 deletions
diff --git a/legacy/emotion/src/generic_players/vlc/emotion_generic_vlc.c b/legacy/emotion/src/generic_players/vlc/emotion_generic_vlc.c
index f41506491e..7ec0a6f6c2 100644
--- a/legacy/emotion/src/generic_players/vlc/emotion_generic_vlc.c
+++ b/legacy/emotion/src/generic_players/vlc/emotion_generic_vlc.c
@@ -25,7 +25,6 @@ enum _Thread_Events {
25 EM_THREAD_POSITION_CHANGED, 25 EM_THREAD_POSITION_CHANGED,
26 EM_THREAD_PLAYBACK_STARTED, 26 EM_THREAD_PLAYBACK_STARTED,
27 EM_THREAD_PLAYBACK_STOPPED, 27 EM_THREAD_PLAYBACK_STOPPED,
28 EM_THREAD_EOF,
29 EM_THREAD_LAST 28 EM_THREAD_LAST
30}; 29};
31 30
@@ -312,7 +311,6 @@ _play(struct _App *app)
312 else 311 else
313 { 312 {
314 libvlc_time_t new_time = pos * 1000; 313 libvlc_time_t new_time = pos * 1000;
315 fprintf(stderr, "pos %f\n", pos);
316 libvlc_media_player_set_time(app->mp, new_time); 314 libvlc_media_player_set_time(app->mp, new_time);
317 libvlc_media_player_play(app->mp); 315 libvlc_media_player_play(app->mp);
318 app->playing = 1; 316 app->playing = 1;
@@ -373,11 +371,9 @@ _event_cb(const struct libvlc_event_t *ev, void *data)
373 _send_file_set(app); 371 _send_file_set(app);
374 break; 372 break;
375 case libvlc_MediaPlayerEndReached: 373 case libvlc_MediaPlayerEndReached:
376 thread_event = EM_THREAD_EOF; 374 thread_event = EM_THREAD_PLAYBACK_STOPPED;
377 write(app->fd_write, &thread_event, sizeof(thread_event)); 375 write(app->fd_write, &thread_event, sizeof(thread_event));
378 /* thread_event = EM_THREAD_PLAYBACK_STOPPED; */ 376 break;
379 /* write(app->fd_write, &thread_event, sizeof(thread_event)); */
380 break;
381 } 377 }
382} 378}
383 379
@@ -743,10 +739,6 @@ _process_thread_events(struct _App *app)
743 case EM_THREAD_PLAYBACK_STARTED: 739 case EM_THREAD_PLAYBACK_STARTED:
744 _send_cmd(app, EM_RESULT_PLAYBACK_STARTED); 740 _send_cmd(app, EM_RESULT_PLAYBACK_STARTED);
745 break; 741 break;
746 case EM_THREAD_EOF:
747 _send_cmd(app, EM_RESULT_FILE_EOF);
748 app->playing = 0;
749 break;
750 case EM_THREAD_PLAYBACK_STOPPED: 742 case EM_THREAD_PLAYBACK_STOPPED:
751 libvlc_media_player_stop(app->mp); 743 libvlc_media_player_stop(app->mp);
752 app->playing = 0; 744 app->playing = 0;
diff --git a/legacy/emotion/src/modules/generic/Emotion_Generic_Plugin.h b/legacy/emotion/src/modules/generic/Emotion_Generic_Plugin.h
index e4813055b9..17bd7e9c50 100644
--- a/legacy/emotion/src/modules/generic/Emotion_Generic_Plugin.h
+++ b/legacy/emotion/src/modules/generic/Emotion_Generic_Plugin.h
@@ -56,7 +56,6 @@ enum _Emotion_Generic_Result
56 EM_RESULT_SPU_TRACK_INFO, // param: current spu, spu count, spu_id, spu_name, spu_id2, spu_name2, ... 56 EM_RESULT_SPU_TRACK_INFO, // param: current spu, spu count, spu_id, spu_name, spu_id2, spu_name2, ...
57 // (int, int, int, string, int, string, ...) 57 // (int, int, int, string, int, string, ...)
58 EM_RESULT_META_INFO, // param: title, artist, album, year, genre, comments, disc id, count (all int) 58 EM_RESULT_META_INFO, // param: title, artist, album, year, genre, comments, disc id, count (all int)
59 EM_RESULT_FILE_EOF, // param: none
60 EM_RESULT_LAST 59 EM_RESULT_LAST
61}; 60};
62 61
diff --git a/legacy/emotion/src/modules/generic/emotion_generic.c b/legacy/emotion/src/modules/generic/emotion_generic.c
index 147fb8ee9f..549c179534 100644
--- a/legacy/emotion/src/modules/generic/emotion_generic.c
+++ b/legacy/emotion/src/modules/generic/emotion_generic.c
@@ -587,10 +587,6 @@ _player_cmd_process(Emotion_Generic_Video *ev)
587 case EM_RESULT_META_INFO: 587 case EM_RESULT_META_INFO:
588 _player_meta_info_read(ev); 588 _player_meta_info_read(ev);
589 break; 589 break;
590 case EM_RESULT_FILE_EOF:
591 _emotion_decode_stop(ev->obj);
592 _emotion_playback_finished(ev->obj);
593 break;
594 default: 590 default:
595 WRN("received wrong command: %d", ev->cmd.type); 591 WRN("received wrong command: %d", ev->cmd.type);
596 } 592 }