Removed dummy VideoOutput instance.

This is part of an attempt to get the draggablevideo test app working on Symbian.  Use of the dummy video output object causes a top-level window to be created, which was suspected of being the reason why video is not visible.  This is not the case - for some reason, when the VideoOutput window is activated, it is still marked as 'hidden' by the window server (CWsClientWindow::ResetHiddenFlag, triggered from CCoeControl::ActivateL).

4 files changed, 79 insertions, 45 deletions

diff --git a/src/3rdparty/phonon/mmf/audioplayer.cpp b/src/3rdparty/phonon/mmf/audioplayer.cpp
index 3a4e04b..4119de6 100644
--- a/src/3rdparty/phonon/mmf/audioplayer.cpp
+++ b/src/3rdparty/phonon/mmf/audioplayer.cpp
@@ -97,7 +97,7 @@ int MMF::AudioPlayer::setDeviceVolume(int mmfVolume)
      * stack by doing a runtime check of the SDK version. */
 #if !defined(__SERIES60_31__)
     const int err = m_player->SetVolume(mmfVolume);
-    if (QSysInfo::s60Version() > QSysInfo::SV_S60_3_1)
+    if (QSysInfo::s60Version() >= QSysInfo::SV_S60_5_0)
         return err;
     else
         return KErrNone;
diff --git a/src/3rdparty/phonon/mmf/mmf_videoplayer.cpp b/src/3rdparty/phonon/mmf/mmf_videoplayer.cpp
index 64e6568..208c99e 100644
--- a/src/3rdparty/phonon/mmf/mmf_videoplayer.cpp
+++ b/src/3rdparty/phonon/mmf/mmf_videoplayer.cpp
@@ -16,11 +16,12 @@ along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
+#include <QApplication>	// for QApplication::activeWindow
 #include <QUrl>
 #include <QTimer>
 #include <QWidget>
 
-#include <coemain.h>    // For CCoeEnv
+#include <coemain.h>    // for CCoeEnv
 #include <coecntrl.h>
 
 #include "mmf_videoplayer.h"
@@ -65,11 +66,8 @@ void MMF::VideoPlayer::construct()
     TRACE_CONTEXT(VideoPlayer::VideoPlayer, EVideoApi);
     TRACE_ENTRY_0();
 
-    if (!m_videoOutput) {
-        m_dummyVideoOutput.reset(new VideoOutput(0));
-    }
-
-    videoOutput().setObserver(this);
+    if(m_videoOutput)
+    	m_videoOutput->setObserver(this);
 
     const TInt priority = 0;
     const TMdaPriorityPreference preference = EMdaPriorityPreferenceNone;
@@ -249,7 +247,8 @@ void MMF::VideoPlayer::MvpuoPrepareComplete(TInt aError)
     if (KErrNone == err) {
         maxVolumeChanged(m_player->MaxVolume());
 
-        videoOutput().setFrameSize(m_frameSize);
+        if(m_videoOutput)
+        	m_videoOutput->setFrameSize(m_frameSize);
 
         // See comment in updateMmfOutput
         if(m_mmfOutputChangePending) {
@@ -335,6 +334,38 @@ void MMF::VideoPlayer::videoOutputRegionChanged()
     TRACE_EXIT_0();
 }
 
+// DEBUGGING *** DO NOT INTEGRATE ***
+class CDummyAO : public CActive
+{
+public:
+	CDummyAO() : CActive(CActive::EPriorityStandard) { CActiveScheduler::Add(this); }
+	void RunL() { }
+	void DoCancel() { }
+	TRequestStatus& Status() { return iStatus; }
+	void SetActive() { CActive::SetActive(); }
+};
+
+// DEBUGGING *** DO NOT INTEGRATE ***
+void getDsaRegion(RWsSession &session, const RWindowBase &window)
+{
+	RDirectScreenAccess dsa(session);
+	TInt err = dsa.Construct();
+	CDummyAO ao;
+	RRegion* region;
+	err = dsa.Request(region, ao.Status(), window);
+	ao.SetActive();
+	dsa.Close();
+	ao.Cancel(); 
+	if(region) {
+		qDebug() << "Phonon::MMF::getDsaRegion count" << region->Count();
+		for(int i=0; i<region->Count(); ++i) {
+			const TRect& rect = region->RectangleList()[i];
+			qDebug() << "Phonon::MMF::getDsaRegion rect" << rect.iTl.iX << rect.iTl.iY << rect.iBr.iX << rect.iBr.iY;
+		}
+		region->Close();
+	}
+}
+
 void MMF::VideoPlayer::updateMmfOutput()
 {
     TRACE_CONTEXT(VideoPlayer::updateMmfOutput, EVideoInternal);
@@ -347,13 +378,10 @@ void MMF::VideoPlayer::updateMmfOutput()
     // MvpuoPrepareComplete, at which point the MMF controller has been
     // loaded.
     
-    // TODO: check whether videoOutput is visible?  If not, then the 
-    // corresponding window will not be active, meaning that the 
-    // clipping region will be set to empty and the video will not be
-    // visible.  If this is the case, we should set m_mmfOutputChangePending
-    // and respond to future showEvents from the videoOutput widget.
-    
     getNativeWindowSystemHandles();
+    
+// DEBUGGING *** DO NOT INTEGRATE ***
+getDsaRegion(*m_wsSession, *m_window);
 
     TRAPD(err,
           m_player->SetDisplayWindowL
@@ -379,28 +407,16 @@ void MMF::VideoPlayer::updateMmfOutput()
 // Private functions
 //-----------------------------------------------------------------------------
 
-VideoOutput& MMF::VideoPlayer::videoOutput()
-{
-    TRACE_CONTEXT(VideoPlayer::videoOutput, EVideoInternal);
-    TRACE("videoOutput 0x%08x dummy 0x%08x", m_videoOutput, m_dummyVideoOutput.data());
-
-    return m_videoOutput ? *m_videoOutput : *m_dummyVideoOutput;
-}
-
 void MMF::VideoPlayer::videoOutputChanged()
 {
     TRACE_CONTEXT(VideoPlayer::videoOutputChanged, EVideoInternal);
     TRACE_ENTRY_0();
 
-    // Lazily construct a dummy output if needed here
-    if (!m_videoOutput and m_dummyVideoOutput.isNull()) {
-        m_dummyVideoOutput.reset(new VideoOutput(0));
+    if(m_videoOutput) {
+		m_videoOutput->setObserver(this);
+		m_videoOutput->setFrameSize(m_frameSize);
     }
 
-    videoOutput().setObserver(this);
-
-    videoOutput().setFrameSize(m_frameSize);
-
     videoOutputRegionChanged();
 
     TRACE_EXIT_0();
@@ -410,9 +426,15 @@ void MMF::VideoPlayer::getNativeWindowSystemHandles()
 {
     TRACE_CONTEXT(VideoPlayer::getNativeWindowSystemHandles, EVideoInternal);
     TRACE_ENTRY_0();
-
-    VideoOutput& output = videoOutput();
-    CCoeControl* const control = output.winId();
+    
+    CCoeControl *control = 0;
+    
+    if(m_videoOutput)
+    	// Create native window
+    	control = m_videoOutput->winId();
+    else
+    	// Get top-level window
+    	control = QApplication::activeWindow()->effectiveWinId();
 
     CCoeEnv* const coeEnv = control->ControlEnv();
     m_wsSession = &(coeEnv->WsSession());
@@ -420,18 +442,29 @@ void MMF::VideoPlayer::getNativeWindowSystemHandles()
     m_window = control->DrawableWindow();
 
 #ifdef _DEBUG
-    QScopedPointer<ObjectDump::QDumper> dumper(new ObjectDump::QDumper);
-    dumper->setPrefix("Phonon::MMF"); // to aid searchability of logs
-    ObjectDump::addDefaultAnnotators(*dumper);
-    TRACE_0("Dumping VideoOutput:");
-    dumper->dumpObject(output);
+    if(m_videoOutput) {
+		QScopedPointer<ObjectDump::QDumper> dumper(new ObjectDump::QDumper);
+		dumper->setPrefix("Phonon::MMF"); // to aid searchability of logs
+		ObjectDump::addDefaultAnnotators(*dumper);
+		TRACE_0("Dumping VideoOutput:");
+		dumper->dumpObject(*m_videoOutput);
+    }
+    else {
+    	TRACE_0("m_videoOutput is null - dumping top-level control info:");
+		TRACE("control %08x", control);
+		TRACE("control.parent %08x", control->Parent());
+		TRACE("control.isVisible %d", control->IsVisible());
+		TRACE("control.rect %d,%d %dx%d",
+			control->Position().iX, control->Position().iY,
+			control->Size().iWidth, control->Size().iHeight);
+		TRACE("control.ownsWindow %d", control->OwnsWindow());
+    }
 #endif
 
     m_windowRect = TRect(
         control->DrawableWindow()->AbsPosition(),
         control->DrawableWindow()->Size());
-    
-    m_clipRect = m_windowRect;
+        m_clipRect = m_windowRect;
 
     TRACE("windowRect            %d %d - %d %d",
         m_windowRect.iTl.iX, m_windowRect.iTl.iY,
diff --git a/src/3rdparty/phonon/mmf/mmf_videoplayer.h b/src/3rdparty/phonon/mmf/mmf_videoplayer.h
index a805135..ee3650a 100644
--- a/src/3rdparty/phonon/mmf/mmf_videoplayer.h
+++ b/src/3rdparty/phonon/mmf/mmf_videoplayer.h
@@ -75,7 +75,6 @@ public:
 
 private:
     void construct();
-    VideoOutput& videoOutput();
 
     void doPrepareCompleteL(TInt aError);
 
@@ -87,7 +86,6 @@ private:
     
 private:
     QScopedPointer<CVideoPlayerUtility> m_player;
-    QScopedPointer<VideoOutput>         m_dummyVideoOutput;
 
     // Not owned
     RWsSession*                         m_wsSession;
diff --git a/src/3rdparty/phonon/mmf/mmfphonondebug/objectdump_symbian.cpp b/src/3rdparty/phonon/mmf/mmfphonondebug/objectdump_symbian.cpp
index f8adcd5..5ae10f9 100644
--- a/src/3rdparty/phonon/mmf/mmfphonondebug/objectdump_symbian.cpp
+++ b/src/3rdparty/phonon/mmf/mmfphonondebug/objectdump_symbian.cpp
@@ -82,9 +82,10 @@ QList<QByteArray> QAnnotatorWindow::annotation(const QObject& object)
             
             // ClientHandle() is available first in 5.0.
 #if !defined(__SERIES60_31__) && !defined(__S60_32__)
-            // Client-side window handle
-            // Cast to a void pointer so that log output is in hexadecimal format.
-            stream << "cli " << reinterpret_cast<const void*>(window.ClientHandle()) << ' ';
+            if (QSysInfo::s60Version() > QSysInfo::SV_S60_3_2)
+				// Client-side window handle
+				// Cast to a void pointer so that log output is in hexadecimal format.
+				stream << "cli " << reinterpret_cast<const void*>(window.ClientHandle()) << ' ';
 #endif
 
             // Server-side address of CWsWindow object
@@ -104,7 +105,9 @@ QList<QByteArray> QAnnotatorWindow::annotation(const QObject& object)
             stream << window.Size().iWidth << 'x' << window.Size().iHeight << ' ';
             
             const TDisplayMode displayMode = window.DisplayMode();
-            stream << "mode " << displayMode;
+            stream << "mode " << displayMode << ' ';
+            
+            stream << "ord " << window.OrdinalPosition();
             
             stream.flush();
             result.append(array);