[BUFFERING_S] = libvlc_Buffering,
[PLAYING_S] = libvlc_Playing,
[PAUSE_S] = libvlc_Paused,
- [END_S] = libvlc_Ended,
+ [STOP_S] = libvlc_Stopped,
[FORWARD_S] = libvlc_Forward,
[BACKWARD_S] = libvlc_Backward,
+ [END_S] = libvlc_Ended,
[ERROR_S] = libvlc_Error,
};
break;
case PLAYING_S:
libvlc_media_set_state( p_mi->p_md, libvlc_Playing, NULL);
- forwarded_event.type = libvlc_MediaPlayerPlayed;
+ forwarded_event.type = libvlc_MediaPlayerPlaying;
break;
case PAUSE_S:
libvlc_media_set_state( p_mi->p_md, libvlc_Paused, NULL);
forwarded_event.type = libvlc_MediaPlayerPaused;
break;
- case END_S:
- libvlc_media_set_state( p_mi->p_md, libvlc_Ended, NULL);
- forwarded_event.type = libvlc_MediaPlayerEndReached;
+ case STOP_S:
+ libvlc_media_set_state( p_mi->p_md, libvlc_Stopped, NULL);
+ forwarded_event.type = libvlc_MediaPlayerStopped;
break;
case FORWARD_S:
libvlc_media_set_state( p_mi->p_md, libvlc_Forward, NULL);
libvlc_media_set_state( p_mi->p_md, libvlc_Backward, NULL);
forwarded_event.type = libvlc_MediaPlayerBackward;
break;
+ case END_S:
+ libvlc_media_set_state( p_mi->p_md, libvlc_Ended, NULL);
+ forwarded_event.type = libvlc_MediaPlayerEndReached;
case ERROR_S:
libvlc_media_set_state( p_mi->p_md, libvlc_Error, NULL);
forwarded_event.type = libvlc_MediaPlayerEncounteredError;
libvlc_event_manager_register_event_type( p_mi->p_event_manager,
libvlc_MediaPlayerPaused, p_e );
libvlc_event_manager_register_event_type( p_mi->p_event_manager,
- libvlc_MediaPlayerEndReached, p_e );
+ libvlc_MediaPlayerStopped, p_e );
libvlc_event_manager_register_event_type( p_mi->p_event_manager,
libvlc_MediaPlayerForward, p_e );
libvlc_event_manager_register_event_type( p_mi->p_event_manager,
libvlc_MediaPlayerBackward, p_e );
+ libvlc_event_manager_register_event_type( p_mi->p_event_manager,
+ libvlc_MediaPlayerEndReached, p_e );
libvlc_event_manager_register_event_type( p_mi->p_event_manager,
libvlc_MediaPlayerEncounteredError, p_e );
* because of some creepy drawable type that are not flexible enough
* (Win32 HWND for instance) */
p_input_thread = libvlc_get_input_thread( p_mi, p_e );
- if( !p_input_thread ) return;
+ if( !p_input_thread ) {
+ /* No input, nothing more to do, we are fine */
+ libvlc_exception_clear( p_e );
+ return;
+ }
p_vout = vlc_object_find( p_input_thread, VLC_OBJECT_VOUT, FIND_CHILD );
- if( !p_vout )
- libvlc_exception_raise( p_e, "No active video output" );
- else
+ if( p_vout )
{
vout_Control( p_vout , VOUT_REPARENT, drawable);
vlc_object_release( p_vout );