Simplified handling of native window information in VideoPlayer

Now retrieve RWsSession and CScreenDevice from CCoeEnv::Static() once
(at construction), instead of at every call to
getNativeWindowSystemHandles().

Collapsed m_screenRect and m_clipRect into a single m_rect member,
since the two rectangles are always identical anyway.

Reviewed-by: Frans Englich

1 files changed, 4 insertions, 5 deletions

diff --git a/src/3rdparty/phonon/mmf/mmf_videoplayer.h b/src/3rdparty/phonon/mmf/mmf_videoplayer.h
index ee3650a..29e0839 100644
--- a/src/3rdparty/phonon/mmf/mmf_videoplayer.h
+++ b/src/3rdparty/phonon/mmf/mmf_videoplayer.h
@@ -88,12 +88,11 @@ private:
     QScopedPointer<CVideoPlayerUtility> m_player;
 
     // Not owned
-    RWsSession*                         m_wsSession;
-    CWsScreenDevice*                    m_screenDevice;
+    RWsSession&                         m_wsSession;
+    CWsScreenDevice&                    m_screenDevice;
     RWindowBase*                        m_window;
-    TRect                               m_windowRect;
-    TRect                               m_clipRect;
-    
+    TRect                               m_rect;
+
     QSize                               m_frameSize;
     qint64                              m_totalTime;