--- a/videoplayback/videoplaybackview/controlsrc/videoplaybackcontrolscontroller.cpp	Mon Sep 20 18:25:37 2010 +0300
+++ b/videoplayback/videoplaybackview/controlsrc/videoplaybackcontrolscontroller.cpp	Tue Oct 05 09:26:49 2010 +0300
@@ -15,7 +15,7 @@
 *
 */
 
-// Version : %version: da1mmcf#54 %
+// Version : %version: da1mmcf#57 %
 
 
 
@@ -29,7 +29,6 @@
 #include <thumbnailmanager_qt.h>
 
 #include <hblabel.h>
-#include <hbvolumesliderpopup.h>
 #include <hbtransparentwindow.h>
 #include <hbiconanimationmanager.h>
 #include <shareui.h>
@@ -37,10 +36,11 @@
 #include <hbtapgesture.h>
 #include <hbpangesture.h>
 
-#include "mpxvideoviewwrapper.h"
+#include "videoservices.h"
 #include "videobaseplaybackview.h"
 #include "videoplaybackcontrolbar.h"
 #include "videoplaybackcontrolpolicy.h"
+#include "videoplaybackvolumecontrol.h"
 #include "videoplaybackdocumentloader.h"
 #include "videoplaybackviewfiledetails.h"
 #include "videoplaybackstatuspanecontrol.h"
@@ -49,7 +49,6 @@
 #include "videoplaybackcontrolscontroller.h"
 #include "videoplaybackcontrolconfiguration.h"
 #include "videoplaybackdetailsplaybackwindow.h"
-#include "videoservices.h"
 
 
 // ================= MEMBER FUNCTIONS ==============================================================
@@ -148,15 +147,6 @@
     mControlsConfig->createControlList();
 
     //
-    // Create volume popup control
-    //
-    mVolumeControl = new HbVolumeSliderPopup();
-    mVolumeControl->setVisible( false );
-    mVolumeControl->setTimeout( KControlsTimeOut );
-    mVolumeControl->setTickPosition( Hb::NoSliderTicks );
-    mVolumeControl->setRange( KPbPlaybackVolumeLevelMin, KPbPlaybackVolumeLevelMax );
-
-    //
     // grab tap gesture
     //
     mView->grabGesture( Qt::TapGesture );
@@ -283,7 +273,7 @@
     	mVideoServices->decreaseReferenceCount();
     	mVideoServices = 0;
     }
-    
+
     if( mShareUi )
     {
         delete mShareUi;
@@ -295,8 +285,7 @@
 // VideoPlaybackControlsController::addFileDetails()
 // -------------------------------------------------------------------------------------------------
 //
-void VideoPlaybackControlsController::addFileDetails(
-    VideoPlaybackViewFileDetails* details )
+void VideoPlaybackControlsController::addFileDetails( VideoPlaybackViewFileDetails* details )
 {
     MPX_ENTER_EXIT(_L("VideoPlaybackControlsController::addFileDetails"));
 
@@ -311,15 +300,6 @@
     evaluateAndChangeViewMode();
 
     //
-    // Dimmed the volume control if it is video only
-    //
-    if ( ! mFileDetails->mAudioEnabled )
-    {
-        mVolumeControl->setValue( 0 );
-        mVolumeControl->setEnabled( false );
-    }
-
-    //
     // grab pan gesture for playlist and seekable(skippable) clip
     //
     if ( mFileDetails->mMultiItemPlaylist && mFileDetails->mSeekable )
@@ -692,8 +672,6 @@
                 MPX_DEBUG(_L("    EIndicatorBitmap load IndicatorBitmaps ok = %d"), ok);
             }
 
-            widget = mLoader->findWidget( QString( "bitmapLayout" ) );
-
             HbWidget *bitmapWidget = qobject_cast<HbWidget*>( widget );
 
             setDefaultBitmap();
@@ -770,7 +748,7 @@
                     //
                     // If the volume control is visible, hide it
                     //
-                    if ( mVolumeControl->isVisible() )
+                    if ( mVolumeControl && mVolumeControl->isVisible() )
                     {
                         mVolumeControl->setVisible( false );
                     }
@@ -933,10 +911,12 @@
 {
     MPX_DEBUG(_L("VideoPlaybackControlsController::volumeChanged() [%d]"), volume);
 
-    if ( mVolumeControl )
+    if ( ! mVolumeControl )
     {
-        mVolumeControl->setValue( volume );
+        mVolumeControl = new VideoPlaybackVolumeControl( this );
     }
+
+    mVolumeControl->volumeChanged( volume );
 }
 
 // -------------------------------------------------------------------------------------------------
@@ -947,10 +927,12 @@
 {
     MPX_DEBUG(_L("VideoPlaybackControlsController::showVolumeControls()"));
 
-    if ( mVolumeControl )
+    if ( ! mVolumeControl )
     {
-        mVolumeControl->setVisible( true );
+        mVolumeControl = new VideoPlaybackVolumeControl( this );
     }
+
+    mVolumeControl->setVisible( true );
 }
 
 // -------------------------------------------------------------------------------------------------
@@ -1222,7 +1204,7 @@
 void VideoPlaybackControlsController::evaluateAndChangeViewMode(
         TPlaybackViewMode viewMode, bool transitionEffect )
 {
-    MPX_DEBUG(_L("VideoPlaybackControlsController::changeViewMode( %d, %d )"),
+    MPX_DEBUG(_L("VideoPlaybackControlsController::evaluateAndChangeViewMode( %d, %d )"),
             viewMode, transitionEffect );
 
     switch ( viewMode )
@@ -1361,8 +1343,12 @@
             rect = widget->geometry();
         }
 
+        //
+        // Turn off the transition effect since it hits performance with high resolution clip
+        // Need to test again with transition effect on with IVE 3.5
+        //
         mViewWrapper->UpdateVideoRect(
-                rect.x(), rect.y(), rect.width(), rect.height(), transitionEffect );
+                rect.x(), rect.y(), rect.width(), rect.height(), false );
     }
 }