input: merge ABORT and DEAD events

diff --git a/include/vlc_input.h b/include/vlc_input.h
index 6ec305bebad2dd0cb1a29d4cd50168e09a53d375..cdcfdd09d7963cec73ac2b0b7013c274663987f4 100644 (file)
--- a/include/vlc_input.h
+++ b/include/vlc_input.h
@@ -335,8 +335,6 @@ typedef enum input_event_type_e
     INPUT_EVENT_STATE,
     /* b_dead is true */
     INPUT_EVENT_DEAD,
-    /* a *user* abort has been requested */
-    INPUT_EVENT_ABORT,
 
     /* "rate" has changed */
     INPUT_EVENT_RATE,

diff --git a/lib/media_player.c b/lib/media_player.c
index cb6b60401c5ff73130e5411e49f1c24cecae637e..81762ad8a6f12cac7a1897efb656f377624bd3b2 100644 (file)
--- a/lib/media_player.c
+++ b/lib/media_player.c
@@ -302,7 +302,7 @@ input_event_changed( vlc_object_t * p_this, char const * psz_cmd,
         set_state( p_mi, libvlc_state, false );
         libvlc_event_send( p_mi->p_event_manager, &event );
     }
-    else if( newval.i_int == INPUT_EVENT_ABORT )
+    else if( newval.i_int == INPUT_EVENT_DEAD )
     {
         libvlc_state_t libvlc_state = libvlc_Stopped;
         event.type = libvlc_MediaPlayerStopped;

diff --git a/modules/control/dbus/dbus.c b/modules/control/dbus/dbus.c
index 31733e03c417f8555562ea481347087083ab4b82..43feeb5a4d08d13f6c7b764c8715e1c309ac5c96 100644 (file)
--- a/modules/control/dbus/dbus.c
+++ b/modules/control/dbus/dbus.c
@@ -893,7 +893,6 @@ static int InputCallback( vlc_object_t *p_this, const char *psz_var,
     switch( newval.i_int )
     {
         case INPUT_EVENT_DEAD:
-        case INPUT_EVENT_ABORT:
             i_state = PLAYBACK_STATE_STOPPED;
             break;
         case INPUT_EVENT_STATE:

diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 4c48a9ec435c1a7970be5e6eefa1cee5a279e8d6..2df03a81d63d9bfadb995a25ff3c697350f2d87b 100644 (file)
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -376,11 +376,6 @@ static int InputEvent(vlc_object_t *p_this, const char *psz_var,
             [[VLCMain sharedInstance] performSelectorOnMainThread:@selector(updatePlaybackPosition) withObject:nil waitUntilDone:NO];
             break;
 
-        case INPUT_EVENT_ABORT:
-            [[VLCMain sharedInstance] performSelectorOnMainThread:@selector(updateName) withObject: nil waitUntilDone:NO];
-            [[VLCMain sharedInstance] performSelectorOnMainThread:@selector(updatePlaybackPosition) withObject:nil waitUntilDone:NO];
-            break;
-
         default:
             break;
     }

diff --git a/src/input/event.c b/src/input/event.c
index 453e04bb6666389a887aa592e73924b27963b482..e32ca8a0bcbc5600025b05868b3a5ab093a8c9ae 100644 (file)
--- a/src/input/event.c
+++ b/src/input/event.c
@@ -55,10 +55,6 @@ void input_SendEventDead( input_thread_t *p_input )
 
     Trigger( p_input, INPUT_EVENT_DEAD );
 }
-void input_SendEventAbort( input_thread_t *p_input )
-{
-    Trigger( p_input, INPUT_EVENT_ABORT );
-}
 
 void input_SendEventPosition( input_thread_t *p_input, double f_position, mtime_t i_time )
 {

diff --git a/src/input/event.h b/src/input/event.h
index c8f1071bbb34a99394dd573da4f1d677a9d7cfa9..e91ad112d2739d9560543043d2532288e25fc503 100644 (file)
--- a/src/input/event.h
+++ b/src/input/event.h
@@ -30,7 +30,6 @@
  * Event for input.c
  *****************************************************************************/
 void input_SendEventDead( input_thread_t *p_input );
-void input_SendEventAbort( input_thread_t *p_input );
 void input_SendEventPosition( input_thread_t *p_input, double f_position, mtime_t i_time );
 void input_SendEventLength( input_thread_t *p_input, mtime_t i_length );
 void input_SendEventStatistics( input_thread_t *p_input );

diff --git a/src/input/input.c b/src/input/input.c
index 4e9fb491fd3b87c67c10e21abf739436788f2b68..7e6a12df926e63c8965b1f7c90608b8d0ec81309 100644 (file)
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -527,22 +527,14 @@ static void *Run( void *obj )
     input_thread_t *p_input = (input_thread_t *)obj;
     const int canc = vlc_savecancel();
 
-    if( Init( p_input ) )
-        goto exit;
-
-    MainLoop( p_input, true ); /* FIXME it can be wrong (like with VLM) */
-
-    /* Clean up */
-    End( p_input );
+    if( !Init( p_input ) )
+    {
+        MainLoop( p_input, true ); /* FIXME it can be wrong (like with VLM) */
 
-exit:
-    /* Tell we're dead */
-    vlc_mutex_lock( &p_input->p->lock_control );
-    const bool b_abort = p_input->p->b_abort;
-    vlc_mutex_unlock( &p_input->p->lock_control );
+        /* Clean up */
+        End( p_input );
+    }
 
-    if( b_abort )
-        input_SendEventAbort( p_input );
     input_SendEventDead( p_input );
 
     vlc_restorecancel( canc );