--- a/videoutils_plat/videoconnutility_api/inc/ipvideo/tvcxconnutilnotifierparams.h	Fri Feb 19 23:50:39 2010 +0200
+++ b/videoutils_plat/videoconnutility_api/inc/ipvideo/tvcxconnutilnotifierparams.h	Fri Mar 12 15:48:41 2010 +0200
@@ -21,6 +21,9 @@
 #ifndef TVCXCONNUTILNOTIFIERPARAMS_
 #define TVCXCONNUTILNOTIFIERPARAMS_
 
+// Deprecation warning
+#warning This header file has been deprecated. Will be removed in one of the next SDK releases.
+
 /**
  * Max lenght of the string passed via message
  */

--- a/videoutils_plat/videoconnutility_api/inc/ipvideo/vcxconnectionutility.h	Fri Feb 19 23:50:39 2010 +0200
+++ b/videoutils_plat/videoconnutility_api/inc/ipvideo/vcxconnectionutility.h	Fri Mar 12 15:48:41 2010 +0200
@@ -18,6 +18,9 @@
 #ifndef __VCX_CONNUTIL_H_
 #define __VCX_CONNUTIL_H_
 
+// Deprecation warning
+#warning This header file has been deprecated. Will be removed in one of the next SDK releases.
+
 // INCLUDES
 #include <e32base.h>
 

--- a/videoutils_plat/videoconnutility_api/inc/ipvideo/vcxconnutilengineobserver.h	Fri Feb 19 23:50:39 2010 +0200
+++ b/videoutils_plat/videoconnutility_api/inc/ipvideo/vcxconnutilengineobserver.h	Fri Mar 12 15:48:41 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
 /**

--- a/videoutils_plat/videoconnutility_api/tsrc/conf/VCXConnUtilTestSNAP.cfg	Fri Feb 19 23:50:39 2010 +0200
+++ b/videoutils_plat/videoconnutility_api/tsrc/conf/VCXConnUtilTestSNAP.cfg	Fri Mar 12 15:48:41 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

--- a/videoutils_plat/videoconnutility_api/tsrc/conf/VCXConnUtilTestStates.cfg	Fri Feb 19 23:50:39 2010 +0200
+++ b/videoutils_plat/videoconnutility_api/tsrc/conf/VCXConnUtilTestStates.cfg	Fri Mar 12 15:48:41 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]
 
 #------------------------------------------------------------------------------------
 #

--- a/videoutils_plat/videoconnutility_api/tsrc/init/All/TestFramework.ini	Fri Feb 19 23:50:39 2010 +0200
+++ b/videoutils_plat/videoconnutility_api/tsrc/init/All/TestFramework.ini	Fri Mar 12 15:48:41 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]
 
 

--- a/videoutils_plat/videoplayer_constants_api/inc/mpxvideoplaybackdefs.h	Fri Feb 19 23:50:39 2010 +0200
+++ b/videoutils_plat/videoplayer_constants_api/inc/mpxvideoplaybackdefs.h	Fri Mar 12 15:48:41 2010 +0200
@@ -15,7 +15,7 @@
 */
 
 
-// Version : %version: 6 %
+// Version : %version: 7 %
 
 
 #ifndef CMPXVIDEOPLAYBACKDEFS_H
@@ -120,7 +120,8 @@
     EPbCmdHandleDecreaseVolume,
     EPbCmdCustomPause,
     EPbCmdCustomPlay,
-    EPbCmdRetrieveBufferingPercentage
+    EPbCmdRetrieveBufferingPercentage,
+    EPbCmdSurfaceRemoved
 };
 
 enum TMPXGeneralError
@@ -165,7 +166,8 @@
 {
     EPbMsgVideoSurfaceCreated,
     EPbMsgVideoSurfaceChanged,
-    EPbMsgVideoSurfaceRemoved
+    EPbMsgVideoSurfaceRemoved,
+    EPbMsgVideoRemoveDisplayWindow
 };
 
 

--- a/videoutils_plat/videoplayer_constants_api/inc/vcxmyvideosdefs.h	Fri Feb 19 23:50:39 2010 +0200
+++ b/videoutils_plat/videoplayer_constants_api/inc/vcxmyvideosdefs.h	Fri Mar 12 15:48:41 2010 +0200
@@ -31,11 +31,16 @@
 * MPX ID has this as iId1 member and 1 as iId2.
 * These are same as indexes in path.
 */
+
 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;
 
 /**
 * Same as KIptvUrlMaxLength in IptvUtil.h.
@@ -114,8 +119,9 @@
     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 KVcxMyVideosCenRepUid = 0x102750E2; // same as KIptvCenRepUid in CIptvUtil.h
 const TInt KVcxMyVideosCenRepPreferredMemoryKey = 0x01; // same as KIptvCenRepPreferredMemoryKey in CIptvUtil.h
@@ -466,6 +472,12 @@
  */
 const TMPXAttributeData KVcxMediaMyVideosTransactionId = {KVcxMediaIdMyVideos, 1 << 23};
 
+/**
+ * 36.
+ * 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 -------- //