# HG changeset patch # User hgs # Date 1288862944 -7200 # Node ID 5af11d9814f546cbd1f631c7509ce98606d09436 # Parent bdf78597b41cf7262d8e17a1e6cde976257bc7e4 201044 diff -r bdf78597b41c -r 5af11d9814f5 package_definition.xml --- a/package_definition.xml Tue Jan 26 12:55:56 2010 +0200 +++ b/package_definition.xml Thu Nov 04 11:29:04 2010 +0200 @@ -1,56 +1,33 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r bdf78597b41c -r 5af11d9814f5 package_map.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/package_map.xml Thu Nov 04 11:29:04 2010 +0200 @@ -0,0 +1,1 @@ + diff -r bdf78597b41c -r 5af11d9814f5 videoscheduler/SchedulerServer/src/CCseScheduleDB.cpp --- a/videoscheduler/SchedulerServer/src/CCseScheduleDB.cpp Tue Jan 26 12:55:56 2010 +0200 +++ b/videoscheduler/SchedulerServer/src/CCseScheduleDB.cpp Thu Nov 04 11:29:04 2010 +0200 @@ -1430,11 +1430,16 @@ { CSELOGSTRING_HIGH_LEVEL(">>>CCseScheduleDB::CompactDb"); // Compact database - TInt err( iScheduleDb.Compact() ); - if ( err != KErrNone ) + + if( iDbAccess != ECseDbLocked ) { - CSELOGSTRING2_HIGH_LEVEL("iScheduleDb.Compact() failed: %d", err); + TInt err( iScheduleDb.Compact() ); + if ( err != KErrNone ) + { + CSELOGSTRING2_HIGH_LEVEL("iScheduleDb.Compact() failed: %d", err); + } } + // Cancel timer if it is running if ( iCompactTimer ) { @@ -1463,6 +1468,14 @@ { // Backup and restore starting, close the db CloseDbFile(); + + // Cancel timer if it is running + if ( iCompactTimer ) + { + iCompactTimer->Cancel(); + delete iCompactTimer; + iCompactTimer = NULL; + } } break; diff -r bdf78597b41c -r 5af11d9814f5 videoscheduler/SchedulerServer/src/CCseSchedulerServer.cpp --- a/videoscheduler/SchedulerServer/src/CCseSchedulerServer.cpp Tue Jan 26 12:55:56 2010 +0200 +++ b/videoscheduler/SchedulerServer/src/CCseSchedulerServer.cpp Thu Nov 04 11:29:04 2010 +0200 @@ -168,13 +168,14 @@ CTrapCleanup* cleanupStack = CTrapCleanup::New(); if ( !cleanupStack ) { - PanicServer( ECseCreateTrapCleanup ); + CSELOGSTRING_HIGH_LEVEL("CCseSchedulerServer::ThreadFunction - Could not create cleanupstack: %d"); + return KErrNone; } TRAPD( err, ThreadFunctionL( ) ); if ( err ) { - PanicServer( ECseSrvCreateServer ); + CSELOGSTRING2_HIGH_LEVEL("CCseSchedulerServer::ThreadFunction - Main thread leaved: %d", err ); } delete cleanupStack; @@ -300,17 +301,21 @@ void CCseSchedulerServer::DeleteSchedulerEngine() { CSELOGSTRING_HIGH_LEVEL(">>>CCseSchedulerServer::DeleteSchedulerEngine"); - + if ( iContainerIx ) { - iSchedulerEngine->Close(); + if( iObjectCon->Count() > 0 ) + { + iSchedulerEngine->Close(); + } + iContainerIx->Remove( iObjectCon ); delete iContainerIx; iContainerIx = NULL; iSchedulerEngine = NULL; } - - if( iStarterBreaker->IsActive() ) + + if( iStarterBreaker && iStarterBreaker->IsActive() ) { iStarterBreaker->Cancel(); } diff -r bdf78597b41c -r 5af11d9814f5 videoscheduler/SchedulerServer/src/CCseSchedulerServerEngine.cpp --- a/videoscheduler/SchedulerServer/src/CCseSchedulerServerEngine.cpp Tue Jan 26 12:55:56 2010 +0200 +++ b/videoscheduler/SchedulerServer/src/CCseSchedulerServerEngine.cpp Thu Nov 04 11:29:04 2010 +0200 @@ -56,6 +56,16 @@ // None. // ============================ MEMBER FUNCTIONS =============================== +// ----------------------------------------------------------------------------- +// CloseEngine +// CB method used if ConstructL leaves. Just calls Close to initiate proper +// shutdown sequence +// ----------------------------------------------------------------------------- +// +void CloseEngine( TAny* aPtr ) + { + static_cast( aPtr )->Close(); + } // ----------------------------------------------------------------------------- // CCseSchedulerServerEngine::CCseSchedulerServerEngine @@ -79,10 +89,10 @@ { CSELOGSTRING_HIGH_LEVEL(">>>CCseSchedulerServerEngine::NewL"); - CCseSchedulerServerEngine* self = new( ELeave ) CCseSchedulerServerEngine( aServer ); - CleanupStack::PushL( self ); + CCseSchedulerServerEngine* self = new( ELeave ) CCseSchedulerServerEngine( aServer ); + CleanupStack::PushL( TCleanupItem( CloseEngine, self ) ); self->ConstructL(); - CleanupStack::Pop( self ); + CleanupStack::Pop( ); // CleanupItem CSELOGSTRING_HIGH_LEVEL("<<>>CCseSchedulerServerEngine::ConstructL"); - + CSELOGSTRING_HIGH_LEVEL(">>>CCseSchedulerServerEngine::ConstructL"); + iDb = CCseScheduleDB::NewL(); iCompletitionBreaker = CIdle::NewL( CActive::EPriorityLow ); - + CSELOGSTRING_HIGH_LEVEL("<<>>CCseSchedulerServerEngine::~CCseSchedulerServerEngine"); - + delete iDb; iPluginControllerArray.ResetAndDestroy(); iPluginControllerArray.Close(); - delete iCompletitionBreaker; - + delete iCompletitionBreaker; + CSELOGSTRING_HIGH_LEVEL("<<>>CCseSchedulerServerEngine::IsSchedulerActive"); + CSELOGSTRING_HIGH_LEVEL(">>>CCseSchedulerServerEngine::Close"); while( AccessCount() >= 1 ) { Dec(); } - CSELOGSTRING_HIGH_LEVEL("<< diff -r bdf78597b41c -r 5af11d9814f5 videoutils_plat/videoconnutility_api/inc/ipvideo/vcxconnutilengineobserver.h --- a/videoutils_plat/videoconnutility_api/inc/ipvideo/vcxconnutilengineobserver.h Tue Jan 26 12:55:56 2010 +0200 +++ b/videoutils_plat/videoconnutility_api/inc/ipvideo/vcxconnutilengineobserver.h Thu Nov 04 11:29:04 2010 +0200 @@ -18,6 +18,9 @@ #ifndef _M_CVCX_CONUTILENGINEOBS_H__ #define _M_CVCX_CONUTILENGINEOBS_H__ +// Deprecation warning +#warning This header file has been deprecated. Will be removed in one of the next SDK releases. + // CLASS DECLARATION /** diff -r bdf78597b41c -r 5af11d9814f5 videoutils_plat/videoconnutility_api/tsrc/conf/VCXConnUtilTestSNAP.cfg --- a/videoutils_plat/videoconnutility_api/tsrc/conf/VCXConnUtilTestSNAP.cfg Tue Jan 26 12:55:56 2010 +0200 +++ b/videoutils_plat/videoconnutility_api/tsrc/conf/VCXConnUtilTestSNAP.cfg Thu Nov 04 11:29:04 2010 +0200 @@ -202,31 +202,31 @@ # Note: Disabled, shows IAP query notification. # #------------------------------------------------------------------------------------ -//[Test] -//title ET31104 Connect to destination with no IAP -//create VCXTestUtilModule Util - -// Destination with no IAPs -//allowerrorcodes KERRNOTFOUND -//Util DeleteDestination DEST_TEST -//pause 1000 -//Util CreateDestination DEST_TEST -//Util DeleteDestinationAfterwards DEST_TEST - -//create VCXConnUtilTest VCXCONN -//VCXCONN PrepareCase -//VCXCONN Create "MASTERPS" KVcxConnUtilTestModeBoth -//allownextresult KERRGENERAL -//VCXCONN GetIap DEST_TEST -//VCXCONN PrintConnUtilDetails -//VCXCONN CheckProperty EVCxPSConnectionStatus EVCxNotConnected - -//print OK! -//VCXCONN ShutdownTester -//delete VCXCONN -//pause 3000 -//delete Util -//[Endtest] +#[Test] +#title ET31104 Connect to destination with no IAP +#create VCXTestUtilModule Util +# +#Destination with no IAPs +#allowerrorcodes KERRNOTFOUND +#Util DeleteDestination DEST_TEST +#pause 1000 +#Util CreateDestination DEST_TEST +#Util DeleteDestinationAfterwards DEST_TEST +# +#create VCXConnUtilTest VCXCONN +#VCXCONN PrepareCase +#VCXCONN Create "MASTERPS" KVcxConnUtilTestModeBoth +#allownextresult KERRGENERAL +#VCXCONN GetIap DEST_TEST +#VCXCONN PrintConnUtilDetails +#VCXCONN CheckProperty EVCxPSConnectionStatus EVCxNotConnected +# +#print OK! +#VCXCONN ShutdownTester +#delete VCXCONN +#pause 3000 +#delete Util +#[Endtest] #------------------------------------------------------------------------------------ # @@ -236,7 +236,7 @@ #------------------------------------------------------------------------------------ #[Test] #title ET31106 Connect to destination with working and bad IAPs -#//create VCXTestUtilModule Util +#create VCXTestUtilModule Util #// Destination with good and bad IAP #allowerrorcodes KERRNOTFOUND @@ -272,42 +272,42 @@ # Test CVcxConnUtility class. # #------------------------------------------------------------------------------------ -[Test] -title ET31107 Connect to destination with bad and working IAPs -create VCXTestUtilModule Util - -// Destination with bad and good IAP -allowerrorcodes KERRNOTFOUND -Util DeleteDestination DEST_TEST -pause 1000 -Util CreateDestination DEST_TEST -Util SetUsedDestination DEST_TEST -Util DeleteDestinationAfterwards DEST_TEST -Util CopyMethod BAD_AP AP1 DEST_TEST -Util CopyMethod 3G_AP AP2 DEST_TEST -Util SetMethodPriority DEST_TEST AP1 0 -Util SetMethodPriority DEST_TEST AP2 1 - -create VCXConnUtilTest VCXCONN -VCXCONN PrepareCase -VCXCONN Create "MASTERPS" KVcxConnUtilTestModeBoth - -VCXCONN GetIap DEST_TEST -allowerrorcodes KERRGENERAL -waittestclass VCXCONN - -Util WaitForConnectionActivity AP2 -allowerrorcodes KERRTIMEDOUT -waittestclass Util - -VCXCONN CheckProperty EVCxPSConnectionStatus EVCxConnected - -print OK! -VCXCONN ShutdownTester -delete VCXCONN -pause 3000 -delete Util -[Endtest] +#[Test] +#title ET31107 Connect to destination with bad and working IAPs +#create VCXTestUtilModule Util +# +#// Destination with bad and good IAP +#allowerrorcodes KERRNOTFOUND +#Util DeleteDestination DEST_TEST +#pause 1000 +#Util CreateDestination DEST_TEST +#Util SetUsedDestination DEST_TEST +#Util DeleteDestinationAfterwards DEST_TEST +#Util CopyMethod BAD_AP AP1 DEST_TEST +#Util CopyMethod 3G_AP AP2 DEST_TEST +#Util SetMethodPriority DEST_TEST AP1 0 +#Util SetMethodPriority DEST_TEST AP2 1 +# +#create VCXConnUtilTest VCXCONN +#VCXCONN PrepareCase +#VCXCONN Create "MASTERPS" KVcxConnUtilTestModeBoth +# +#VCXCONN GetIap DEST_TEST +#allowerrorcodes KERRGENERAL +#waittestclass VCXCONN +# +#Util WaitForConnectionActivity AP2 +#allowerrorcodes KERRTIMEDOUT +#waittestclass Util +# +#VCXCONN CheckProperty EVCxPSConnectionStatus EVCxConnected +# +#print OK! +#VCXCONN ShutdownTester +#delete VCXCONN +#pause 3000 +#delete Util +#[Endtest] #------------------------------------------------------------------------------------ # @@ -975,109 +975,109 @@ # Test CVcxConnUtility class. # #------------------------------------------------------------------------------------ -[Test] -title ET31123 Connect, terminate connection 2nd app, connect -create VCXTestUtilModule Util - -allowerrorcodes KERRNOTFOUND -Util DeleteDestination DEST_TEST -pause 1000 -Util CreateDestination DEST_TEST -Util SetUsedDestination DEST_TEST -Util DeleteDestinationAfterwards DEST_TEST -Util CopyMethod 3G_AP AP1 DEST_TEST -Util CopyMethod 3G_AP AP2 DEST_TEST -Util SetMethodPriority DEST_TEST AP1 0 -Util SetMethodPriority DEST_TEST AP2 1 - -create VCXConnUtilTest VCXCONN -VCXCONN PrepareCase -VCXCONN Create "MASTERPS" KVcxConnUtilTestModeBoth - -VCXCONN GetIap DEST_TEST -waittestclass VCXCONN - -Util WaitForConnectionActivity AP1 -waittestclass Util - -Util Attach AP1 -Util Terminate -Util WaitUntilConnectionIsClosed AP1 -waittestclass Util - -pause 5000 - -VCXCONN GetIap DEST_TEST -waittestclass VCXCONN -VCXCONN PrintConnUtilDetails -VCXCONN CheckProperty EVCxPSConnectionStatus EVCxConnected - -pause 5000 - -Util WaitForConnectionActivity AP1 -waittestclass Util - -VCXCONN Disconnect -waittestclass VCXCONN - -print OK! -VCXCONN ShutdownTester -delete VCXCONN -pause 3000 -delete Util -[Endtest] +#[Test] +#title ET31123 Connect, terminate connection 2nd app, connect +#create VCXTestUtilModule Util +# +#allowerrorcodes KERRNOTFOUND +#Util DeleteDestination DEST_TEST +#pause 1000 +#Util CreateDestination DEST_TEST +#Util SetUsedDestination DEST_TEST +#Util DeleteDestinationAfterwards DEST_TEST +#Util CopyMethod 3G_AP AP1 DEST_TEST +#Util CopyMethod 3G_AP AP2 DEST_TEST +#Util SetMethodPriority DEST_TEST AP1 0 +#Util SetMethodPriority DEST_TEST AP2 1 +# +#create VCXConnUtilTest VCXCONN +#VCXCONN PrepareCase +#VCXCONN Create "MASTERPS" KVcxConnUtilTestModeBoth +# +#VCXCONN GetIap DEST_TEST +#waittestclass VCXCONN +# +#Util WaitForConnectionActivity AP1 +#waittestclass Util +# +#Util Attach AP1 +#Util Terminate +#Util WaitUntilConnectionIsClosed AP1 +#waittestclass Util +# +#pause 5000 +# +#VCXCONN GetIap DEST_TEST +#waittestclass VCXCONN +#VCXCONN PrintConnUtilDetails +#VCXCONN CheckProperty EVCxPSConnectionStatus EVCxConnected +# +#pause 5000 +# +#Util WaitForConnectionActivity AP1 +#waittestclass Util +# +#VCXCONN Disconnect +#waittestclass VCXCONN +# +#print OK! +#VCXCONN ShutdownTester +#delete VCXCONN +#pause 3000 +#delete Util +#[Endtest] #------------------------------------------------------------------------------------ # # Test CVcxConnUtility class. # #------------------------------------------------------------------------------------ -[Test] -title ET31124 Connect, terminate connection 2nd app, disconnect -create VCXTestUtilModule Util - -allowerrorcodes KERRNOTFOUND -Util DeleteDestination DEST_TEST -pause 1000 -Util CreateDestination DEST_TEST -Util SetUsedDestination DEST_TEST -Util DeleteDestinationAfterwards DEST_TEST -Util CopyMethod 3G_AP AP1 DEST_TEST -Util CopyMethod 3G_AP AP2 DEST_TEST -Util SetMethodPriority DEST_TEST AP1 0 -Util SetMethodPriority DEST_TEST AP2 1 -pause 2000 - -create VCXConnUtilTest VCXCONN -VCXCONN PrepareCase -VCXCONN Create "MASTERPS" KVcxConnUtilTestModeBoth - -VCXCONN GetIap DEST_TEST -waittestclass VCXCONN - -Util WaitForConnectionActivity AP1 -waittestclass Util -pause 500 - -Util Attach AP1 -pause 500 -Util Terminate -pause 500 -Util WaitUntilConnectionIsClosed AP1 -waittestclass Util -pause 500 -VCXCONN Disconnect -waittestclass VCXCONN -pause 500 -VCXCONN PrintConnUtilDetails -VCXCONN CheckProperty EVCxPSConnectionStatus EVCxNotConnected - -print OK! -VCXCONN ShutdownTester -delete VCXCONN -pause 3000 -delete Util -[Endtest] +#[Test] +#title ET31124 Connect, terminate connection 2nd app, disconnect +#create VCXTestUtilModule Util +# +#allowerrorcodes KERRNOTFOUND +#Util DeleteDestination DEST_TEST +#pause 1000 +#Util CreateDestination DEST_TEST +#Util SetUsedDestination DEST_TEST +#Util DeleteDestinationAfterwards DEST_TEST +#Util CopyMethod 3G_AP AP1 DEST_TEST +#Util CopyMethod 3G_AP AP2 DEST_TEST +#Util SetMethodPriority DEST_TEST AP1 0 +#Util SetMethodPriority DEST_TEST AP2 1 +#pause 2000 +# +#create VCXConnUtilTest VCXCONN +#VCXCONN PrepareCase +#VCXCONN Create "MASTERPS" KVcxConnUtilTestModeBoth +# +#VCXCONN GetIap DEST_TEST +#waittestclass VCXCONN +# +#Util WaitForConnectionActivity AP1 +#waittestclass Util +#pause 500 +# +#Util Attach AP1 +#pause 500 +#Util Terminate +#pause 500 +#Util WaitUntilConnectionIsClosed AP1 +#waittestclass Util +#pause 500 +#VCXCONN Disconnect +#waittestclass VCXCONN +#pause 500 +#VCXCONN PrintConnUtilDetails +#VCXCONN CheckProperty EVCxPSConnectionStatus EVCxNotConnected +# +#print OK! +#VCXCONN ShutdownTester +#delete VCXCONN +#pause 3000 +#delete Util +#[Endtest] #------------------------------------------------------------------------------------ # @@ -1122,104 +1122,54 @@ # Test CVcxConnUtility class. # #------------------------------------------------------------------------------------ -[Test] -title ET31127 Roaming - Connect 3G, WLAN becomes available -create VCXTestUtilModule Util - -allowerrorcodes KERRNOTFOUND -Util DeleteDestination DEST_TEST -pause 1000 -Util CreateDestination DEST_TEST -Util SetUsedDestination DEST_TEST -Util DeleteDestinationAfterwards DEST_TEST -Util CopyMethod 3G_AP AP2 DEST_TEST -Util SetMethodPriority DEST_TEST AP2 1 - -create VCXConnUtilTest VCXCONN -VCXCONN PrepareCase -VCXCONN Create "MASTERPS" KVcxConnUtilTestModeBoth - -VCXCONN AddWaitedProperty EVCxPSConnectionStatus EVCxConnected -VCXCONN AddWaitedProperty EVCxPSConnectionStatus EVCxRoamingRequest -VCXCONN AddWaitedProperty EVCxPSNbRoamAccepted 1 -VCXCONN AddWaitedProperty EVCxPSConnectionStatus EVCxConnected - -VCXCONN GetIap DEST_TEST -waittestclass VCXCONN - -Util WaitForConnectionActivity AP2 -waittestclass Util -VCXCONN PrintConnUtilDetails -VCXCONN CheckProperty EVCxPSConnectionStatus EVCxConnected - -Util CopyMethod WLAN_AP AP3 DEST_TEST -Util SetMethodPriority DEST_TEST AP3 0 - -VCXCONN WaitForPropertyQueue -waittestclass VCXCONN - -VCXCONN PrintConnUtilDetails -VCXCONN CheckProperty EVCxPSConnectionStatus EVCxConnected - -Util WaitForConnectionActivity AP3 -waittestclass Util - -print OK! -VCXCONN ShutdownTester -delete VCXCONN -pause 3000 -delete Util -[Endtest] - -#------------------------------------------------------------------------------------ +#[Test] +#title ET31127 Roaming - Connect 3G, WLAN becomes available +#create VCXTestUtilModule Util +# +#allowerrorcodes KERRNOTFOUND +#Util DeleteDestination DEST_TEST +#pause 1000 +#Util CreateDestination DEST_TEST +#Util SetUsedDestination DEST_TEST +#Util DeleteDestinationAfterwards DEST_TEST +#Util CopyMethod 3G_AP AP2 DEST_TEST +#Util SetMethodPriority DEST_TEST AP2 1 +# +#create VCXConnUtilTest VCXCONN +#VCXCONN PrepareCase +#VCXCONN Create "MASTERPS" KVcxConnUtilTestModeBoth +# +#VCXCONN AddWaitedProperty EVCxPSConnectionStatus EVCxConnected +#VCXCONN AddWaitedProperty EVCxPSConnectionStatus EVCxRoamingRequest +#VCXCONN AddWaitedProperty EVCxPSNbRoamAccepted 1 +#VCXCONN AddWaitedProperty EVCxPSConnectionStatus EVCxConnected # -# Test CVcxConnUtility class. +#VCXCONN GetIap DEST_TEST +#waittestclass VCXCONN +# +#Util WaitForConnectionActivity AP2 +#waittestclass Util +#VCXCONN PrintConnUtilDetails +#VCXCONN CheckProperty EVCxPSConnectionStatus EVCxConnected +# +#Util CopyMethod WLAN_AP AP3 DEST_TEST +#Util SetMethodPriority DEST_TEST AP3 0 # -#------------------------------------------------------------------------------------ -[Test] -title ET31128 Roaming - Connect WLAN, 3G becomes available -create VCXTestUtilModule Util - -allowerrorcodes KERRNOTFOUND -Util DeleteDestination DEST_TEST -pause 1000 -Util CreateDestination DEST_TEST -Util SetUsedDestination DEST_TEST -Util DeleteDestinationAfterwards DEST_TEST -Util CopyMethod WLAN_AP AP2 DEST_TEST -Util SetMethodPriority DEST_TEST AP2 1 - -create VCXConnUtilTest VCXCONN -VCXCONN PrepareCase -VCXCONN Create "MASTERPS" KVcxConnUtilTestModeBoth -VCXCONN GetIap DEST_TEST -waittestclass VCXCONN - -Util WaitForConnectionActivity AP2 -waittestclass Util -VCXCONN PrintConnUtilDetails -VCXCONN CheckProperty EVCxPSConnectionStatus EVCxConnected - -Util CopyMethod 3G_AP AP3 DEST_TEST -Util SetMethodPriority DEST_TEST AP3 0 - -pause 5000 - -Util WaitForConnectionActivity AP2 -waittestclass Util - -Util WaitUntilConnectionIsClosed AP3 -waittestclass Util - -VCXCONN PrintConnUtilDetails -VCXCONN CheckProperty EVCxPSConnectionStatus EVCxConnected - -print OK! -VCXCONN ShutdownTester -delete VCXCONN -pause 3000 -delete Util -[Endtest] +#VCXCONN WaitForPropertyQueue +#waittestclass VCXCONN +# +#VCXCONN PrintConnUtilDetails +#VCXCONN CheckProperty EVCxPSConnectionStatus EVCxConnected +# +#Util WaitForConnectionActivity AP3 +#waittestclass Util +# +#print OK! +#VCXCONN ShutdownTester +#delete VCXCONN +#pause 3000 +#delete Util +#[Endtest] #------------------------------------------------------------------------------------ # @@ -1227,116 +1177,166 @@ # #------------------------------------------------------------------------------------ [Test] -title ET31129 Roaming - Connect WLAN, another WLAN becomes available -create VCXTestUtilModule Util - -allowerrorcodes KERRNOTFOUND -Util DeleteDestination DEST_TEST -pause 1000 -Util CreateDestination DEST_TEST -Util SetUsedDestination DEST_TEST -Util DeleteDestinationAfterwards DEST_TEST -Util CopyMethod WLAN_AP AP2 DEST_TEST -Util SetMethodPriority DEST_TEST AP2 1 - -create VCXConnUtilTest VCXCONN -VCXCONN PrepareCase -VCXCONN Create "MASTERPS" KVcxConnUtilTestModeBoth -VCXCONN GetIap DEST_TEST -waittestclass VCXCONN - -Util WaitForConnectionActivity AP2 -waittestclass Util - -VCXCONN PrintConnUtilDetails -VCXCONN CheckProperty EVCxPSConnectionStatus EVCxConnected - -Util CopyMethod WLAN_AP2 AP3 DEST_TEST -Util SetMethodPriority DEST_TEST AP3 0 - -pause 5000 - -Util WaitForConnectionActivity AP2 -waittestclass Util - -Util WaitUntilConnectionIsClosed AP3 -waittestclass Util - -VCXCONN PrintConnUtilDetails -VCXCONN CheckProperty EVCxPSConnectionStatus EVCxConnected - -VCXCONN AddWaitedProperty EVCxPSConnectionStatus EVCxNotConnected - -VCXCONN Disconnect -waittestclass VCXCONN - -VCXCONN WaitForPropertyQueue -waittestclass VCXCONN - -print OK! -VCXCONN ShutdownTester -delete VCXCONN -pause 3000 -delete Util -[Endtest] +#title ET31128 Roaming - Connect WLAN, 3G becomes available +#create VCXTestUtilModule Util +# +#allowerrorcodes KERRNOTFOUND +#Util DeleteDestination DEST_TEST +#pause 1000 +#Util CreateDestination DEST_TEST +#Util SetUsedDestination DEST_TEST +#Util DeleteDestinationAfterwards DEST_TEST +#Util CopyMethod WLAN_AP AP2 DEST_TEST +#Util SetMethodPriority DEST_TEST AP2 1 +# +#create VCXConnUtilTest VCXCONN +#VCXCONN PrepareCase +#VCXCONN Create "MASTERPS" KVcxConnUtilTestModeBoth +#VCXCONN GetIap DEST_TEST +#waittestclass VCXCONN +# +#Util WaitForConnectionActivity AP2 +#waittestclass Util +#VCXCONN PrintConnUtilDetails +#VCXCONN CheckProperty EVCxPSConnectionStatus EVCxConnected +# +#Util CopyMethod 3G_AP AP3 DEST_TEST +#Util SetMethodPriority DEST_TEST AP3 0 +# +#pause 5000 +# +#Util WaitForConnectionActivity AP2 +#waittestclass Util +# +#Util WaitUntilConnectionIsClosed AP3 +#waittestclass Util +# +#VCXCONN PrintConnUtilDetails +#VCXCONN CheckProperty EVCxPSConnectionStatus EVCxConnected +# +#print OK! +#VCXCONN ShutdownTester +#delete VCXCONN +#pause 3000 +#delete Util +#[Endtest] #------------------------------------------------------------------------------------ # # Test CVcxConnUtility class. # #------------------------------------------------------------------------------------ -[Test] -title ET31130 Roaming not allowed - Connect 3G, WLAN becomes available -create VCXTestUtilModule Util - -allowerrorcodes KERRNOTFOUND -Util DeleteDestination DEST_TEST -pause 1000 -Util CreateDestination DEST_TEST -Util SetUsedDestination DEST_TEST -Util DeleteDestinationAfterwards DEST_TEST -Util CopyMethod 3G_AP AP2 DEST_TEST -Util SetMethodPriority DEST_TEST AP2 1 - -create VCXConnUtilTest VCXCONN -VCXCONN PrepareCase -VCXCONN Create "MASTERPS" KVcxConnUtilTestModeBoth - -VCXCONN AddWaitedProperty EVCxPSConnectionStatus EVCxConnected -//VCXCONN AddWaitedProperty EVCxPSConnectionStatus EVCxRoamingRequest -VCXCONN AddWaitedProperty EVCxPSNbRoamAccepted 0 -VCXCONN AddWaitedProperty EVCxPSConnectionStatus EVCxConnected - -VCXCONN GetIap DEST_TEST -waittestclass VCXCONN -VCXCONN SetRoamingAllowed 0 +#[Test] +#title ET31129 Roaming - Connect WLAN, another WLAN becomes available +#create VCXTestUtilModule Util +# +#allowerrorcodes KERRNOTFOUND +#Util DeleteDestination DEST_TEST +#pause 1000 +#Util CreateDestination DEST_TEST +#Util SetUsedDestination DEST_TEST +#Util DeleteDestinationAfterwards DEST_TEST +#Util CopyMethod WLAN_AP AP2 DEST_TEST +#Util SetMethodPriority DEST_TEST AP2 1 +# +#create VCXConnUtilTest VCXCONN +#VCXCONN PrepareCase +#VCXCONN Create "MASTERPS" KVcxConnUtilTestModeBoth +#VCXCONN GetIap DEST_TEST +#waittestclass VCXCONN +# +#Util WaitForConnectionActivity AP2 +#waittestclass Util +# +#VCXCONN PrintConnUtilDetails +#VCXCONN CheckProperty EVCxPSConnectionStatus EVCxConnected +# +#Util CopyMethod WLAN_AP2 AP3 DEST_TEST +#Util SetMethodPriority DEST_TEST AP3 0 +# +#pause 5000 +# +#Util WaitForConnectionActivity AP2 +#waittestclass Util +# +#Util WaitUntilConnectionIsClosed AP3 +#waittestclass Util +# +#VCXCONN PrintConnUtilDetails +#VCXCONN CheckProperty EVCxPSConnectionStatus EVCxConnected +# +#VCXCONN AddWaitedProperty EVCxPSConnectionStatus EVCxNotConnected +# +#VCXCONN Disconnect +#waittestclass VCXCONN +# +#VCXCONN WaitForPropertyQueue +#waittestclass VCXCONN +# +#print OK! +#VCXCONN ShutdownTester +#delete VCXCONN +#pause 3000 +#delete Util +#[Endtest] -Util WaitForConnectionActivity AP2 -waittestclass Util -VCXCONN PrintConnUtilDetails -VCXCONN CheckProperty EVCxPSConnectionStatus EVCxConnected - -Util CopyMethod WLAN_AP AP3 DEST_TEST -Util SetMethodPriority DEST_TEST AP3 0 - -VCXCONN WaitForPropertyQueue -waittestclass VCXCONN - -Util WaitForConnectionActivity AP2 -waittestclass Util - -Util WaitUntilConnectionIsClosed AP3 -waittestclass Util - -VCXCONN PrintConnUtilDetails -VCXCONN CheckProperty EVCxPSConnectionStatus EVCxConnected - -print OK! -VCXCONN ShutdownTester -delete VCXCONN -pause 3000 -delete Util -[Endtest] +#------------------------------------------------------------------------------------ +# +# Test CVcxConnUtility class. +# +#------------------------------------------------------------------------------------ +#[Test] +#title ET31130 Roaming not allowed - Connect 3G, WLAN becomes available +#create VCXTestUtilModule Util +# +#allowerrorcodes KERRNOTFOUND +#Util DeleteDestination DEST_TEST +#pause 1000 +#Util CreateDestination DEST_TEST +#Util SetUsedDestination DEST_TEST +#Util DeleteDestinationAfterwards DEST_TEST +#Util CopyMethod 3G_AP AP2 DEST_TEST +#Util SetMethodPriority DEST_TEST AP2 1 +# +#create VCXConnUtilTest VCXCONN +#VCXCONN PrepareCase +#VCXCONN Create "MASTERPS" KVcxConnUtilTestModeBoth +# +#VCXCONN AddWaitedProperty EVCxPSConnectionStatus EVCxConnected +#//VCXCONN AddWaitedProperty EVCxPSConnectionStatus EVCxRoamingRequest +#VCXCONN AddWaitedProperty EVCxPSNbRoamAccepted 0 +#VCXCONN AddWaitedProperty EVCxPSConnectionStatus EVCxConnected +# +#VCXCONN GetIap DEST_TEST +#waittestclass VCXCONN +#VCXCONN SetRoamingAllowed 0 +# +#Util WaitForConnectionActivity AP2 +#waittestclass Util +#VCXCONN PrintConnUtilDetails +#VCXCONN CheckProperty EVCxPSConnectionStatus EVCxConnected +# +#Util CopyMethod WLAN_AP AP3 DEST_TEST +#Util SetMethodPriority DEST_TEST AP3 0 +# +#VCXCONN WaitForPropertyQueue +#waittestclass VCXCONN +# +#Util WaitForConnectionActivity AP2 +#waittestclass Util +# +#Util WaitUntilConnectionIsClosed AP3 +#waittestclass Util +# +#VCXCONN PrintConnUtilDetails +#VCXCONN CheckProperty EVCxPSConnectionStatus EVCxConnected +# +#print OK! +#VCXCONN ShutdownTester +#delete VCXCONN +#pause 3000 +#delete Util +#[Endtest] #------------------------------------------------------------------------------------ # @@ -1472,46 +1472,46 @@ # Test CVcxConnUtility class. # #------------------------------------------------------------------------------------ -[Test] -title ET31134 Default SNAP has no IAPs, connect -create VCXTestUtilModule Util - -allowerrorcodes KERRNOTFOUND -Util DeleteDestination DEST_TEST -pause 1000 -allowerrorcodes KERRNOTFOUND -Util DeleteDestination DEST_TEST2 -pause 1000 - -Util CreateDestination DEST_TEST -Util SetUsedDestination DEST_TEST -Util DeleteDestinationAfterwards DEST_TEST - -Util CreateDestination DEST_TEST2 -Util DeleteDestinationAfterwards DEST_TEST2 -Util CopyMethod 3G_AP AP2 DEST_TEST2 -Util SetMethodPriority DEST_TEST2 AP2 0 - -create VCXConnUtilTest VCXCONN -VCXCONN PrepareCase -VCXCONN Create "MASTERPS" KVcxConnUtilTestModeBoth - -print connect default -VCXCONN GetIap DEST_TEST -allownextresult KERRGENERAL -waittestclass VCXCONN - -print connect dest_test2 -VCXCONN GetIap DEST_TEST2 -allownextresult KERRGENERAL -waittestclass VCXCONN - -VCXCONN PrintConnUtilDetails -VCXCONN CheckProperty EVCxPSConnectionStatus EVCxNotConnected - -print OK! -VCXCONN ShutdownTester -delete VCXCONN -pause 3000 -delete Util -[Endtest] \ No newline at end of file +#[Test] +#title ET31134 Default SNAP has no IAPs, connect +#create VCXTestUtilModule Util +# +#allowerrorcodes KERRNOTFOUND +#Util DeleteDestination DEST_TEST +#pause 1000 +#allowerrorcodes KERRNOTFOUND +#Util DeleteDestination DEST_TEST2 +#pause 1000 +# +#Util CreateDestination DEST_TEST +#Util SetUsedDestination DEST_TEST +#Util DeleteDestinationAfterwards DEST_TEST +# +#Util CreateDestination DEST_TEST2 +#Util DeleteDestinationAfterwards DEST_TEST2 +#Util CopyMethod 3G_AP AP2 DEST_TEST2 +#Util SetMethodPriority DEST_TEST2 AP2 0 +# +#create VCXConnUtilTest VCXCONN +#VCXCONN PrepareCase +#VCXCONN Create "MASTERPS" KVcxConnUtilTestModeBoth +# +#print connect default +#VCXCONN GetIap DEST_TEST +#allownextresult KERRGENERAL +#waittestclass VCXCONN +# +#print connect dest_test2 +#VCXCONN GetIap DEST_TEST2 +#allownextresult KERRGENERAL +#waittestclass VCXCONN +# +#VCXCONN PrintConnUtilDetails +#VCXCONN CheckProperty EVCxPSConnectionStatus EVCxNotConnected +# +#print OK! +#VCXCONN ShutdownTester +#delete VCXCONN +#pause 3000 +#delete Util +#[Endtest] \ No newline at end of file diff -r bdf78597b41c -r 5af11d9814f5 videoutils_plat/videoconnutility_api/tsrc/conf/VCXConnUtilTestStates.cfg --- a/videoutils_plat/videoconnutility_api/tsrc/conf/VCXConnUtilTestStates.cfg Tue Jan 26 12:55:56 2010 +0200 +++ b/videoutils_plat/videoconnutility_api/tsrc/conf/VCXConnUtilTestStates.cfg Thu Nov 04 11:29:04 2010 +0200 @@ -162,42 +162,42 @@ # Test CVcxConnUtilEngine class. # #------------------------------------------------------------------------------------ -[Test] -title ET31186 Connection terminated by another app, state -create VCXTestUtilModule Util - -// Destination with 2 working IAPs -allowerrorcodes KERRNOTFOUND -Util DeleteDestination DEST_TEST -pause 1000 -Util CreateDestination DEST_TEST -Util SetUsedDestination DEST_TEST -Util DeleteDestinationAfterwards DEST_TEST -Util CopyMethod 3G_AP AP1 DEST_TEST -Util CopyMethod 3G_AP AP2 DEST_TEST -Util SetMethodPriority DEST_TEST AP1 0 -Util SetMethodPriority DEST_TEST AP2 1 - -create VCXConnUtilTest VCXCONN -VCXCONN Create -VCXCONN GetIap DEST_TEST -waittestclass VCXCONN -Util WaitForConnectionActivity AP1 -waittestclass Util - -Util Attach AP1 -Util Terminate AP1 -Util WaitUntilConnectionIsClosed AP1 -waittestclass Util - -pause 5000 -VCXCONN CheckProperty EVCxPSConnectionStatus EVCxNotConnected - -print OK! -delete VCXCONN -pause 3000 -delete Util -[Endtest] +#[Test] +#title ET31186 Connection terminated by another app, state +#create VCXTestUtilModule Util +# +#// Destination with 2 working IAPs +#allowerrorcodes KERRNOTFOUND +#Util DeleteDestination DEST_TEST +#pause 1000 +#Util CreateDestination DEST_TEST +#Util SetUsedDestination DEST_TEST +#Util DeleteDestinationAfterwards DEST_TEST +#Util CopyMethod 3G_AP AP1 DEST_TEST +#Util CopyMethod 3G_AP AP2 DEST_TEST +#Util SetMethodPriority DEST_TEST AP1 0 +#Util SetMethodPriority DEST_TEST AP2 1 +# +#create VCXConnUtilTest VCXCONN +#VCXCONN Create +#VCXCONN GetIap DEST_TEST +#waittestclass VCXCONN +#Util WaitForConnectionActivity AP1 +#waittestclass Util +# +#Util Attach AP1 +#Util Terminate AP1 +#Util WaitUntilConnectionIsClosed AP1 +#waittestclass Util +# +#pause 5000 +#VCXCONN CheckProperty EVCxPSConnectionStatus EVCxNotConnected +# +#print OK! +#delete VCXCONN +#pause 3000 +#delete Util +#[Endtest] #------------------------------------------------------------------------------------ # diff -r bdf78597b41c -r 5af11d9814f5 videoutils_plat/videoconnutility_api/tsrc/custom/prerun_custom.xml --- a/videoutils_plat/videoconnutility_api/tsrc/custom/prerun_custom.xml Tue Jan 26 12:55:56 2010 +0200 +++ b/videoutils_plat/videoconnutility_api/tsrc/custom/prerun_custom.xml Thu Nov 04 11:29:04 2010 +0200 @@ -51,12 +51,4 @@ - - - install - - - - - \ No newline at end of file diff -r bdf78597b41c -r 5af11d9814f5 videoutils_plat/videoconnutility_api/tsrc/doc/guide.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/videoutils_plat/videoconnutility_api/tsrc/doc/guide.txt Thu Nov 04 11:29:04 2010 +0200 @@ -0,0 +1,22 @@ +---------------------------- + videoconnutility_api tests +---------------------------- + +Device must have following APs in the "Internet" destination: + - Internet + - Internet2 + - Wlan + - Wlan2 + - BadIap <- Doesn't work at all, make copy of a GPRS AP and +change access point name to something. + +The test PKG file includes cenrep config file which has +APs for Tampere CATS, this file is used in ATS3 tests. PKG +has also TestFramework.ini. Comment these two if you want +to install tests from SIS. + +There's ats_*.txt config files in conf directory for ATS3 +drop creation. + +Run /vado/video/internal/testing/tools/genATSdrop.pl from +the tsrc folder to create ATS3 drop. diff -r bdf78597b41c -r 5af11d9814f5 videoutils_plat/videoconnutility_api/tsrc/init/All/TestFramework.ini --- a/videoutils_plat/videoconnutility_api/tsrc/init/All/TestFramework.ini Tue Jan 26 12:55:56 2010 +0200 +++ b/videoutils_plat/videoconnutility_api/tsrc/init/All/TestFramework.ini Thu Nov 04 11:29:04 2010 +0200 @@ -77,6 +77,7 @@ ModuleName= testscripter TestCaseFile= c:\testframework\VCXConnUtilTestSNAP.cfg TestCaseFile= c:\testframework\VCXConnUtilTestMasterAndSlave.cfg +TestCaseFile= c:\testframework\VCXConnUtilTestStates.cfg [End_Module] diff -r bdf78597b41c -r 5af11d9814f5 videoutils_plat/videoplayer_constants_api/inc/mpxmediavideodefs.h --- a/videoutils_plat/videoplayer_constants_api/inc/mpxmediavideodefs.h Tue Jan 26 12:55:56 2010 +0200 +++ b/videoutils_plat/videoplayer_constants_api/inc/mpxmediavideodefs.h Thu Nov 04 11:29:04 2010 +0200 @@ -15,7 +15,7 @@ */ -// Version : %version: 3 % +// Version : %version: 5 % @@ -48,6 +48,13 @@ const TMPXAttributeData KMPXMediaVideoDrmProtected = { KMPXMediaIdVideo, 0x200 }; const TMPXAttributeData KMPXMediaVideoPausableStream = { KMPXMediaIdVideo, 0x400 }; const TMPXAttributeData KMPXMediaFourCCCode = { KMPXMediaIdVideo, 0x800 }; +const TMPXAttributeData KMPXMediaVideoDescription = { KMPXMediaIdVideo, 0x1000 }; +const TMPXAttributeData KMPXMediaVideoLocation = { KMPXMediaIdVideo, 0x2000 }; +const TMPXAttributeData KMPXMediaVideoCopyright = { KMPXMediaIdVideo, 0x4000 }; +const TMPXAttributeData KMPXMediaVideoLanguage = { KMPXMediaIdVideo, 0x8000 }; +const TMPXAttributeData KMPXMediaVideoKeywords = { KMPXMediaIdVideo, 0x10000 }; +const TMPXAttributeData KMPXMediaVideoCreated = { KMPXMediaIdVideo, 0x20000 }; +const TMPXAttributeData KMPXMediaVideoLastModified = { KMPXMediaIdVideo, 0x40000 }; const TMPXAttributeData KMPXMediaVideoAll = { KMPXMediaIdVideo, 0xffffffff }; diff -r bdf78597b41c -r 5af11d9814f5 videoutils_plat/videoplayer_constants_api/inc/mpxvideoplaybackdefs.h --- a/videoutils_plat/videoplayer_constants_api/inc/mpxvideoplaybackdefs.h Tue Jan 26 12:55:56 2010 +0200 +++ b/videoutils_plat/videoplayer_constants_api/inc/mpxvideoplaybackdefs.h Thu Nov 04 11:29:04 2010 +0200 @@ -15,7 +15,7 @@ */ -// Version : %version: ou1cpsw#4 % +// Version : %version: 14 % #ifndef CMPXVIDEOPLAYBACKDEFS_H @@ -120,7 +120,11 @@ EPbCmdHandleDecreaseVolume, EPbCmdCustomPause, EPbCmdCustomPlay, - EPbCmdRetrieveBufferingPercentage + EPbCmdRetrieveBufferingPercentage, + EPbCmdLoadingStarted, + EPbCmdHideControls, + EPbCmdSetPosterFrame, + EPbCmdSurfaceRemovedFromWindow }; enum TMPXGeneralError @@ -129,7 +133,9 @@ KMPXVideoPlayOver2GDuringVoiceCallError, KMPXVideoTvOutPlaybackNotAllowed, KMPXVideoTvOutPlaybackNotAllowedClose, - + KMPXVideoSetPosterFrameFailure, + KMPXVideoSetPosterFrameSuccess, + KMPXVideoSetPosterFrameNotSupported, KMPXPluginError }; @@ -160,6 +166,7 @@ // const TMPXAttributeData KMPXMediaVideoDisplayAspectRatio = { KMPXMediaIdVideoDisplayMessage, 0x08 }; + enum TMPXVideoDisplayCommand { EPbMsgVideoSurfaceCreated, @@ -167,7 +174,6 @@ EPbMsgVideoSurfaceRemoved }; - #endif // EOF diff -r bdf78597b41c -r 5af11d9814f5 videoutils_plat/videoplayer_constants_api/inc/vcxmyvideosdefs.h --- a/videoutils_plat/videoplayer_constants_api/inc/vcxmyvideosdefs.h Tue Jan 26 12:55:56 2010 +0200 +++ b/videoutils_plat/videoplayer_constants_api/inc/vcxmyvideosdefs.h Thu Nov 04 11:29:04 2010 +0200 @@ -26,16 +26,33 @@ #include #include +//These are written to TMPXItemId::iId2 +const TInt KVcxMvcMediaTypeVideo = 0; +const TInt KVcxMvcMediaTypeCategory = 1; +const TInt KVcxMvcMediaTypeAlbum = 2; + /** * My Videos Collection category IDs. -* MPX ID has this as iId1 member and 1 as iId2. -* These are same as indexes in path. +* TMPXItemId has these as iId1 member and KVcxMvcMediaTypeCategory as iId2. */ const TInt KVcxMvcCategoryIdAll = 0; const TInt KVcxMvcCategoryIdDownloads = 1; const TInt KVcxMvcCategoryIdTvRecordings = 2; const TInt KVcxMvcCategoryIdCaptured = 3; const TInt KVcxMvcCategoryIdOther = 4; +const TInt KCategoryIdLastWatched = 5; +const TInt KCategoryIdExtraItem1 = 6; +const TInt KCategoryIdExtraItem2 = 7; +const TInt KCategoryIdExtraItem3 = 8; + +/** +* My Videos Custom command ID +* +* This is sent to MPX video player app UI, +* when the my videos main view is initialized, and +* player app should do the background initialization. +*/ +const TInt KVcxMyVideosCmdDoLateConstruct = 0x20016B9D; /** * Same as KIptvUrlMaxLength in IptvUtil.h. @@ -48,6 +65,12 @@ const TInt KVcxMvcMaxUrlLength = 1024; /** +* Maximum length of KMPXMediaGeneralTitle attribute. Limiting factor +* comes from MDS. +*/ +const TInt KVcxMvcMaxTitleLength = 255; + +/** * Content ID (UID) identifying My Videos category of content provided * in the media object and associated attributes. */ @@ -114,8 +137,12 @@ EVcxMyVideosOriginTvRecording = MdeConstants::Object::ERecorded } TVcxMyVideosOrigin; -const TInt KVcxMyVideosCollectionCenrepUid = 0x2001B2A9; -const TInt KVcxMyVideosCollectionCenrepKeySortingOrder = 0x01; +const TInt KVcxMyVideosCollectionCenrepUid = 0x2001B2A9; +const TInt KVcxMyVideosCollectionCenrepKeySortingOrder = 0x01; +const TInt KVcxMyVideosCollectionCenrepKeyLastWatchedMpxId = 0x02; +const TInt KVcxMyVideosCollectionCenrepKeyLastWatchedName = 0x03; +const TInt KVcxMyVideosCollectionCenrepKeyLastWatchedPath = 0x04; +const TInt KVcxMyVideosCollectionCenrepKeyLastWatchedIndicator = 0x05; const TInt KVcxMyVideosCenRepUid = 0x102750E2; // same as KIptvCenRepUid in CIptvUtil.h const TInt KVcxMyVideosCenRepPreferredMemoryKey = 0x01; // same as KIptvCenRepPreferredMemoryKey in CIptvUtil.h @@ -155,6 +182,19 @@ */ EVcxMyVideosVideoListOrderChanged }; + +/** +* These values are written to video list (received by HandleOpen) +* KVcxMediaMyVideosInt32Value attribute to give extra information about the list status. +*/ +enum TVcxMyVideosVideoListInfo + { + /** + * Indicates that the list is complete and no more items are appended + * to the list by KVcxMessageMyVideosItemsAppended event. + */ + EVcxMyVideosVideoListComplete + }; // // These are the general attributes used in My Videos media object. @@ -176,6 +216,7 @@ /** * 2. (BRIEF) * Descriptor, contains video name. +* Maximum length is KVcxMvcMaxTitleLength. * Saved to MDS. */ //KMPXMediaGeneralTitle @@ -459,13 +500,26 @@ /** * 35. + * TUint32, general parameter, the usage depends on context. + * Not saved to MDS + */ +const TMPXAttributeData KVcxMediaMyVideosUint32Value = {KVcxMediaIdMyVideos, 1 << 23}; + +/** + * 36. * TUint32, transaction ID, client sets this field when making asynchronous request. * Collection sets the same ID to response messages. Client can use this to pair * requests and responses. * Not saved to MDS */ -const TMPXAttributeData KVcxMediaMyVideosTransactionId = {KVcxMediaIdMyVideos, 1 << 23}; +const TMPXAttributeData KVcxMediaMyVideosTransactionId = {KVcxMediaIdMyVideos, 1 << 24}; +/** + * 37. + * TBool, video list is partial. This is set to Category level video list to inform + * client that video cache is not complete yet. + */ +const TMPXAttributeData KVcxMediaMyVideosVideoListIsPartial = {KVcxMediaIdMyVideos, 1 << 24}; // -------- end of my videos media attributes -------- // @@ -490,6 +544,10 @@ const TInt KVcxCommandMyVideosMove = 6; //async const TInt KVcxCommandMyVideosCopy = 7; //async const TInt KVcxCommandMyVideosDelete = 8; //async +const TInt KVcxCommandMyVideosAddToAlbum = 9; //async +const TInt KVcxCommandMyVideosRemoveFromAlbum = 10; //async +const TInt KVcxCommandMyVideosAddAlbum = 11; //async & sync +const TInt KVcxCommandMyVideosRemoveAlbums = 12; //async /** This command cancels the move or copy operation only if it * is allready being processed by the collection plugin. If the @@ -497,7 +555,7 @@ * If Move or Copy operations were not in progress the command * leaves with KErrNotFound. */ -const TInt KVcxCommandMyVideosCancelMoveOrCopy = 9; //sync +const TInt KVcxCommandMyVideosCancelMoveOrCopy = 13; //sync /** This command cancels the delete operation only if it * is allready being processed by the collection plugin. If the @@ -505,9 +563,9 @@ * If delete operation was not in progress the command * leaves with KErrNotFound. */ -const TInt KVcxCommandMyVideosCancelDelete = 10; //sync +const TInt KVcxCommandMyVideosCancelDelete = 14; //sync -const TInt KVcxMessageMyVideosGetMediasByMpxIdResp = 11; +const TInt KVcxMessageMyVideosGetMediasByMpxIdResp = 15; /** * Collection sends this message when new items are added @@ -520,7 +578,7 @@ * are broadcasted to all clients. So they might appear even when client hasn't * done OpenL. */ -const TInt KVcxMessageMyVideosItemsAppended = 12; //event +const TInt KVcxMessageMyVideosItemsAppended = 16; //event /** * Collection sends this message when media list fetching has ended @@ -531,32 +589,32 @@ * in the list it had received earlier (unless client itself initiated the new fetching * by calling OpenL(). */ -const TInt KVcxMessageMyVideosListComplete = 13; //event +const TInt KVcxMessageMyVideosListComplete = 17; //event /* Collection sends this message when it starts processing * Move Or Copy command. When this event is received, * KVcxCommandMyVideosCancelMoveOrCopy can be sent. */ -const TInt KVcxMessageMyVideosMoveOrCopyStarted = 14; //event +const TInt KVcxMessageMyVideosMoveOrCopyStarted = 18; //event /* Collection sends this message when it starts processing * KVcxCommandMyVideosDelete command. After this event is received, * KVcxCommandMyVideosCancelDelete can be sent. */ -const TInt KVcxMessageMyVideosDeleteStarted = 15; //event +const TInt KVcxMessageMyVideosDeleteStarted = 19; //event /* End events for Move/Copy/Delete operations. The response contains * MDS ID and error codes for each item. */ -const TInt KVcxMessageMyVideosMoveResp = 16; //event -const TInt KVcxMessageMyVideosCopyResp = 17; //event -const TInt KVcxMessageMyVideosDeleteResp = 18; //event +const TInt KVcxMessageMyVideosMoveResp = 20; //event +const TInt KVcxMessageMyVideosCopyResp = 21; //event +const TInt KVcxMessageMyVideosDeleteResp = 22; //event /** * Indicates that media array variable contains other messages. * This message is only sent as the highest level item in the message tree. */ -const TInt KVcxMessageMyVideosMessageArray = 19; +const TInt KVcxMessageMyVideosMessageArray = 23; /* OpenL() (video list) MSC @@ -566,9 +624,9 @@ has the video list already fetched, then the HandleOpenL will contain all videos and KVcxMessageMyVideosListComplete is received immedetially. - KVcxMessageMyVideosItemsAppended and KVcxMessageMyVideosListComplete events concern only video lists. - Category level always returns all categories at HandleOpenL. - + The list complete status (EVcxMyVideosVideoListComplete) is also written to aEntries KVcxMediaMyVideosInt32Value + attribute when the list is complete. + .------. .-------------------------. |CLIENT| |MPX My Videos Collection | '------' '-------------------------' @@ -616,116 +674,6 @@ | | - DOWNLOAD START MSC - ------------------ - - In future download request parameters can be made to contain media array of download parameters, - allowing multiple downloads. Currently it is not supported. - - .------. .-------------------------. - |CLIENT| |MPX My Videos Collection | - '------' '-------------------------' - | | - | | -iCollectionUtility->Collection().CommandL( *downloadStartCommand ) | - | -downloadStartCommand (CMPXCommand type) contains: | - KMPXCommandGeneralId = KVcxCommandIdMyVideos | - KVcxMediaMyVideosCommandId = KVcxCommandMyVideosStartDownload | - KMPXCommandGeneralCollectionId = KVcxUidMyVideosMpxCollection | - KMPXCommandColAddMedia = Download request parameters (CMPXMedia type) | - Download request parameters CMPXMedia type) contains: | - KVcxMediaMyVideosIapId = IAP ID | - KVcxMediaMyVideosUsername = User name | - KVcxMediaMyVideosPassword = Password | - KMPXMediaGeneralFlags = EVcxMyVideosServiceHasReadOnlyIap|EVcxMyVideosSilent | - KVcxMediaMyVideosRemoteUrl = Remote URL | - KMPXMediaGeneralTitle = Video title | - |--------------------------------------------------------------------------------->| - | | - | | - | HandleCommandComplete(downloadStartCommand, FAIL/SUCCESS) | - |<---------------------------------------------------------------------------------| - | | - | | - | | - | HandleCollectionMessage( CMPXMessage* aMessage, TInt aError ) | - | | - | aMessage contains: | - | KMPXMessageGeneralId = KMPXMessageIdItemChanged | - | KMPXMessageChangeEventType = EMPXItemInserted | - | KMPXMessageCollectionId = KVcxUidMyVideosMpxCollection | - | KMPXMessageMediaGeneralId = MPX ID | - | | - | The corresponding media object contains: | - | KMPXMediaGeneralId = MPX ID | - | KMPXMediaGeneralUri = Local file path | - | KVcxMediaMyVideosRemoteUrl = Remote URL | - |<---------------------------------------------------------------------------------| - | | - | | - | | - | | - | HandleCollectionMessage( CMPXMessage* aMessage, TInt aError ) | - | | - | aMessage contains: | - | KMPXMessageGeneralId = KMPXMessageIdItemChanged | - | KMPXMessageChangeEventType = EMPXItemModified | - | KMPXMessageCollectionId = KVcxUidMyVideosMpxCollection | - | KMPXMessageMediaGeneralId = MPX ID | - | | - | The corresponding media object contains: | - | KMPXMediaGeneralId = MPX ID | - | KVcxMediaMyVideosDownloadState = Download state | - | KVcxMediaMyVideosDownloadId = Download ID | - |<---------------------------------------------------------------------------------| - | | - | | - - - -DOWNLOAD CANCEL MSC -------------------- - - .------. .-------------------------. - |CLIENT| |MPX My Videos Collection | - '------' '-------------------------' - | | - | | -iCollectionUtility->Collection().CommandL( *cancelDownloadCommand ) | - | -cancelDownloadCommand (CMPXCommand type) contains: | - KMPXCommandGeneralId = KVcxCommandIdMyVideos | - KVcxMediaMyVideosCommandId = KVcxCommandMyVideosCancelDownload | - KMPXCommandGeneralCollectionId = KVcxUidMyVideosMpxCollection | - KMPXCommandColAddMedia = Cancel download request parameters (CMPXMedia type) | - Cancel download request parameters (CMPXMedia type) contains: | - KMPXMediaGeneralId = MPX ID | - KVcxMediaMyVideosDownloadId = download ID | - KMPXMediaGeneralUri = file path | - |--------------------------------------------------------------------------------->| - | | - | | - | HandleCommandComplete(cancelDownloadCommand, TInt aError ) | - | aError is != KErrNone if either dl object (in Download Manager), file or | - | MPX object was left to system. | - |<---------------------------------------------------------------------------------| - | | - | | - | | - | HandleCollectionMessage( CMPXMessage* aMessage, TInt aError ) | - | | - | aMessage contains: | - | KMPXMessageGeneralId = KMPXMessageIdItemChanged | - | KMPXMessageChangeEventType = EMPXItemDeleted | - | KMPXMessageCollectionId = KVcxUidMyVideosMpxCollection | - | KMPXMessageMediaGeneralId = MPX ID | - | | - | The corresponding media object is gone | - |<---------------------------------------------------------------------------------| - | | - - GET MEDIA FULL DETAILS BY MPX ID MSC ------------------------------------ @@ -761,7 +709,8 @@ ------------------------ This command loads requested MDS items to MPX My Videos collection cache and returns the requested - items to the client ( subset of the cache ). + items to the client ( subset of the cache ). Notice that if this command is given while OpenL is + being processed, then OpenL is interrupted and started from scratch when this command finishes. .------. .-------------------------. |CLIENT| |MPX My Videos Collection | @@ -795,83 +744,6 @@ |<---------------------------------------------------------------------------------| | | -DOWNLOAD PAUSE MSC -------------------- - - .------. .-------------------------. - |CLIENT| |MPX My Videos Collection | - '------' '-------------------------' - | | - | | -iCollectionUtility->Collection().CommandL( *pauseDownloadCommand ) | - | -cancelDownloadCommand (CMPXCommand type) contains: | - KMPXCommandGeneralId = KVcxCommandIdMyVideos | - KVcxMediaMyVideosCommandId = KVcxCommandMyVideosPauseDownload | - KMPXCommandGeneralCollectionId = KVcxUidMyVideosMpxCollection | - KVcxMediaMyVideosDownloadId = download id | - |--------------------------------------------------------------------------------->| - | | - | | - | HandleCommandComplete(pauseDownloadCommand, FAIL/SUCCESS) | - |<---------------------------------------------------------------------------------| - | | - | | - | | - | HandleCollectionMessage( CMPXMessage* aMessage, TInt aError ) | - | | - | aMessage contains: | - | KMPXMessageGeneralId = KMPXMessageIdItemChanged | - | KMPXMessageChangeEventType = EMPXItemModified | - | KMPXMessageCollectionId = KVcxUidMyVideosMpxCollection | - | KMPXMessageMediaGeneralId = MPX ID | - |<---------------------------------------------------------------------------------| - | | - -DOWNLOAD RESUME MSC -------------------- - - .------. .-------------------------. - |CLIENT| |MPX My Videos Collection | - '------' '-------------------------' - | | - | | -iCollectionUtility->Collection().CommandL( *downloadStartCommand ) | - | -downloadStartCommand (CMPXCommand type) contains: | - KMPXCommandGeneralId = KVcxCommandIdMyVideos | - KVcxMediaMyVideosCommandId = KVcxCommandMyVideosStartDownload | - KMPXCommandGeneralCollectionId = KVcxUidMyVideosMpxCollection | - KMPXCommandColAddMedia = Download request parameters (CMPXMedia type) | - Download request parameters (CMPXMedia type) contains: | - KVcxMediaMyVideosIapId = IAP ID | - KVcxMediaMyVideosUsername = User name | - KVcxMediaMyVideosPassword = Password | - KMPXMediaGeneralFlags = EVcxMyVideosServiceHasReadOnlyIap|EVcxMyVideosSilent | - KVcxMediaMyVideosDownloadId = Download ID | - |--------------------------------------------------------------------------------->| - | | - | | - | HandleCommandComplete(downloadStartCommand, FAIL/SUCCESS) | - |<---------------------------------------------------------------------------------| - | | - | | - | | - | HandleCollectionMessage( CMPXMessage* aMessage, TInt aError ) | - | | - | aMessage contains: | - | KMPXMessageGeneralId = KMPXMessageIdItemChanged | - | KMPXMessageChangeEventType = EMPXItemModified | - | KMPXMessageCollectionId = KVcxUidMyVideosMpxCollection | - | KMPXMessageMediaGeneralId = MPX ID | - | | - | The corresponding media object contains: | - | KMPXMediaGeneralId = MPX ID | - | KVcxMediaMyVideosDownloadState = Download state | - | KVcxMediaMyVideosDownloadId = Download ID | - |<---------------------------------------------------------------------------------| - | | - | | VIDEO ADD MSC ------------- @@ -1000,7 +872,10 @@ | KVcxMediaMyVideosInt32Value = result (system wide error code) | |<---------------------------------------------------------------------------------| | | - | HandleCommandComplete(videoMoveCommand, FAIL/SUCCESS) | + | HandleCommandComplete(videoMoveCommand, KErrNone) | + | videoDeleteCommand KVcxMediaMyVideosInt32Value contains KErrNone if everything went + | OK. If value is != KErrNone, then something went wrong and command might | + | have ended prematurely | |<---------------------------------------------------------------------------------| @@ -1052,7 +927,10 @@ | KVcxMediaMyVideosInt32Value = result (system wide error code) | |<---------------------------------------------------------------------------------| | | - | HandleCommandComplete(videoDeleteCommand, FAIL/SUCCESS) | + | HandleCommandComplete(videoDeleteCommand, KErrNone) | + | videoDeleteCommand KVcxMediaMyVideosInt32Value contains KErrNone if everything went + | OK. If value is != KErrNone, then something went wrong and command was ended| + | prematurely. | |<---------------------------------------------------------------------------------| @@ -1060,6 +938,215 @@ ----------------------- + +ADD VIDEOS TO ALBUM MSC +----------------------- +Notice that adding items to album does not add videos from collection. Ie item added events +will not arrive for this operation. Instead the modify event is sent for the album item which is +affected. + .------. .-------------------------. + |CLIENT| |MPX My Videos Collection | + '------' '-------------------------' + | | + | | +iCollectionUtility->Collection().CommandL( *cmd ) | + | +cmd (CMPXCommand type) contains: | + KMPXCommandGeneralId = KVcxCommandIdMyVideos | + KVcxMediaMyVideosCommandId = KVcxCommandMyVideosAddToAlbum | + KMPXCommandGeneralCollectionId = 0x20016B97 | + KMPXCommandGeneralDoSync = EFalse | + KVcxMediaMyVideosTransactionId = TR ID | + KVcxMediaMyVideosUint32Value = Album MDS ID (album where to add) | + KMPXMediaArrayContents = Media array (CMPXMediaArray) | + Media array contains array of CMPXMedia objects which contain: | + KMPXMediaGeneralId = video MPX ID (video to add) | + |--------------------------------------------------------------------------------->| + | | + | HandleCommandComplete(cmd, KErrNone) | + | cmd is the same as was given in .CommandL() call. | + | cmd contains in addition to parameters set earlier: | + | 1. Media array has error codes set to each array item: | + | KVcxMediaMyVideosInt32Value = KErrNone if successful, | + | KErrGeneral or KErrAlreadyExists otherwise. | + | 2. cmd KVcxMediaMyVideosInt32Value contains KErrNone if everything went | + | OK. If value is != KErrNone, then something went wrong and individual | + | error codes for array items might not contain values. | + |<---------------------------------------------------------------------------------| + | | + | HandleCollectionMessage( CMPXMessage* aMessage, TInt aError ) | + | | + | aMessage contains: | + | KMPXMessageGeneralId = KMPXMessageIdItemChanged | + | KMPXMessageChangeEventType = EMPXItemModified | + | KVcxMediaMyVideosInt32Value = EVcxMyVideosVideoListOrderChanged | + | KMPXMessageCollectionId = KVcxUidMyVideosMpxCollection | + | KMPXMessageMediaGeneralId = MPX ID (ID of the album which had videos added) + |<---------------------------------------------------------------------------------| + + +REMOVE VIDEOS FROM ALBUM MSC +---------------------------- + +Notice that removing items from album does not remove videos from collection. Ie item deleted events +will not arrive for this operation. Instead the modify event is sent for the album item which is +affected. + .------. .-------------------------. + |CLIENT| |MPX My Videos Collection | + '------' '-------------------------' + | | + | | +iCollectionUtility->Collection().CommandL( *cmd ) | + | +cmd (CMPXCommand type) contains: | + KMPXCommandGeneralId = KVcxCommandIdMyVideos | + KVcxMediaMyVideosCommandId = KVcxCommandMyVideosRemoveFromAlbum | + KMPXCommandGeneralCollectionId = 0x20016B97 | + KMPXCommandGeneralDoSync = EFalse | + KVcxMediaMyVideosTransactionId = TR ID | + KVcxMediaMyVideosUint32Value = Album MDS ID (iId1 member of TMPXItemId, album where from to remove) + KMPXMediaArrayContents = Media array (CMPXMediaArray) | + Media array contains array of CMPXMedia objects which contain: | + KMPXMediaGeneralId = video MPX ID (video to remove) | + |--------------------------------------------------------------------------------->| + | | + | HandleCommandComplete(cmd, KErrNone) | + | cmd is the same as was given in .CommandL() call. | + | cmd contains in addition to parameters set earlier: | + | 1. Media array has error codes set to each array item: | + | KVcxMediaMyVideosInt32Value = KErrNone if successful, KErrGeneral otherwise. + | 2. cmd KVcxMediaMyVideosInt32Value contains KErrNone if everything went | + | OK. If value is != KErrNone, then something went wrong and individual | + | error codes for array items might not contain values. | + |<---------------------------------------------------------------------------------| + | | + | HandleCollectionMessage( CMPXMessage* aMessage, TInt aError ) | + | | + | aMessage contains: | + | KMPXMessageGeneralId = KMPXMessageIdItemChanged | + | KMPXMessageChangeEventType = EMPXItemModified | + | KVcxMediaMyVideosInt32Value = EVcxMyVideosVideoListOrderChanged | + | KMPXMessageCollectionId = KVcxUidMyVideosMpxCollection | + | KMPXMessageMediaGeneralId = MPX ID (ID of the album which had videos removed) + |<---------------------------------------------------------------------------------| + +ADD ALBUM MSC +------------- + +Asynchronous version: + + .------. .-------------------------. + |CLIENT| |MPX My Videos Collection | + '------' '-------------------------' + | | + | | +iCollectionUtility->Collection().CommandL( *cmd ) | + | +cmd (CMPXCommand type) contains: | + KMPXCommandGeneralId = KVcxCommandIdMyVideos | + KVcxMediaMyVideosCommandId = KVcxCommandMyVideosAddAlbum | + KMPXCommandGeneralCollectionId = KVcxUidMyVideosMpxCollection (0x20016B97) | + KMPXCommandGeneralDoSync = EFalse | + KVcxMediaMyVideosTransactionId = TR ID | + KMPXMediaGeneralTitle = Album title text | + |--------------------------------------------------------------------------------->| + | | + | HandleCommandComplete(cmd, KErrNone) | + | cmd is the same as was given in .CommandL() call. | + | cmd contains in addition to parameters set earlier: | + | 1. cmd KVcxMediaMyVideosInt32Value contains KErrNone if everything went | + | OK. If value is != KErrNone, then something went wrong. | + | 2. KMPXMediaGeneralId contains the MPX ID of the new album. | + |<---------------------------------------------------------------------------------| + | | + | HandleCollectionMessage( CMPXMessage* aMessage, TInt aError ) | + | | + | aMessage contains: | + | KMPXMessageGeneralId = KMPXMessageIdItemChanged | + | KMPXMessageChangeEventType = EMPXItemInserted | + | KVcxMediaMyVideosInt32Value = EVcxMyVideosListNoInfo | + | KMPXMessageCollectionId = KVcxUidMyVideosMpxCollection | + | KMPXMessageMediaGeneralId = MPX ID (ID of the new album) | + | KMPXCommandColAddMedia = MPX media of the new album (CMPXMedia) | + |<---------------------------------------------------------------------------------| + +Synchronous version: + +CommandL leaves if error occurs. + + .------. .-------------------------. + |CLIENT| |MPX My Videos Collection | + '------' '-------------------------' + | | + | | +iCollectionUtility->Collection().CommandL( *cmd ) | + | +cmd (CMPXCommand type) contains: | + KMPXCommandGeneralId = KVcxCommandIdMyVideos | + KVcxMediaMyVideosCommandId = KVcxCommandMyVideosAddAlbum | + KMPXCommandGeneralCollectionId = KVcxUidMyVideosMpxCollection (0x20016B97) | + KMPXCommandGeneralDoSync = ETrue | + KVcxMediaMyVideosTransactionId = TR ID | + KMPXMediaGeneralTitle = Album title text | + | + After the call KMPXMediaGeneralId attribute contains the MPX ID of the new album. | + |--------------------------------------------------------------------------------->. + |<---------------------------------------------------------------------------------' + | | + | HandleCollectionMessage( CMPXMessage* aMessage, TInt aError ) | + | | + | aMessage contains: | + | KMPXMessageGeneralId = KMPXMessageIdItemChanged | + | KMPXMessageChangeEventType = EMPXItemInserted | + | KVcxMediaMyVideosInt32Value = EVcxMyVideosListNoInfo | + | KMPXMessageCollectionId = KVcxUidMyVideosMpxCollection | + | KMPXMessageMediaGeneralId = MPX ID (ID of the new album) | + | KMPXCommandColAddMedia = MPX media of the new album (CMPXMedia) | + |<---------------------------------------------------------------------------------| + + + +REMOVE ALBUMS MSC +----------------- + + .------. .-------------------------. + |CLIENT| |MPX My Videos Collection | + '------' '-------------------------' + | | + | | +iCollectionUtility->Collection().CommandL( *cmd ) | + | +cmd (CMPXCommand type) contains: | + KMPXCommandGeneralId = KVcxCommandIdMyVideos | + KVcxMediaMyVideosCommandId = KVcxCommandMyVideosRemoveAlbums | + KMPXCommandGeneralCollectionId = KVcxUidMyVideosMpxCollection (0x20016B97) | + KMPXCommandGeneralDoSync = EFalse (only async supported) | + KVcxMediaMyVideosTransactionId = TR ID | + KMPXMediaArrayContents = Media array (CMPXMediaArray) | + Media array contains array of CMPXMedia objects which contain: | + KMPXMediaGeneralId = album MPX ID (album to remove) | + |--------------------------------------------------------------------------------->| + | | + | HandleCommandComplete(cmd, KErrNone) | + | cmd is the same as was given in .CommandL() call. | + | cmd contains in addition to parameters set earlier: | + | 1. Media array has error codes set to each array item: | + | KVcxMediaMyVideosInt32Value = KErrNone if successful, KErrGeneral otherwise. + | 2. cmd KVcxMediaMyVideosInt32Value contains KErrNone if everything went | + | OK. If value is != KErrNone, then something went wrong and individual | + | error codes for array items might not contain values. | + |<---------------------------------------------------------------------------------| + | | + | HandleCollectionMessage( CMPXMessage* aMessage, TInt aError ) | + | | + | aMessage contains: | + | KMPXMessageGeneralId = KMPXMessageIdItemChanged | + | KMPXMessageChangeEventType = EMPXItemDeleted | + | KVcxMediaMyVideosInt32Value = EVcxMyVideosListNoInfo | + | KMPXMessageCollectionId = KVcxUidMyVideosMpxCollection | + | KMPXMessageMediaGeneralId = MPX ID (ID of the album which was removed) | + |<---------------------------------------------------------------------------------| + */ #endif // VCXMYVIDEOSDEFS_H diff -r bdf78597b41c -r 5af11d9814f5 videoutils_plat/videoplayer_constants_api/inc/vcxmyvideosuids.h --- a/videoutils_plat/videoplayer_constants_api/inc/vcxmyvideosuids.h Tue Jan 26 12:55:56 2010 +0200 +++ b/videoutils_plat/videoplayer_constants_api/inc/vcxmyvideosuids.h Thu Nov 04 11:29:04 2010 +0200 @@ -11,11 +11,12 @@ * * Contributors: * -* Description: +* Description: * */ +// Version : %version: da1mmcf#4 % #ifndef VCXMYVIDEOSUIDS_H @@ -26,4 +27,9 @@ */ #define KVcxUidMyVideosMpxCollection 0x20016B97 +// +// UID for the In Memory collection plugin used for playlist files +// +#define KMpxInMemoryPluginUid 0x101FFCD8 + #endif // VCXMYVIDEOSUIDS_H diff -r bdf78597b41c -r 5af11d9814f5 videoutils_plat/videoscheduler_api/inc/ipvideo/CCseSchedulerAPI.h --- a/videoutils_plat/videoscheduler_api/inc/ipvideo/CCseSchedulerAPI.h Tue Jan 26 12:55:56 2010 +0200 +++ b/videoutils_plat/videoscheduler_api/inc/ipvideo/CCseSchedulerAPI.h Thu Nov 04 11:29:04 2010 +0200 @@ -22,8 +22,8 @@ // INCLUDES #include -#include // Client common methods (server start up etc) -#include // Client common methods (open, close etc) +#include // Client common methods (server start up etc) +#include // Client common methods (open, close etc) // CONSTANTS // None. @@ -126,7 +126,7 @@ * @param aArray On return contains items from the database. * @return Generic symbian error code. */ - TInt GetSchedulesByPluginUid( const TInt32 aPluginUid, + IMPORT_C TInt GetSchedulesByPluginUid( const TInt32 aPluginUid, RPointerArray& aArray ) const; /** @@ -135,7 +135,7 @@ * @param aArray On return contains items from the database. * @return Generic symbian error code. */ - TInt GetSchedulesByType( const TInt32 aScheduleType, + IMPORT_C TInt GetSchedulesByType( const TInt32 aScheduleType, RPointerArray& aArray ) const; /** @@ -144,7 +144,7 @@ * @param aEnd End of the time frame * @return Generic symbian error code. */ - TInt GetSchedulesByTime( const TTime& aBeginning, + IMPORT_C TInt GetSchedulesByTime( const TTime& aBeginning, const TTime& aEnd, RPointerArray& aArray ) const; diff -r bdf78597b41c -r 5af11d9814f5 videoutils_plat/videoscheduler_api/inc/ipvideo/CCseSchedulerPluginIF.h --- a/videoutils_plat/videoscheduler_api/inc/ipvideo/CCseSchedulerPluginIF.h Tue Jan 26 12:55:56 2010 +0200 +++ b/videoutils_plat/videoscheduler_api/inc/ipvideo/CCseSchedulerPluginIF.h Thu Nov 04 11:29:04 2010 +0200 @@ -75,6 +75,6 @@ #include -#include +#include #endif //CCSESCHEDULERPLUGINIF_H diff -r bdf78597b41c -r 5af11d9814f5 videoutils_plat/videoscheduler_api/inc/ipvideo/RCseSchedulerService.h --- a/videoutils_plat/videoscheduler_api/inc/ipvideo/RCseSchedulerService.h Tue Jan 26 12:55:56 2010 +0200 +++ b/videoutils_plat/videoscheduler_api/inc/ipvideo/RCseSchedulerService.h Thu Nov 04 11:29:04 2010 +0200 @@ -20,7 +20,7 @@ #define __RCSESCHEDULERSERVICE_H__ // INCLUDES -#include // Client common methods (open, close etc) +#include // Client common methods (open, close etc) // CONSTANTS // None.