Revert "QT4: connect signal from inputmanager metaChanged to playlist-model so it...

This reverts commit 394a9e2c128f34c183a2c4d9b7efc5ca5679afa7.

This doesn't really fix the issues, so better to revert and rework it.

diff --git a/modules/gui/qt4/components/playlist/playlist_model.cpp b/modules/gui/qt4/components/playlist/playlist_model.cpp
index eb1d55c0dc1001e20bdafec00d4ac4ef254ca456..4cb8c2cabedebbe7917b49fcb00061d57e69dc7a 100644 (file)
--- a/modules/gui/qt4/components/playlist/playlist_model.cpp
+++ b/modules/gui/qt4/components/playlist/playlist_model.cpp
@@ -528,14 +528,6 @@ void PLModel::customEvent( QEvent *event )
         rebuild();
 }
 
-void PLModel::updateMeta ( input_item_t *p_item )
-{
-    if( p_item )
-    {
-        ProcessInputItemUpdate( p_item->i_id );
-    }
-}
-
 /**** Events processing ****/
 void PLModel::ProcessInputItemUpdate( int i_input_id )
 {
@@ -631,9 +623,6 @@ void PLModel::rebuild( playlist_item_t *p_root )
     /* And signal the view */
     emit layoutChanged();
     addCallbacks();
-    /* Connect item update for metachanges */
-    CONNECT( THEMIM->getIM(), metaChanged( input_item_t *),
-             this, updateMeta( input_item_t *) );
 }
 
 /* This function must be entered WITH the playlist lock */

diff --git a/modules/gui/qt4/components/playlist/playlist_model.hpp b/modules/gui/qt4/components/playlist/playlist_model.hpp
index 1057e2f674ed996fa85dda00802ade61f9d74f7a..2dcaccbce5485f87367c20d02784dd52219f3668 100644 (file)
--- a/modules/gui/qt4/components/playlist/playlist_model.hpp
+++ b/modules/gui/qt4/components/playlist/playlist_model.hpp
@@ -178,7 +178,6 @@ private slots:
     void popupSave();
     void popupExplore();
     void viewchanged( int );
-    void updateMeta( input_item_t * );
 };
 
 #endif

diff --git a/src/input/event.c b/src/input/event.c
index 9fde71365d22e54405926388531b11928e06eee5..922447831d5d71969de56effc44158359ea7c227 100644 (file)
--- a/src/input/event.c
+++ b/src/input/event.c
@@ -69,12 +69,9 @@ void input_SendEventTimes( input_thread_t *p_input,
     val.i_time = i_time;
     var_Change( p_input, "time", VLC_VAR_SETVALUE, &val, NULL );
 
-    /* FIXME ugly */
+       /* FIXME ugly + what about meta change event ? */
     if( var_GetTime( p_input, "length" ) != i_length )
-    {
         input_item_SetDuration( p_input->p->p_item, i_length );
-        input_SendEventMeta( p_input );
-    }
     val.i_time = i_length;
     var_Change( p_input, "length", VLC_VAR_SETVALUE, &val, NULL );