--- a/mmmw_plat/enhanced_media_client_api/tsrc/Conf/EnhanMediaTestClass.cfg Wed Apr 14 16:29:54 2010 +0300
+++ b/mmmw_plat/enhanced_media_client_api/tsrc/Conf/EnhanMediaTestClass.cfg Tue Apr 27 17:11:02 2010 +0300
@@ -55,8 +55,8 @@
AudioEnhs CreateSink
AudioEnhs AddObserver 4
AudioEnhs StreamAddSink 4
-AudioEnhs ControlTypeL 4
-AudioEnhs ControlControlTypeL 4
+AudioEnhs Control_Type 4
+AudioEnhs Control_ControlType 4
//waittestclass AudioEnhs
AudioEnhs StreamRemoveSink 4
AudioEnhs RemoveObserver 4
@@ -72,11 +72,22 @@
AudioEnhs CreateStream
AudioEnhs CreateEffect 7
AudioEnhs AddObserver 7
+AudioEnhs CreateEffect 20
+AudioEnhs AddObserver 20
AudioEnhs StreamAddEffect 7
waittestclass AudioEnhs
+AudioEnhs StreamAddEffect 20
+waittestclass AudioEnhs
+AudioEnhs Control_Type 20
+AudioEnhs Control_ControlType 20
+
+AudioEnhs BalGetBalance
AudioEnhs RemoveObserver 7
AudioEnhs RemoveEffect 7
AudioEnhs DeleteEffect 7
+AudioEnhs RemoveObserver 20
+AudioEnhs RemoveEffect 20
+AudioEnhs DeleteEffect 20
AudioEnhs DeleteFactory
delete AudioEnhs
[Endtest]
@@ -90,13 +101,6 @@
AudioEnhs AddObserver 9
AudioEnhs StreamAddEffect 9
waittestclass AudioEnhs
-allownextresult -18
-AudioEnhs AudioEffect_Enable 9
-allownextresult -18
-AudioEnhs EffectApply 7
-allownextresult -18
-AudioEnhs AudioEffect_Disable 9
-allownextresult -18
AudioEnhs RemoveObserver 9
AudioEnhs RemoveEffect 9
AudioEnhs DeleteEffect 9
@@ -111,8 +115,8 @@
AudioEnhs CreateStream
AudioEnhs AddObserver 3
//waittestclass AudioEnhs
-AudioEnhs ControlTypeL 3
-AudioEnhs ControlControlTypeL 3
+AudioEnhs Control_Type 3
+AudioEnhs Control_ControlType 3
AudioEnhs RemoveObserver 3
AudioEnhs DeleteStream
AudioEnhs DeleteFactory
@@ -132,9 +136,11 @@
AudioEnhs AddObserver 4
AudioEnhs CreateEffect 7
AudioEnhs AddObserver 7
+
AudioEnhs StreamAddSource 0
AudioEnhs StreamAddSink 4
AudioEnhs StreamAddEffect 7
+
waittestclass AudioEnhs
AudioEnhs FileSOpen
AudioEnhs StreamOpen
@@ -195,6 +201,11 @@
AudioEnhs EffectApply 7
pause 5000
AudioEnhs StreamStart
+
+AudioEnhs AudioEffect_Disable 7
+
+
+
AudioEnhs CloseSource
AudioEnhs StreamClose
waittestclass AudioEnhs
@@ -279,8 +290,8 @@
AudioEnhs DRMRemoveAllowedOutputDevice 2
//AudioEnhs DRMGetAllowedOutputDevice 4
//AudioEnhs DRMRemoveAllowedOutputDevice 4
-AudioEnhs ControlTypeL 1
-AudioEnhs ControlControlTypeL 1
+AudioEnhs Control_Type 1
+AudioEnhs Control_ControlType 1
pause 3000
AudioEnhs StreamStart
pause 5000
@@ -316,10 +327,10 @@
AudioEnhs StreamStart
pause 4000
AudioEnhs StreamPause
-AudioEnhs ControlTypeL 2
-AudioEnhs ControlControlTypeL 2
-AudioEnhs ControlTypeL 3
-AudioEnhs ControlControlTypeL 3
+AudioEnhs Control_Type 2
+AudioEnhs Control_ControlType 2
+AudioEnhs Control_Type 3
+AudioEnhs Control_ControlType 3
AudioEnhs DescSGetBitRate
AudioEnhs DSGetSize
pause 2000
@@ -358,8 +369,8 @@
AudioEnhs StreamStart
pause 4000
AudioEnhs StreamPause
-AudioEnhs ControlTypeL 2
-AudioEnhs ControlControlTypeL 2
+AudioEnhs Control_Type 2
+AudioEnhs Control_ControlType 2
AudioEnhs DescSGetBitRate
AudioEnhs DSGetSize
pause 2000
@@ -401,10 +412,10 @@
AudioEnhs AudioEffect_Enforce 1
AudioEnhs AudioEffect_IsEnabled
AudioEnhs AudioEffect_HaveUpdateRights
-AudioEnhs ControlTypeL 0
-AudioEnhs ControlControlTypeL 0
-AudioEnhs ControlTypeL 5
-AudioEnhs ControlControlTypeL 5
+AudioEnhs Control_Type 0
+AudioEnhs Control_ControlType 0
+AudioEnhs Control_Type 5
+AudioEnhs Control_ControlType 5
AudioEnhs FileSGetSize
AudioEnhs FileSGetBitRate
AudioEnhs StreamStart
@@ -470,10 +481,10 @@
AudioEnhs StreamGetPositionL
AudioEnhs StreamSetPositionL 0
AudioEnhs StreamGetPositionL
-AudioEnhs ControlTypeL 0
-AudioEnhs ControlControlTypeL 0
-AudioEnhs ControlTypeL 5
-AudioEnhs ControlControlTypeL 5
+AudioEnhs Control_Type 0
+AudioEnhs Control_ControlType 0
+AudioEnhs Control_Type 5
+AudioEnhs Control_ControlType 5
pause 3000
AudioEnhs StreamStart
pause 4000
@@ -563,8 +574,8 @@
AudioEnhs ER_SetRoomHFLevel 0
AudioEnhs ER_SetRoomLevel -1000
AudioEnhs AudioEffect_IsEnabled
-//AudioEnhs AudioEffect_IsEnforced
-//AudioEnhs AudioEffect_Uid
+AudioEnhs AudioEffect_IsEnforced
+AudioEnhs AudioEffect_Uid
AudioEnhs AudioEffect_HaveUpdateRights
AudioEnhs AudioEffect_Enforce 1
pause 2000
@@ -574,8 +585,8 @@
AudioEnhs EffectApply 8
AudioEnhs StreamPause
pause 2000
-AudioEnhs ControlTypeL 8
-AudioEnhs ControlControlTypeL 8
+AudioEnhs Control_Type 8
+AudioEnhs Control_ControlType 8
AudioEnhs StreamStart
AudioEnhs CloseSource
AudioEnhs StreamClose
@@ -629,10 +640,20 @@
waittestclass AudioEnhs
AudioEnhs StreamPrime
waittestclass AudioEnhs
-AudioEnhs ControlTypeL 9
-AudioEnhs ControlControlTypeL 9
+AudioEnhs Control_Type 9
+AudioEnhs Control_ControlType 9
AudioEnhs StreamStart
pause 5000
+
+AudioEnhs AudioEffect_IsEnabled
+AudioEnhs AudioEffect_IsEnforced
+AudioEnhs AudioEffect_Enable 9
+AudioEnhs AudioEffect_Uid
+AudioEnhs AudioEffect_HaveUpdateRights
+AudioEnhs AudioEffect_Enforce 1
+AudioEnhs EffectApply 9
+AudioEnhs AudioEffect_Disable 9
+
AudioEnhs CloseSource
AudioEnhs StreamClose
waittestclass AudioEnhs
@@ -675,16 +696,16 @@
AudioEnhs SW_SetStereoWideningLevelL 100
waittestclass AudioEnhs
AudioEnhs AudioEffect_IsEnabled
-//AudioEnhs AudioEffect_IsEnforced
-//AudioEnhs AudioEffect_Uid
+AudioEnhs AudioEffect_IsEnforced
+AudioEnhs AudioEffect_Uid
AudioEnhs AudioEffect_HaveUpdateRights
AudioEnhs AudioEffect_Enforce 1
pause 2000
AudioEnhs StreamStart
AudioEnhs EffectApply 10
pause 5000
-AudioEnhs ControlTypeL 10
-AudioEnhs ControlControlTypeL 10
+AudioEnhs Control_Type 10
+AudioEnhs Control_ControlType 10
AudioEnhs AudioEffect_Disable 10
AudioEnhs CloseSource
AudioEnhs StreamClose
@@ -725,12 +746,12 @@
waittestclass AudioEnhs
AudioEnhs AudioEffect_Enable 11
AudioEnhs AudioEffect_IsEnabled
-//AudioEnhs AudioEffect_IsEnforced
-//AudioEnhs AudioEffect_Uid
+AudioEnhs AudioEffect_IsEnforced
+AudioEnhs AudioEffect_Uid
AudioEnhs AudioEffect_HaveUpdateRights
AudioEnhs AudioEffect_Enforce 1
-AudioEnhs ControlTypeL 11
-AudioEnhs ControlControlTypeL 11
+AudioEnhs Control_Type 11
+AudioEnhs Control_ControlType 11
pause 2000
AudioEnhs StreamStart
AudioEnhs EffectApply 11
@@ -769,6 +790,7 @@
AudioEnhs AddObserver 12
AudioEnhs StreamAddSource 0
AudioEnhs StreamAddSink 4
+AudioEnhs AttachReverb
AudioEnhs StreamAddEffect 8
AudioEnhs StreamAddEffect 12
waittestclass AudioEnhs
@@ -776,23 +798,26 @@
AudioEnhs StreamOpen
waittestclass AudioEnhs
AudioEnhs StreamPrime
+waittestclass AudioEnhs
AudioEnhs EffectApply 8
AudioEnhs EffectApply 12
-waittestclass AudioEnhs
+AudioEnhs AudioEffect_Enable 12
AudioEnhs RL_LevelRangeL
AudioEnhs RL_SetRoomLevelL -200
AudioEnhs RL_LevelL
-AudioEnhs ControlTypeL 12
-AudioEnhs ControlControlTypeL 12
-pause 2000
+AudioEnhs Control_Type 12
+AudioEnhs Control_ControlType 12
+pause 1000
AudioEnhs AudioEffect_IsEnabled
-//AudioEnhs AudioEffect_IsEnforced
-//AudioEnhs AudioEffect_Uid
+AudioEnhs AudioEffect_IsEnforced
+AudioEnhs AudioEffect_Uid
AudioEnhs AudioEffect_HaveUpdateRights
AudioEnhs AudioEffect_Enforce 1
pause 2000
AudioEnhs StreamStart
pause 5000
+AudioEnhs AudioEffect_Enable 8
+
AudioEnhs AudioEffect_Disable 12
AudioEnhs AudioEffect_Disable 8
pause 2000
@@ -800,9 +825,11 @@
AudioEnhs StreamClose
waittestclass AudioEnhs
AudioEnhs RemoveObserver 12
+AudioEnhs RemoveObserver 8
AudioEnhs RemoveObserver 4
AudioEnhs RemoveObserver 0
AudioEnhs RemoveObserver 3
+AudioEnhs DetachReverb
AudioEnhs RemoveEffect 12
AudioEnhs RemoveEffect 8
AudioEnhs DeleteStream
@@ -838,12 +865,19 @@
AudioEnhs DA_DistanceAttenuationL
AudioEnhs DA_RollOffFactorMaxL
AudioEnhs DA_RoomRollOffFactorMaxL
-AudioEnhs ControlTypeL 13
-AudioEnhs ControlControlTypeL 13
+AudioEnhs Control_Type 13
+AudioEnhs Control_ControlType 13
waittestclass AudioEnhs
AudioEnhs StreamStart
AudioEnhs EffectApply 13
pause 5000
+
+AudioEnhs AudioEffect_IsEnabled
+AudioEnhs AudioEffect_Enforce 1
+AudioEnhs AudioEffect_IsEnforced
+AudioEnhs AudioEffect_Uid
+AudioEnhs AudioEffect_HaveUpdateRights
+
AudioEnhs AudioEffect_Disable 13
AudioEnhs CloseSource
AudioEnhs StreamClose
@@ -884,14 +918,22 @@
AudioEnhs AudioEffect_Enable 17
AudioEnhs SL_LocationCartesianL 17
AudioEnhs SL_LocationSphericalL 17
-AudioEnhs ControlTypeL 17
-AudioEnhs ControlControlTypeL 17
+AudioEnhs Control_Type 17
+AudioEnhs Control_ControlType 17
waittestclass AudioEnhs
AudioEnhs StreamStart
AudioEnhs EffectApply 17
pause 5000
AudioEnhs SL_SetLocationCartesianL 17 0 0 0
AudioEnhs SL_SetLocationSphericalL 17 0 0 0
+
+AudioEnhs AudioEffect_IsEnabled
+AudioEnhs AudioEffect_Enforce 1
+AudioEnhs AudioEffect_IsEnforced
+AudioEnhs AudioEffect_Uid
+AudioEnhs AudioEffect_HaveUpdateRights
+
+
AudioEnhs AudioEffect_Disable 17
AudioEnhs CloseSource
AudioEnhs StreamClose
@@ -932,14 +974,22 @@
AudioEnhs AudioEffect_Enable 16
AudioEnhs SL_LocationCartesianL 16
AudioEnhs SL_LocationSphericalL 16
-AudioEnhs ControlTypeL 16
-AudioEnhs ControlControlTypeL 16
+AudioEnhs Control_Type 16
+AudioEnhs Control_ControlType 16
waittestclass AudioEnhs
AudioEnhs StreamStart
AudioEnhs EffectApply 16
pause 5000
AudioEnhs SL_SetLocationCartesianL 16 0 0 0
AudioEnhs SL_SetLocationSphericalL 16 0 0 0
+
+AudioEnhs AudioEffect_IsEnabled
+AudioEnhs AudioEffect_Enforce 1
+AudioEnhs AudioEffect_IsEnforced
+AudioEnhs AudioEffect_Uid
+AudioEnhs AudioEffect_HaveUpdateRights
+
+
AudioEnhs AudioEffect_Disable 16
pause 2000
AudioEnhs CloseSource
@@ -982,10 +1032,18 @@
AudioEnhs AudioEffect_Enable 18
AudioEnhs LO_OrientationL 18
AudioEnhs LO_OrientationVectorsL 18
-AudioEnhs ControlTypeL 18
-AudioEnhs ControlControlTypeL 18
+AudioEnhs Control_Type 18
+AudioEnhs Control_ControlType 18
AudioEnhs StreamStart
+AudioEnhs EffectApply 18
pause 5000
+
+AudioEnhs AudioEffect_IsEnabled
+AudioEnhs AudioEffect_Enforce 1
+AudioEnhs AudioEffect_IsEnforced
+AudioEnhs AudioEffect_Uid
+AudioEnhs AudioEffect_HaveUpdateRights
+
AudioEnhs AudioEffect_Disable 18
AudioEnhs CloseSource
AudioEnhs StreamClose
@@ -1023,17 +1081,22 @@
AudioEnhs StreamOpen
waittestclass AudioEnhs
AudioEnhs StreamPrime
-//AudioEnhs AudioEffect_Enable 19
-pause 1000
-//AudioEnhs EffectApply 19
-//AudioEnhs LO_OrientationL 19
-//AudioEnhs LO_OrientationVectorsL 19
+waittestclass AudioEnhs
+AudioEnhs AudioEffect_Enable 19
+AudioEnhs LO_OrientationL 19
+AudioEnhs LO_OrientationVectorsL 19
waittestclass AudioEnhs
AudioEnhs StreamStart
+AudioEnhs EffectApply 19
pause 5000
-//AudioEnhs AudioEffect_Disable 19
-AudioEnhs ControlTypeL 19
-AudioEnhs ControlControlTypeL 19
+AudioEnhs AudioEffect_IsEnabled
+AudioEnhs AudioEffect_Enforce 1
+AudioEnhs AudioEffect_IsEnforced
+AudioEnhs AudioEffect_Uid
+AudioEnhs AudioEffect_HaveUpdateRights
+AudioEnhs AudioEffect_Disable 19
+AudioEnhs Control_Type 19
+AudioEnhs Control_ControlType 19
AudioEnhs CloseSource
AudioEnhs StreamClose
waittestclass AudioEnhs
@@ -1073,6 +1136,14 @@
AudioEnhs StreamPrime
waittestclass AudioEnhs
AudioEnhs AudioEffect_Enable 15
+
+AudioEnhs AudioEffect_IsEnabled
+AudioEnhs AudioEffect_IsEnforced
+AudioEnhs AudioEffect_Uid
+AudioEnhs AudioEffect_HaveUpdateRights
+AudioEnhs AudioEffect_Enforce 1
+AudioEnhs EffectApply 15
+
AudioEnhs SD_CartesianVelocityL 15
AudioEnhs SD_SphericalVelocityL 15
AudioEnhs SD_FactorL 15
@@ -1082,8 +1153,8 @@
AudioEnhs SD_SetCartesianVelocityL 15 0 0 0
AudioEnhs StreamStart
pause 5000
-AudioEnhs ControlTypeL 15
-AudioEnhs ControlControlTypeL 15
+AudioEnhs Control_Type 15
+AudioEnhs Control_ControlType 15
AudioEnhs AudioEffect_Disable 15
AudioEnhs CloseSource
AudioEnhs StreamClose
@@ -1124,6 +1195,13 @@
AudioEnhs StreamPrime
waittestclass AudioEnhs
AudioEnhs AudioEffect_Enable 14
+AudioEnhs AudioEffect_IsEnabled
+AudioEnhs AudioEffect_IsEnforced
+AudioEnhs AudioEffect_Uid
+AudioEnhs AudioEffect_HaveUpdateRights
+AudioEnhs AudioEffect_Enforce 1
+AudioEnhs EffectApply 14
+
AudioEnhs SD_CartesianVelocityL 14
AudioEnhs SD_SphericalVelocityL 14
AudioEnhs SD_FactorL 15
@@ -1131,8 +1209,8 @@
AudioEnhs SD_FactorMaxL 15
AudioEnhs SD_SetSphericalVelocityL 14 0 0 0
AudioEnhs SD_SetCartesianVelocityL 14 0 0 0
-AudioEnhs ControlTypeL 14
-AudioEnhs ControlControlTypeL 14
+AudioEnhs Control_Type 14
+AudioEnhs Control_ControlType 14
AudioEnhs StreamStart
pause 5000
AudioEnhs AudioEffect_Disable 14
@@ -1182,8 +1260,8 @@
#AudioEnhs PDLSGetDLRateL
#AudioEnhs PDLSGetBitRateL
#AudioEnhs PDLSResumeDownloadL
-#AudioEnhs ControlTypeL 6
-#AudioEnhs ControlControlTypeL 6
+#AudioEnhs Control_Type 6
+#AudioEnhs Control_ControlType 6
#AudioEnhs PDLSGetSize
#pause 10000
#AudioEnhs StreamStart
@@ -1288,6 +1366,7 @@
AudioEnhs ER_ReflectionLevelRange
AudioEnhs ER_ReverbDelay
AudioEnhs ER_ReverbDelayMax
+AudioEnhs ER_DelayMaxMax
AudioEnhs ER_ReverbLevel
AudioEnhs ER_ReverbLevelRange
AudioEnhs ER_RoomHFLevel
@@ -1309,8 +1388,8 @@
AudioEnhs RL_SetRoomLevelL -200
AudioEnhs RL_LevelL
AudioEnhs AudioEffect_IsEnabled
-//AudioEnhs AudioEffect_IsEnforced
-//AudioEnhs AudioEffect_Uid
+AudioEnhs AudioEffect_IsEnforced
+AudioEnhs AudioEffect_Uid
AudioEnhs AudioEffect_HaveUpdateRights
AudioEnhs AudioEffect_Enforce 1
AudioEnhs StreamStart