[vlc-commits] Qt, simplification: kill dead code

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri May 20 18:21:21 2011 +0200| [65d1e7848966911f24e8f45c629f391846538cc8] | committer: Jean-Baptiste Kempf

Qt, simplification: kill dead code

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=65d1e7848966911f24e8f45c629f391846538cc8
---

 modules/gui/qt4/input_manager.cpp |   14 +-------------
 modules/gui/qt4/qt4.cpp           |    2 +-
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp
index e8bdea4..f541992 100644
--- a/modules/gui/qt4/input_manager.cpp
+++ b/modules/gui/qt4/input_manager.cpp
@@ -958,19 +958,6 @@ MainInputManager::MainInputManager( intf_thread_t *_p_intf )
     DCONNECT( this, inputChanged( input_thread_t * ),
               im, setInput( input_thread_t * ) );
 
-    /* emit check if playlist has already started playing */
-    input_thread_t *p_input = playlist_CurrentInput( THEPL );
-    if( p_input )
-    {
-        input_item_t *p_item = input_GetItem( p_input );
-        if( p_item )
-        {
-            IMEvent *event = new IMEvent( ItemChanged_Type, p_item );
-            customEvent( event );
-            delete event;
-        }
-        vlc_object_release( p_input );
-    }
 }
 
 MainInputManager::~MainInputManager()
@@ -1042,6 +1029,7 @@ void MainInputManager::customEvent( QEvent *event )
     case LeafToParent_Type:
         imEv = static_cast<IMEvent*>( event );
         emit leafBecameParent( imEv->p_item );
+        return;
     default:
         if( type != ItemChanged_Type ) return;
     }
diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index be5aa3d..0ab6cf0 100644
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -32,7 +32,7 @@
 
 #include "qt4.hpp"
 
-#include "input_manager.hpp"    /* THEMIM creation */
+#include "input_manager.hpp"    /* THEMIM destruction */
 #include "dialogs_provider.hpp" /* THEDP creation */
 #include "main_interface.hpp"   /* MainInterface creation */
 #include "dialogs/help.hpp"     /* Launch Update */