Revision: 201003 PDK_3.0.g
authorDremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
Tue, 02 Feb 2010 00:12:10 +0200
changeset 2 dec420019252
parent 1 6711b85517b7
child 6 7d91903f795f
child 7 5794cea85c20
child 15 cf5481c2bc0b
child 30 4f111d64a341
Revision: 201003 Kit: 201005
mediasettings/mediasettingsapp/src/MPSettingsNetworkSettingItemList.cpp
videocollection/hgmyvideos/tsrc/ut_vcxhgmyvideosmainview/conf/ui_VcxHgMyVideosMainViewTest.cfg
videocollection/mpxmyvideoscollection/src/vcxmyvideosmdsdb.cpp
videofeeds/hgvodui/src/vcxhgvodcontentlistimpl.cpp
videofeeds/hgvodui/src/vcxhgvodlistimplbase.cpp
videofeeds/hgvodui/src/vcxhgvodmainview.cpp
videofeeds/omaprovisioning/data/IptvOmaProvisioningAdapter.rss
videofeeds/omaprovisioning/data/IptvOmaProvisioningAdapterRes.rss
videofeeds/omaprovisioning/group/IptvOmaProvisioningAdapter.mmp
videofeeds/omaprovisioning/group/bld.inf
videofeeds/omaprovisioning/inc/CIptvOmaProvisioningAdapter.h
videofeeds/omaprovisioning/rom/videoomaprovisioningres.iby
videofeeds/omaprovisioning/src/CIptvOmaProvisioningAdapter.cpp
videofeeds/vcnsuiengine/src/vcxnsserviceprovider.cpp
videoplayback/videohelix/src/mpxvideoplaybackcontroller.cpp
videoplayback/videohelix/tsrc/ut_videohelixtest/src/mpxvideoaccessoryobserver_stub.cpp
videoplayback/videohelix/tsrc/ut_videohelixtest/src/videohelixtestbody.cpp
videoplayback/videoplaybackcontrols/src/mpxvideoplaybackmediadetailsviewer.cpp
videoplayback/videoplaybackcontrols/tsrc/videoplaybackcontrols_test/group/videoplaybackcontrolstest.mmp
videoplayback/videoplaybackcontrols/tsrc/videoplaybackcontrols_test/inc/mpxvpbc_stub.h
videoplayback/videoplaybackcontrols/tsrc/videoplaybackcontrols_test/inc/videoplaybackcontrolstest.h
videoplayback/videoplaybackcontrols/tsrc/videoplaybackcontrols_test/src/mpxvpbc_stub.cpp
videoplayback/videoplaybackcontrols/tsrc/videoplaybackcontrols_test/src/videoplaybackcontrolstestblocks.cpp
videoplayback/videoplaybackviews/src/mpxvideobaseplaybackview.cpp
videoplayback/videoplaybackviews/src/mpxvideoplaybackdisplayhandler.cpp
videoplayerapp/mpxvideoplayer/inc/mpxvideoplayerappuiengine.h
videoplayerapp/mpxvideoplayer/src/mpxvideoembeddedpdlhandler.cpp
videoplayerapp/mpxvideoplayer/src/mpxvideoplayerappuiengine.cpp
--- a/mediasettings/mediasettingsapp/src/MPSettingsNetworkSettingItemList.cpp	Tue Jan 26 12:00:59 2010 +0200
+++ b/mediasettings/mediasettingsapp/src/MPSettingsNetworkSettingItemList.cpp	Tue Feb 02 00:12:10 2010 +0200
@@ -15,7 +15,7 @@
 */
 
 
-// Version : %version: 9 %
+// Version : %version: 10 %
 
 
 
@@ -264,8 +264,8 @@
     CCmApplicationSettingsUi* settingsUi = CCmApplicationSettingsUi::NewL();
     CleanupStack::PushL ( settingsUi );
     
-    TCmSettingSelection selection; 
-    selection.iId = 0;
+    TCmSettingSelection selection;
+    selection.iId = iDefaultAP;
     selection.iResult = CMManager::EConnectionMethod;
     
     TUint listItems = CMManager::EShowConnectionMethods;
--- a/videocollection/hgmyvideos/tsrc/ut_vcxhgmyvideosmainview/conf/ui_VcxHgMyVideosMainViewTest.cfg	Tue Jan 26 12:00:59 2010 +0200
+++ b/videocollection/hgmyvideos/tsrc/ut_vcxhgmyvideosmainview/conf/ui_VcxHgMyVideosMainViewTest.cfg	Tue Feb 02 00:12:10 2010 +0200
@@ -2,9 +2,9 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of the License "Symbian Foundation License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
-* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
 * Initial Contributors:
 * Nokia Corporation - initial contribution.
--- a/videocollection/mpxmyvideoscollection/src/vcxmyvideosmdsdb.cpp	Tue Jan 26 12:00:59 2010 +0200
+++ b/videocollection/mpxmyvideoscollection/src/vcxmyvideosmdsdb.cpp	Tue Feb 02 00:12:10 2010 +0200
@@ -740,19 +740,9 @@
     //  This is a fix for setting the title always
     if ( !property || static_cast<CMdETextProperty*>(property)->Value().Length() == 0 )
         {
-        TEntry entry;
         TParse parse;
-
-        if ( iFs.Entry( aObject.Uri(), entry ) == KErrNone )
-            {
-            parse.Set( entry.iName, NULL, NULL );
-            }
-        else
-            {
-            parse.Set( aObject.Uri(), NULL, NULL );
-            }
-        aVideo.SetTextValueL( KMPXMediaGeneralTitle,
-                parse.Name());        
+        parse.Set( aObject.Uri(), NULL, NULL );
+        aVideo.SetTextValueL( KMPXMediaGeneralTitle, parse.Name() );
         }
 
     //3. DESCRIPTION
--- a/videofeeds/hgvodui/src/vcxhgvodcontentlistimpl.cpp	Tue Jan 26 12:00:59 2010 +0200
+++ b/videofeeds/hgvodui/src/vcxhgvodcontentlistimpl.cpp	Tue Feb 02 00:12:10 2010 +0200
@@ -563,10 +563,10 @@
 
         if( aSelected >= 0 && aSelected < contents.Count() )
             {
+            iModel.SetVcAppState( EStateBrowser );
+            
             OpenEmbeddedBrowserL( ( contents[aSelected] )->GetBrowserUrl() );
-            iModel.SetVcAppState( EStateBrowser );
             }
-        
         }
     }
 
--- a/videofeeds/hgvodui/src/vcxhgvodlistimplbase.cpp	Tue Jan 26 12:00:59 2010 +0200
+++ b/videofeeds/hgvodui/src/vcxhgvodlistimplbase.cpp	Tue Feb 02 00:12:10 2010 +0200
@@ -100,10 +100,6 @@
         urlToLaunch->Des().Append( KUrlLaunchParameter );
         urlToLaunch->Des().Append( *parsed );
 
-#if defined(__WINSCW__)
-        //custom ap overriden settings cannot be used in emulator environment
-        iLauncher->LaunchBrowserEmbeddedL( *urlToLaunch, NULL, this );
-#else
         //Get available iap and pass it to browser 
         TUint32 wap = iModel.GetAvailableWapIdL();
         if ( wap == 0 )
@@ -113,8 +109,11 @@
         TBrowserOverriddenSettings overriddenSettings;
         overriddenSettings.SetBrowserSetting( EBrowserOverSettingsCustomAp, wap );
 
-        iLauncher->LaunchBrowserEmbeddedL( *urlToLaunch, NULL, this, &overriddenSettings );
-#endif
+        // Check, that the state has not been changed while launching
+        if ( iModel.VcAppState() == EStateBrowser )
+            {
+            iLauncher->LaunchBrowserEmbeddedL( *urlToLaunch, NULL, this, &overriddenSettings );
+            }
 
         CleanupStack::PopAndDestroy( urlToLaunch );
         CleanupStack::PopAndDestroy( parsed );
--- a/videofeeds/hgvodui/src/vcxhgvodmainview.cpp	Tue Jan 26 12:00:59 2010 +0200
+++ b/videofeeds/hgvodui/src/vcxhgvodmainview.cpp	Tue Feb 02 00:12:10 2010 +0200
@@ -14,7 +14,7 @@
 * Description:   HG VOD Main view implementation*
 */
 
-// Version : %version: REL6_39 %
+// Version : %version: REL6_40 %
 
 #include <aknview.h>
 #include <aknViewAppUi.h>
@@ -298,6 +298,11 @@
                 iModel->HandleBack();
                 }
             
+            if ( iServiceList && iModel->VcAppState() == EStateBrowser )
+                {
+                iServiceList->CloseEmbeddedBrowser();
+                }            
+            
             TBool consumed  = iModel->HandleBack();
 
             ChangeListViewL();
--- a/videofeeds/omaprovisioning/data/IptvOmaProvisioningAdapter.rss	Tue Jan 26 12:00:59 2010 +0200
+++ b/videofeeds/omaprovisioning/data/IptvOmaProvisioningAdapter.rss	Tue Feb 02 00:12:10 2010 +0200
@@ -20,8 +20,6 @@
 //  INCLUDES
 #include <ecom/registryinfo.rh>
 #include "IptvOmaProvisioningAdapterUIDs.h"
-#include <eikon.rh>
-#include <ipvideo.loc>
 
 //  RESOURCE DEFINITIONS 
 // ---------------------------------------------------------
@@ -55,25 +53,4 @@
 		};
 	}
 
-// -----------------------------------------------------------------------------
-// r_iptv_oma_client_prov_summary_title
-// 
-// -----------------------------------------------------------------------------
-//
-RESOURCE LBUF r_iptv_oma_client_prov_summary_title
-	{
-	txt = qtn_vcx_ns_service_settings_title; 
-	}
-
-// ---------------------------------------------------------------------------
-// r_iptv_video_store_list
-// "Nokia video store"
-// NOTE Replaces provisioned logical text.
-// ---------------------------------------------------------------------------
-//
-RESOURCE LBUF r_iptv_video_store_list
-    {
-    txt = qtn_iptv_video_store_list;
-    }
-
 // End of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/videofeeds/omaprovisioning/data/IptvOmaProvisioningAdapterRes.rss	Tue Feb 02 00:12:10 2010 +0200
@@ -0,0 +1,38 @@
+/*
+* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:    Resources for Iptv OMA Provisioning adapter.*
+*/
+
+
+
+NAME    IOPA // 4 letter ID
+
+//  INCLUDES
+
+#include <eikon.rh>
+#include <ipvideo.loc>
+
+
+RESOURCE RSS_SIGNATURE { }
+
+// -----------------------------------------------------------------------------
+// r_iptv_oma_client_prov_summary_title
+// -----------------------------------------------------------------------------
+//
+RESOURCE LBUF r_iptv_oma_client_prov_summary_title
+    {
+    txt = qtn_vcx_ns_service_settings_title; 
+    }
+
+
--- a/videofeeds/omaprovisioning/group/IptvOmaProvisioningAdapter.mmp	Tue Jan 26 12:00:59 2010 +0200
+++ b/videofeeds/omaprovisioning/group/IptvOmaProvisioningAdapter.mmp	Tue Feb 02 00:12:10 2010 +0200
@@ -44,11 +44,15 @@
 APP_LAYER_SYSTEMINCLUDE
 
 SOURCEPATH      ../data
-START RESOURCE IptvOmaProvisioningAdapter.rss
+START RESOURCE  IptvOmaProvisioningAdapter.rss
+END // RESOURCE
+
+SOURCEPATH      ../data
+START RESOURCE  IptvOmaProvisioningAdapterRes.rss
 HEADER
-TARGETPATH resource/plugins
 LANGUAGE_IDS 
-END
+END // RESOURCE
+
 
 SOURCEPATH      ../src
 SOURCE          CIptvOmaProvisioningAdapter.cpp
@@ -60,6 +64,9 @@
 LIBRARY         iptvclientapi.lib
 LIBRARY         flogger.lib
 LIBRARY         efsrv.lib
+LIBRARY         iptvutil.lib
+LIBRARY         cone.lib                // CCoeEnv
+LIBRARY         commonengine.lib        // StringLoader
 
 // For RAPTOR compliancy
 LIBRARY         ecom.lib 
--- a/videofeeds/omaprovisioning/group/bld.inf	Tue Jan 26 12:00:59 2010 +0200
+++ b/videofeeds/omaprovisioning/group/bld.inf	Tue Feb 02 00:12:10 2010 +0200
@@ -22,7 +22,8 @@
 
 PRJ_EXPORTS
 
-../rom/videoomaprovisioning.iby        CORE_APP_LAYER_IBY_EXPORT_PATH(videoomaprovisioning.iby)
+../rom/videoomaprovisioning.iby    CORE_APP_LAYER_IBY_EXPORT_PATH(videoomaprovisioning.iby)
+../rom/videoomaprovisioningres.iby LANGUAGE_APP_LAYER_IBY_EXPORT_PATH(videoomaprovisioningres.iby)
 
 PRJ_MMPFILES
 IptvOmaProvisioningAdapter.mmp
--- a/videofeeds/omaprovisioning/inc/CIptvOmaProvisioningAdapter.h	Tue Jan 26 12:00:59 2010 +0200
+++ b/videofeeds/omaprovisioning/inc/CIptvOmaProvisioningAdapter.h	Tue Feb 02 00:12:10 2010 +0200
@@ -237,12 +237,6 @@
         void ConstructL();
         
         /**
-        * Loads localized texts from resource file.
-        * @param aResourceId Resource ID.
-        */
-        HBufC* LoadResourceTextL( TInt aResourceId ) const;
-
-        /**
         * Set given icon path. Whether it is drive independent filepath,
         * searches correct drive and fix it
         *
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/videofeeds/omaprovisioning/rom/videoomaprovisioningres.iby	Tue Feb 02 00:12:10 2010 +0200
@@ -0,0 +1,27 @@
+/*
+* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*/
+
+
+
+
+#ifndef __VIDEOOMAPROVISIONRES_IBY__
+#define __VIDEOOMAPROVISIONRES_IBY__
+
+#include <data_caging_paths_for_iby.hrh>
+
+data=DATAZ_\resource\Plugins\IptvOmaProvisioningAdapterRes.rsc    resource\Plugins\IptvOmaProvisioningAdapterRes.rsc
+
+#endif // __VIDEOOMAPROVISIONRES_IBY__
\ No newline at end of file
--- a/videofeeds/omaprovisioning/src/CIptvOmaProvisioningAdapter.cpp	Tue Jan 26 12:00:59 2010 +0200
+++ b/videofeeds/omaprovisioning/src/CIptvOmaProvisioningAdapter.cpp	Tue Feb 02 00:12:10 2010 +0200
@@ -25,11 +25,12 @@
 #include "IptvEngineUids.h"
 #include "CIptvUtil.h"
 #include <StringLoader.h>
-#include <IptvOmaProvisioningAdapter.rsg>
+#include <IptvOmaProvisioningAdapterRes.rsg>
 #include <bautils.h>
 #include <f32file.h>
 #include "iptvlocalisationliterals.h"
 #include <bautils.h>
+#include "CIptvResourceLoader.h"
 
 #include "CIptvService.h"
 #include "CIptvServices.h"
@@ -67,6 +68,8 @@
 
 const TInt KIptvDriveLetterSpace( 2 );
 
+_LIT( KIptvOmaProvisioningAdapterResFile, "\\Resource\\Plugins\\IptvOmaProvisioningAdapterRes.");
+
 // ================= MEMBER FUNCTIONS =======================
 
 // ---------------------------------------------------------
@@ -92,20 +95,31 @@
 
     iServices = CIptvServices::NewL();
 
-    HBufC* resourceText = LoadResourceTextL( R_IPTV_OMA_CLIENT_PROV_SUMMARY_TITLE );
-    CleanupStack::PushL( resourceText ); //1->
-    if ( resourceText->Des().Length() > KIptvOcpMaxSummaryTitleLength )
+    CCoeEnv* env = CCoeEnv::Static();
+    if( env )
         {
-        iSummaryTitle = resourceText->Des().Left( KIptvOcpMaxSummaryTitleLength - 1 );
-        }
-    else
-        {
-        iSummaryTitle = resourceText->Des();
-        }
-
-    IPTVLOGSTRING2_LOW_LEVEL( "CIptvOmaProvisioningAdapter:: iSummaryTitle = %S", &iSummaryTitle );
-
-    CleanupStack::PopAndDestroy( resourceText ); // <-1
+        CIptvResourceLoader* resourceLoader = CIptvResourceLoader::NewL( *env );   
+        if ( resourceLoader )
+            {
+            CleanupStack::PushL( resourceLoader );
+            resourceLoader->AddResourceL( KIptvOmaProvisioningAdapterResFile );
+            HBufC* resourceText = StringLoader::LoadLC( R_IPTV_OMA_CLIENT_PROV_SUMMARY_TITLE );
+            if ( resourceText->Des().Length() > KIptvOcpMaxSummaryTitleLength )
+                {
+                iSummaryTitle = resourceText->Des().Left( KIptvOcpMaxSummaryTitleLength - 1 );
+                }
+            else
+                {
+                iSummaryTitle = resourceText->Des();
+                }
+            CleanupStack::PopAndDestroy( resourceText );
+			CleanupStack::PopAndDestroy( resourceLoader );
+            }
+        else
+            {
+            User::Leave( KErrGeneral );
+            }
+        } 
     
     User::LeaveIfError( iFs.Connect() );
 
@@ -422,32 +436,6 @@
         case EWPParameterName:
             IPTVLOGSTRING_LOW_LEVEL( "CIptvOmaProvisioningAdapter:: parameter EWPParameterName -> collecting" );
 
-#if defined(__SERIES60_30__) || defined(__SERIES60_31__) || defined(__SERIES60_32__)
-
-            // Video Store name must be localised here.
-            if ( 0 == aParameter.Value().CompareF( KQtnIptvVideoStoreList ) )
-                {
-                HBufC* resourceText = LoadResourceTextL( R_IPTV_VIDEO_STORE_LIST );
-                if ( resourceText->Length() > KIptvSmServicesDbNameMaxLength )
-                    {
-                    IPTVLOGSTRING_LOW_LEVEL( "CIptvOmaProvisioningAdapter:: name too long! -> skipping value" );
-                    }
-                else
-                    {
-                    iCurrentService->SetName( *resourceText );
-                    }
-                delete resourceText;
-                }
-            else if ( aParameter.Value().Length() > KIptvSmServicesDbNameMaxLength )
-                {
-                IPTVLOGSTRING_LOW_LEVEL( "CIptvOmaProvisioningAdapter:: name too long! -> skipping value" );
-                }
-            else
-                {
-                iCurrentService->SetName( aParameter.Value() );
-                }
-
-#else // S60 5.0 ->
 
             if ( aParameter.Value().Length() > KIptvSmServicesDbNameMaxLength )
                 {
@@ -457,9 +445,6 @@
                 {
                 iCurrentService->SetName( aParameter.Value() );
                 }
-
-#endif // defined(__SERIES60_30__) || defined(__SERIES60_31__) || defined(__SERIES60_32__)
-
             break;
 
         case EWPParameterToNapID:
@@ -773,65 +758,6 @@
     }
 
 // -----------------------------------------------------------------------------
-// CIptvOmaProvisioningAdapter::LoadResourceTextL
-// -----------------------------------------------------------------------------
-//
-HBufC* CIptvOmaProvisioningAdapter::LoadResourceTextL( TInt aResourceId ) const
-    {        
-    IPTVLOGSTRING_LOW_LEVEL( "CIptvOmaProvisioningAdapter::LoadResourceTextL() start" );
-
-    // Open a file server session
-    RFs fs;
-    User::LeaveIfError( fs.Connect() );
-    CleanupClosePushL( fs ); // 1->
-
-    // Get the drive from DLL file name
-    TFileName dllName;
-    Dll::FileName( dllName );
-
-    TFileName fileName;
-    TParsePtrC parse( dllName );
-    fileName = parse.Drive();
-
-    _LIT(KIptvOcpResourcePath, "\\Resource\\Plugins\\");
-    fileName.Append( KIptvOcpResourcePath );
-
-    _LIT(KIptvOcpResourceFileName, "IptvOmaProvisioningAdapter.rsc");    
-    fileName.Append( KIptvOcpResourceFileName );
-
-    //Retrieve the correct suffix
-    BaflUtils::NearestLanguageFile( fs, fileName );
-
-    IPTVLOGSTRING2_LOW_LEVEL( "CIptvOmaProvisioningAdapter:: resource file = %S", &fileName );
-
-    //Open the file
-    RResourceFile resourceFile;
-    resourceFile.OpenL( fs, fileName );
-    CleanupClosePushL( resourceFile ); // 2->
- 
-    //Read data from resource file
-    HBufC8* resourceData = resourceFile.AllocReadLC( aResourceId ); // 3->
-    
-    //Extract text from data    
-    TResourceReader resReader;
-    resReader.SetBuffer( resourceData );    
-    HBufC* text = resReader.ReadHBufCL();
-    CleanupStack::PushL( text ); // 4->
-    
-    TPtr textPtr( text->Des() );
-    
-    IPTVLOGSTRING2_LOW_LEVEL( "CIptvOmaProvisioningAdapter:: resource text = %S", &textPtr );
-
-    CleanupStack::Pop( text );                    // <-4
-    CleanupStack::PopAndDestroy( resourceData );  // <-3
-    CleanupStack::PopAndDestroy( &resourceFile ); // <-2    
-    CleanupStack::PopAndDestroy( &fs );           // <-1
-
-    IPTVLOGSTRING_LOW_LEVEL( "CIptvOmaProvisioningAdapter::LoadResourceTextL() exit" );    
-    return text;
-    }
-
-// -----------------------------------------------------------------------------
 // CIptvOmaProvisioningAdapter::AddServiceResp
 // -----------------------------------------------------------------------------
 //
--- a/videofeeds/vcnsuiengine/src/vcxnsserviceprovider.cpp	Tue Jan 26 12:00:59 2010 +0200
+++ b/videofeeds/vcnsuiengine/src/vcxnsserviceprovider.cpp	Tue Feb 02 00:12:10 2010 +0200
@@ -16,7 +16,7 @@
 */
 
 
-// Version : %version: Rel6_49 %
+// Version : %version: Rel6_50 %
 
 // INCLUDE FILES
 #include <bldvariant.hrh>
@@ -710,6 +710,8 @@
         service = GetServiceData( aSelected );
         if ( service )
             {
+            iUiEngine.SetVcAppState( EStateBrowser );
+            
             for ( TInt i = 0; i < iServiceObservers.Count(); i++ )
                 {
                 if( iServiceObservers[i] )
@@ -718,7 +720,6 @@
                         service->AccountMgmtUri() );
                     }
                 }
-            iUiEngine.SetVcAppState( EStateBrowser );
             }
         }
     }
@@ -1372,6 +1373,8 @@
     {
     if ( aUri.Length() > 0 )
         {
+        iUiEngine.SetVcAppState( EStateBrowser );
+
         for ( TInt i = 0; i < iServiceObservers.Count(); i++ )
             {
             if( iServiceObservers[i] )
@@ -1379,7 +1382,6 @@
                 iServiceObservers[i]->OpenBrowserLinkL( aUri );
                 }
             }
-        iUiEngine.SetVcAppState( EStateBrowser );
         }
     }
 
--- a/videoplayback/videohelix/src/mpxvideoplaybackcontroller.cpp	Tue Jan 26 12:00:59 2010 +0200
+++ b/videoplayback/videohelix/src/mpxvideoplaybackcontroller.cpp	Tue Feb 02 00:12:10 2010 +0200
@@ -15,7 +15,7 @@
  *
 */
 
-// Version : %version: 40 %
+// Version : %version: ou1cpsw#41 %
 
 
 //
@@ -1728,13 +1728,6 @@
             iState->SendErrorToViewL( KMPXVideoTvOutPlaybackNotAllowed );
         }
     }
-    else
-    {
-        //
-        //  Pause playback since TV-Out accessory has been disconnected.
-        //
-        DoHandleCommandL( EPbCmdPause );
-    }
 
     //
     //  Send notice to the playback view with TV-Out connection status
--- a/videoplayback/videohelix/tsrc/ut_videohelixtest/src/mpxvideoaccessoryobserver_stub.cpp	Tue Jan 26 12:00:59 2010 +0200
+++ b/videoplayback/videohelix/tsrc/ut_videohelixtest/src/mpxvideoaccessoryobserver_stub.cpp	Tue Feb 02 00:12:10 2010 +0200
@@ -15,7 +15,7 @@
  *
 */
 
-// Version : %version: 2 %
+// Version : %version: 3 %
 
 //
 //  INCLUDE FILES
@@ -75,6 +75,9 @@
 
 void CMPXVideoAccessoryObserver::SetTvOutConnected( TBool aConnected )
 {
+    MPX_ENTER_EXIT(_L("CMPXVideoAccessoryObserver::SetTvOutConnected()"),
+                   _L("aConnected = %d"), aConnected);
+
     iTvOutConnected = aConnected;
 
     if ( ! iTvOutConnected )
@@ -85,6 +88,9 @@
 
 void CMPXVideoAccessoryObserver::SetTvOutPlaybackAllowed( TBool aAllowed )
 {
+    MPX_ENTER_EXIT(_L("CMPXVideoAccessoryObserver::SetTvOutPlaybackAllowed()"),
+                   _L("aAllowed = %d"), aAllowed);
+
     iTvOutPlaybackAllowed = aAllowed;
 }
 
@@ -99,21 +105,6 @@
     {
         iTvOutConnected = aTvOutConnected;
 
-        if ( iTvOutConnected )
-        {
-            //
-            //  Check the playablility of the clip
-            //
-            if ( iController )
-            {
-                iTvOutPlaybackAllowed = iController->iPlaybackMode->IsTvOutAllowedL();
-            }
-        }
-        else
-        {
-            iTvOutPlaybackAllowed = ETrue;
-        }
-
         iController->HandleTvOutEventL( iTvOutConnected );
     }
 
--- a/videoplayback/videohelix/tsrc/ut_videohelixtest/src/videohelixtestbody.cpp	Tue Jan 26 12:00:59 2010 +0200
+++ b/videoplayback/videohelix/tsrc/ut_videohelixtest/src/videohelixtestbody.cpp	Tue Feb 02 00:12:10 2010 +0200
@@ -15,7 +15,7 @@
 *
 */
 
-// Version : %version: 15 %
+// Version : %version: 16 %
 
 
 // [INCLUDE FILES] - do not remove
@@ -1959,6 +1959,8 @@
 
     if ( err == KErrNone )
     {
+        iAccObserver->SetTvOutPlaybackAllowed( playable );
+
         if ( ! playable )
         {
             TCallbackEvent* event = new TCallbackEvent;
--- a/videoplayback/videoplaybackcontrols/src/mpxvideoplaybackmediadetailsviewer.cpp	Tue Jan 26 12:00:59 2010 +0200
+++ b/videoplayback/videoplaybackcontrols/src/mpxvideoplaybackmediadetailsviewer.cpp	Tue Feb 02 00:12:10 2010 +0200
@@ -15,7 +15,7 @@
 *
 */
 
-// Version : %version:  e003sa33#10 %
+// Version : %version:  e003sa33#11 %
 
 
 // INCLUDE FILES
@@ -583,41 +583,49 @@
     iClipnameLabel = new (ELeave) CEikLabel;
     iClipnameLabel->SetContainerWindowL( *this );     
     iClipnameLabel->SetTextL( KNullDesC ); 
+    iClipnameLabel->SetLabelAlignment( ELayoutAlignBidi );
     
     // Title
     iTitleLabel = new (ELeave) CEikLabel;
     iTitleLabel->SetContainerWindowL( *this );     
     iTitleLabel->SetTextL( KNullDesC );     
+    iTitleLabel->SetLabelAlignment( ELayoutAlignBidi );
     
     // Artist
     iArtistLabel = new (ELeave) CEikLabel;
     iArtistLabel->SetContainerWindowL( *this );     
     iArtistLabel->SetTextL( KNullDesC );        
+    iArtistLabel->SetLabelAlignment( ELayoutAlignBidi );
     
     // Format
     iFormatLabel = new (ELeave) CEikLabel;
     iFormatLabel->SetContainerWindowL( *this );     
     iFormatLabel->SetTextL( KNullDesC );
+    iFormatLabel->SetLabelAlignment( ELayoutAlignBidi );
     
     // Resolution
     iResolutionLabel = new (ELeave) CEikLabel;
     iResolutionLabel->SetContainerWindowL( *this );     
     iResolutionLabel->SetTextL( KNullDesC );    
+    iResolutionLabel->SetLabelAlignment( ELayoutAlignBidi );
     
     // Duration
     iDurationLabel = new (ELeave) CEikLabel;
     iDurationLabel->SetContainerWindowL( *this );     
     iDurationLabel->SetTextL( KNullDesC );    
+    iDurationLabel->SetLabelAlignment( ELayoutAlignBidi );
     
     // Bitrate
     iBitrateLabel = new (ELeave) CEikLabel;
     iBitrateLabel->SetContainerWindowL( *this );     
     iBitrateLabel->SetTextL( KNullDesC );   
+    iBitrateLabel->SetLabelAlignment( ELayoutAlignBidi );
 
     // Additional Labels
     iAdditionalLabel = new (ELeave) CEikLabel;
     iAdditionalLabel->SetContainerWindowL( *this );     
     iAdditionalLabel->SetTextL( KNullDesC );   
+    iAdditionalLabel->SetLabelAlignment( ELayoutAlignBidi );
 
 } 
 
--- a/videoplayback/videoplaybackcontrols/tsrc/videoplaybackcontrols_test/group/videoplaybackcontrolstest.mmp	Tue Jan 26 12:00:59 2010 +0200
+++ b/videoplayback/videoplaybackcontrols/tsrc/videoplaybackcontrols_test/group/videoplaybackcontrolstest.mmp	Tue Feb 02 00:12:10 2010 +0200
@@ -2,9 +2,9 @@
 * Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of the License "Symbian Foundation License v1.0"
+* under the terms of "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
-* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
 * Initial Contributors:
 * Nokia Corporation - initial contribution.
@@ -15,7 +15,7 @@
 *
 */
 
-// Version : %version: e003sa33#8 %
+// Version : %version: 9 %
 
 
 
--- a/videoplayback/videoplaybackcontrols/tsrc/videoplaybackcontrols_test/inc/mpxvpbc_stub.h	Tue Jan 26 12:00:59 2010 +0200
+++ b/videoplayback/videoplaybackcontrols/tsrc/videoplaybackcontrols_test/inc/mpxvpbc_stub.h	Tue Feb 02 00:12:10 2010 +0200
@@ -2,9 +2,9 @@
 * Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of the License "Symbian Foundation License v1.0"
+* under the terms of "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
-* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
 * Initial Contributors:
 * Nokia Corporation - initial contribution.
@@ -15,7 +15,7 @@
 *
 */
 
-// Version : %version: e003sa33#7 %
+// Version : %version: 8 %
 
 
 
--- a/videoplayback/videoplaybackcontrols/tsrc/videoplaybackcontrols_test/inc/videoplaybackcontrolstest.h	Tue Jan 26 12:00:59 2010 +0200
+++ b/videoplayback/videoplaybackcontrols/tsrc/videoplaybackcontrols_test/inc/videoplaybackcontrolstest.h	Tue Feb 02 00:12:10 2010 +0200
@@ -2,9 +2,9 @@
 * Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of the License "Symbian Foundation License v1.0"
+* under the terms of "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
-* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
 * Initial Contributors:
 * Nokia Corporation - initial contribution.
@@ -15,7 +15,7 @@
 *
 */
 
-// Version : %version: e003sa33#8 %
+// Version : %version: 9 %
 
 
 
--- a/videoplayback/videoplaybackcontrols/tsrc/videoplaybackcontrols_test/src/mpxvpbc_stub.cpp	Tue Jan 26 12:00:59 2010 +0200
+++ b/videoplayback/videoplaybackcontrols/tsrc/videoplaybackcontrols_test/src/mpxvpbc_stub.cpp	Tue Feb 02 00:12:10 2010 +0200
@@ -2,9 +2,9 @@
 * Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of the License "Symbian Foundation License v1.0"
+* under the terms of "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
-* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
 * Initial Contributors:
 * Nokia Corporation - initial contribution.
@@ -15,7 +15,7 @@
 *
 */
 
-// Version : %version: e003sa33#11 %
+// Version : %version: 12 %
 
 
 // INCLUDES
--- a/videoplayback/videoplaybackcontrols/tsrc/videoplaybackcontrols_test/src/videoplaybackcontrolstestblocks.cpp	Tue Jan 26 12:00:59 2010 +0200
+++ b/videoplayback/videoplaybackcontrols/tsrc/videoplaybackcontrols_test/src/videoplaybackcontrolstestblocks.cpp	Tue Feb 02 00:12:10 2010 +0200
@@ -2,9 +2,9 @@
 * Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of the License "Symbian Foundation License v1.0"
+* under the terms of "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
-* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
 * Initial Contributors:
 * Nokia Corporation - initial contribution.
@@ -15,7 +15,7 @@
 *
 */
 
-// Version : %version: e003sa33#8 %
+// Version : %version: 9 %
 
 
 // [INCLUDE FILES] - do not remove
--- a/videoplayback/videoplaybackviews/src/mpxvideobaseplaybackview.cpp	Tue Jan 26 12:00:59 2010 +0200
+++ b/videoplayback/videoplaybackviews/src/mpxvideobaseplaybackview.cpp	Tue Feb 02 00:12:10 2010 +0200
@@ -15,7 +15,7 @@
 *
 */
 
-// Version : %version: 57 %
+// Version : %version: e003sa33#58 %
 
 
 //  Include Files
@@ -587,8 +587,10 @@
     //  This view is active since we are receiving the callback.
     //  Some new view is being activated so stop playback and return to automatic orientation
     //
-    HandleCommandL( EMPXPbvCmdStop );
-    AppUi()->SetOrientationL( CAknAppUiBase::EAppUiOrientationAutomatic );
+    TRAP_IGNORE(
+        HandleCommandL( EMPXPbvCmdStop );
+        AppUi()->SetOrientationL( CAknAppUiBase::EAppUiOrientationAutomatic );
+        );
 }
 
 // -------------------------------------------------------------------------------------------------
@@ -1624,6 +1626,7 @@
     RWsSession wsSession;
 
     User::LeaveIfError( wsSession.Connect() );
+    CleanupClosePushL( wsSession );
 
     if ( wsSession.Handle() )
     {
@@ -1643,7 +1646,7 @@
         delete wgList;
     }
 
-    wsSession.Close();
+    CleanupStack::PopAndDestroy(); //wsSession
 
     MPX_DEBUG(_L("CMPXVideoBasePlaybackView::IsAppInFrontL (%d)" ), ret);
 
@@ -2014,7 +2017,11 @@
 
         if ( openError == KErrNone )
         {
-            TRAP_IGNORE( drmUiHandling->ShowDetailsViewL(fileHandle) );
+            MPX_TRAPD( err, drmUiHandling->ShowDetailsViewL( fileHandle ) );
+            if ( KLeaveExit == err )
+            {
+                User::Leave( err );
+            }
         }
 #ifdef SYMBIAN_ENABLE_64_BIT_FILE_SERVER_API
         else if ( openError == KErrTooBig )
@@ -2025,9 +2032,12 @@
 
             if ( err == KErrNone && openError == KErrNone )
             {
-                TRAP_IGNORE( drmUiHandling->ShowDetailsViewL(fileHandle64) );
+                MPX_TRAPD( err, drmUiHandling->ShowDetailsViewL( fileHandle64 ) );
+                if ( KLeaveExit == err )
+                {
+                    User::Leave( err );
+                }
             }
-
             CleanupStack::PopAndDestroy(); // fileHandle64
         }
 #endif // SYMBIAN_ENABLE_64_BIT_FILE_SERVER_API
--- a/videoplayback/videoplaybackviews/src/mpxvideoplaybackdisplayhandler.cpp	Tue Jan 26 12:00:59 2010 +0200
+++ b/videoplayback/videoplaybackviews/src/mpxvideoplaybackdisplayhandler.cpp	Tue Feb 02 00:12:10 2010 +0200
@@ -15,7 +15,7 @@
 *
 */
 
-// Version : %version: 6 %
+// Version : %version: 7 %
 
 #include <sysutil.h>
 #include <s32file.h>
@@ -420,6 +420,8 @@
 {
     MPX_ENTER_EXIT(_L("CMPXVideoPlaybackDisplayHandler::SurfaceCreatedL()"));
 
+    TSurfaceId oldSurfaceId = iSurfaceId;
+    
     //
     //  Extract the surface parameters from the message
     //
@@ -432,7 +434,7 @@
         //
         //  Remove old surface if one exists
         //
-        if ( iSurfaceId.IsNull() )
+        if ( ! oldSurfaceId.IsNull() )
         {
             iVideoDisplay->RemoveSurface();
         }
--- a/videoplayerapp/mpxvideoplayer/inc/mpxvideoplayerappuiengine.h	Tue Jan 26 12:00:59 2010 +0200
+++ b/videoplayerapp/mpxvideoplayer/inc/mpxvideoplayerappuiengine.h	Tue Feb 02 00:12:10 2010 +0200
@@ -15,7 +15,7 @@
 *
 */
 
-// Version : %version: da1mmcf#26 %
+// Version : %version: da1mmcf#27 %
 
 
 #ifndef CMPXVIDEOPLAYERAPPUIENGINE_H
@@ -239,6 +239,8 @@
 
         void InitializeFileL( const TDesC& aFileName );
 
+        void ClosePlaybackPluginL();
+
     private:
         /**
          * Constructor
--- a/videoplayerapp/mpxvideoplayer/src/mpxvideoembeddedpdlhandler.cpp	Tue Jan 26 12:00:59 2010 +0200
+++ b/videoplayerapp/mpxvideoplayer/src/mpxvideoembeddedpdlhandler.cpp	Tue Feb 02 00:12:10 2010 +0200
@@ -12,10 +12,10 @@
 * Contributors:
 *
 * Description:  Handles PDL commands passed in by other appilcations
- *
+*
 */
 
-// Version : %version:  10 %
+// Version : %version:  11 %
 
 
 #include <mpxcommand.h>
@@ -105,7 +105,7 @@
             //
             //  New download received, close old playback plugin
             //
-            iAppUiEngine->PlaybackUtility()->CommandL( EPbCmdClose );
+            iAppUiEngine->ClosePlaybackPluginL();
 
             StartNewDownloadL( aDlId, aFileName );
         }
--- a/videoplayerapp/mpxvideoplayer/src/mpxvideoplayerappuiengine.cpp	Tue Jan 26 12:00:59 2010 +0200
+++ b/videoplayerapp/mpxvideoplayer/src/mpxvideoplayerappuiengine.cpp	Tue Feb 02 00:12:10 2010 +0200
@@ -15,7 +15,7 @@
 *
 */
 
-// Version : %version: da1mmcf#58 %
+// Version : %version: da1mmcf#59 %
 
 
 #include <eikon.hrh>
@@ -429,7 +429,7 @@
     else if ( iRecognizer->IsValidStreamingPrefix( aFileName ) ||
               mediaType == CMediaRecognizer::ELocalSdpFile )
     {
-    	InitializeStreamingLinkL( aFileName );
+        InitializeStreamingLinkL( aFileName );
     }
     else
     {
@@ -483,8 +483,8 @@
     if ( iUpdateSeekInfo )
     {
         //
-    	//  The plugin has been instantiated, update the media
-    	//
+        //  The plugin has been instantiated, update the media
+        //
         UpdatePbPluginMediaL();
         iUpdateSeekInfo = EFalse;
     }
@@ -524,7 +524,8 @@
 
     if ( iPlaybackUtility )
     {
-        iPlaybackUtility->CommandL( EPbCmdClose );
+        ClosePlaybackPluginL();
+        
         MMPXPlayerManager& manager = iPlaybackUtility->PlayerManager();
         TRAP_IGNORE( manager.ClearSelectPlayersL() );
     }
@@ -770,7 +771,7 @@
         }
         else
         {
-        	InitializeStreamingLinkL( link );
+            InitializeStreamingLinkL( link );
         }
         CleanupStack::PopAndDestroy();  // link
     }
@@ -1272,7 +1273,7 @@
 
     if ( aError == KErrNone )
     {
-    	InitializePlaylistL( aPlaylist, EFalse );
+        InitializePlaylistL( aPlaylist, EFalse );
     }
 }
 
@@ -1477,13 +1478,13 @@
 void CMpxVideoPlayerAppUiEngine::InitializeStreamingLinkL( const TDesC& aUri )
 {
     MPX_ENTER_EXIT(_L("CMpxVideoPlayerAppUiEngine::InitializeStreamingLinkL()"),
-    		       _L("aUri = %S"), &aUri );
+                   _L("aUri = %S"), &aUri );
 
     SetAccessPointL();
 
-	iPlaybackUtility->InitStreamingL( aUri,
-									  (TDesC8*)(&KDATATYPEVIDEOHELIX),
-									  iAccessPointId );
+    iPlaybackUtility->InitStreamingL( aUri,
+                                      (TDesC8*)(&KDATATYPEVIDEOHELIX),
+                                      iAccessPointId );
 
     ActivatePlaybackViewL();
 }
@@ -1495,9 +1496,9 @@
 void CMpxVideoPlayerAppUiEngine::InitializeFileL( const TDesC& aFileName )
 {
     MPX_ENTER_EXIT(_L("CMpxVideoPlayerAppUiEngine::InitializeFileL()"),
-    		       _L("aFileName = %S"), &aFileName );
+                   _L("aFileName = %S"), &aFileName );
 
-	iPlaybackUtility->InitL( aFileName );
+    iPlaybackUtility->InitL( aFileName );
 
     ActivatePlaybackViewL();
 }
@@ -1511,10 +1512,29 @@
 {
     MPX_ENTER_EXIT(_L("CMpxVideoPlayerAppUiEngine::InitializePlaylistL()"));
 
-	iPlaybackUtility->InitL( aPlaylist, aPlay );
+    iPlaybackUtility->InitL( aPlaylist, aPlay );
 
     ActivatePlaybackViewL();
 }
 
+// -------------------------------------------------------------------------------------------------
+//   CMpxVideoPlayerAppUiEngine::ClosePlaybackPluginL()
+// -------------------------------------------------------------------------------------------------
+//
+void CMpxVideoPlayerAppUiEngine::ClosePlaybackPluginL()
+{
+    MPX_ENTER_EXIT(_L("CMpxVideoPlayerAppUiEngine::ClosePlaybackPluginL"));
+
+    if ( iViewUtility->ActiveViewType() == TUid::Uid( KMpxPlaybackPluginTypeUid ) )
+    {
+        //
+        //  The display window must be removed before closing the playback plugin
+        //
+        iAppUi->View()->HandleCommandL( EAknSoftkeyClose );
+    }
+
+    iPlaybackUtility->CommandL( EPbCmdClose );
+}
+
 
 // EOF