videoplayback/hbvideoplaybackview/tsrc/testfullscreencontrol/src/testfullscreencontrol.cpp
--- a/videoplayback/hbvideoplaybackview/tsrc/testfullscreencontrol/src/testfullscreencontrol.cpp Thu Apr 01 23:32:44 2010 +0300
+++ b/videoplayback/hbvideoplaybackview/tsrc/testfullscreencontrol/src/testfullscreencontrol.cpp Fri Apr 16 18:13:14 2010 +0300
@@ -15,7 +15,7 @@
*
*/
-// Version : %version: 2 %
+// Version : %version: 3 %
#include <hbapplication.h>
@@ -78,9 +78,8 @@
{
MPX_ENTER_EXIT(_L("TestFullScreenControl::setup()"));
- mFileDetails = new QMPXVideoPlaybackViewFileDetails();
-
- mControlsController = new QMPXVideoPlaybackControlsController( mFileDetails );
+
+ mControlsController = new QMPXVideoPlaybackControlsController();
createControl( control );
}
@@ -130,12 +129,6 @@
{
MPX_ENTER_EXIT(_L("TestFullScreenControl::cleanup()"));
- if ( mFileDetails )
- {
- delete mFileDetails;
- mFileDetails = NULL;
- }
-
if ( mControlsController )
{
delete mControlsController;
@@ -163,18 +156,6 @@
}
// ---------------------------------------------------------------------------
-// main
-// ---------------------------------------------------------------------------
-//
-void TestFullScreenControl::testVolumeChanged()
-{
- setup( EMPXStatusPane );
-
- QVERIFY( ! mFullScreenControl->volumeChanged( 50 ) );
-
-}
-
-// ---------------------------------------------------------------------------
// testDurationChanged
// ---------------------------------------------------------------------------
//
@@ -264,15 +245,21 @@
{
MPX_ENTER_EXIT(_L("TestFullScreenControl::testUpdateControlsWithFileDetails()"));
- delete mFullScreenControl;
- mFullScreenControl = NULL;
+ QMPXVideoPlaybackViewFileDetails *fileDetails = new QMPXVideoPlaybackViewFileDetails();
+
setup( EMPXControlBar );
- mFileDetails->mPausableStream = true;
+ fileDetails->mPausableStream = true;
- mFullScreenControl->updateControlsWithFileDetails(mFileDetails);
+ mFullScreenControl->updateControlsWithFileDetails( fileDetails );
QVERIFY( static_cast<QMPXVideoPlaybackControlBar*>(mFullScreenControl->mControl)->mFileDetails->mPausableStream );
+
+ if ( fileDetails )
+ {
+ delete fileDetails;
+ fileDetails = NULL;
+ }
}
// ---------------------------------------------------------------------------