Removed over-riding signal declaration from VideoPlayer.

This was causing the stateChanged signal not to propagate up to the Phonon client.  In the case of the mediaplayer demo, this causes the app not to show() the ancestor of the VideoWidget, resulting in the layout not being updated when the clip has been loaded.

This means that the hack to explicitly call show() on this ancestor from the backend has been removed.

Now the layout is correctly updated, but the size of VideoOutput::winId()->Rect() is still incorrect, so the hack to hard-code the screen rectangle passed to CVideoPlayerUtility is left in place.

1 files changed, 6 insertions, 6 deletions

diff --git a/src/3rdparty/phonon/mmf/mediaobject.cpp b/src/3rdparty/phonon/mmf/mediaobject.cpp
index 396f658..04b7dc7 100644
--- a/src/3rdparty/phonon/mmf/mediaobject.cpp
+++ b/src/3rdparty/phonon/mmf/mediaobject.cpp
@@ -322,12 +322,7 @@ void MMF::MediaObject::createPlayer(const MediaSource &source)
 	}
 	
 	m_player.reset(newPlayer);
-		
-	connect(m_player.data(), SIGNAL(totalTimeChanged(qint64)), SIGNAL(totalTimeChanged(qint64)));
-	connect(m_player.data(), SIGNAL(stateChanged(Phonon::State, Phonon::State)), SIGNAL(stateChanged(Phonon::State, Phonon::State)));
-	connect(m_player.data(), SIGNAL(finished()), SIGNAL(finished()));
-	connect(m_player.data(), SIGNAL(tick(qint64)), SIGNAL(tick(qint64)));
-	
+			
 	if(oldPlayerHasVideo != hasVideo())
 	{
 	    emit hasVideoChanged(hasVideo());
@@ -338,6 +333,11 @@ void MMF::MediaObject::createPlayer(const MediaSource &source)
 	    emit seekableChanged(isSeekable());
 	}
 	
+	connect(m_player.data(), SIGNAL(totalTimeChanged(qint64)), SIGNAL(totalTimeChanged(qint64)));
+	connect(m_player.data(), SIGNAL(stateChanged(Phonon::State, Phonon::State)), SIGNAL(stateChanged(Phonon::State, Phonon::State)));
+	connect(m_player.data(), SIGNAL(finished()), SIGNAL(finished()));
+	connect(m_player.data(), SIGNAL(tick(qint64)), SIGNAL(tick(qint64)));
+	
 	TRACE_EXIT_0();
 }