From: Ilkka Ollakka <ileoo@videolan.org>
Date: Mon, 16 Feb 2009 12:55:11 +0000 (+0200)
Subject: Revert "QT4: connect signal from inputmanager metaChanged to playlist-model so it... 
X-Git-Tag: 1.0.0-pre1~632
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=e49255cb910661e5a878297cc688d48b6e84fe46;p=vlc

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

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 eb1d55c0dc..4cb8c2cabe 100644
--- 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 1057e2f674..2dcaccbce5 100644
--- 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 9fde71365d..922447831d 100644
--- 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 );