Commit f593c8f0 authored by Laurent Aimar's avatar Laurent Aimar

Removed unused STOP_S input state.

 The associated libvlc_MediaPlayerStopped and libvlc_Stopped value could
probably be removed (not done as I do not know the maintainer opinion).
parent 78d82649
...@@ -479,7 +479,6 @@ typedef enum input_state_e ...@@ -479,7 +479,6 @@ typedef enum input_state_e
BUFFERING_S, BUFFERING_S,
PLAYING_S, PLAYING_S,
PAUSE_S, PAUSE_S,
STOP_S,
END_S, END_S,
ERROR_S, ERROR_S,
} input_state_e; } input_state_e;
......
...@@ -942,7 +942,7 @@ static int StateChange( vlc_object_t *p_this, const char* psz_var, ...@@ -942,7 +942,7 @@ static int StateChange( vlc_object_t *p_this, const char* psz_var,
} }
if( newval.i_int == PLAYING_S || newval.i_int == PAUSE_S || if( newval.i_int == PLAYING_S || newval.i_int == PAUSE_S ||
newval.i_int == STOP_S || newval.i_int == END_S ) newval.i_int == END_S )
{ {
StatusChangeSignal( p_sys->p_conn, (void*) p_intf ); StatusChangeSignal( p_sys->p_conn, (void*) p_intf );
} }
......
...@@ -1543,10 +1543,6 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh ) ...@@ -1543,10 +1543,6 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh )
{ {
mvnprintw( y++, 0, COLS, _(" State : Playing %s"), psz_state ); mvnprintw( y++, 0, COLS, _(" State : Playing %s"), psz_state );
} }
else if( val.i_int == STOP_S )
{
mvnprintw( y++, 0, COLS, _(" State : Stopped %s"), psz_state );
}
else if( val.i_int == OPENING_S ) else if( val.i_int == OPENING_S )
{ {
mvnprintw( y++, 0, COLS, _(" State : Opening/Connecting %s"), psz_state ); mvnprintw( y++, 0, COLS, _(" State : Opening/Connecting %s"), psz_state );
......
...@@ -52,7 +52,6 @@ static const libvlc_state_t vlc_to_libvlc_state_array[] = ...@@ -52,7 +52,6 @@ static const libvlc_state_t vlc_to_libvlc_state_array[] =
[BUFFERING_S] = libvlc_Buffering, [BUFFERING_S] = libvlc_Buffering,
[PLAYING_S] = libvlc_Playing, [PLAYING_S] = libvlc_Playing,
[PAUSE_S] = libvlc_Paused, [PAUSE_S] = libvlc_Paused,
[STOP_S] = libvlc_Stopped,
[END_S] = libvlc_Ended, [END_S] = libvlc_Ended,
[ERROR_S] = libvlc_Error, [ERROR_S] = libvlc_Error,
}; };
...@@ -161,10 +160,6 @@ input_state_changed( const vlc_event_t * event, void * p_userdata ) ...@@ -161,10 +160,6 @@ input_state_changed( const vlc_event_t * event, void * p_userdata )
libvlc_media_set_state( p_mi->p_md, libvlc_Paused, NULL); libvlc_media_set_state( p_mi->p_md, libvlc_Paused, NULL);
forwarded_event.type = libvlc_MediaPlayerPaused; forwarded_event.type = libvlc_MediaPlayerPaused;
break; break;
case STOP_S:
libvlc_media_set_state( p_mi->p_md, libvlc_Stopped, NULL);
forwarded_event.type = libvlc_MediaPlayerStopped;
break;
case END_S: case END_S:
libvlc_media_set_state( p_mi->p_md, libvlc_Ended, NULL); libvlc_media_set_state( p_mi->p_md, libvlc_Ended, NULL);
forwarded_event.type = libvlc_MediaPlayerEndReached; forwarded_event.type = libvlc_MediaPlayerEndReached;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment