enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

emotion: oops, this files should never have gotten in. 

SVN revision: 75496
This commit is contained in:
Cedric BAIL 2012-08-21 09:20:08 +00:00
parent 36bc7b270b
commit 593f82e316
3 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
legacy/emotion/src/generic_players/vlc/emotion_generic_vlc.c
View File

@ -25,7 +25,6 @@ enum _Thread_Events {
EM_THREAD_POSITION_CHANGED,
EM_THREAD_PLAYBACK_STARTED,
EM_THREAD_PLAYBACK_STOPPED,
EM_THREAD_EOF,
EM_THREAD_LAST
};
@ -312,7 +311,6 @@ _play(struct _App *app)
else
{
libvlc_time_t new_time = pos * 1000;
fprintf(stderr, "pos %f\n", pos);
libvlc_media_player_set_time(app->mp, new_time);
libvlc_media_player_play(app->mp);
app->playing = 1;
@ -373,11 +371,9 @@ _event_cb(const struct libvlc_event_t *ev, void *data)
_send_file_set(app);
break;
case libvlc_MediaPlayerEndReached:
thread_event = EM_THREAD_EOF;
write(app->fd_write, &thread_event, sizeof(thread_event));
/* thread_event = EM_THREAD_PLAYBACK_STOPPED; */
/* write(app->fd_write, &thread_event, sizeof(thread_event)); */
break;
thread_event = EM_THREAD_PLAYBACK_STOPPED;
write(app->fd_write, &thread_event, sizeof(thread_event));
break;
}
}
@ -743,10 +739,6 @@ _process_thread_events(struct _App *app)
case EM_THREAD_PLAYBACK_STARTED:
_send_cmd(app, EM_RESULT_PLAYBACK_STARTED);
break;
case EM_THREAD_EOF:
_send_cmd(app, EM_RESULT_FILE_EOF);
app->playing = 0;
break;
case EM_THREAD_PLAYBACK_STOPPED:
libvlc_media_player_stop(app->mp);
app->playing = 0;

1
legacy/emotion/src/modules/generic/Emotion_Generic_Plugin.h
View File

@ -56,7 +56,6 @@ enum _Emotion_Generic_Result
EM_RESULT_SPU_TRACK_INFO, // param: current spu, spu count, spu_id, spu_name, spu_id2, spu_name2, ...
// (int, int, int, string, int, string, ...)
EM_RESULT_META_INFO, // param: title, artist, album, year, genre, comments, disc id, count (all int)
EM_RESULT_FILE_EOF, // param: none
EM_RESULT_LAST
};

4
legacy/emotion/src/modules/generic/emotion_generic.c
View File

@ -587,10 +587,6 @@ _player_cmd_process(Emotion_Generic_Video *ev)
case EM_RESULT_META_INFO:
_player_meta_info_read(ev);
break;
case EM_RESULT_FILE_EOF:
_emotion_decode_stop(ev->obj);
_emotion_playback_finished(ev->obj);
break;
default:
WRN("received wrong command: %d", ev->cmd.type);
}