--- a/mmappcomponents/asxparser/src/asxparser.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappcomponents/asxparser/src/asxparser.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -15,7 +15,7 @@
*
*/
-// Version : %version: 10.1.5.1.2 %
+// Version : %version: 10.1.5.1.3 %
@@ -421,7 +421,7 @@
{
iVersion = KErrNotFound;
- TInt size;
+ TInt size = 0;
User::LeaveIfError( aFile.Size( size ) );
if ( size > KMaxAsxFileSize )
--- a/mmappcomponents/collectionhelper/group/mpxcollectionhelper.mmp Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappcomponents/collectionhelper/group/mpxcollectionhelper.mmp Wed Aug 18 10:16:02 2010 +0300
@@ -66,3 +66,6 @@
#elif defined(WINSCW)
deffile ../bwinscw/
#endif
+
+SMPSAFE
+
--- a/mmappcomponents/collectionhelper/inc/mpxcollectionhelperimp.h Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappcomponents/collectionhelper/inc/mpxcollectionhelperimp.h Wed Aug 18 10:16:02 2010 +0300
@@ -19,6 +19,9 @@
#ifndef CMPXCOLLECTIONHELPERIMP_H
#define CMPXCOLLECTIONHELPERIMP_H
+#include <thumbnailmanager.h>
+#include <thumbnailmanagerobserver.h>
+
#include "mpxcollectionhelper.h"
#include "mpxharvesterutilityobserver.h"
#include "mpxmediatorobserver.h"
@@ -41,7 +44,8 @@
NONSHARABLE_CLASS( CMPXCollectionHelperImp ): public CBase,
public MMPXCollectionHelper,
public MMPXHarvesterUtilityObserver,
- public MMPXMediatorObserver
+ public MMPXMediatorObserver,
+ public MThumbnailManagerObserver
{
public:
@@ -695,6 +699,18 @@
*/
void HandleFileGetMediaCompletedL( CMPXMedia* aMedia, TInt aErr );
+public:
+ /**
+ * From MThumbnailManagerObserver
+ */
+ void ThumbnailPreviewReady( MThumbnailData& aThumbnail,
+ TThumbnailRequestId aId );
+ /**
+ * From MThumbnailManagerObserver
+ */
+ void ThumbnailReady( TInt aError,
+ MThumbnailData& aThumbnail,
+ TThumbnailRequestId aId );
private:
/**
@@ -702,6 +718,13 @@
* @param aMedia media item to add to the collection
*/
void DoAddToCollectionL( CMPXMedia* aMedia );
+
+ /**
+ * Rename the thumbnail through thumbnail manager
+ * @param aOldUri exiting uri of the song
+ * @param aNewUri new uri of the song
+ */
+ void RenameThumbnailL( const TDesC& aOldUri, const TDesC& aNewUri );
protected:
@@ -720,7 +743,8 @@
MMPXHarvesterUtility* iHvsUtility;
MMPXCollectionUtility* iCollectionUtil;
CMPXCollectionMediator* iMediator;
-
+
+ CThumbnailManager* iTNManager; // owned
MMPXCollectionHelperObserver* iObserver; // not owned
TUid iMusicCollectionId;
TBool iInitialized;
--- a/mmappcomponents/collectionhelper/src/mpxcollectioncachedhelper.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappcomponents/collectionhelper/src/mpxcollectioncachedhelper.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -12,7 +12,7 @@
* Contributors:
*
* Description: Extended collection helper with an internal caching array
-* Version : %version: da1mmcf#27.1.12.3.2 %
+* Version : %version: e003sa33#27.1.12.3.4 %
*
*/
@@ -395,6 +395,11 @@
// Not found in the array
if( !media )
{
+ // If the catched count is more than KCacheCount, commit it to database.
+ if( count >= KCacheCount )
+ {
+ Commit();
+ }
CMPXMedia* copy = CMPXMedia::NewL( *aMedia );
CleanupStack::PushL( copy );
iCache->AppendL( copy ); // ownership x-fer
--- a/mmappcomponents/collectionhelper/src/mpxcollectionhelperimp.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappcomponents/collectionhelper/src/mpxcollectionhelperimp.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -25,6 +25,7 @@
#include <mpxcollectionutility.h>
#include <mpxharvesterutility.h>
#include <mpxmediageneraldefs.h>
+#include <mpxmediamusicdefs.h>
#include <mpxmediacontainerdefs.h>
#include <mpxuser.h>
#include <mpxcollectionplugin.hrh>
@@ -45,6 +46,7 @@
// ---------------------------------------------------------------------------
//
CMPXCollectionHelperImp::CMPXCollectionHelperImp()
+ : iTNManager(NULL)
{
}
@@ -59,7 +61,7 @@
iCollectionUtil = MMPXCollectionUtility::NewL();
iMediator = CMPXCollectionMediator::NewL( iCollectionUtil->Collection(),
this );
-
+
RArray<TUid> ary;
CleanupClosePushL( ary );
ary.AppendL( TUid::Uid(EMPXCollectionPluginMusic) );
@@ -111,6 +113,8 @@
iCollectionUtil->Close();
}
delete iMediator;
+
+ delete iTNManager;
}
@@ -416,11 +420,28 @@
RArray<TMPXAttribute> attributes;
CleanupClosePushL( attributes );
attributes.AppendL(KMPXMediaGeneralId);
+ attributes.AppendL(KMPXMediaMusicAlbumArtFileName);
CMPXMedia* media = GetL(aOldUri, attributes.Array(), aItemCat);
CleanupStack::PopAndDestroy(&attributes);
CleanupStack::PushL(media);
+ const TDesC& fileName(media->ValueText(KMPXMediaMusicAlbumArtFileName));
+
+ // the songs have embedded albumart.
+ if(fileName.CompareF(aOldUri) == 0)
+ {
+ // change the Art filename to the new Uri
+ media->SetTextValueL(KMPXMediaMusicAlbumArtFileName, aNewUri);
+
+ // Rename the thumbnail
+ TRAPD(err, RenameThumbnailL(aOldUri, aNewUri));
+ if(KErrNone != err)
+ {
+ MPX_DEBUG2("Thumbnail renames failed. Err: %d", err);
+ }
+ }
+
// change file path to the new file path
media->SetTextValueL(KMPXMediaGeneralUri, aNewUri);
@@ -528,25 +549,19 @@
CMPXMedia* foundMedia(NULL);
- switch ( ary && ary->Count() ) //lint !e961
+ if ( ary && ary->Count() )
{
- case 0:
- User::Leave(KErrNotFound);
- case 1:
- {
- foundMedia = CMPXMedia::NewL(*ary->AtL(0));
- CleanupStack::PushL(foundMedia);
- foundMedia->SetTObjectValueL<TUid>(
- KMPXMediaGeneralCollectionId, TUid::Uid(col) );
- CleanupStack::Pop(foundMedia);
- break;
- }
- default:
- User::Leave(KErrCorrupt);
+ foundMedia = CMPXMedia::NewL(*ary->AtL(0));
+ CleanupStack::PushL(foundMedia);
+ foundMedia->SetTObjectValueL<TUid>( KMPXMediaGeneralCollectionId, TUid::Uid(col) );
+ CleanupStack::Pop(foundMedia);
}
-
+ else
+ {
+ User::Leave(KErrNotFound);
+ }
+
CleanupStack::PopAndDestroy(result);
-
return foundMedia;
}
@@ -735,4 +750,41 @@
delete this;
}
+// ---------------------------------------------------------------------------
+// Rename the thumbnail through TNM
+// ---------------------------------------------------------------------------
+//
+void CMPXCollectionHelperImp::RenameThumbnailL( const TDesC& aOldUri,
+ const TDesC& aNewUri )
+ {
+ MPX_FUNC("CMPXCollectionHelperImp::RenameThumbnailL");
+
+ // Create Thumbnail Manager instance when use first time.
+ if(NULL == iTNManager)
+ {
+ iTNManager = CThumbnailManager::NewL( *this );
+ }
+
+ // Rename thumbnail
+ iTNManager->RenameThumbnailsL(aOldUri, aNewUri, 0);
+ }
+
+// ---------------------------------------------------------------------------
+// CMPXDbAbstractAlbum::ThumbnailReady
+// Callback but not used here
+// ---------------------------------------------------------------------------
+void CMPXCollectionHelperImp::ThumbnailPreviewReady(
+ MThumbnailData& /*aThumbnail*/, TThumbnailRequestId /*aId*/ )
+ {
+ }
+
+
+// ---------------------------------------------------------------------------
+// CMPXDbAbstractAlbum::ThumbnailReady
+// Callback but not used here
+// ---------------------------------------------------------------------------
+void CMPXCollectionHelperImp::ThumbnailReady( TInt /*aError*/,
+ MThumbnailData& /*aThumbnail*/, TThumbnailRequestId /*aId*/ )
+ {
+ }
// End of file
--- a/mmappcomponents/harvester/collectionmediator/group/mpxcollectionmediator.mmp Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappcomponents/harvester/collectionmediator/group/mpxcollectionmediator.mmp Wed Aug 18 10:16:02 2010 +0300
@@ -53,4 +53,7 @@
deffile ../eabi/
#elif defined(WINSCW)
deffile ../bwinscw/
-#endif
\ No newline at end of file
+#endif
+
+SMPSAFE
+
--- a/mmappcomponents/harvester/filehandler/group/mpxfilehandler.mmp Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappcomponents/harvester/filehandler/group/mpxfilehandler.mmp Wed Aug 18 10:16:02 2010 +0300
@@ -77,3 +77,5 @@
deffile ../bwinscw/
#endif
+SMPSAFE
+
--- a/mmappcomponents/harvester/filehandler/inc/mpxdbcommon.h Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappcomponents/harvester/filehandler/inc/mpxdbcommon.h Wed Aug 18 10:16:02 2010 +0300
@@ -24,12 +24,12 @@
// Please update the increment number for each increment
// Please update the version number for each schema change
#ifdef ABSTRACTAUDIOALBUM_INCLUDED
-_LIT( KHarvesterDBName, "harvesterdbv10_0.dat" );
-_LIT( KHarvesterDBNameEMMC, "harvesterdbv10_0i.dat" );
+_LIT( KHarvesterDBName, "harvesterdbv10_1.dat" );
+_LIT( KHarvesterDBNameEMMC, "harvesterdbv10_1i.dat" );
#else
-_LIT( KHarvesterDBName, "harvesterdbv10_0n.dat" );
-_LIT( KHarvesterDBNameEMMC, "harvesterdbv10_0in.dat" );
-#endif
+_LIT( KHarvesterDBName, "harvesterdbv10_1n.dat" );
+_LIT( KHarvesterDBNameEMMC, "harvesterdbv10_1in.dat" );
+#endif
_LIT( KHarvesterDBPattern, "harvesterdbv*.dat" );
const TInt KDbMaxTableCreationSQLLength = 1024;
--- a/mmappcomponents/harvester/filehandler/inc/mpxharvesterdbmanager.h Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappcomponents/harvester/filehandler/inc/mpxharvesterdbmanager.h Wed Aug 18 10:16:02 2010 +0300
@@ -211,7 +211,7 @@
*
* @return TInt64 estimated file size
*/
- TInt64 CalculateInitalDummyDBSizeL( TVolumeInfo aVol, TInt aOrigDbSize );
+ TInt64 CalculateInitalDummyDBSizeL( TVolumeInfo& aVol, TInt aOrigDbSize );
/**
* Remove dummy file
--- a/mmappcomponents/harvester/filehandler/src/mpxharvesterdbmanager.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappcomponents/harvester/filehandler/src/mpxharvesterdbmanager.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -862,7 +862,7 @@
// CMPXHarvesterDatabaseManager::CalculateInitalDummyDBSizeL
// ---------------------------------------------------------------------------
//
-TInt64 CMPXHarvesterDatabaseManager::CalculateInitalDummyDBSizeL( TVolumeInfo aVol, TInt aOrigDbSize )
+TInt64 CMPXHarvesterDatabaseManager::CalculateInitalDummyDBSizeL( TVolumeInfo& aVol, TInt aOrigDbSize )
{
MPX_FUNC("CMPXHarvesterDatabaseManager::CalculateInitalDummyDBSizeL");
TInt64 size;
--- a/mmappcomponents/harvester/metadataextractor/group/mpxmetadataextractor.mmp Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappcomponents/harvester/metadataextractor/group/mpxmetadataextractor.mmp Wed Aug 18 10:16:02 2010 +0300
@@ -61,3 +61,6 @@
#elif defined(WINSCW)
deffile ../bwinscw/
#endif
+
+SMPSAFE
+
--- a/mmappcomponents/harvester/metadataextractor/src/mpxfileinfoutility.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappcomponents/harvester/metadataextractor/src/mpxfileinfoutility.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -12,7 +12,7 @@
* Contributors:
*
* Description: This class is responsible for reading file info
-* Version : %version: da1mmcf#5.1.3.1.6.2.1 % << Don't touch! Updated by Synergy at check-out.
+* Version : %version: e003sa33#5.1.3.1.6.2.3 % << Don't touch! Updated by Synergy at check-out.
*
* Copyright © 2005 Nokia. All rights reserved.
*/
@@ -81,8 +81,8 @@
iMMFControllers.ResetAndDestroy();
iMMFControllers.Close();
- // delete non cached controller
- if(iController)
+ //delete non cached Helix controller
+ if( iController && ( iCurrentControllerUid == 0x10207B65 ) )
{
iController->Close();
delete iController;
@@ -163,9 +163,6 @@
buf->Ptr(0),
dataSource));
- MPX_DEBUG1("CMPXFileInfoUtility::OpenFileL()- AddDataSink()");
- User::LeaveIfError(iController->AddDataSink(KUidMmfAudioOutput,
- KNullDesC8));
CleanupStack::PopAndDestroy(buf);
MPX_DEBUG1("CMPXFileInfoUtility::OpenFileL()--->");
--- a/mmappcomponents/harvester/metadataextractor/src/mpxmetadataextractor.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappcomponents/harvester/metadataextractor/src/mpxmetadataextractor.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -12,7 +12,7 @@
* Contributors:
*
* Description: Extracts metadata from a file
-* Version : %version: da1mmcf#38.1.4.2.6.1.5.3.4 % << Don't touch! Updated by Synergy at check-out.
+* Version : %version: da1mmcf#38.1.4.2.6.1.5.3.6 % << Don't touch! Updated by Synergy at check-out.
*
*/
@@ -52,7 +52,7 @@
#ifdef RD_MPX_TNM_INTEGRATION
_LIT( KImageFileType, "image/jpeg" );
const TInt KMPXTimeoutTimer = 3000000; // 3 seconds
-const TInt KMPXMaxThumbnailRequest = 2;
+const TInt KMPXMaxThumbnailRequest = 2;
#endif //RD_MPX_TNM_INTEGRATION
#ifdef ABSTRACTAUDIOALBUM_INCLUDED
@@ -186,10 +186,10 @@
aNewProperty = NULL;
iFileName = aFile;
iMetadataOnly = aMetadataOnly;
-
+
// populate the task array
AddTasksL();
-
+
// execute all tasks in the array
while ( iArrayTasks.Count() )
{
@@ -211,10 +211,10 @@
}
break;
}
-
+
iArrayTasks.Remove( 0 );
}
-
+
aNewProperty = iMedia;
iMedia = NULL; // ownership transferred.
CleanUp();
@@ -236,9 +236,6 @@
// Album
aMediaProp.SetTextValueL( KMPXMediaMusicAlbum,
KNullDesC );
- // Year
- aMediaProp.SetTObjectValueL<TInt64>( KMPXMediaMusicYear,
- (TInt64) 0 );
// Track
aMediaProp.SetTextValueL( KMPXMediaMusicAlbumTrack,
KNullDesC );
@@ -267,20 +264,20 @@
const TDesC& mimeType = iMedia->ValueText( KMPXMediaGeneralMimeType );
HBufC8* mimeType8 = HBufC8::NewLC( mimeType.Length() );
mimeType8->Des().Append( mimeType );
-
+
// Continue to extract metadata even if fail.
MPX_TRAPD( metadataerror, iMetadataUtility->OpenFileL( iFile, *mimeType8 ) );
CleanupStack::PopAndDestroy( mimeType8 );
-
+
// Get MetadataUtility Container
const CMetaDataFieldContainer& metaCont = iMetadataUtility->MetaDataFieldsL();
// Get DRM data
// Need the protected flag from metadataUtility Container
MPX_TRAPD( drmerror, SetDrmMediaPropertiesL( metaCont ) );
- MPX_DEBUG2("CMPXMetadataExtractor::SetMediaPropertiesL, result=%d getting drm data",
+ MPX_DEBUG2("CMPXMetadataExtractor::SetMediaPropertiesL, result=%d getting drm data",
drmerror );
-
+
// Get metadata fields
TInt count( metaCont.Count() );
for( TInt i=0; i<count; ++i )
@@ -289,19 +286,19 @@
HBufC* value = NULL;
metaCont.FieldIdAt( i, fieldType ); // get the field type
-
+
// get the value, except for album art
if ( fieldType != EMetaDataJpeg )
{
MPX_TRAPD( err, value = metaCont.At( i, fieldType ).AllocL() );
if ( KErrNone != err )
{
- MPX_DEBUG2("CMPXMetadataExtractor::SetMediaPropertiesL - error = %i", err);
+ MPX_DEBUG2("CMPXMetadataExtractor::SetMediaPropertiesL - error = %i", err);
continue;
- }
+ }
CleanupStack::PushL( value );
}
-
+
switch( fieldType )
{
case EMetaDataSongTitle:
@@ -409,26 +406,70 @@
*value );
break;
}
- case EMetaDataDuration:
- {
+ case EMetaDataDuration:
+ {
const TDesC& mimeType = iMedia->ValueText( KMPXMediaGeneralMimeType );
- MPX_DEBUG2("CMPXMetadataExtractor::SetMediaPropertiesL, mimeType = %S", &mimeType);
-
+ MPX_DEBUG2("CMPXMetadataExtractor::SetMediaPropertiesL, mimeType = %S", &mimeType);
+
// Verify if WMA, get the duration
if( mimeType.Compare(KWmaMimeType) == 0 || mimeType.Compare(KWmaCafMimeType) == 0 )
{
- MPX_DEBUG1("CMPXMetadataExtractor::SetMediaPropertiesL- WMA");
+ MPX_DEBUG1("CMPXMetadataExtractor::SetMediaPropertiesL- WMA");
// Perform the duration conversion
TLex lexer( *value );
TInt32 duration ( 0 );
- lexer.Val( duration ); // [second]
+ lexer.Val( duration ); // [second]
duration *= 1000; // [msec]
-
+
iMedia->SetTObjectValueL<TInt32>( KMPXMediaGeneralDuration,
- duration );
-
- MPX_DEBUG2("CMPXMetadataExtractor::SetMediaPropertiesL- duration = %i", duration);
+ duration );
+
+ MPX_DEBUG2("CMPXMetadataExtractor::SetMediaPropertiesL- duration = %i", duration);
+ }
+ break;
+ }
+ case EMetaDataSampleRate:
+ {
+ const TDesC& mimeType = iMedia->ValueText( KMPXMediaGeneralMimeType );
+ MPX_DEBUG2("CMPXMetadataExtractor::SetMediaPropertiesL, mimeType = %S", &mimeType);
+
+ // Verify if WMA, get the sample rate
+ if( mimeType.Compare(KWmaMimeType) == 0 || mimeType.Compare(KWmaCafMimeType) == 0 )
+ {
+ MPX_DEBUG1("CMPXMetadataExtractor::SetMediaPropertiesL- WMA");
+
+ // Perform the sample rate conversion
+ TLex lexer( *value );
+ TInt32 sampleRate ( 0 );
+ lexer.Val( sampleRate );
+
+ iMedia->SetTObjectValueL<TUint>( KMPXMediaAudioSamplerate,
+ sampleRate );
+
+ MPX_DEBUG2("CMPXMetadataExtractor::SetMediaPropertiesL- sample rate = %i", sampleRate);
+ }
+ break;
+ }
+ case EMetaDataBitRate:
+ {
+ const TDesC& mimeType = iMedia->ValueText( KMPXMediaGeneralMimeType );
+ MPX_DEBUG2("CMPXMetadataExtractor::SetMediaPropertiesL, mimeType = %S", &mimeType);
+
+ // Verify if WMA, get the duration
+ if( mimeType.Compare(KWmaMimeType) == 0 || mimeType.Compare(KWmaCafMimeType) == 0 )
+ {
+ MPX_DEBUG1("CMPXMetadataExtractor::SetMediaPropertiesL- WMA");
+
+ // Perform the duration conversion
+ TLex lexer( *value );
+ TInt32 bitRate ( 0 );
+ lexer.Val( bitRate );
+
+ iMedia->SetTObjectValueL<TUint>( KMPXMediaAudioBitrate,
+ bitRate );
+
+ MPX_DEBUG2("CMPXMetadataExtractor::SetMediaPropertiesL- duration = %i", bitRate);
}
break;
}
@@ -449,7 +490,7 @@
}
if (fieldType != EMetaDataJpeg)
{
- CleanupStack::PopAndDestroy( value );
+ CleanupStack::PopAndDestroy( value );
}
}
}
@@ -469,25 +510,25 @@
if( iFileOpenError == KErrNone )
{
const TDesC& mimeType = iMedia->ValueText( KMPXMediaGeneralMimeType );
- MPX_DEBUG2("CMPXMetadataExtractor::SetExtMediaPropertiesL, mimeType = %S", &mimeType);
+ MPX_DEBUG2("CMPXMetadataExtractor::SetExtMediaPropertiesL, mimeType = %S", &mimeType);
iFile.Size( size );
iMedia->SetTObjectValueL<TInt>( KMPXMediaGeneralSize, size );
-
+
// Verify if WMA, skip getting info from MMF
if( mimeType.Compare(KWmaMimeType) == 0 || mimeType.Compare(KWmaCafMimeType) == 0 )
{
// No need to get MMF support
- MPX_DEBUG1("CMPXMetadataExtractor::SetExtMediaPropertiesL, skip MMF ");
+ MPX_DEBUG1("CMPXMetadataExtractor::SetExtMediaPropertiesL, skip MMF ");
}
else
{
- MPX_DEBUG1("CMPXMetadataExtractor::SetExtMediaPropertiesL, get MMF controller");
+ MPX_DEBUG1("CMPXMetadataExtractor::SetExtMediaPropertiesL, get MMF controller");
// Duration, bitrate, samplerate, etc
//
if( !iMetadataOnly )
{
MPX_TRAPD(err2, iFileInfoUtil->OpenFileL(
- iFile,
+ iFile,
iMedia->ValueText(KMPXMediaGeneralMimeType)));
MPX_DEBUG2("CMPXMetadataExtractor::SetExtMediaPropertiesL, file info util error %i", err2);
if( KErrNone == err2 )
@@ -502,7 +543,7 @@
MPX_DEBUG2("CMPXMetadataExtractor::SetExtMediaPropertiesL -- duration %i", duration);
}
-
+
iFileInfoUtil->Reset();
}
}
@@ -538,22 +579,22 @@
// CMPXMetadataExtractor::ThumbnailPreviewReady
// Callback but not used here
// ---------------------------------------------------------------------------
-void CMPXMetadataExtractor::ThumbnailPreviewReady(
+void CMPXMetadataExtractor::ThumbnailPreviewReady(
MThumbnailData& /*aThumbnail*/, TThumbnailRequestId /*aId*/ )
{
MPX_FUNC("CMPXMetadataExtractor::ThumbnailPreviewReady()");
}
-
+
// ---------------------------------------------------------------------------
// CMPXMetadataExtractor::ThumbnailReady
// Callback but not used here
// ---------------------------------------------------------------------------
-void CMPXMetadataExtractor::ThumbnailReady( TInt /*aError*/,
+void CMPXMetadataExtractor::ThumbnailReady( TInt /*aError*/,
MThumbnailData& /*aThumbnail*/, TThumbnailRequestId aId )
{
MPX_FUNC("CMPXMetadataExtractor::ThumbnailReady()");
-
+
// Remove thumbnail id from array.
TInt index = iArrayTNRequestId.Find( aId );
if ( index >= 0 )
@@ -578,8 +619,8 @@
CMPXMetadataExtractor* ptr =
static_cast<CMPXMetadataExtractor*>(aPtr);
-
- // Timer expired before thumbnail callback occurred. Stop wait loop to unblock.
+
+ // Timer expired before thumbnail callback occurred. Stop wait loop to unblock.
ptr->StopWaitLoop();
return KErrNone;
}
@@ -592,7 +633,7 @@
MPX_FUNC("CMPXMetadataExtractor::StopWaitLoop()");
// Cancel timer
CancelTimeoutTimer();
-
+
// Stop wait loop to unblock.
if ( iTNSyncWait->IsStarted() )
{
@@ -602,12 +643,12 @@
}
// ----------------------------------------------------------------------------
-// Cancel timer.
+// Cancel timer.
// ----------------------------------------------------------------------------
void CMPXMetadataExtractor::CancelTimeoutTimer()
{
MPX_FUNC("CMPXMetadataExtractor::CancelTimeoutTimer()");
-
+
// Cancel timer.
if ( iTimer && iTimer->IsActive() )
{
@@ -624,12 +665,12 @@
MPX_FUNC("CMPXMetadataExtractor::ExtractAlbumArtL()");
TInt err = KErrNone;
iCancelled = EFalse;
-
+
if ( !aMedia->IsSupported(KMPXMediaGeneralUri) )
{
return KErrArgument;
}
-
+
// Get full file name.
const TDesC& path = aMedia->ValueText(KMPXMediaGeneralUri);
MPX_DEBUG2("CMPXMetadataExtractor::ExtractAlbumArtL Filename:%S ", &path );
@@ -651,7 +692,7 @@
HBufC8* value8 = ((HBufC8*)sampleData)->Des().AllocLC(); // make a local copy of sampleData
source = CThumbnailObjectSource::NewLC(
value8, mimeType, path ); // give up ownership of value8
-
+
MPX_DEBUG1("CMPXMetadataExtractor::ExtractAlbumArtL source created from buffer");
TThumbnailRequestId tnId = iTNManager->CreateThumbnails( *source );
iArrayTNRequestId.Append( tnId );
@@ -662,7 +703,7 @@
{
source = CThumbnailObjectSource::NewLC(
path, KImageFileType );
-
+
MPX_DEBUG1("CMPXMetadataExtractor::ExtractAlbumArtL source created from path");
TThumbnailRequestId tnId = iTNManager->CreateThumbnails( *source );
iArrayTNRequestId.Append( tnId );
@@ -677,7 +718,7 @@
RArray<TMetaDataFieldId> wantedFields;
CleanupClosePushL( wantedFields );
wantedFields.Append(EMetaDataJpeg);
-
+
// Open file
if ( aMedia->IsSupported(KMPXMediaGeneralMimeType) )
{
@@ -693,7 +734,7 @@
MPX_TRAP( err, iMetadataUtility->OpenFileL( path, wantedFields ) );
}
CleanupStack::PopAndDestroy( &wantedFields );
-
+
if ( !err )
{
//check if can send TN request, If thumbnail creation is ongoing, wait til it is done
@@ -712,28 +753,28 @@
// ----------------------------------------------------------------------------
// Add album art to media object.
// ----------------------------------------------------------------------------
-void CMPXMetadataExtractor::AddMediaAlbumArtL( CMPXMedia& aMedia,
+void CMPXMetadataExtractor::AddMediaAlbumArtL( CMPXMedia& aMedia,
const TDesC& aFile )
{
MPX_FUNC("CMPXMetadataExtractor::AddMediaAlbumArtL()");
-
+
// get metadata container.
const CMetaDataFieldContainer& metaCont = iMetadataUtility->MetaDataFieldsL();
TPtrC8 data8 = metaCont.Field8( EMetaDataJpeg );
-
+
if ( data8.Length() )
{
MPX_DEBUG1("CMPXMetadataExtractor::GetMediaAlbumArtL(): Album art exist.");
#ifdef RD_MPX_TNM_INTEGRATION
- HBufC8* value8 = NULL;
+ HBufC8* value8 = NULL;
MPX_TRAPD( err, value8 = data8.AllocL() );
if ( KErrNone != err )
{
MPX_DEBUG2("CMPXMetadataExtractor::GetMediaAlbumArtL - error jpeg = %i", err);
return;
- }
+ }
CleanupStack::PushL( value8 );
-
+
TBuf<256> mimeType;
mimeType.Copy( KImageFileType );
CThumbnailObjectSource* source = CThumbnailObjectSource::NewL(
@@ -742,9 +783,9 @@
iArrayTNRequestId.Append( tnId ); // add thumbnail id to array
CleanupStack::Pop( value8 );
delete source;
-
+
aMedia.SetTextValueL( KMPXMediaMusicOriginalAlbumArtFileName, aFile );
-#endif // RD_MPX_TNM_INTEGRATION
+#endif // RD_MPX_TNM_INTEGRATION
aMedia.SetTextValueL( KMPXMediaMusicAlbumArtFileName, aFile );
}
}
@@ -885,7 +926,7 @@
iAppArc.AppForDocument(iFileName, dummyUid, dataType);
iMedia->SetTextValueL( KMPXMediaGeneralMimeType,dataType.Des() );
}
-
+
// Initially set default tags.
SetDefaultL( *iMedia );
}
@@ -937,23 +978,23 @@
MPX_DEBUG1("CMPXMetadataExtractor::CreateMediaAsyncL Request ongoing. Abort!" );
User::Leave( KErrAbort );
}
-
+
iCancelled = EFalse;
iFileOpenError = KErrNone;
iFileName = aFile;
iObs = aObs;
iMetadataOnly = aMetadataOnly;
-
+
// populate the task array
AddTasksL();
-
+
// Start task timer to execute task
if ( iArrayTasks.Count() )
{
if ( iTaskTimer->IsActive() )
{
iTaskTimer->Cancel();
- }
+ }
iTaskTimer->Start( 0, 0, TCallBack(TaskTimerCallback, this ));
}
}
@@ -965,7 +1006,7 @@
TInt CMPXMetadataExtractor::OpenFile()
{
MPX_FUNC("CMPXMetadataExtractor::OpenFile()");
-
+
// Open the file
iFile.Close();
TInt error = iFile.Open( iFs, iFileName, EFileRead | EFileShareReadersOrWriters );
@@ -981,7 +1022,7 @@
{
MPX_FUNC("CMPXMetadataExtractor::AddTasks()");
iFileOpenError = OpenFile();
-
+
// Do not change the order of the task below.
iArrayTasks.Reset();
if ( iFileOpenError == KErrNone )
@@ -1022,7 +1063,7 @@
void CMPXMetadataExtractor::HandleTaskTimerExpired()
{
MPX_FUNC("CMPXMetadataExtractor::HandleTaskTimerExpired()");
-
+
if ( iTaskTimer && iTaskTimer->IsActive() )
{
iTaskTimer->Cancel();
@@ -1039,13 +1080,13 @@
}
iArrayTasks.Reset();
}
-
+
// Remove task at index 0.
if ( iArrayTasks.Count() )
{
iArrayTasks.Remove( 0 );
}
-
+
// check if we have any more task to run
if ( iArrayTasks.Count() )
{
@@ -1060,7 +1101,7 @@
iObs->HandleCreateMediaComplete( iMedia, error );
iMedia = NULL; // ownership transferred.
}
-
+
CleanUp();
}
}
@@ -1091,7 +1132,7 @@
// Validate the objects to be used
MPX_ASSERT(iMedia);
MPX_ASSERT(iDrmMediaUtility);
-
+
// File Path
TParsePtrC parse( iFileName );
iMedia->SetTextValueL( KMPXMediaGeneralUri, iFileName );
@@ -1099,7 +1140,7 @@
MPX_DEBUG2("CMPXMetadataExtractor::SetDrmMediaPropertiesL - Filename=%S", &iFileName);
// get the protected flag from MetadataUtility Container
- TPtrC ptr = aMetaCont.Field( EMetaDataProtected );
+ TPtrC ptr = aMetaCont.Field( EMetaDataProtected );
MPX_DEBUG2("CMPXMetadataExtractor::SetDrmMediaPropertiesL -- status=%S", &ptr);
_LIT( KNonProtected, "0" );
if ( ptr.Compare( KNonProtected ) == 0 )
@@ -1110,7 +1151,7 @@
iMedia->SetTObjectValueL<TBool>( KMPXMediaDrmProtected, prot );
iMedia->SetTObjectValueL<TUint16>( KMPXMediaMTPDrmStatus, (TUint16)prot );
}
- else
+ else
{ // DRM file
// DRM Rights
@@ -1162,20 +1203,20 @@
iMedia->SetTObjectValueL<TBool>( KMPXMediaDrmProtected, prot );
iMedia->SetTObjectValueL<TUint16>( KMPXMediaMTPDrmStatus, (TUint16)prot );
-
+
iDrmMediaUtility->Close();
-
+
} // DRM file
-
+
// verify the file open status
if( iFileOpenError == KErrNotFound || iFileOpenError == KErrPathNotFound )
{
dbFlags |= KMPXMediaGeneralFlagsIsInvalid;
}
-
+
// Finally set the db flag
//
iMedia->SetTObjectValueL( KMPXMediaGeneralFlags, dbFlags );
-
+
}
--- a/mmappcomponents/harvester/server/group/mpxharvester.mmp Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappcomponents/harvester/server/group/mpxharvester.mmp Wed Aug 18 10:16:02 2010 +0300
@@ -62,3 +62,6 @@
LIBRARY usbman.lib
LIBRARY PlatformEnv.lib
LIBRARY disknotifyhandler.lib
+
+SMPSAFE
+
--- a/mmappcomponents/harvester/utility/group/mpxharvesterutility.mmp Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappcomponents/harvester/utility/group/mpxharvesterutility.mmp Wed Aug 18 10:16:02 2010 +0300
@@ -45,4 +45,7 @@
deffile ../eabi/
#elif defined(WINSCW)
deffile ../bwinscw/
-#endif
\ No newline at end of file
+#endif
+
+SMPSAFE
+
--- a/mmappcomponents/mmmtpdataprovider/mmmtpdpplugins/abstractmediamtpdataprovider/src/cabstractmediamtpdataprovidergetobjectproplist.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappcomponents/mmmtpdataprovider/mmmtpdpplugins/abstractmediamtpdataprovider/src/cabstractmediamtpdataprovidergetobjectproplist.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -124,7 +124,7 @@
PRINT2( _L( "MM MTP <> EMTPObjectPropCodeRepresentativeSampleData sampleFile.Size size=%d, err=%d" ), size, err );
if( err == KErrNone && size > 0 )
{
- HBufC8* sampleData = HBufC8::NewLC( size * sizeof( TUint8 ) ); // + sampleData
+ HBufC8* sampleData = HBufC8::NewLC( size ); // + sampleData
TPtr8 samplePtr = sampleData->Des();
err = sampleFile.Read( samplePtr );
PRINT1( _L( "MM MTP <> EMTPObjectPropCodeRepresentativeSampleData sampleFile.Read err=%d" ), err );
--- a/mmappcomponents/mmmtpdataprovider/mmmtpdpplugins/abstractmediamtpdataprovider/src/cabstractmediamtpdataprovidergetobjectpropvalue.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappcomponents/mmmtpdataprovider/mmmtpdpplugins/abstractmediamtpdataprovider/src/cabstractmediamtpdataprovidergetobjectpropvalue.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -126,7 +126,7 @@
if( size > 0 )
{
- HBufC8* sampleData = HBufC8::NewLC( size * sizeof(TUint8) ); // + sampleData
+ HBufC8* sampleData = HBufC8::NewLC( size ); // + sampleData
TPtr8 samplePtr = sampleData->Des();
User::LeaveIfError( sampleFile.Read( samplePtr ) );
iMTPTypeArray->SetByDesL( samplePtr );
--- a/mmappcomponents/mmmtpdataprovider/mmmtpdpplugins/mediamtpdataprovider/src/cmediamtpdataprovidercopyobject.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappcomponents/mmmtpdataprovider/mmmtpdpplugins/mediamtpdataprovider/src/cmediamtpdataprovidercopyobject.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -222,10 +222,6 @@
{
iPropertyElement = NULL;
}
- else
- {
- User::LeaveIfError( err );
- }
PRINT( _L( "MM MTP <= CMediaMtpDataProviderCopyObject::ServiceSpecificObjectPropertyL" ) );
}
--- a/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/bwins/mmmtpdprequestprocessoru.def Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/bwins/mmmtpdprequestprocessoru.def Wed Aug 18 10:16:02 2010 +0300
@@ -8,143 +8,144 @@
?UpdateMusicCollectionL@CMmMtpDpMetadataAccessWrapper@@QAEXABVTDesC16@@@Z @ 7 NONAME ; void CMmMtpDpMetadataAccessWrapper::UpdateMusicCollectionL(class TDesC16 const &)
?Release@CRequestProcessor@@MAEXXZ @ 8 NONAME ; void CRequestProcessor::Release(void)
?HandleRequestL@CRequestProcessor@@MAEHABVTMTPTypeRequest@@W4TMTPTransactionPhase@@@Z @ 9 NONAME ; int CRequestProcessor::HandleRequestL(class TMTPTypeRequest const &, enum TMTPTransactionPhase)
- ??1CGetInterdependentPropDesc@@UAE@XZ @ 10 NONAME ; CGetInterdependentPropDesc::~CGetInterdependentPropDesc(void)
- ?OpenSessionL@CMmMtpDpAccessSingleton@@SAXXZ @ 11 NONAME ; void CMmMtpDpAccessSingleton::OpenSessionL(void)
- ?ServiceL@CGetPartialObject@@MAEXXZ @ 12 NONAME ; void CGetPartialObject::ServiceL(void)
- ?DoHandleResponsePhaseL@CRequestProcessor@@MAEHXZ @ 13 NONAME ; int CRequestProcessor::DoHandleResponsePhaseL(void)
- ?NewL@CGetObjectPropDesc@@SAPAVMMmRequestProcessor@@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@AAVMMmMtpDpConfig@@@Z @ 14 NONAME ; class MMmRequestProcessor * CGetObjectPropDesc::NewL(class MMTPDataProviderFramework &, class MMTPConnection &, class MMmMtpDpConfig &)
- ??0CGetObjectPropValue@@IAE@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@AAVMMmMtpDpConfig@@@Z @ 15 NONAME ; CGetObjectPropValue::CGetObjectPropValue(class MMTPDataProviderFramework &, class MMTPConnection &, class MMmMtpDpConfig &)
- ?CheckRequestL@CSetObjectPropList@@MAE?AW4TMTPResponseCode@@XZ @ 16 NONAME ; enum TMTPResponseCode CSetObjectPropList::CheckRequestL(void)
- ?RunL@CRequestProcessor@@MAEXXZ @ 17 NONAME ; void CRequestProcessor::RunL(void)
- ?ServiceL@CDeleteObject@@MAEXXZ @ 18 NONAME ; void CDeleteObject::ServiceL(void)
- ?DoCancel@CSetObjectPropList@@MAEXXZ @ 19 NONAME ; void CSetObjectPropList::DoCancel(void)
- ?CleanupDatabaseL@CMmMtpDpMetadataAccessWrapper@@QAEXXZ @ 20 NONAME ; void CMmMtpDpMetadataAccessWrapper::CleanupDatabaseL(void)
- ?ServiceL@CGetObjectPropsSupported@@MAEXXZ @ 21 NONAME ; void CGetObjectPropsSupported::ServiceL(void)
- ?NewL@CSetObjectReferences@@SAPAVMMmRequestProcessor@@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@AAVMMmMtpDpConfig@@@Z @ 22 NONAME ; class MMmRequestProcessor * CSetObjectReferences::NewL(class MMTPDataProviderFramework &, class MMTPConnection &, class MMmMtpDpConfig &)
- ?Release@CMmMtpDpAccessSingleton@@SAXXZ @ 23 NONAME ; void CMmMtpDpAccessSingleton::Release(void)
- ?UsbDisconnect@CSendObject@@MAEXXZ @ 24 NONAME ; void CSendObject::UsbDisconnect(void)
- ?ServiceL@CGetFormatCapabilities@@MAEXXZ @ 25 NONAME ; void CGetFormatCapabilities::ServiceL(void)
- ??1CSetObjectPropList@@UAE@XZ @ 26 NONAME ; CSetObjectPropList::~CSetObjectPropList(void)
- ?ServiceL@CSetObjectPropList@@MAEXXZ @ 27 NONAME ; void CSetObjectPropList::ServiceL(void)
- ??0CMoveObject@@IAE@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@AAVMMmMtpDpConfig@@@Z @ 28 NONAME ; CMoveObject::CMoveObject(class MMTPDataProviderFramework &, class MMTPConnection &, class MMmMtpDpConfig &)
- ?ConstructL@CGetObjectPropList@@IAEXXZ @ 29 NONAME ; void CGetObjectPropList::ConstructL(void)
- ??1CSendObject@@UAE@XZ @ 30 NONAME ; CSendObject::~CSendObject(void)
- ?ServiceMetaDataFromWrapperL@CGetObjectPropValue@@IAEXGAAVMMTPType@@ABVCMTPObjectMetaData@@@Z @ 31 NONAME ; void CGetObjectPropValue::ServiceMetaDataFromWrapperL(unsigned short, class MMTPType &, class CMTPObjectMetaData const &)
- ?NewL@CGetObject@@SAPAVMMmRequestProcessor@@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@AAVMMmMtpDpConfig@@@Z @ 32 NONAME ; class MMmRequestProcessor * CGetObject::NewL(class MMTPDataProviderFramework &, class MMTPConnection &, class MMmMtpDpConfig &)
- ??1CGetObjectPropValue@@UAE@XZ @ 33 NONAME ; CGetObjectPropValue::~CGetObjectPropValue(void)
- ?ActiveToIdleStatusChange@CMmMtpDpAccessSingleton@@SAXXZ @ 34 NONAME ; void CMmMtpDpAccessSingleton::ActiveToIdleStatusChange(void)
- ?CreateL@CMmMtpDpAccessSingleton@@SAXAAVMMTPDataProviderFramework@@@Z @ 35 NONAME ; void CMmMtpDpAccessSingleton::CreateL(class MMTPDataProviderFramework &)
- ??1CGetFormatCapabilities@@UAE@XZ @ 36 NONAME ; CGetFormatCapabilities::~CGetFormatCapabilities(void)
- ?ServiceL@CSetObjectReferences@@EAEXXZ @ 37 NONAME ; void CSetObjectReferences::ServiceL(void)
- ?DoHandleDataIToRPhaseL@CRequestProcessor@@MAEHXZ @ 38 NONAME ; int CRequestProcessor::DoHandleDataIToRPhaseL(void)
- ??0CGetObjectPropList@@IAE@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@AAVMMmMtpDpConfig@@@Z @ 39 NONAME ; CGetObjectPropList::CGetObjectPropList(class MMTPDataProviderFramework &, class MMTPConnection &, class MMmMtpDpConfig &)
- ?ConstructL@CCopyObject@@IAEXXZ @ 40 NONAME ; void CCopyObject::ConstructL(void)
- ?SetMetaDataToWrapper@CPropertySettingUtility@@QAE?AW4TMTPResponseCode@@AAVMMmMtpDpConfig@@GAAVMMTPType@@ABVCMTPObjectMetaData@@@Z @ 41 NONAME ; enum TMTPResponseCode CPropertySettingUtility::SetMetaDataToWrapper(class MMmMtpDpConfig &, unsigned short, class MMTPType &, class CMTPObjectMetaData const &)
- ?ServiceL@CGetObjectPropValue@@MAEXXZ @ 42 NONAME ; void CGetObjectPropValue::ServiceL(void)
- ??1CRenameObject@@UAE@XZ @ 43 NONAME ; CRenameObject::~CRenameObject(void)
- ?Match@CRequestProcessor@@MBEHABVTMTPTypeEvent@@AAVMMTPConnection@@@Z @ 44 NONAME ; int CRequestProcessor::Match(class TMTPTypeEvent const &, class MMTPConnection &) const
- ?DoHandleCompletingPhaseL@CSendObject@@MAEHXZ @ 45 NONAME ; int CSendObject::DoHandleCompletingPhaseL(void)
- ?GetDrmStatus@MmMtpDpUtility@@SAHABVTDesC16@@@Z @ 46 NONAME ; int MmMtpDpUtility::GetDrmStatus(class TDesC16 const &)
- ?RunL@CRenameObject@@MAEXXZ @ 47 NONAME ; void CRenameObject::RunL(void)
- ?SetPSStatus@MmMtpDpUtility@@SAXW4TMtpPSStatus@@@Z @ 48 NONAME ; void MmMtpDpUtility::SetPSStatus(enum TMtpPSStatus)
- ??0CRequestProcessor@@IAE@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@HPBUTMTPRequestElementInfo@@@Z @ 49 NONAME ; CRequestProcessor::CRequestProcessor(class MMTPDataProviderFramework &, class MMTPConnection &, int, struct TMTPRequestElementInfo const *)
- ?ServiceL@CSendObject@@MAEXXZ @ 50 NONAME ; void CSendObject::ServiceL(void)
- ?Request@CRequestProcessor@@MBEABVTMTPTypeRequest@@XZ @ 51 NONAME ; class TMTPTypeRequest const & CRequestProcessor::Request(void) const
- ?CheckRequestL@CGetPartialObject@@MAE?AW4TMTPResponseCode@@XZ @ 52 NONAME ; enum TMTPResponseCode CGetPartialObject::CheckRequestL(void)
- ?DoCancel@CRequestProcessor@@MAEXXZ @ 53 NONAME ; void CRequestProcessor::DoCancel(void)
- ?NewL@CRequestUnknown@@SAPAVMMmRequestProcessor@@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@@Z @ 54 NONAME ; class MMmRequestProcessor * CRequestUnknown::NewL(class MMTPDataProviderFramework &, class MMTPConnection &)
- ?ConstructL@CGetObjectInfo@@AAEXXZ @ 55 NONAME ; void CGetObjectInfo::ConstructL(void)
- ?UsbDisconnect@CRequestProcessor@@MAEXXZ @ 56 NONAME ; void CRequestProcessor::UsbDisconnect(void)
- ??1CMoveObject@@UAE@XZ @ 57 NONAME ; CMoveObject::~CMoveObject(void)
- ?CheckRequestL@CSendObject@@MAE?AW4TMTPResponseCode@@XZ @ 58 NONAME ; enum TMTPResponseCode CSendObject::CheckRequestL(void)
- ??1CRequestProcessor@@MAE@XZ @ 59 NONAME ; CRequestProcessor::~CRequestProcessor(void)
- ?DoCancel@CDeleteObject@@MAEXXZ @ 60 NONAME ; void CDeleteObject::DoCancel(void)
- ??1CGetObject@@UAE@XZ @ 61 NONAME ; CGetObject::~CGetObject(void)
- ?NewL@CGetInterdependentPropDesc@@SAPAVMMmRequestProcessor@@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@AAVMMmMtpDpConfig@@@Z @ 62 NONAME ; class MMmRequestProcessor * CGetInterdependentPropDesc::NewL(class MMTPDataProviderFramework &, class MMTPConnection &, class MMmMtpDpConfig &)
- ?AddObjectL@CMmMtpDpMetadataAccessWrapper@@QAEXABVCMTPObjectMetaData@@@Z @ 63 NONAME ; void CMmMtpDpMetadataAccessWrapper::AddObjectL(class CMTPObjectMetaData const &)
- ?DoHandleResponsePhaseL@CSetObjectReferences@@EAEHXZ @ 64 NONAME ; int CSetObjectReferences::DoHandleResponsePhaseL(void)
- ?GetAccessWrapperL@CMmMtpDpAccessSingleton@@SAAAVCMmMtpDpMetadataAccessWrapper@@XZ @ 65 NONAME ; class CMmMtpDpMetadataAccessWrapper & CMmMtpDpAccessSingleton::GetAccessWrapperL(void)
- ??1CGetObjectPropsSupported@@UAE@XZ @ 66 NONAME ; CGetObjectPropsSupported::~CGetObjectPropsSupported(void)
- ?CheckRequestL@CGetObjectPropList@@MAE?AW4TMTPResponseCode@@XZ @ 67 NONAME ; enum TMTPResponseCode CGetObjectPropList::CheckRequestL(void)
- ?HasDataphase@CRequestProcessor@@MBEHXZ @ 68 NONAME ; int CRequestProcessor::HasDataphase(void) const
- ?NewL@CGetObjectPropsSupported@@SAPAVMMmRequestProcessor@@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@AAVMMmMtpDpConfig@@@Z @ 69 NONAME ; class MMmRequestProcessor * CGetObjectPropsSupported::NewL(class MMTPDataProviderFramework &, class MMTPConnection &, class MMmMtpDpConfig &)
- ?Connection@CRequestProcessor@@MBEAAVMMTPConnection@@XZ @ 70 NONAME ; class MMTPConnection & CRequestProcessor::Connection(void) const
- ??1CPropertySettingUtility@@UAE@XZ @ 71 NONAME ; CPropertySettingUtility::~CPropertySettingUtility(void)
- ??1CGetPartialObject@@UAE@XZ @ 72 NONAME ; CGetPartialObject::~CGetPartialObject(void)
- ?NewL@CGetObjectInfo@@SAPAVMMmRequestProcessor@@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@AAVMMmMtpDpConfig@@@Z @ 73 NONAME ; class MMmRequestProcessor * CGetObjectInfo::NewL(class MMTPDataProviderFramework &, class MMTPConnection &, class MMmMtpDpConfig &)
- ?RunError@CSetObjectPropList@@MAEHH@Z @ 74 NONAME ; int CSetObjectPropList::RunError(int)
- ?CheckRequestL@CGetInterdependentPropDesc@@MAE?AW4TMTPResponseCode@@XZ @ 75 NONAME ; enum TMTPResponseCode CGetInterdependentPropDesc::CheckRequestL(void)
- ?Match@CRequestUnknown@@MBEHABVTMTPTypeRequest@@AAVMMTPConnection@@@Z @ 76 NONAME ; int CRequestUnknown::Match(class TMTPTypeRequest const &, class MMTPConnection &) const
- ?ServiceL@CMoveObject@@MAEXXZ @ 77 NONAME ; void CMoveObject::ServiceL(void)
- ?CreateDummyFile@CMmMtpDpMetadataAccessWrapper@@QAEXABVTDesC16@@@Z @ 78 NONAME ; void CMmMtpDpMetadataAccessWrapper::CreateDummyFile(class TDesC16 const &)
- ?CheckRequestL@CGetObjectPropDesc@@MAE?AW4TMTPResponseCode@@XZ @ 79 NONAME ; enum TMTPResponseCode CGetObjectPropDesc::CheckRequestL(void)
- ?DoHandleRToIPhaseL@CRequestProcessor@@MAEHXZ @ 80 NONAME ; int CRequestProcessor::DoHandleRToIPhaseL(void)
- ?ServiceMetaDataToWrapperL@CSetObjectPropValue@@IAE?AW4TMTPResponseCode@@GAAVMMTPType@@ABVCMTPObjectMetaData@@@Z @ 81 NONAME ; enum TMTPResponseCode CSetObjectPropValue::ServiceMetaDataToWrapperL(unsigned short, class MMTPType &, class CMTPObjectMetaData const &)
- ?FormatFromFilename@MmMtpDpUtility@@SA?AW4TMTPFormatCode@@ABVTDesC16@@@Z @ 82 NONAME ; enum TMTPFormatCode MmMtpDpUtility::FormatFromFilename(class TDesC16 const &)
- ?GetAllReferenceL@CMmMtpDpMetadataAccessWrapper@@QAEXABVCMTPObjectMetaData@@AAVCDesC16Array@@@Z @ 83 NONAME ; void CMmMtpDpMetadataAccessWrapper::GetAllReferenceL(class CMTPObjectMetaData const &, class CDesC16Array &)
- ?CheckRequestL@CSetObjectPropValue@@MAE?AW4TMTPResponseCode@@XZ @ 84 NONAME ; enum TMTPResponseCode CSetObjectPropValue::CheckRequestL(void)
- ??0CPropertySettingUtility@@IAE@XZ @ 85 NONAME ; CPropertySettingUtility::CPropertySettingUtility(void)
- ?Match@CRequestProcessor@@MBEHABVTMTPTypeRequest@@AAVMMTPConnection@@@Z @ 86 NONAME ; int CRequestProcessor::Match(class TMTPTypeRequest const &, class MMTPConnection &) const
- ??0CCopyObject@@IAE@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@AAVMMmMtpDpConfig@@@Z @ 87 NONAME ; CCopyObject::CCopyObject(class MMTPDataProviderFramework &, class MMTPConnection &, class MMmMtpDpConfig &)
- ?CheckRequestL@CRequestProcessor@@MAE?AW4TMTPResponseCode@@XZ @ 88 NONAME ; enum TMTPResponseCode CRequestProcessor::CheckRequestL(void)
- ?SendResponseL@CRequestProcessor@@IAEXW4TMTPResponseCode@@HPAK@Z @ 89 NONAME ; void CRequestProcessor::SendResponseL(enum TMTPResponseCode, int, unsigned long *)
- ?CancelActiveToIdleStatusChange@CMmMtpDpAccessSingleton@@SAXXZ @ 90 NONAME ; void CMmMtpDpAccessSingleton::CancelActiveToIdleStatusChange(void)
- ?DoHandleCompletingPhaseL@CRequestProcessor@@MAEHXZ @ 91 NONAME ; int CRequestProcessor::DoHandleCompletingPhaseL(void)
- ?DeleteDummyFile@CMmMtpDpMetadataAccessWrapper@@QAEXABVTDesC16@@@Z @ 92 NONAME ; void CMmMtpDpMetadataAccessWrapper::DeleteDummyFile(class TDesC16 const &)
- ??1CGetObjectInfo@@UAE@XZ @ 93 NONAME ; CGetObjectInfo::~CGetObjectInfo(void)
- ?ServiceL@CRequestUnknown@@MAEXXZ @ 94 NONAME ; void CRequestUnknown::ServiceL(void)
- ?HasDataphase@CSetObjectPropList@@MBEHXZ @ 95 NONAME ; int CSetObjectPropList::HasDataphase(void) const
- ?NewL@CGetObjectReferences@@SAPAVMMmRequestProcessor@@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@AAVMMmMtpDpConfig@@@Z @ 96 NONAME ; class MMmRequestProcessor * CGetObjectReferences::NewL(class MMTPDataProviderFramework &, class MMTPConnection &, class MMmMtpDpConfig &)
- ?DoCancel@CRenameObject@@MAEXXZ @ 97 NONAME ; void CRenameObject::DoCancel(void)
- ??1CSetObjectReferences@@UAE@XZ @ 98 NONAME ; CSetObjectReferences::~CSetObjectReferences(void)
- ?Match@CSendObject@@MBEHABVTMTPTypeRequest@@AAVMMTPConnection@@@Z @ 99 NONAME ; int CSendObject::Match(class TMTPTypeRequest const &, class MMTPConnection &) const
- ?NewL@CSetObjectPropList@@SAPAVMMmRequestProcessor@@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@AAVMMmMtpDpConfig@@@Z @ 100 NONAME ; class MMmRequestProcessor * CSetObjectPropList::NewL(class MMTPDataProviderFramework &, class MMTPConnection &, class MMmMtpDpConfig &)
- ??1CCopyObject@@UAE@XZ @ 101 NONAME ; CCopyObject::~CCopyObject(void)
- ?GetModifiedContentL@CMmMtpDpMetadataAccessWrapper@@QAEXABVTDesC16@@AAHAAVCDesC16Array@@@Z @ 102 NONAME ; void CMmMtpDpMetadataAccessWrapper::GetModifiedContentL(class TDesC16 const &, int &, class CDesC16Array &)
- ?RunL@CGetObjectPropList@@MAEXXZ @ 103 NONAME ; void CGetObjectPropList::RunL(void)
- ?NewRangeFormDescriptionL@CDescriptionUtility@@QAEPAVCMTPTypeObjectPropDesc@@GKKKH@Z @ 104 NONAME ; class CMTPTypeObjectPropDesc * CDescriptionUtility::NewRangeFormDescriptionL(unsigned short, unsigned long, unsigned long, unsigned long, int)
- ?RunError@CRequestProcessor@@MAEHH@Z @ 105 NONAME ; int CRequestProcessor::RunError(int)
- ?SessionId@CRequestProcessor@@MAEKXZ @ 106 NONAME ; unsigned long CRequestProcessor::SessionId(void)
- ??0CDescriptionUtility@@IAE@XZ @ 107 NONAME ; CDescriptionUtility::CDescriptionUtility(void)
- ?HandleEventL@CRequestProcessor@@MAEXABVTMTPTypeEvent@@@Z @ 108 NONAME ; void CRequestProcessor::HandleEventL(class TMTPTypeEvent const &)
- ?NewL@CGetPartialObject@@SAPAVMMmRequestProcessor@@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@AAVMMmMtpDpConfig@@@Z @ 109 NONAME ; class MMmRequestProcessor * CGetPartialObject::NewL(class MMTPDataProviderFramework &, class MMTPConnection &, class MMmMtpDpConfig &)
- ?HasDataphase@CSetObjectReferences@@EBEHXZ @ 110 NONAME ; int CSetObjectReferences::HasDataphase(void) const
- ?RunError@CGetObjectPropList@@MAEHH@Z @ 111 NONAME ; int CGetObjectPropList::RunError(int)
- ?DoHandleResponsePhaseL@CSetObjectPropList@@MAEHXZ @ 112 NONAME ; int CSetObjectPropList::DoHandleResponsePhaseL(void)
- ?NewL@CRenameObject@@SAPAV1@AAVMMTPDataProviderFramework@@AAVCMmMtpDpMetadataAccessWrapper@@@Z @ 113 NONAME ; class CRenameObject * CRenameObject::NewL(class MMTPDataProviderFramework &, class CMmMtpDpMetadataAccessWrapper &)
- ?RenameObjectL@CMmMtpDpMetadataAccessWrapper@@QAEXABVCMTPObjectMetaData@@ABVTDesC16@@@Z @ 114 NONAME ; void CMmMtpDpMetadataAccessWrapper::RenameObjectL(class CMTPObjectMetaData const &, class TDesC16 const &)
- ?GetObjectMetadataValueL@CMmMtpDpMetadataAccessWrapper@@QAEXGAAVMMTPType@@ABVCMTPObjectMetaData@@@Z @ 115 NONAME ; void CMmMtpDpMetadataAccessWrapper::GetObjectMetadataValueL(unsigned short, class MMTPType &, class CMTPObjectMetaData const &)
- ?GetAllAbstractMediaL@CMmMtpDpMetadataAccessWrapper@@QAEXABVTDesC16@@AAVCDesC16Array@@W4TMPXGeneralCategory@@@Z @ 116 NONAME ; void CMmMtpDpMetadataAccessWrapper::GetAllAbstractMediaL(class TDesC16 const &, class CDesC16Array &, enum TMPXGeneralCategory)
- ?AddDummyFileL@CMmMtpDpMetadataAccessWrapper@@QAEXABVTDesC16@@@Z @ 117 NONAME ; void CMmMtpDpMetadataAccessWrapper::AddDummyFileL(class TDesC16 const &)
- ??1CGetObjectPropDesc@@UAE@XZ @ 118 NONAME ; CGetObjectPropDesc::~CGetObjectPropDesc(void)
- ?ServiceL@CGetObjectPropDesc@@MAEXXZ @ 119 NONAME ; void CGetObjectPropDesc::ServiceL(void)
- ?HasDataphase@CSetObjectPropValue@@MBEHXZ @ 120 NONAME ; int CSetObjectPropValue::HasDataphase(void) const
- ?ServiceL@CCopyObject@@MAEXXZ @ 121 NONAME ; void CCopyObject::ServiceL(void)
- ?CheckRequestL@CGetObjectPropValue@@MAE?AW4TMTPResponseCode@@XZ @ 122 NONAME ; enum TMTPResponseCode CGetObjectPropValue::CheckRequestL(void)
- ?CloseSessionL@CMmMtpDpAccessSingleton@@SAXXZ @ 123 NONAME ; void CMmMtpDpAccessSingleton::CloseSessionL(void)
- ?NewL@CGetFormatCapabilities@@SAPAVMMmRequestProcessor@@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@AAVMMmMtpDpConfig@@@Z @ 124 NONAME ; class MMmRequestProcessor * CGetFormatCapabilities::NewL(class MMTPDataProviderFramework &, class MMTPConnection &, class MMmMtpDpConfig &)
- ?ReceiveDataL@CRequestProcessor@@IAEXAAVMMTPType@@@Z @ 125 NONAME ; void CRequestProcessor::ReceiveDataL(class MMTPType &)
- ??1CDescriptionUtility@@UAE@XZ @ 126 NONAME ; CDescriptionUtility::~CDescriptionUtility(void)
- ?ConstructL@CMoveObject@@IAEXXZ @ 127 NONAME ; void CMoveObject::ConstructL(void)
- ?NewL@CSendObject@@SAPAVMMmRequestProcessor@@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@AAVMMmMtpDpConfig@@@Z @ 128 NONAME ; class MMmRequestProcessor * CSendObject::NewL(class MMTPDataProviderFramework &, class MMTPConnection &, class MMmMtpDpConfig &)
- ?RunL@CSetObjectPropList@@MAEXXZ @ 129 NONAME ; void CSetObjectPropList::RunL(void)
- ??1CGetObjectReferences@@UAE@XZ @ 130 NONAME ; CGetObjectReferences::~CGetObjectReferences(void)
- ?HasDataphase@CSendObject@@MBEHXZ @ 131 NONAME ; int CSendObject::HasDataphase(void) const
- ??1CSetObjectPropValue@@UAE@XZ @ 132 NONAME ; CSetObjectPropValue::~CSetObjectPropValue(void)
- ?ConstructL@CRenameObject@@IAEXXZ @ 133 NONAME ; void CRenameObject::ConstructL(void)
- ?DoHandleResponsePhaseL@CSendObject@@MAEHXZ @ 134 NONAME ; int CSendObject::DoHandleResponsePhaseL(void)
- ?SendDataL@CRequestProcessor@@IAEXABVMMTPType@@@Z @ 135 NONAME ; void CRequestProcessor::SendDataL(class MMTPType const &)
- ?SetReferenceL@CMmMtpDpMetadataAccessWrapper@@QAEXABVCMTPObjectMetaData@@AAVCDesC16Array@@@Z @ 136 NONAME ; void CMmMtpDpMetadataAccessWrapper::SetReferenceL(class CMTPObjectMetaData const &, class CDesC16Array &)
- ?DoCancel@CGetObjectPropList@@MAEXXZ @ 137 NONAME ; void CGetObjectPropList::DoCancel(void)
- ?ServiceL@CGetInterdependentPropDesc@@MAEXXZ @ 138 NONAME ; void CGetInterdependentPropDesc::ServiceL(void)
- ?DoHandleRequestPhaseL@CRequestProcessor@@MAEHXZ @ 139 NONAME ; int CRequestProcessor::DoHandleRequestPhaseL(void)
- ?ServiceL@CSetObjectPropValue@@MAEXXZ @ 140 NONAME ; void CSetObjectPropValue::ServiceL(void)
- ?RunError@CRenameObject@@MAEHH@Z @ 141 NONAME ; int CRenameObject::RunError(int)
- ??1CDeleteObject@@UAE@XZ @ 142 NONAME ; CDeleteObject::~CDeleteObject(void)
- ?DoHandleResponsePhaseL@CGetPartialObject@@MAEHXZ @ 143 NONAME ; int CGetPartialObject::DoHandleResponsePhaseL(void)
- ??0CSetObjectPropValue@@IAE@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@AAVMMmMtpDpConfig@@@Z @ 144 NONAME ; CSetObjectPropValue::CSetObjectPropValue(class MMTPDataProviderFramework &, class MMTPConnection &, class MMmMtpDpConfig &)
- ??1CGetObjectPropList@@UAE@XZ @ 145 NONAME ; CGetObjectPropList::~CGetObjectPropList(void)
- ?CheckRequestL@CGetFormatCapabilities@@MAE?AW4TMTPResponseCode@@XZ @ 146 NONAME ; enum TMTPResponseCode CGetFormatCapabilities::CheckRequestL(void)
- ??0CRenameObject@@IAE@AAVMMTPDataProviderFramework@@AAVCMmMtpDpMetadataAccessWrapper@@@Z @ 147 NONAME ; CRenameObject::CRenameObject(class MMTPDataProviderFramework &, class CMmMtpDpMetadataAccessWrapper &)
+ ?DoHandleCompletingPhaseL@CDeleteObject@@MAEHXZ @ 10 NONAME ; int CDeleteObject::DoHandleCompletingPhaseL(void)
+ ??1CGetInterdependentPropDesc@@UAE@XZ @ 11 NONAME ; CGetInterdependentPropDesc::~CGetInterdependentPropDesc(void)
+ ?OpenSessionL@CMmMtpDpAccessSingleton@@SAXXZ @ 12 NONAME ; void CMmMtpDpAccessSingleton::OpenSessionL(void)
+ ?ServiceL@CGetPartialObject@@MAEXXZ @ 13 NONAME ; void CGetPartialObject::ServiceL(void)
+ ?DoHandleResponsePhaseL@CRequestProcessor@@MAEHXZ @ 14 NONAME ; int CRequestProcessor::DoHandleResponsePhaseL(void)
+ ?NewL@CGetObjectPropDesc@@SAPAVMMmRequestProcessor@@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@AAVMMmMtpDpConfig@@@Z @ 15 NONAME ; class MMmRequestProcessor * CGetObjectPropDesc::NewL(class MMTPDataProviderFramework &, class MMTPConnection &, class MMmMtpDpConfig &)
+ ??0CGetObjectPropValue@@IAE@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@AAVMMmMtpDpConfig@@@Z @ 16 NONAME ; CGetObjectPropValue::CGetObjectPropValue(class MMTPDataProviderFramework &, class MMTPConnection &, class MMmMtpDpConfig &)
+ ?CheckRequestL@CSetObjectPropList@@MAE?AW4TMTPResponseCode@@XZ @ 17 NONAME ; enum TMTPResponseCode CSetObjectPropList::CheckRequestL(void)
+ ?RunL@CRequestProcessor@@MAEXXZ @ 18 NONAME ; void CRequestProcessor::RunL(void)
+ ?ServiceL@CDeleteObject@@MAEXXZ @ 19 NONAME ; void CDeleteObject::ServiceL(void)
+ ?DoCancel@CSetObjectPropList@@MAEXXZ @ 20 NONAME ; void CSetObjectPropList::DoCancel(void)
+ ?CleanupDatabaseL@CMmMtpDpMetadataAccessWrapper@@QAEXXZ @ 21 NONAME ; void CMmMtpDpMetadataAccessWrapper::CleanupDatabaseL(void)
+ ?ServiceL@CGetObjectPropsSupported@@MAEXXZ @ 22 NONAME ; void CGetObjectPropsSupported::ServiceL(void)
+ ?NewL@CSetObjectReferences@@SAPAVMMmRequestProcessor@@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@AAVMMmMtpDpConfig@@@Z @ 23 NONAME ; class MMmRequestProcessor * CSetObjectReferences::NewL(class MMTPDataProviderFramework &, class MMTPConnection &, class MMmMtpDpConfig &)
+ ?Release@CMmMtpDpAccessSingleton@@SAXXZ @ 24 NONAME ; void CMmMtpDpAccessSingleton::Release(void)
+ ?UsbDisconnect@CSendObject@@MAEXXZ @ 25 NONAME ; void CSendObject::UsbDisconnect(void)
+ ?ServiceL@CGetFormatCapabilities@@MAEXXZ @ 26 NONAME ; void CGetFormatCapabilities::ServiceL(void)
+ ??1CSetObjectPropList@@UAE@XZ @ 27 NONAME ; CSetObjectPropList::~CSetObjectPropList(void)
+ ?ServiceL@CSetObjectPropList@@MAEXXZ @ 28 NONAME ; void CSetObjectPropList::ServiceL(void)
+ ??0CMoveObject@@IAE@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@AAVMMmMtpDpConfig@@@Z @ 29 NONAME ; CMoveObject::CMoveObject(class MMTPDataProviderFramework &, class MMTPConnection &, class MMmMtpDpConfig &)
+ ?ConstructL@CGetObjectPropList@@IAEXXZ @ 30 NONAME ; void CGetObjectPropList::ConstructL(void)
+ ??1CSendObject@@UAE@XZ @ 31 NONAME ; CSendObject::~CSendObject(void)
+ ?ServiceMetaDataFromWrapperL@CGetObjectPropValue@@IAEXGAAVMMTPType@@ABVCMTPObjectMetaData@@@Z @ 32 NONAME ; void CGetObjectPropValue::ServiceMetaDataFromWrapperL(unsigned short, class MMTPType &, class CMTPObjectMetaData const &)
+ ?NewL@CGetObject@@SAPAVMMmRequestProcessor@@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@AAVMMmMtpDpConfig@@@Z @ 33 NONAME ; class MMmRequestProcessor * CGetObject::NewL(class MMTPDataProviderFramework &, class MMTPConnection &, class MMmMtpDpConfig &)
+ ??1CGetObjectPropValue@@UAE@XZ @ 34 NONAME ; CGetObjectPropValue::~CGetObjectPropValue(void)
+ ?ActiveToIdleStatusChange@CMmMtpDpAccessSingleton@@SAXXZ @ 35 NONAME ; void CMmMtpDpAccessSingleton::ActiveToIdleStatusChange(void)
+ ?CreateL@CMmMtpDpAccessSingleton@@SAXAAVMMTPDataProviderFramework@@@Z @ 36 NONAME ; void CMmMtpDpAccessSingleton::CreateL(class MMTPDataProviderFramework &)
+ ??1CGetFormatCapabilities@@UAE@XZ @ 37 NONAME ; CGetFormatCapabilities::~CGetFormatCapabilities(void)
+ ?ServiceL@CSetObjectReferences@@EAEXXZ @ 38 NONAME ; void CSetObjectReferences::ServiceL(void)
+ ?DoHandleDataIToRPhaseL@CRequestProcessor@@MAEHXZ @ 39 NONAME ; int CRequestProcessor::DoHandleDataIToRPhaseL(void)
+ ??0CGetObjectPropList@@IAE@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@AAVMMmMtpDpConfig@@@Z @ 40 NONAME ; CGetObjectPropList::CGetObjectPropList(class MMTPDataProviderFramework &, class MMTPConnection &, class MMmMtpDpConfig &)
+ ?ConstructL@CCopyObject@@IAEXXZ @ 41 NONAME ; void CCopyObject::ConstructL(void)
+ ?SetMetaDataToWrapper@CPropertySettingUtility@@QAE?AW4TMTPResponseCode@@AAVMMmMtpDpConfig@@GAAVMMTPType@@ABVCMTPObjectMetaData@@@Z @ 42 NONAME ; enum TMTPResponseCode CPropertySettingUtility::SetMetaDataToWrapper(class MMmMtpDpConfig &, unsigned short, class MMTPType &, class CMTPObjectMetaData const &)
+ ?ServiceL@CGetObjectPropValue@@MAEXXZ @ 43 NONAME ; void CGetObjectPropValue::ServiceL(void)
+ ??1CRenameObject@@UAE@XZ @ 44 NONAME ; CRenameObject::~CRenameObject(void)
+ ?Match@CRequestProcessor@@MBEHABVTMTPTypeEvent@@AAVMMTPConnection@@@Z @ 45 NONAME ; int CRequestProcessor::Match(class TMTPTypeEvent const &, class MMTPConnection &) const
+ ?DoHandleCompletingPhaseL@CSendObject@@MAEHXZ @ 46 NONAME ; int CSendObject::DoHandleCompletingPhaseL(void)
+ ?GetDrmStatus@MmMtpDpUtility@@SAHABVTDesC16@@@Z @ 47 NONAME ; int MmMtpDpUtility::GetDrmStatus(class TDesC16 const &)
+ ?RunL@CRenameObject@@MAEXXZ @ 48 NONAME ; void CRenameObject::RunL(void)
+ ?SetPSStatus@MmMtpDpUtility@@SAXW4TMtpPSStatus@@@Z @ 49 NONAME ; void MmMtpDpUtility::SetPSStatus(enum TMtpPSStatus)
+ ??0CRequestProcessor@@IAE@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@HPBUTMTPRequestElementInfo@@@Z @ 50 NONAME ; CRequestProcessor::CRequestProcessor(class MMTPDataProviderFramework &, class MMTPConnection &, int, struct TMTPRequestElementInfo const *)
+ ?ServiceL@CSendObject@@MAEXXZ @ 51 NONAME ; void CSendObject::ServiceL(void)
+ ?Request@CRequestProcessor@@MBEABVTMTPTypeRequest@@XZ @ 52 NONAME ; class TMTPTypeRequest const & CRequestProcessor::Request(void) const
+ ?CheckRequestL@CGetPartialObject@@MAE?AW4TMTPResponseCode@@XZ @ 53 NONAME ; enum TMTPResponseCode CGetPartialObject::CheckRequestL(void)
+ ?DoCancel@CRequestProcessor@@MAEXXZ @ 54 NONAME ; void CRequestProcessor::DoCancel(void)
+ ?NewL@CRequestUnknown@@SAPAVMMmRequestProcessor@@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@@Z @ 55 NONAME ; class MMmRequestProcessor * CRequestUnknown::NewL(class MMTPDataProviderFramework &, class MMTPConnection &)
+ ?ConstructL@CGetObjectInfo@@AAEXXZ @ 56 NONAME ; void CGetObjectInfo::ConstructL(void)
+ ?UsbDisconnect@CRequestProcessor@@MAEXXZ @ 57 NONAME ; void CRequestProcessor::UsbDisconnect(void)
+ ??1CMoveObject@@UAE@XZ @ 58 NONAME ; CMoveObject::~CMoveObject(void)
+ ?CheckRequestL@CSendObject@@MAE?AW4TMTPResponseCode@@XZ @ 59 NONAME ; enum TMTPResponseCode CSendObject::CheckRequestL(void)
+ ??1CRequestProcessor@@MAE@XZ @ 60 NONAME ; CRequestProcessor::~CRequestProcessor(void)
+ ?DoCancel@CDeleteObject@@MAEXXZ @ 61 NONAME ; void CDeleteObject::DoCancel(void)
+ ??1CGetObject@@UAE@XZ @ 62 NONAME ; CGetObject::~CGetObject(void)
+ ?NewL@CGetInterdependentPropDesc@@SAPAVMMmRequestProcessor@@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@AAVMMmMtpDpConfig@@@Z @ 63 NONAME ; class MMmRequestProcessor * CGetInterdependentPropDesc::NewL(class MMTPDataProviderFramework &, class MMTPConnection &, class MMmMtpDpConfig &)
+ ?AddObjectL@CMmMtpDpMetadataAccessWrapper@@QAEXABVCMTPObjectMetaData@@@Z @ 64 NONAME ; void CMmMtpDpMetadataAccessWrapper::AddObjectL(class CMTPObjectMetaData const &)
+ ?DoHandleResponsePhaseL@CSetObjectReferences@@EAEHXZ @ 65 NONAME ; int CSetObjectReferences::DoHandleResponsePhaseL(void)
+ ?GetAccessWrapperL@CMmMtpDpAccessSingleton@@SAAAVCMmMtpDpMetadataAccessWrapper@@XZ @ 66 NONAME ; class CMmMtpDpMetadataAccessWrapper & CMmMtpDpAccessSingleton::GetAccessWrapperL(void)
+ ??1CGetObjectPropsSupported@@UAE@XZ @ 67 NONAME ; CGetObjectPropsSupported::~CGetObjectPropsSupported(void)
+ ?CheckRequestL@CGetObjectPropList@@MAE?AW4TMTPResponseCode@@XZ @ 68 NONAME ; enum TMTPResponseCode CGetObjectPropList::CheckRequestL(void)
+ ?HasDataphase@CRequestProcessor@@MBEHXZ @ 69 NONAME ; int CRequestProcessor::HasDataphase(void) const
+ ?NewL@CGetObjectPropsSupported@@SAPAVMMmRequestProcessor@@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@AAVMMmMtpDpConfig@@@Z @ 70 NONAME ; class MMmRequestProcessor * CGetObjectPropsSupported::NewL(class MMTPDataProviderFramework &, class MMTPConnection &, class MMmMtpDpConfig &)
+ ?Connection@CRequestProcessor@@MBEAAVMMTPConnection@@XZ @ 71 NONAME ; class MMTPConnection & CRequestProcessor::Connection(void) const
+ ??1CPropertySettingUtility@@UAE@XZ @ 72 NONAME ; CPropertySettingUtility::~CPropertySettingUtility(void)
+ ??1CGetPartialObject@@UAE@XZ @ 73 NONAME ; CGetPartialObject::~CGetPartialObject(void)
+ ?NewL@CGetObjectInfo@@SAPAVMMmRequestProcessor@@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@AAVMMmMtpDpConfig@@@Z @ 74 NONAME ; class MMmRequestProcessor * CGetObjectInfo::NewL(class MMTPDataProviderFramework &, class MMTPConnection &, class MMmMtpDpConfig &)
+ ?RunError@CSetObjectPropList@@MAEHH@Z @ 75 NONAME ; int CSetObjectPropList::RunError(int)
+ ?CheckRequestL@CGetInterdependentPropDesc@@MAE?AW4TMTPResponseCode@@XZ @ 76 NONAME ; enum TMTPResponseCode CGetInterdependentPropDesc::CheckRequestL(void)
+ ?Match@CRequestUnknown@@MBEHABVTMTPTypeRequest@@AAVMMTPConnection@@@Z @ 77 NONAME ; int CRequestUnknown::Match(class TMTPTypeRequest const &, class MMTPConnection &) const
+ ?ServiceL@CMoveObject@@MAEXXZ @ 78 NONAME ; void CMoveObject::ServiceL(void)
+ ?CreateDummyFile@CMmMtpDpMetadataAccessWrapper@@QAEXABVTDesC16@@@Z @ 79 NONAME ; void CMmMtpDpMetadataAccessWrapper::CreateDummyFile(class TDesC16 const &)
+ ?CheckRequestL@CGetObjectPropDesc@@MAE?AW4TMTPResponseCode@@XZ @ 80 NONAME ; enum TMTPResponseCode CGetObjectPropDesc::CheckRequestL(void)
+ ?DoHandleRToIPhaseL@CRequestProcessor@@MAEHXZ @ 81 NONAME ; int CRequestProcessor::DoHandleRToIPhaseL(void)
+ ?ServiceMetaDataToWrapperL@CSetObjectPropValue@@IAE?AW4TMTPResponseCode@@GAAVMMTPType@@ABVCMTPObjectMetaData@@@Z @ 82 NONAME ; enum TMTPResponseCode CSetObjectPropValue::ServiceMetaDataToWrapperL(unsigned short, class MMTPType &, class CMTPObjectMetaData const &)
+ ?FormatFromFilename@MmMtpDpUtility@@SA?AW4TMTPFormatCode@@ABVTDesC16@@@Z @ 83 NONAME ; enum TMTPFormatCode MmMtpDpUtility::FormatFromFilename(class TDesC16 const &)
+ ?GetAllReferenceL@CMmMtpDpMetadataAccessWrapper@@QAEXABVCMTPObjectMetaData@@AAVCDesC16Array@@@Z @ 84 NONAME ; void CMmMtpDpMetadataAccessWrapper::GetAllReferenceL(class CMTPObjectMetaData const &, class CDesC16Array &)
+ ?CheckRequestL@CSetObjectPropValue@@MAE?AW4TMTPResponseCode@@XZ @ 85 NONAME ; enum TMTPResponseCode CSetObjectPropValue::CheckRequestL(void)
+ ??0CPropertySettingUtility@@IAE@XZ @ 86 NONAME ; CPropertySettingUtility::CPropertySettingUtility(void)
+ ?Match@CRequestProcessor@@MBEHABVTMTPTypeRequest@@AAVMMTPConnection@@@Z @ 87 NONAME ; int CRequestProcessor::Match(class TMTPTypeRequest const &, class MMTPConnection &) const
+ ??0CCopyObject@@IAE@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@AAVMMmMtpDpConfig@@@Z @ 88 NONAME ; CCopyObject::CCopyObject(class MMTPDataProviderFramework &, class MMTPConnection &, class MMmMtpDpConfig &)
+ ?CheckRequestL@CRequestProcessor@@MAE?AW4TMTPResponseCode@@XZ @ 89 NONAME ; enum TMTPResponseCode CRequestProcessor::CheckRequestL(void)
+ ?SendResponseL@CRequestProcessor@@IAEXW4TMTPResponseCode@@HPAK@Z @ 90 NONAME ; void CRequestProcessor::SendResponseL(enum TMTPResponseCode, int, unsigned long *)
+ ?CancelActiveToIdleStatusChange@CMmMtpDpAccessSingleton@@SAXXZ @ 91 NONAME ; void CMmMtpDpAccessSingleton::CancelActiveToIdleStatusChange(void)
+ ?DoHandleCompletingPhaseL@CRequestProcessor@@MAEHXZ @ 92 NONAME ; int CRequestProcessor::DoHandleCompletingPhaseL(void)
+ ?DeleteDummyFile@CMmMtpDpMetadataAccessWrapper@@QAEXABVTDesC16@@@Z @ 93 NONAME ; void CMmMtpDpMetadataAccessWrapper::DeleteDummyFile(class TDesC16 const &)
+ ??1CGetObjectInfo@@UAE@XZ @ 94 NONAME ; CGetObjectInfo::~CGetObjectInfo(void)
+ ?ServiceL@CRequestUnknown@@MAEXXZ @ 95 NONAME ; void CRequestUnknown::ServiceL(void)
+ ?HasDataphase@CSetObjectPropList@@MBEHXZ @ 96 NONAME ; int CSetObjectPropList::HasDataphase(void) const
+ ?NewL@CGetObjectReferences@@SAPAVMMmRequestProcessor@@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@AAVMMmMtpDpConfig@@@Z @ 97 NONAME ; class MMmRequestProcessor * CGetObjectReferences::NewL(class MMTPDataProviderFramework &, class MMTPConnection &, class MMmMtpDpConfig &)
+ ?DoCancel@CRenameObject@@MAEXXZ @ 98 NONAME ; void CRenameObject::DoCancel(void)
+ ??1CSetObjectReferences@@UAE@XZ @ 99 NONAME ; CSetObjectReferences::~CSetObjectReferences(void)
+ ?Match@CSendObject@@MBEHABVTMTPTypeRequest@@AAVMMTPConnection@@@Z @ 100 NONAME ; int CSendObject::Match(class TMTPTypeRequest const &, class MMTPConnection &) const
+ ?NewL@CSetObjectPropList@@SAPAVMMmRequestProcessor@@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@AAVMMmMtpDpConfig@@@Z @ 101 NONAME ; class MMmRequestProcessor * CSetObjectPropList::NewL(class MMTPDataProviderFramework &, class MMTPConnection &, class MMmMtpDpConfig &)
+ ??1CCopyObject@@UAE@XZ @ 102 NONAME ; CCopyObject::~CCopyObject(void)
+ ?GetModifiedContentL@CMmMtpDpMetadataAccessWrapper@@QAEXABVTDesC16@@AAHAAVCDesC16Array@@@Z @ 103 NONAME ; void CMmMtpDpMetadataAccessWrapper::GetModifiedContentL(class TDesC16 const &, int &, class CDesC16Array &)
+ ?RunL@CGetObjectPropList@@MAEXXZ @ 104 NONAME ; void CGetObjectPropList::RunL(void)
+ ?NewRangeFormDescriptionL@CDescriptionUtility@@QAEPAVCMTPTypeObjectPropDesc@@GKKKH@Z @ 105 NONAME ; class CMTPTypeObjectPropDesc * CDescriptionUtility::NewRangeFormDescriptionL(unsigned short, unsigned long, unsigned long, unsigned long, int)
+ ?RunError@CRequestProcessor@@MAEHH@Z @ 106 NONAME ; int CRequestProcessor::RunError(int)
+ ?SessionId@CRequestProcessor@@MAEKXZ @ 107 NONAME ; unsigned long CRequestProcessor::SessionId(void)
+ ??0CDescriptionUtility@@IAE@XZ @ 108 NONAME ; CDescriptionUtility::CDescriptionUtility(void)
+ ?HandleEventL@CRequestProcessor@@MAEXABVTMTPTypeEvent@@@Z @ 109 NONAME ; void CRequestProcessor::HandleEventL(class TMTPTypeEvent const &)
+ ?NewL@CGetPartialObject@@SAPAVMMmRequestProcessor@@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@AAVMMmMtpDpConfig@@@Z @ 110 NONAME ; class MMmRequestProcessor * CGetPartialObject::NewL(class MMTPDataProviderFramework &, class MMTPConnection &, class MMmMtpDpConfig &)
+ ?HasDataphase@CSetObjectReferences@@EBEHXZ @ 111 NONAME ; int CSetObjectReferences::HasDataphase(void) const
+ ?RunError@CGetObjectPropList@@MAEHH@Z @ 112 NONAME ; int CGetObjectPropList::RunError(int)
+ ?DoHandleResponsePhaseL@CSetObjectPropList@@MAEHXZ @ 113 NONAME ; int CSetObjectPropList::DoHandleResponsePhaseL(void)
+ ?NewL@CRenameObject@@SAPAV1@AAVMMTPDataProviderFramework@@AAVCMmMtpDpMetadataAccessWrapper@@@Z @ 114 NONAME ; class CRenameObject * CRenameObject::NewL(class MMTPDataProviderFramework &, class CMmMtpDpMetadataAccessWrapper &)
+ ?RenameObjectL@CMmMtpDpMetadataAccessWrapper@@QAEXABVCMTPObjectMetaData@@ABVTDesC16@@@Z @ 115 NONAME ; void CMmMtpDpMetadataAccessWrapper::RenameObjectL(class CMTPObjectMetaData const &, class TDesC16 const &)
+ ?GetObjectMetadataValueL@CMmMtpDpMetadataAccessWrapper@@QAEXGAAVMMTPType@@ABVCMTPObjectMetaData@@@Z @ 116 NONAME ; void CMmMtpDpMetadataAccessWrapper::GetObjectMetadataValueL(unsigned short, class MMTPType &, class CMTPObjectMetaData const &)
+ ?GetAllAbstractMediaL@CMmMtpDpMetadataAccessWrapper@@QAEXABVTDesC16@@AAVCDesC16Array@@W4TMPXGeneralCategory@@@Z @ 117 NONAME ; void CMmMtpDpMetadataAccessWrapper::GetAllAbstractMediaL(class TDesC16 const &, class CDesC16Array &, enum TMPXGeneralCategory)
+ ?AddDummyFileL@CMmMtpDpMetadataAccessWrapper@@QAEXABVTDesC16@@@Z @ 118 NONAME ; void CMmMtpDpMetadataAccessWrapper::AddDummyFileL(class TDesC16 const &)
+ ??1CGetObjectPropDesc@@UAE@XZ @ 119 NONAME ; CGetObjectPropDesc::~CGetObjectPropDesc(void)
+ ?ServiceL@CGetObjectPropDesc@@MAEXXZ @ 120 NONAME ; void CGetObjectPropDesc::ServiceL(void)
+ ?HasDataphase@CSetObjectPropValue@@MBEHXZ @ 121 NONAME ; int CSetObjectPropValue::HasDataphase(void) const
+ ?ServiceL@CCopyObject@@MAEXXZ @ 122 NONAME ; void CCopyObject::ServiceL(void)
+ ?CheckRequestL@CGetObjectPropValue@@MAE?AW4TMTPResponseCode@@XZ @ 123 NONAME ; enum TMTPResponseCode CGetObjectPropValue::CheckRequestL(void)
+ ?CloseSessionL@CMmMtpDpAccessSingleton@@SAXXZ @ 124 NONAME ; void CMmMtpDpAccessSingleton::CloseSessionL(void)
+ ?NewL@CGetFormatCapabilities@@SAPAVMMmRequestProcessor@@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@AAVMMmMtpDpConfig@@@Z @ 125 NONAME ; class MMmRequestProcessor * CGetFormatCapabilities::NewL(class MMTPDataProviderFramework &, class MMTPConnection &, class MMmMtpDpConfig &)
+ ?ReceiveDataL@CRequestProcessor@@IAEXAAVMMTPType@@@Z @ 126 NONAME ; void CRequestProcessor::ReceiveDataL(class MMTPType &)
+ ??1CDescriptionUtility@@UAE@XZ @ 127 NONAME ; CDescriptionUtility::~CDescriptionUtility(void)
+ ?ConstructL@CMoveObject@@IAEXXZ @ 128 NONAME ; void CMoveObject::ConstructL(void)
+ ?NewL@CSendObject@@SAPAVMMmRequestProcessor@@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@AAVMMmMtpDpConfig@@@Z @ 129 NONAME ; class MMmRequestProcessor * CSendObject::NewL(class MMTPDataProviderFramework &, class MMTPConnection &, class MMmMtpDpConfig &)
+ ?RunL@CSetObjectPropList@@MAEXXZ @ 130 NONAME ; void CSetObjectPropList::RunL(void)
+ ??1CGetObjectReferences@@UAE@XZ @ 131 NONAME ; CGetObjectReferences::~CGetObjectReferences(void)
+ ?HasDataphase@CSendObject@@MBEHXZ @ 132 NONAME ; int CSendObject::HasDataphase(void) const
+ ??1CSetObjectPropValue@@UAE@XZ @ 133 NONAME ; CSetObjectPropValue::~CSetObjectPropValue(void)
+ ?ConstructL@CRenameObject@@IAEXXZ @ 134 NONAME ; void CRenameObject::ConstructL(void)
+ ?DoHandleResponsePhaseL@CSendObject@@MAEHXZ @ 135 NONAME ; int CSendObject::DoHandleResponsePhaseL(void)
+ ?SendDataL@CRequestProcessor@@IAEXABVMMTPType@@@Z @ 136 NONAME ; void CRequestProcessor::SendDataL(class MMTPType const &)
+ ?SetReferenceL@CMmMtpDpMetadataAccessWrapper@@QAEXABVCMTPObjectMetaData@@AAVCDesC16Array@@@Z @ 137 NONAME ; void CMmMtpDpMetadataAccessWrapper::SetReferenceL(class CMTPObjectMetaData const &, class CDesC16Array &)
+ ?DoCancel@CGetObjectPropList@@MAEXXZ @ 138 NONAME ; void CGetObjectPropList::DoCancel(void)
+ ?ServiceL@CGetInterdependentPropDesc@@MAEXXZ @ 139 NONAME ; void CGetInterdependentPropDesc::ServiceL(void)
+ ?DoHandleRequestPhaseL@CRequestProcessor@@MAEHXZ @ 140 NONAME ; int CRequestProcessor::DoHandleRequestPhaseL(void)
+ ?ServiceL@CSetObjectPropValue@@MAEXXZ @ 141 NONAME ; void CSetObjectPropValue::ServiceL(void)
+ ?RunError@CRenameObject@@MAEHH@Z @ 142 NONAME ; int CRenameObject::RunError(int)
+ ??1CDeleteObject@@UAE@XZ @ 143 NONAME ; CDeleteObject::~CDeleteObject(void)
+ ?DoHandleResponsePhaseL@CGetPartialObject@@MAEHXZ @ 144 NONAME ; int CGetPartialObject::DoHandleResponsePhaseL(void)
+ ??0CSetObjectPropValue@@IAE@AAVMMTPDataProviderFramework@@AAVMMTPConnection@@AAVMMmMtpDpConfig@@@Z @ 145 NONAME ; CSetObjectPropValue::CSetObjectPropValue(class MMTPDataProviderFramework &, class MMTPConnection &, class MMmMtpDpConfig &)
+ ??1CGetObjectPropList@@UAE@XZ @ 146 NONAME ; CGetObjectPropList::~CGetObjectPropList(void)
+ ?CheckRequestL@CGetFormatCapabilities@@MAE?AW4TMTPResponseCode@@XZ @ 147 NONAME ; enum TMTPResponseCode CGetFormatCapabilities::CheckRequestL(void)
?ServiceL@CGetObjectPropList@@MAEXXZ @ 148 NONAME ; void CGetObjectPropList::ServiceL(void)
+ ??0CRenameObject@@IAE@AAVMMTPDataProviderFramework@@AAVCMmMtpDpMetadataAccessWrapper@@@Z @ 149 NONAME ; CRenameObject::CRenameObject(class MMTPDataProviderFramework &, class CMmMtpDpMetadataAccessWrapper &)
--- a/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/eabi/mmmtpdprequestprocessoru.def Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/eabi/mmmtpdprequestprocessoru.def Wed Aug 18 10:16:02 2010 +0300
@@ -262,4 +262,5 @@
_ZThn28_NK17CRequestProcessor5MatchERK13TMTPTypeEventR14MMTPConnection @ 261 NONAME
_ZThn28_NK17CRequestProcessor5MatchERK15TMTPTypeRequestR14MMTPConnection @ 262 NONAME
_ZThn28_NK17CRequestProcessor7RequestEv @ 263 NONAME
+ _ZN13CDeleteObject24DoHandleCompletingPhaseLEv @ 264 NONAME
--- a/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/inc/cdeleteobject.h Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/inc/cdeleteobject.h Wed Aug 18 10:16:02 2010 +0300
@@ -77,6 +77,11 @@
*/
IMPORT_C void DoCancel();
+ /**
+ * Completeing phase Handler
+ */
+ IMPORT_C TBool DoHandleCompletingPhaseL();
+
private:
void ConstructL();
/**
@@ -114,6 +119,12 @@
// Keeps track of whether any files where deleted
TBool iIsMultiDelete;
+ // Keeps track of the respone code when it is EMTPRespCodeDeviceBusy
+ TBool iDeviceBusy;
+
+ // Keeps track of the count of EMTPRespCodeDeviceBusy that return to PC
+ TInt iCountDeviceBusyError;
+
// Accessor of DB
MMmMtpDpConfig& iDpConfig;
--- a/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/ccopyobject.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/ccopyobject.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -310,9 +310,9 @@
SetPreviousPropertiesL();
CFileMan* fileMan = CFileMan::NewL( iFramework.Fs() );
+ CleanupStack::PushL( fileMan ); // + fileMan
User::LeaveIfError( fileMan->Copy( oldFileName, aNewFileName ) );
- delete fileMan;
- fileMan = NULL;
+ CleanupStack::PopAndDestroy( fileMan ); // - fileMan
PRINT( _L( "MM MTP <= CCopyObject::CopyFileL" ) );
return handle;
@@ -417,8 +417,6 @@
{
PRINT( _L( "MM MTP => CCopyObject::SetPreviousPropertiesL" ) );
- TMTPResponseCode respcode = EMTPRespCodeOK;
-
iPropertyList->ResetCursor();
const TInt count = iPropertyList->NumberOfElements();
for ( TInt i = 0; i < count; i++ )
@@ -460,7 +458,7 @@
{
CMTPTypeString *stringData = CMTPTypeString::NewLC( element.StringL( CMTPTypeObjectPropListElement::EValue ) ); // + stringData
- respcode = iDpConfig.PropSettingUtility()->SetMetaDataToWrapper( iDpConfig,
+ iDpConfig.PropSettingUtility()->SetMetaDataToWrapper( iDpConfig,
propertyCode,
*stringData,
*iTargetObject );
@@ -471,7 +469,7 @@
default:
{
- respcode = iDpConfig.PropSettingUtility()->SetSpecificObjectPropertyL( iDpConfig,
+ iDpConfig.PropSettingUtility()->SetSpecificObjectPropertyL( iDpConfig,
propertyCode,
*iTargetObject,
element );
@@ -480,13 +478,7 @@
}
} // end of for loop
- // ignore errors
- if ( respcode == EMTPRespCodeOK )
- {
- // do nothing, just to get rid of build warning
- }
-
- PRINT1( _L( "MM MTP <= CCopyObject::SetPreviousPropertiesL respcode = 0x%x" ), respcode );
+ PRINT( _L( "MM MTP <= CCopyObject::SetPreviousPropertiesL" ) );
}
// -----------------------------------------------------------------------------
--- a/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/cdeleteobject.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/cdeleteobject.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -26,6 +26,7 @@
#include "mmmtpdputility.h"
const TInt KMaxDeletionTimes = 10;
+const TInt KMaxDeviceBusyTimes = 3;
const TInt KDeletionThreshold = 100 * 1000; // (100 millisec)
// -----------------------------------------------------------------------------
@@ -294,6 +295,25 @@
}
// -----------------------------------------------------------------------------
+// CDeleteObject::DoHandleCompletingPhaseL
+// Completeing phase Handler
+// -----------------------------------------------------------------------------
+//
+EXPORT_C TBool CDeleteObject::DoHandleCompletingPhaseL()
+ {
+ CRequestProcessor::DoHandleCompletingPhaseL();
+
+ // If the response code is EMTPRespCodeDeviceBusy, don't release this object
+ TBool result = !iDeviceBusy;
+
+ PRINT2( _L( "MM MTP <> CDeleteObject::DoHandleCompletingPhaseL iDeleteError= %d, result = %d" ),
+ iDeleteError,
+ result );
+
+ return result;
+ }
+
+// -----------------------------------------------------------------------------
// CDeleteObject::ProcessFinalPhaseL
// Delete all of the associations if file deletion was successful
// Then signals that the deletion has been completed
@@ -305,6 +325,7 @@
TInt num = iObjectsToDelete.Count();
TBool isOk = iDeleteError == KErrNone || iDeleteError == KErrNotFound;
+ iDeviceBusy = EFalse;
if ( num == 0 && isOk )
{
@@ -315,12 +336,15 @@
SendResponseL( EMTPRespCodePartialDeletion );
}
else if ( !iIsMultiDelete && iDeleteError == KErrAccessDenied )
- {
+ {
SendResponseL( EMTPRespCodeObjectWriteProtected );
}
- else if ( iDeleteError == KErrInUse )
+ else if ( iDeleteError == KErrInUse
+ && iCountDeviceBusyError < KMaxDeviceBusyTimes )
{
+ iCountDeviceBusyError++;
SendResponseL( EMTPRespCodeDeviceBusy );
+ iDeviceBusy = ETrue;
}
else
{
--- a/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/cgetobjectinfo.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/cgetobjectinfo.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -95,7 +95,6 @@
//
EXPORT_C void CGetObjectInfo::ConstructL()
{
- CActiveScheduler::Add( this );
}
// -----------------------------------------------------------------------------
@@ -106,7 +105,7 @@
void CGetObjectInfo::ServiceL()
{
PRINT( _L( "MM MTP => CGetObjectInfo::ServiceL" ) );
-
+
MmMtpDpUtility::SetPSStatus(EMtpPSStatusActive);
delete iObjectInfo;
@@ -174,8 +173,13 @@
// Image Bit Depth
iObjectInfo->SetUint32L( CMTPTypeObjectInfo::EImageBitDepth, 0 );
// Parent Object
- iObjectInfo->SetUint32L( CMTPTypeObjectInfo::EParentObject,
- object->Uint( CMTPObjectMetaData::EParentHandle ) );
+ TUint32 parentHandle = object->Uint( CMTPObjectMetaData::EParentHandle );
+ // refer to 5.3.1.9 of MTP Spec 1.0
+ if ( parentHandle == KMTPHandleNoParent )
+ {
+ parentHandle = KMTPHandleNone;
+ }
+ iObjectInfo->SetUint32L( CMTPTypeObjectInfo::EParentObject, parentHandle );
// Association Type
iObjectInfo->SetUint16L( CMTPTypeObjectInfo::EAssociationType, 0 );
// Association Description
--- a/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/cgetobjectproplist.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/cgetobjectproplist.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -500,29 +500,11 @@
properties = iDpConfig.GetSupportedPropertiesL( formatCode );
const TInt count = properties->Count();
-
- TInt err = KErrNone;
- TBool successQuery = EFalse;
for ( TInt i = 0; i < count; i++ )
{
- // no need to do the trap anymore, this is being handle internally in Media DP's ServiceSpecificObjectPropertyL,
- // also, this base class should not know too much of different handling between different formats
- err = ServiceOneObjectPropertyL( aHandle, (*properties)[i] );
- if ( err == KErrNone )
- successQuery = ETrue;
- if ( err == KErrNotSupported || err == KErrNotFound ) // Skip
- err = KErrNone;
- if ( err != KErrNone )
- break;
+ ServiceOneObjectPropertyL( aHandle, (*properties)[i] );
}
-
- // In PC Suite combined mode, a file that was found at the beginning could be deleted by PC Suite protocol
- // Need to fail it here.
- if ( successQuery == EFalse )
- err = KErrNotFound;
-
- PRINT1( _L( "MM MTP <= CGetObjectPropList::ServiceAllPropertiesL err = %d" ), err );
- return err;
+ return KErrNone;
}
// -----------------------------------------------------------------------------
@@ -626,17 +608,10 @@
// Filename
case EMTPObjectPropCodeObjectFileName:
{
-#ifdef _DEBUG
- HBufC* log = iObject->DesC( CMTPObjectMetaData::ESuid ).Alloc();
- PRINT1( _L( "MM MTP <> CGetObjectPropList::ServiceOneObjectPropertyL FileName = %S" ), log );
- delete log;
- log = NULL;
-#endif // _DEBUG
TParsePtrC parse( iObject->DesC( CMTPObjectMetaData::ESuid ) );
- textData = CMTPTypeString::NewLC( parse.NameAndExt() ); // + textData
+ PRINT1( _L( "MM MTP <> CGetObjectPropList::ServiceOneObjectPropertyL FileName = %S" ), &parse.FullName() );
iPropertyElement = &( iPropertyList->ReservePropElemL( aHandle, aPropCode) );
- iPropertyElement->SetStringL( CMTPTypeObjectPropListElement::EValue, textData->StringChars() );
- CleanupStack::PopAndDestroy( textData ); // - textData
+ iPropertyElement->SetStringL( CMTPTypeObjectPropListElement::EValue, parse.NameAndExt() );
}
break;
@@ -644,7 +619,13 @@
case EMTPObjectPropCodeParentObject:
{
iPropertyElement = &( iPropertyList->ReservePropElemL( aHandle, aPropCode ) );
- iPropertyElement->SetUint32L( CMTPTypeObjectPropListElement::EValue, iObject->Uint( CMTPObjectMetaData::EParentHandle ) );
+ TUint32 parentHandle = iObject->Uint( CMTPObjectMetaData::EParentHandle );
+ // refer to 5.3.1.9 of MTP Spec 1.0
+ if ( parentHandle == KMTPHandleNoParent )
+ {
+ parentHandle = KMTPHandleNone;
+ }
+ iPropertyElement->SetUint32L( CMTPTypeObjectPropListElement::EValue, parentHandle );
}
break;
--- a/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/cgetobjectpropvalue.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/cgetobjectpropvalue.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -205,8 +205,15 @@
// Parent
case EMTPObjectPropCodeParentObject:
{
- iMTPTypeUint32.Set( 0 );
- iMTPTypeUint32 = iObjectInfo->Uint( CMTPObjectMetaData::EParentHandle );
+ iMTPTypeUint32.Set( KMTPHandleNone );
+
+ TUint32 parentHandle = iObjectInfo->Uint( CMTPObjectMetaData::EParentHandle );
+ // refer to 5.3.1.9 of MTP Spec 1.0
+ if ( parentHandle != KMTPHandleNoParent )
+ {
+ iMTPTypeUint32.Set( parentHandle );
+ }
+
SendDataL( iMTPTypeUint32 );
}
break;
--- a/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/cgetobjectreferences.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/cgetobjectreferences.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -204,12 +204,10 @@
PRINT2( _L("MM MTP => CGetObjectReferences::AddReferencesL aRefOwnerSuid = %S, ref count = %d"), &aRefOwnerSuid, count );
// check if references are valid
- TInt removeCount = 0;
- for ( TInt i = 0; i < count; i++ )
+ for ( TInt i = count-1; i >= 0; i-- )
{
- TInt index = i - removeCount;
- TPtrC temp( aReferences[index] );
- PRINT2( _L( "MM MTP <> CGetObjectReferences::AddReferencesL ref[%d]'s name = %S" ), index, &temp );
+ TPtrC temp( aReferences[i] );
+ PRINT2( _L( "MM MTP <> CGetObjectReferences::AddReferencesL ref[%d]'s name = %S" ), i, &temp );
PERFLOGSTART( KObjectManagerHandle );
TUint32 handle = iFramework.ObjectMgr().HandleL( temp );
PERFLOGSTOP( KObjectManagerHandle );
@@ -218,8 +216,7 @@
PRINT1( _L( "MM MTP <> CGetObjectReferences::AddReferencesL, [%S] doesn't existed in handle db, remove this from reference array" ), &temp );
// if handle is invalid, remove from reference array
- aReferences.Delete( index, 1 );
- removeCount++;
+ aReferences.Delete( i );
}
}
--- a/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/cmoveobject.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/cmoveobject.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -292,15 +292,15 @@
// Move the file first no matter if it will fail in Get/SetPreviousPropertiesL
// Already trapped inside
GetPreviousPropertiesL( *iObjectInfo );
- TRAPD( err, SetPropertiesL( aNewFileName ) );
+ TRAP_IGNORE( SetPropertiesL( aNewFileName ) );
CFileMan* fileMan = CFileMan::NewL( iFramework.Fs() );
- err = fileMan->Move( *oldFileName, aNewFileName );
-
- CleanupStack::PopAndDestroy( oldFileName ); // - oldFileName
-
- if ( err != KErrNone )
- PRINT1( _L( "MM MTP <> CMoveObject::MoveFileL err = %d" ), err );
+ CleanupStack::PushL( fileMan ); // + fileMan
+ TInt err = fileMan->Move( *oldFileName, aNewFileName );
+ PRINT1( _L( "MM MTP <> CMoveObject::MoveFileL err = %d" ), err );
+ User::LeaveIfError( err );
+ CleanupStack::PopAndDestroy( fileMan ); // - fileMan
+ CleanupStack::PopAndDestroy( oldFileName ); // - oldFileName
PRINT( _L( "MM MTP <= CMoveObject::MoveFileL" ) );
}
@@ -314,8 +314,6 @@
{
PRINT( _L( "MM MTP => CMoveObject::GetPreviousPropertiesL" ) );
- const TDesC& suid( aObject.DesC( CMTPObjectMetaData::ESuid ) );
-
// same storage, not necessary to get the properties
if ( iSameStorage )
return;
@@ -408,8 +406,6 @@
{
PRINT( _L( "MM MTP => CMoveObject::SetPreviousPropertiesL" ) );
- TMTPResponseCode respcode = EMTPRespCodeOK;
-
iPropertyList->ResetCursor();
const TInt count = iPropertyList->NumberOfElements();
for ( TInt i = 0; i < count; i++ )
@@ -449,7 +445,7 @@
{
CMTPTypeString *stringData = CMTPTypeString::NewLC( element.StringL( CMTPTypeObjectPropListElement::EValue ) ); // + stringData
- respcode = iDpConfig.PropSettingUtility()->SetMetaDataToWrapper( iDpConfig,
+ iDpConfig.PropSettingUtility()->SetMetaDataToWrapper( iDpConfig,
propertyCode,
*stringData,
*iObjectInfo );
@@ -460,7 +456,7 @@
default:
{
- respcode = iDpConfig.PropSettingUtility()->SetSpecificObjectPropertyL( iDpConfig,
+ iDpConfig.PropSettingUtility()->SetSpecificObjectPropertyL( iDpConfig,
propertyCode,
*iObjectInfo,
element );
@@ -469,13 +465,7 @@
}
} // end of for loop
- // ignore errors
- if ( respcode == EMTPRespCodeOK )
- {
- // do nothing, just to get rid of build warning
- }
-
- PRINT1( _L( "MM MTP <= CMoveObject::SetPreviousPropertiesL respcode = 0x%x" ), respcode );
+ PRINT( _L( "MM MTP <= CMoveObject::SetPreviousPropertiesL" ) );
}
// -----------------------------------------------------------------------------
--- a/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/crenameobject.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/crenameobject.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -269,7 +269,7 @@
PRINT1( _L( "MM MTP <> CRenameObject::GetParentSuidL new folder full file name(%S)" ), &iNewFolderName );
iOldFolderFullName.Zero();
- iOldFolderFullName.Append( aFolderName ); // just name not suid
+ iOldFolderFullName.Append( aFolderName );
PRINT1( _L( "MM MTP <> CRenameObject::GetParentSuidL = %S" ), &iOldFolderFullName );
}
--- a/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/crequestchecker.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/crequestchecker.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -243,10 +243,6 @@
CMTPObjectMetaData* object( CMTPObjectMetaData::NewLC() );
TBool result( iFramework.ObjectMgr().ObjectL( aHandle, *object ) );
- iObjectArray.AppendL( object );
- CleanupStack::Pop( object );
- iHandles.AppendL( aHandle );
-
// Obj handle exists
if ( result )
{
@@ -277,8 +273,18 @@
ret = EMTPRespCodeInvalidParentObject;
}
}
+
+ if ( result )
+ {
+ iObjectArray.AppendL( object );
+ CleanupStack::Pop( object );
+ iHandles.AppendL( aHandle );
+ }
else
+ {
+ CleanupStack::PopAndDestroy( object );
ret = EMTPRespCodeInvalidObjectHandle;
+ }
PRINT1( _L( "MM MTP <= CRequestChecker::VerifyObjectHandleL ret = 0x%x" ), ret );
--- a/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/crequestprocessor.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/crequestprocessor.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -233,6 +233,7 @@
{
TUint16 eventCode = aEvent.Uint16( TMTPTypeEvent::EEventCode );
iCancelled = ( eventCode == EMTPEventCodeCancelTransaction );
+ PRINT1( _L("CRequestProcessor::HandleEventL, eventCode = %d"), eventCode);
}
// -----------------------------------------------------------------------------
--- a/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/csendobject.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/csendobject.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -198,12 +198,14 @@
{
delete iObjectInfo;
iObjectInfo = NULL;
+ Rollback();
iProgress = EObjectNone;
}
else if ( iOperationCode == EMTPOpCodeSendObjectPropList )
{
delete iObjectPropList;
iObjectPropList = NULL;
+ Rollback();
iProgress = EObjectNone;
}
}
@@ -328,6 +330,10 @@
if ( iProgress == EObjectNone )
{
+ // iCancelled could have been set after the last transaction
+ // reset the flag here
+ iCancelled = EFalse;
+
if ( iOperationCode == EMTPOpCodeSendObjectInfo )
{
ServiceInfoL();
@@ -607,6 +613,8 @@
SendResponseL( EMTPRespCodeOK );
}
+ iCancelled = EFalse;
+
PRINT1( _L( "MM MTP <= CSendObject::DoHandleResponsePhaseObjectL result = %d" ), result );
return result;
@@ -1067,6 +1075,17 @@
// might happen if function is called before physical file arrives
// do nothing
}
+ else if ( iObjectFormat == EMTPFormatCodeASF )
+ {
+ // happens on some buggy PC implementation, default formatcode to WMA or WMV if extension matches
+ PRINT( _L( "MM MTP <> happens on some buggy PC implementation, default formatcode to WMA or WMV if extension matches" ) );
+ if ( parser.Ext().CompareF( KTxtExtensionWMA ) == 0 )
+ iObjectFormat = EMTPFormatCodeWMA;
+ else if ( parser.Ext().CompareF( KTxtExtensionWMV ) == 0 )
+ iObjectFormat = EMTPFormatCodeWMV;
+ else
+ result = EFalse;
+ }
else
{
PRINT2( _L( "MM MTP <> %S does not match 0x%x" ), &iFullPath, iObjectFormat );
--- a/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/csetobjectproplist.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/csetobjectproplist.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -188,103 +188,105 @@
if ( protectionStatus != EMTPProtectionNoProtection )
{
// NOTE: P4S expects AccessDenied response instead of ObjectWriteProtected
- return EMTPRespCodeAccessDenied; // EMTPRespCodeObjectWriteProtected;
+ responseCode = EMTPRespCodeAccessDenied; // EMTPRespCodeObjectWriteProtected;
}
-
- switch ( propertyCode )
+ else
{
- case EMTPObjectPropCodeStorageID:
- case EMTPObjectPropCodeObjectFormat:
- case EMTPObjectPropCodeProtectionStatus:
- case EMTPObjectPropCodeObjectSize:
- case EMTPObjectPropCodeParentObject:
- case EMTPObjectPropCodePersistentUniqueObjectIdentifier:
- case EMTPObjectPropCodeDateAdded:
- case EMTPObjectPropCodeDateCreated:
- case EMTPObjectPropCodeDateModified:
- {
- responseCode = EMTPRespCodeAccessDenied;
- }
- break;
-
- case EMTPObjectPropCodeNonConsumable:
- object->SetUint( CMTPObjectMetaData::ENonConsumable,
- aPropListElement.Uint8L( CMTPTypeObjectPropListElement::EValue ) );
- // TODO: need to reconsider,
- // if propList comprise both non-consumable and objectFileName,
- // ModifyObjectL would be called twice, need to investigate if it won't affect
- // performance
- iFramework.ObjectMgr().ModifyObjectL( *object );
- break;
-
- case EMTPObjectPropCodeObjectFileName:
+ switch ( propertyCode )
{
- TPtrC suid( object->DesC( CMTPObjectMetaData::ESuid ) );
- TPtrC ptr( aPropListElement.StringL( CMTPTypeObjectPropListElement::EValue ) );
- if ( KMaxFileName < ptr.Length() )
- responseCode = EMTPRespCodeInvalidDataset;
- else
+ case EMTPObjectPropCodeStorageID:
+ case EMTPObjectPropCodeObjectFormat:
+ case EMTPObjectPropCodeProtectionStatus:
+ case EMTPObjectPropCodeObjectSize:
+ case EMTPObjectPropCodeParentObject:
+ case EMTPObjectPropCodePersistentUniqueObjectIdentifier:
+ case EMTPObjectPropCodeDateAdded:
+ case EMTPObjectPropCodeDateCreated:
+ case EMTPObjectPropCodeDateModified:
{
- TFileName newSuid( ptr );
- TInt err = MmMtpDpUtility::UpdateObjectFileName( iFramework.Fs(), suid, newSuid );
- PRINT1( _L( "MM MTP <> Update object file name err = %d" ), err );
- if ( KErrOverflow == err ) // full path name is too long
- {
+ responseCode = EMTPRespCodeAccessDenied;
+ }
+ break;
+
+ case EMTPObjectPropCodeNonConsumable:
+ object->SetUint( CMTPObjectMetaData::ENonConsumable,
+ aPropListElement.Uint8L( CMTPTypeObjectPropListElement::EValue ) );
+ // TODO: need to reconsider,
+ // if propList comprise both non-consumable and objectFileName,
+ // ModifyObjectL would be called twice, need to investigate if it won't affect
+ // performance
+ iFramework.ObjectMgr().ModifyObjectL( *object );
+ break;
+
+ case EMTPObjectPropCodeObjectFileName:
+ {
+ TPtrC suid( object->DesC( CMTPObjectMetaData::ESuid ) );
+ TPtrC ptr( aPropListElement.StringL( CMTPTypeObjectPropListElement::EValue ) );
+ if ( KMaxFileName < ptr.Length() )
responseCode = EMTPRespCodeInvalidDataset;
- }
- else if ( KErrNone == err ) // TODO: ( KErrAlreadyExists == err )
- {
- TRAP( err, iDpConfig.GetWrapperL().RenameObjectL( *object, newSuid ) ); //Update MPX DB
-
- PRINT1( _L( "MM MTP <> Rename MPX object file name err = %d" ), err );
- // it is ok if file is not found in DB, following S60 solution
- if ( KErrNotFound == err )
- {
- TRAP( err, iDpConfig.GetWrapperL().AddObjectL( *object ) );
- PRINT1( _L( "MM MTP <> Add MPX object file name err = %d" ), err );
- }
-
- object->SetDesCL( CMTPObjectMetaData::ESuid, newSuid );
- iFramework.ObjectMgr().ModifyObjectL( *object );
- }
- else if ( KErrInUse == err ) // object file is being used by other program
- {
- responseCode = EMTPRespCodeDeviceBusy;
- }
else
{
- responseCode = EMTPRespCodeGeneralError;
+ TFileName newSuid( ptr );
+ TInt err = MmMtpDpUtility::UpdateObjectFileName( iFramework.Fs(), suid, newSuid );
+ PRINT1( _L( "MM MTP <> Update object file name err = %d" ), err );
+ if ( KErrOverflow == err ) // full path name is too long
+ {
+ responseCode = EMTPRespCodeInvalidDataset;
+ }
+ else if ( KErrNone == err ) // TODO: ( KErrAlreadyExists == err )
+ {
+ TRAP( err, iDpConfig.GetWrapperL().RenameObjectL( *object, newSuid ) ); //Update MPX DB
+
+ PRINT1( _L( "MM MTP <> Rename MPX object file name err = %d" ), err );
+ // it is ok if file is not found in DB, following S60 solution
+ if ( KErrNotFound == err )
+ {
+ TRAP( err, iDpConfig.GetWrapperL().AddObjectL( *object ) );
+ PRINT1( _L( "MM MTP <> Add MPX object file name err = %d" ), err );
+ }
+
+ object->SetDesCL( CMTPObjectMetaData::ESuid, newSuid );
+ iFramework.ObjectMgr().ModifyObjectL( *object );
+ }
+ else if ( KErrInUse == err ) // object file is being used by other program
+ {
+ responseCode = EMTPRespCodeDeviceBusy;
+ }
+ else
+ {
+ responseCode = EMTPRespCodeGeneralError;
+ }
}
}
- }
- break;
+ break;
- case EMTPObjectPropCodeName:
- case EMTPObjectPropCodeAlbumArtist:
- {
- CMTPTypeString* stringData = CMTPTypeString::NewLC(
- aPropListElement.StringL( CMTPTypeObjectPropListElement::EValue ) );// + stringData
+ case EMTPObjectPropCodeName:
+ case EMTPObjectPropCodeAlbumArtist:
+ {
+ CMTPTypeString* stringData = CMTPTypeString::NewLC(
+ aPropListElement.StringL( CMTPTypeObjectPropListElement::EValue ) );// + stringData
- responseCode = iDpConfig.PropSettingUtility()->SetMetaDataToWrapper( iDpConfig,
- propertyCode,
- *stringData,
- *object );
+ responseCode = iDpConfig.PropSettingUtility()->SetMetaDataToWrapper( iDpConfig,
+ propertyCode,
+ *stringData,
+ *object );
- CleanupStack::PopAndDestroy( stringData );// - stringData
- }
- break;
+ CleanupStack::PopAndDestroy( stringData );// - stringData
+ }
+ break;
- default:
- {
- responseCode = iDpConfig.PropSettingUtility()->SetSpecificObjectPropertyL( iDpConfig,
- propertyCode,
- *object,
- aPropListElement );
+ default:
+ {
+ responseCode = iDpConfig.PropSettingUtility()->SetSpecificObjectPropertyL( iDpConfig,
+ propertyCode,
+ *object,
+ aPropListElement );
+ }
+ break;
}
- break;
+
+ CleanupStack::PopAndDestroy( object ); // - object
}
-
- CleanupStack::PopAndDestroy( object ); // - object
}
PRINT1( _L( "MM MTP <= CSetObjectPropList::SetObjectPropListL responseCode = 0x%x" ), responseCode );
--- a/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/csetobjectpropvalue.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/csetobjectpropvalue.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -148,17 +148,11 @@
TUint32 objectHandle = Request().Uint32( TMTPTypeRequest::ERequestParameter1 );
CMTPObjectMetaData* objectInfo = iRequestChecker->GetObjectInfo( objectHandle );
- if ( objectInfo == NULL )
- {
- PRINT( _L("MM MTP <> CSetObjectPropValue::CheckRequestL, objectInfo is NULL" ) );
- return EMTPRespCodeInvalidObjectHandle;
- }
- TPtrC fileName = objectInfo->DesC( CMTPObjectMetaData::ESuid );
TUint32 formatCode = objectInfo->Uint( CMTPObjectMetaData::EFormatCode );
PRINT3( _L( "MM MTP <> CSetObjectPropValue::CheckRequestL, handle = 0x%x, filename = %S, formatCode = 0x%x" ),
objectHandle,
- &fileName,
+ &(objectInfo->DesC( CMTPObjectMetaData::ESuid )),
formatCode );
const RArray<TUint>* properties = iDpConfig.GetSupportedPropertiesL( formatCode );
TInt count = properties->Count();
--- a/mmappcomponents/mmmtpdataprovider/src/cmmmtpdpmetadataaccesswrapper.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappcomponents/mmmtpdataprovider/src/cmmmtpdpmetadataaccesswrapper.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -155,7 +155,7 @@
break;
}
// else
- // get from mpx
+ // Fall through on purpoe to get from mpx
case EMPXPlaylist:
case EMPXSong:
{
--- a/mmappcomponents/mmmtpdataprovider/src/cmmmtpdpmetadatampxaccess.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappcomponents/mmmtpdataprovider/src/cmmmtpdpmetadatampxaccess.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -902,7 +902,7 @@
delete iSampleData;
iSampleData = NULL;
- iSampleData = HBufC8::NewL( numElements * sizeof( TUint8 ) );
+ iSampleData = HBufC8::NewL( numElements );
TPtr8 samplePtr = iSampleData->Des();
mtpTypeArray.ToDes( samplePtr );
RFile sampleFile;
@@ -1522,12 +1522,6 @@
PRINT( _L( "MM MTP <> Modified contents are:" ) );
foundMedia = FindWMPMediaLC( KMPXMediaGeneralModified, ETrue ); // + foundMedia
-
- if ( !foundMedia->IsSupported( KMPXMediaArrayCount ) )
- {
- User::Leave( KErrNotSupported );
- }
-
foundItemCount = *foundMedia->Value<TInt>( KMPXMediaArrayCount );
PRINT1( _L( "MM MTP <> CMmMtpDpMetadataMpxAccess::GetModifiedContentL() found %d Media Objects" ), foundItemCount );
@@ -1600,14 +1594,14 @@
CleanupStack::PopAndDestroy( &playlistAttributes ); // - playlistAttributes
CleanupStack::PopAndDestroy( searchMedia ); // - searchMedia
+ CleanupStack::PushL( foundMedia ); // + foundMedia
if ( !foundMedia->IsSupported( KMPXMediaArrayCount ) )
User::Leave( KErrNotSupported );
TInt foundItemCount = *foundMedia->Value<TInt>( KMPXMediaArrayCount );
- delete foundMedia;
- foundMedia = NULL;
+ CleanupStack::PopAndDestroy( foundMedia ); // - foundMedia
PRINT1( _L( "MM MTP <= CMmMtpDpMetadataMpxAccess::IsExist foundItemCount(%d)" ), foundItemCount );
return ( foundItemCount > 0 ? ETrue : EFalse );
--- a/mmappcomponents/mmmtpdataprovider/src/cmmmtpdpmetadatavideoaccess.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappcomponents/mmmtpdataprovider/src/cmmmtpdpmetadatavideoaccess.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -89,6 +89,8 @@
User::LeaveIfError( iDbsSession.Connect() );
TInt err = DriveInfo::GetDefaultDrive( DriveInfo::EDefaultPhoneMemory, iStoreNum );
+ PRINT1( _L( "MM MTP <> CMmMtpDpMetadataVideoAccess::ConstructL, EDefaultPhoneMemory err = %d" ), err );
+ User::LeaveIfError( err );
err = OpenDatabase();
@@ -153,15 +155,17 @@
}
}
- TBuf<KStorageRootMaxLength> storeRoot;
- err = PathInfo::GetRootPath( storeRoot, iStoreNum );
- iRfs.SetSessionPath( storeRoot );
-
if ( err == KErrNone )
{
iDbOpened = ETrue;
}
+ TBuf<KStorageRootMaxLength> storeRoot;
+ if( PathInfo::GetRootPath( storeRoot, iStoreNum ) == KErrNone )
+ {
+ iRfs.SetSessionPath( storeRoot );
+ }
+
PRINT( _L( "MM MTP <= CMmMtpDpMetadataVideoAccess::OpenDatabase" ) );
return err;
}
@@ -349,12 +353,14 @@
for ( iRecordSet.FirstL(); iRecordSet.AtRow(); iRecordSet.NextL() )
{
+#ifdef _DEBUG
HBufC* data = ReadLongTextL( KMtpVideoLocation );
- CleanupStack::PushL( data );
PRINT1( _L( "MM MTP <> CleanupDbIfNecessaryL removing %S from database" ), data );
+ delete data;
+ data = NULL;
+#endif
iRecordSet.DeleteL();
- CleanupStack::PopAndDestroy( data );
}
delete iColSet;
@@ -474,6 +480,8 @@
//__ASSERT_DEBUG(!iColSet, _MTP_PANIC(KMtpPrtPncCat, ENullPointer)); // Must have iColSet == NULL
// Make sure any quotes in the aMatchCriteria are doubled...
+ // coverity[incorrect_multiplication]
+ // coverity[buffer_alloc]
HBufC* matchText = HBufC::NewLC( 2 * aMatchCriteria.Length() );
TPtr pMatchText( matchText->Des() );
TInt srcLen = aMatchCriteria.Length();
@@ -706,9 +714,8 @@
OpenDatabaseL();
// File Path
- HBufC* suid = aObjectMetaData.DesC( CMTPObjectMetaData::ESuid ).AllocLC(); // + suid
- SetRecordL( *suid, ERecordRead );
- CleanupStack::PopAndDestroy( suid ); // - suid
+ const TDesC& suid = aObjectMetaData.DesC( CMTPObjectMetaData::ESuid );
+ SetRecordL( suid, ERecordRead );
HBufC* data = NULL;
TDbColNo num;
@@ -779,16 +786,14 @@
{
PRINT( _L( "MM MTP <> EMTPObjectPropCodeDescription-MD" ) );
data = ReadLongTextL( KMtpVideoComment );
+ CleanupStack::PushL( data ); // + data
TInt len = data->Length();
PRINT1( _L( "MM MTP <> CMmMtpDpMetadataMpxAccess::GetObjectMetadataValue len = %d" ),len );
- if ( len != 0 )
- {
- for ( TInt i = 0; i < len; i++ )
- ( ( CMTPTypeArray& ) aNewData ).AppendUintL( ( *data )[i] );
- }
+ for ( TInt i = 0; i < len; i++ )
+ ( ( CMTPTypeArray& ) aNewData ).AppendUintL( ( *data )[i] );
- delete data;
+ CleanupStack::PopAndDestroy( data ); // - data
data = NULL;
}
break;
@@ -1025,6 +1030,7 @@
// Pack the info to aNewData
if ( data )
{
+ CleanupStack::PushL( data ); // + data
#ifdef _DEBUG
if ( data->Length() > KMtpMaxStringDescLength ) // Have to concatenate for MTP
{
@@ -1040,8 +1046,7 @@
{
User::Leave( KErrArgument );
}
- delete data;
- data = NULL;
+ CleanupStack::PopAndDestroy( data ); // - data
}
PRINT( _L( "MM MTP <= CMmMtpDpMetadataVideoAccess::GetObjectMetadataValue" ) );
--- a/mmappcomponents/mmmtpdataprovider/src/mmmtpdputility.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappcomponents/mmmtpdataprovider/src/mmmtpdputility.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -110,14 +110,8 @@
if ( mime->CompareF( KMimeTypeAudio3gpp ) == 0
|| mime->CompareF( KMimeTypeVideo3gpp ) == 0 )
{
- delete mime;
- mime = NULL;
format = EMTPFormatCode3GPContainer;
}
- }
-
- if ( mime != NULL )
- {
delete mime;
mime = NULL;
}
@@ -525,34 +519,15 @@
HBufC8* MmMtpDpUtility::OdfMimeTypeL( const TDesC& aFullPath )
{
PRINT( _L( "MM MTP => MmMtpDpUtility::OdfMimeTypeL" ) );
- HBufC8* mimebuf = NULL;
- CContent* content = CContent::NewL( aFullPath );
- CleanupStack::PushL( content ); // + content
-
- HBufC* buffer = HBufC::NewL( KMimeTypeMaxLength );
- CleanupStack::PushL( buffer ); // + buffer
+ CContent* content = CContent::NewLC( aFullPath ); // + content
+ HBufC* buffer = HBufC::NewLC( KMimeTypeMaxLength ); // + buffer
TPtr data = buffer->Des();
- TInt err = content->GetStringAttribute( EMimeType, data );
-
- if ( err == KErrNone )
- {
- mimebuf = HBufC8::New( buffer->Length() );
+ User::LeaveIfError( content->GetStringAttribute( EMimeType, data ) );
- if ( mimebuf == NULL )
- {
- User::LeaveIfError( KErrNotFound );
- }
-
- mimebuf->Des().Copy( *buffer );
- }
-
- // leave if NULL
- if ( mimebuf == NULL )
- {
- User::Leave( KErrNotFound );
- }
+ HBufC8* mimebuf = HBufC8::NewL( buffer->Length() );
+ mimebuf->Des().Copy( *buffer );
CleanupStack::PopAndDestroy( buffer ); // - buffer
CleanupStack::PopAndDestroy( content ); // - content
--- a/mmappcomponents/mmmtpdataprovider/tsrc/mtpdataprovidertestmodule/src/ctestobjectmanager.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappcomponents/mmmtpdataprovider/tsrc/mtpdataprovidertestmodule/src/ctestobjectmanager.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -84,6 +84,7 @@
const TMTPObjectMgrQueryParams& aParams,
RMTPObjectMgrQueryContext& aContext, RArray<TUint>& aHandles ) const
{
+ CleanupClosePushL( aHandles );
PRINTF3( ">CTestObjectManager::GetObjectHandlesL storage = 0x%x parent = 0x%x format = 0x%x", aParams.iStorageId, aParams.iParentHandle, aParams.iFormatCode );
for ( TInt i = 0; i < iMTPObjects.Count(); i++ )
{
@@ -103,6 +104,7 @@
}
aContext.Close();
PRINTF0( "<CTestObjectManager::GetObjectHandlesL" );
+ CleanupStack::Pop();
}
void CTestObjectManager::GetObjectSuidsL(
--- a/mmappcomponents/mmmtpdataprovider/tsrc/mtpdataprovidertestmodule/src/ctestobserver.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappcomponents/mmmtpdataprovider/tsrc/mtpdataprovidertestmodule/src/ctestobserver.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -737,6 +737,7 @@
void CTestObserver::GetArrayValue( MMTPDataProviderConfig::TParameter aParam, RArray<TUint>& aArray ) const
{
+ CleanupClosePushL( aArray );
PRINTF1( ">CTestObserver::GetArrayValue aParam = %d", aParam );
switch (aParam)
{
@@ -751,4 +752,5 @@
User::Leave( KErrArgument );
}
PRINTF0( "<CTestObserver::GetArrayValue" );
+ CleanupStack::Pop();
}
--- a/mmappcomponents/mmmtpdataprovider/tsrc/mtpdataprovidertestmodule/src/cteststoragemgr.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappcomponents/mmmtpdataprovider/tsrc/mtpdataprovidertestmodule/src/cteststoragemgr.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -432,6 +432,7 @@
void CTestStorageMgr::GetAvailableDrivesL(
RArray<TDriveNumber>& aDrives ) const
{
+ CleanupClosePushL( aDrives );
PRINTF0( ">CTestStorageMgr::GetAvailableDrivesL" );
aDrives.Reset();
for ( TUint i = 0; ( i < iMapDriveToStorage.Count() ); i++ )
@@ -443,6 +444,7 @@
}
}
PRINTF0( "<CTestStorageMgr::GetAvailableDrivesL" );
+ CleanupStack::Pop();
}
void CTestStorageMgr::GetLogicalStoragesL(
--- a/mmappcomponents/playlistengine/group/mpxplaylistengine.mmp Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappcomponents/playlistengine/group/mpxplaylistengine.mmp Wed Aug 18 10:16:02 2010 +0300
@@ -51,4 +51,6 @@
LIBRARY charconv.lib
LIBRARY mpxcommon.lib
+SMPSAFE
+
// End of File
--- a/mmappcomponents/playlistengine/group/mpxplaylistrecognizer.mmp Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappcomponents/playlistengine/group/mpxplaylistrecognizer.mmp Wed Aug 18 10:16:02 2010 +0300
@@ -46,5 +46,6 @@
LIBRARY bafl.lib
LIBRARY mpxcommon.lib
+SMPSAFE
// End of File
--- a/mmappfw_plat/harvester_utility_api/tsrc/Conf/mpxharvestertest.cfg Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappfw_plat/harvester_utility_api/tsrc/Conf/mpxharvestertest.cfg Wed Aug 18 10:16:02 2010 +0300
@@ -142,8 +142,8 @@
[Test]
title Delete files synchronously
create mpxharvestertest utility
+utility CopyTestFile mpxtest1.mp3 mpxtest2.mp3
pause 2000
-utility CopyTestFile mpxtest1.mp3 mpxtest2.mp3
utility CreateUtility
utility AddFileByPath mpxtest1.mp3
waittestclass utility
--- a/mmappfw_plat/qt_telephony_multimedia_service_api/inc/qtmsamrformat.h Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappfw_plat/qt_telephony_multimedia_service_api/inc/qtmsamrformat.h Wed Aug 18 10:16:02 2010 +0300
@@ -23,11 +23,13 @@
#include "qtmswrapperexport.h"
// FORWARD DECLARATIONS
-namespace TMS {
+namespace TMS
+{
class TMSFormat;
}
-namespace QTMS {
+namespace QTMS
+{
/**
* QTMSAMRFormat class
@@ -40,10 +42,9 @@
* @lib QTMSapi.lib
*
*/
-class QTMS_WRAPPER_DLL_EXPORT QTMSAMRFormat : public QObject,
- public QTMSFormat
- {
- Q_OBJECT
+class QTMS_WRAPPER_DLL_EXPORT QTMSAMRFormat: public QObject, public QTMSFormat
+{
+Q_OBJECT
public:
/**
* Destructor
@@ -55,7 +56,7 @@
* Constructor
*/
QTMSAMRFormat();
- };
+};
} //namespace QTMS
--- a/mmappfw_plat/qt_telephony_multimedia_service_api/inc/qtmsbuffer.h Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappfw_plat/qt_telephony_multimedia_service_api/inc/qtmsbuffer.h Wed Aug 18 10:16:02 2010 +0300
@@ -20,7 +20,8 @@
#include <qtms.h>
-namespace QTMS {
+namespace QTMS
+{
/**
* QTMSBuffer class
@@ -33,12 +34,14 @@
*
*/
class QTMSBuffer
- {
+{
public:
/*
* Destructor
*/
- virtual ~QTMSBuffer() {}
+ virtual ~QTMSBuffer()
+ {
+ }
/**
* Return buffer type.
@@ -122,7 +125,7 @@
*
*/
virtual gint GetDataPtr(guint8*& bufptr) = 0;
- };
+};
} //namespace QTMS
--- a/mmappfw_plat/qt_telephony_multimedia_service_api/inc/qtmscall.h Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappfw_plat/qt_telephony_multimedia_service_api/inc/qtmscall.h Wed Aug 18 10:16:02 2010 +0300
@@ -23,11 +23,13 @@
#include "qtmswrapperexport.h"
// FORWARD DECLARATIONS
-namespace TMS {
+namespace TMS
+{
class TMSCall;
}
-namespace QTMS {
+namespace QTMS
+{
// FORWARD DECLARATIONS
class QTMSStream;
@@ -65,7 +67,7 @@
*
*/
class QTMS_WRAPPER_DLL_EXPORT QTMSCall : public QObject
- {
+{
Q_OBJECT
public:
/**
@@ -147,11 +149,10 @@
protected:
TMS::TMSCall* iTmsCall;
- };
+};
} //namespace QTMS
#endif //QTMS_CALL_H
-
// End of file
--- a/mmappfw_plat/qt_telephony_multimedia_service_api/inc/qtmsclientsink.h Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappfw_plat/qt_telephony_multimedia_service_api/inc/qtmsclientsink.h Wed Aug 18 10:16:02 2010 +0300
@@ -26,11 +26,13 @@
#include "qtmswrapperexport.h"
// FORWARD DECLARATIONS
-namespace TMS {
+namespace TMS
+{
class TMSSink;
}
-namespace QTMS {
+namespace QTMS
+{
/**
* QTMSClientSink class
@@ -48,7 +50,7 @@
*/
class QTMS_WRAPPER_DLL_EXPORT QTMSClientSink : public QObject,
public QTMSSink
- {
+{
Q_OBJECT
public:
/**
@@ -98,11 +100,10 @@
protected:
TMS::TMSSink* iSink;
- };
+};
} //namespace QTMS
#endif //QTMS_CLIENT_SINK_H
-
// End of file
--- a/mmappfw_plat/qt_telephony_multimedia_service_api/inc/qtmsclientsource.h Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappfw_plat/qt_telephony_multimedia_service_api/inc/qtmsclientsource.h Wed Aug 18 10:16:02 2010 +0300
@@ -25,11 +25,13 @@
#include "qtmswrapperexport.h"
// FORWARD DECLARATIONS
-namespace TMS {
+namespace TMS
+{
class TMSSource;
}
-namespace QTMS {
+namespace QTMS
+{
/**
* QTMSClientSource class
@@ -43,7 +45,7 @@
*/
class QTMS_WRAPPER_DLL_EXPORT QTMSClientSource : public QObject,
public QTMSSource
- {
+{
Q_OBJECT
public:
/**
@@ -163,11 +165,10 @@
protected:
TMS::TMSSource* iSource;
- };
+};
} //namespace QTMS
#endif //QTMS_CLIENT_SOURCE_H
-
// End of file
--- a/mmappfw_plat/qt_telephony_multimedia_service_api/inc/qtmsdtmf.h Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappfw_plat/qt_telephony_multimedia_service_api/inc/qtmsdtmf.h Wed Aug 18 10:16:02 2010 +0300
@@ -23,11 +23,13 @@
#include "qtmswrapperexport.h"
// FORWARD DECLARATIONS
-namespace TMS {
+namespace TMS
+{
class TMSDTMF;
}
-namespace QTMS {
+namespace QTMS
+{
/**
* QTMSDTMFclass
@@ -39,7 +41,7 @@
*
*/
class QTMS_WRAPPER_DLL_EXPORT QTMSDTMF : public QObject
- {
+{
Q_OBJECT
public:
/**
@@ -113,10 +115,9 @@
protected:
TMS::TMSDTMF* iDtmf;
- };
+};
} //namespace QTMS
#endif //__QTMS_DTMF_H__
-
// End of file
--- a/mmappfw_plat/qt_telephony_multimedia_service_api/inc/qtmseffect.h Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappfw_plat/qt_telephony_multimedia_service_api/inc/qtmseffect.h Wed Aug 18 10:16:02 2010 +0300
@@ -21,7 +21,8 @@
#include <qtms.h>
#include <QObject>
-namespace QTMS {
+namespace QTMS
+{
/**
* QTMSEffect class
@@ -33,7 +34,7 @@
*
*/
class QTMSEffect
- {
+{
public:
/**
* Return effect type.
@@ -46,10 +47,9 @@
*
*/
virtual gint GetType(QTMSEffectType& effecttype) = 0;
- };
+};
} //namespace QTMS
#endif //QTMS_EFFECT_H
-
// End of file
--- a/mmappfw_plat/qt_telephony_multimedia_service_api/inc/qtmsfactory.h Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappfw_plat/qt_telephony_multimedia_service_api/inc/qtmsfactory.h Wed Aug 18 10:16:02 2010 +0300
@@ -23,7 +23,8 @@
#include <QtCore/qglobal.h>
#include "qtmswrapperexport.h"
-namespace QTMS {
+namespace QTMS
+{
// FORWARD DECLARATIONS
class QTMSCall;
@@ -61,7 +62,7 @@
*
*/
class QTMS_WRAPPER_DLL_EXPORT QTMSFactory : public QObject
- {
+{
Q_OBJECT
public:
/**
@@ -119,7 +120,7 @@
*
*/
gint CreateCall(QTMSCallType ctype, QTMSCall*& QTMScall,
- guint ctxid = DEFAULT_CALL_CONTEXT);
+ guint ctxid = DEFAULT_CALL_CONTEXT);
/**
* Deletes QTMS Call.
@@ -165,7 +166,7 @@
*
*/
gint GetSupportedFormats(const QTMSStreamType strmtype,
- FormatVector& fmtlist);
+ FormatVector& fmtlist);
/**
* Creates Format object of the given format type.
@@ -217,7 +218,7 @@
*
*/
gint CreateEffect(QTMSEffectType QTMSeffecttype,
- QTMSEffect*& qtmseffect);
+ QTMSEffect*& qtmseffect);
/**
* Deletes Effect object.
@@ -253,7 +254,7 @@
*
*/
gint CreateBuffer(QTMSBufferType buffertype, guint size,
- QTMSBuffer*& qtmsbuffer);
+ QTMSBuffer*& qtmsbuffer);
/**
* Deletes the Buffer object.
@@ -451,7 +452,7 @@
private:
QTMSFactoryImpl* impl;
- };
+};
} //namespace QTMS
--- a/mmappfw_plat/qt_telephony_multimedia_service_api/inc/qtmsformat.h Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappfw_plat/qt_telephony_multimedia_service_api/inc/qtmsformat.h Wed Aug 18 10:16:02 2010 +0300
@@ -21,11 +21,13 @@
#include <qtms.h>
#include "qtmswrapperexport.h"
-namespace TMS {
+namespace TMS
+{
class TMSFormat;
}
-namespace QTMS {
+namespace QTMS
+{
/**
* QTMSFormat class
@@ -49,7 +51,7 @@
*
*/
class QTMS_WRAPPER_DLL_EXPORT QTMSFormat
- {
+{
public:
/**
* Destructor
@@ -126,7 +128,7 @@
protected:
TMS::TMSFormat* iFormat;
- };
+};
} //namespace QTMS
--- a/mmappfw_plat/qt_telephony_multimedia_service_api/inc/qtmsg711format.h Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappfw_plat/qt_telephony_multimedia_service_api/inc/qtmsg711format.h Wed Aug 18 10:16:02 2010 +0300
@@ -24,11 +24,13 @@
#include "qtmswrapperexport.h"
// FORWARD DECLARATIONS
-namespace TMS {
+namespace TMS
+{
class TMSFormat;
}
-namespace QTMS {
+namespace QTMS
+{
/**
* QTMSG711Format class
@@ -41,10 +43,9 @@
* @lib QTMSapi.lib
*
*/
-class QTMS_WRAPPER_DLL_EXPORT QTMSG711Format : public QObject,
- public QTMSFormat
- {
- Q_OBJECT
+class QTMS_WRAPPER_DLL_EXPORT QTMSG711Format: public QObject, public QTMSFormat
+{
+Q_OBJECT
public:
/**
* Destructor
@@ -198,7 +199,7 @@
* Constructor
*/
QTMSG711Format();
- };
+};
} //namespace QTMS
--- a/mmappfw_plat/qt_telephony_multimedia_service_api/inc/qtmsg729format.h Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappfw_plat/qt_telephony_multimedia_service_api/inc/qtmsg729format.h Wed Aug 18 10:16:02 2010 +0300
@@ -24,11 +24,13 @@
#include "qtmswrapperexport.h"
// FORWARD DECLARATIONS
-namespace TMS {
+namespace TMS
+{
class TMSFormat;
}
-namespace QTMS {
+namespace QTMS
+{
/**
* QTMSG729Format class
@@ -41,10 +43,9 @@
* @lib QTMSapi.lib
*
*/
-class QTMS_WRAPPER_DLL_EXPORT QTMSG729Format : public QObject,
- public QTMSFormat
- {
- Q_OBJECT
+class QTMS_WRAPPER_DLL_EXPORT QTMSG729Format: public QObject, public QTMSFormat
+{
+Q_OBJECT
public:
/**
* Destructor
@@ -89,7 +90,7 @@
* Constructor
*/
QTMSG729Format();
- };
+};
} //namespace QTMS
--- a/mmappfw_plat/qt_telephony_multimedia_service_api/inc/qtmsgaineffect.h Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappfw_plat/qt_telephony_multimedia_service_api/inc/qtmsgaineffect.h Wed Aug 18 10:16:02 2010 +0300
@@ -23,11 +23,13 @@
#include "qtmswrapperexport.h"
// FORWARD DECLARATIONS
-namespace TMS {
+namespace TMS
+{
class TMSEffect;
}
-namespace QTMS {
+namespace QTMS
+{
/**
* QTMSGainEffect class
@@ -38,8 +40,8 @@
*
*/
class QTMS_WRAPPER_DLL_EXPORT QTMSGainEffect : public QObject,
- public QTMSEffect
- {
+public QTMSEffect
+{
Q_OBJECT
public:
/**
@@ -109,7 +111,7 @@
protected:
TMS::TMSEffect *iEffect;
- };
+};
} //namespace QTMS
--- a/mmappfw_plat/qt_telephony_multimedia_service_api/inc/qtmsglobalgaineffect.h Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappfw_plat/qt_telephony_multimedia_service_api/inc/qtmsglobalgaineffect.h Wed Aug 18 10:16:02 2010 +0300
@@ -24,11 +24,13 @@
#include <QObject>
// FORWARD DECLARATIONS
-namespace TMS {
+namespace TMS
+{
class TMSEffect;
}
-namespace QTMS {
+namespace QTMS
+{
/**
* QTMSGlobalGainEffect class
@@ -42,7 +44,7 @@
*/
class QTMS_WRAPPER_DLL_EXPORT QTMSGlobalGainEffect : public QObject,
public QTMSEffect
- {
+{
Q_OBJECT
public:
/**
@@ -110,7 +112,7 @@
protected:
TMS::TMSEffect* iEffect;
- };
+};
} //namespace QTMS
--- a/mmappfw_plat/qt_telephony_multimedia_service_api/inc/qtmsglobalrouting.h Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappfw_plat/qt_telephony_multimedia_service_api/inc/qtmsglobalrouting.h Wed Aug 18 10:16:02 2010 +0300
@@ -23,11 +23,13 @@
#include "qtmswrapperexport.h"
// FORWARD DECLARATIONS
-namespace TMS {
+namespace TMS
+{
class TMSGlobalRouting;
}
-namespace QTMS {
+namespace QTMS
+{
/**
* QTMSGlobalRouting class
@@ -40,7 +42,7 @@
*
*/
class QTMS_WRAPPER_DLL_EXPORT QTMSGlobalRouting : public QObject
- {
+{
Q_OBJECT
public:
/**
@@ -123,7 +125,7 @@
Q_SIGNALS:
void GlobalRoutingEvent(const QTMSGlobalRouting& routing,
- QTMSSignalEvent event, QTMSAudioOutput output);
+ QTMSSignalEvent event, QTMSAudioOutput output);
protected:
/**
@@ -133,7 +135,7 @@
protected:
TMS::TMSGlobalRouting* iRouting;
- };
+};
} //namespace QTMS
--- a/mmappfw_plat/qt_telephony_multimedia_service_api/inc/qtmsglobalvoleffect.h Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappfw_plat/qt_telephony_multimedia_service_api/inc/qtmsglobalvoleffect.h Wed Aug 18 10:16:02 2010 +0300
@@ -25,11 +25,13 @@
#include "qtmswrapperexport.h"
// FORWARD DECLARATIONS
-namespace TMS {
+namespace TMS
+{
class TMSEffect;
}
-namespace QTMS {
+namespace QTMS
+{
/**
* QTMSGlobalVolEffect class
@@ -43,7 +45,7 @@
*/
class QTMS_WRAPPER_DLL_EXPORT QTMSGlobalVolEffect : public QObject,
public QTMSEffect
- {
+{
Q_OBJECT
public:
/**
@@ -109,7 +111,7 @@
protected:
TMS::TMSEffect* iEffect;
- };
+};
} //namespace QTMS
--- a/mmappfw_plat/qt_telephony_multimedia_service_api/inc/qtmsilbcformat.h Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappfw_plat/qt_telephony_multimedia_service_api/inc/qtmsilbcformat.h Wed Aug 18 10:16:02 2010 +0300
@@ -24,11 +24,13 @@
#include "qtmswrapperexport.h"
// FORWARD DECLARATIONS
-namespace TMS {
+namespace TMS
+{
class TMSFormat;
}
-namespace QTMS {
+namespace QTMS
+{
/**
* QTMSILBCFormat class
@@ -41,10 +43,9 @@
* @lib QTMSapi.lib
*
*/
-class QTMS_WRAPPER_DLL_EXPORT QTMSILBCFormat : public QObject,
- public QTMSFormat
- {
- Q_OBJECT
+class QTMS_WRAPPER_DLL_EXPORT QTMSILBCFormat: public QObject, public QTMSFormat
+{
+Q_OBJECT
public:
/**
* Destructor
@@ -170,7 +171,7 @@
* Constructor
*/
QTMSILBCFormat();
- };
+};
} //namespace QTMS
--- a/mmappfw_plat/qt_telephony_multimedia_service_api/inc/qtmsinbandtone.h Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappfw_plat/qt_telephony_multimedia_service_api/inc/qtmsinbandtone.h Wed Aug 18 10:16:02 2010 +0300
@@ -24,11 +24,13 @@
#include "qtmswrapperexport.h"
// FORWARD DECLARATIONS
-namespace TMS {
+namespace TMS
+{
class TMSInbandTone;
}
-namespace QTMS {
+namespace QTMS
+{
/**
* QTMSInbandTone class
@@ -39,7 +41,7 @@
*
*/
class QTMS_WRAPPER_DLL_EXPORT QTMSInbandTone : public QObject
- {
+{
Q_OBJECT
public:
/**
@@ -70,7 +72,7 @@
Q_SIGNALS:
void InbandToneEvent(const QTMSInbandTone& inbandtone,
- QTMSSignalEvent event);
+ QTMSSignalEvent event);
protected:
@@ -81,10 +83,9 @@
protected:
TMS::TMSInbandTone* iInbandTone;
- };
+};
} //namespace QTMS
#endif //__QTMS_INBAND_TONE_H__
-
// End of file
--- a/mmappfw_plat/qt_telephony_multimedia_service_api/inc/qtmsmicsource.h Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappfw_plat/qt_telephony_multimedia_service_api/inc/qtmsmicsource.h Wed Aug 18 10:16:02 2010 +0300
@@ -24,11 +24,13 @@
#include "qtmswrapperexport.h"
// FORWARD DECLARATIONS
-namespace TMS {
+namespace TMS
+{
class TMSSource;
}
-namespace QTMS {
+namespace QTMS
+{
/**
* QTMSMicSource class
@@ -40,7 +42,7 @@
*/
class QTMS_WRAPPER_DLL_EXPORT QTMSMicSource : public QObject,
public QTMSSource
- {
+{
Q_OBJECT
public:
/**
@@ -70,11 +72,10 @@
protected:
TMS::TMSSource *iSource;
- };
+};
} //namespace QTMS
#endif //QTMS_MIC_SOURCE_H
-
// End of file
--- a/mmappfw_plat/qt_telephony_multimedia_service_api/inc/qtmsmodemsink.h Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappfw_plat/qt_telephony_multimedia_service_api/inc/qtmsmodemsink.h Wed Aug 18 10:16:02 2010 +0300
@@ -24,11 +24,13 @@
#include "qtmswrapperexport.h"
// FORWARD DECLARATIONS
-namespace TMS {
+namespace TMS
+{
class TMSSink;
}
-namespace QTMS {
+namespace QTMS
+{
/**
* QTMSModemSink class
@@ -40,7 +42,7 @@
*/
class QTMS_WRAPPER_DLL_EXPORT QTMSModemSink : public QObject,
public QTMSSink
- {
+{
Q_OBJECT
public:
/**
@@ -70,11 +72,10 @@
protected:
TMS::TMSSink *iSink;
- };
+};
} //namespace QTMS
#endif //QTMS_MODEM_SINK_H
-
// End of file
--- a/mmappfw_plat/qt_telephony_multimedia_service_api/inc/qtmsmodemsource.h Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappfw_plat/qt_telephony_multimedia_service_api/inc/qtmsmodemsource.h Wed Aug 18 10:16:02 2010 +0300
@@ -24,11 +24,13 @@
#include "qtmswrapperexport.h"
// FORWARD DECLARATIONS
-namespace TMS {
+namespace TMS
+{
class TMSSource;
}
-namespace QTMS {
+namespace QTMS
+{
/**
* QTMSModemSource class
@@ -40,7 +42,7 @@
*/
class QTMS_WRAPPER_DLL_EXPORT QTMSModemSource : public QObject,
public QTMSSource
- {
+{
Q_OBJECT
public:
/**
@@ -70,11 +72,10 @@
protected:
TMS::TMSSource *iSource;
- };
+};
} //namespace QTMS
#endif //QTMS_MODEM_SOURCE_H
-
// End of file
--- a/mmappfw_plat/qt_telephony_multimedia_service_api/inc/qtmspcmformat.h Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappfw_plat/qt_telephony_multimedia_service_api/inc/qtmspcmformat.h Wed Aug 18 10:16:02 2010 +0300
@@ -24,11 +24,13 @@
#include "qtmswrapperexport.h"
// FORWARD DECLARATIONS
-namespace TMS {
+namespace TMS
+{
class TMSFormat;
}
-namespace QTMS {
+namespace QTMS
+{
/**
* QTMSPCMFormat class
@@ -39,10 +41,9 @@
* @lib QTMSapi.lib
*
*/
-class QTMS_WRAPPER_DLL_EXPORT QTMSPCMFormat : public QObject,
- public QTMSFormat
- {
- Q_OBJECT
+class QTMS_WRAPPER_DLL_EXPORT QTMSPCMFormat: public QObject, public QTMSFormat
+{
+Q_OBJECT
public:
/**
* Destructor
@@ -54,7 +55,7 @@
* Constructor
*/
QTMSPCMFormat();
- };
+};
} //namespace QTMS
--- a/mmappfw_plat/qt_telephony_multimedia_service_api/inc/qtmsringtone.h Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappfw_plat/qt_telephony_multimedia_service_api/inc/qtmsringtone.h Wed Aug 18 10:16:02 2010 +0300
@@ -23,11 +23,13 @@
#include "qtmswrapperexport.h"
// FORWARD DECLARATIONS
-namespace TMS {
+namespace TMS
+{
class TMSRingTone;
}
-namespace QTMS {
+namespace QTMS
+{
/**
* QTMSRingTone class
@@ -38,7 +40,7 @@
*
*/
class QTMS_WRAPPER_DLL_EXPORT QTMSRingTone : public QObject
- {
+{
Q_OBJECT
public:
/**
@@ -76,7 +78,7 @@
*
*/
gint Init(const QTMSRingToneType type = QTMS_RINGTONE_DEFAULT,
- GString* str = NULL, GString* tts = NULL);
+ GString* str = NULL, GString* tts = NULL);
/**
* Deinit ring tone player.
@@ -134,11 +136,10 @@
protected:
TMS::TMSRingTone *iRingTone;
- };
+};
} //namespace QTMS
#endif //QTMS_RINGTONE_H
-
// End of file
--- a/mmappfw_plat/qt_telephony_multimedia_service_api/inc/qtmssink.h Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappfw_plat/qt_telephony_multimedia_service_api/inc/qtmssink.h Wed Aug 18 10:16:02 2010 +0300
@@ -20,7 +20,8 @@
#include <qtms.h>
-namespace QTMS {
+namespace QTMS
+{
/**
* QTMSSink class
@@ -31,7 +32,7 @@
*
*/
class QTMSSink
- {
+{
public:
/**
* Returns type of the concrete data sink object implementation.
@@ -46,9 +47,8 @@
*
*/
virtual gint GetType(QTMSSinkType& sinktype) = 0;
- };
+};
} //namespace QTMS
#endif //QTMS_SINK_H
-
--- a/mmappfw_plat/qt_telephony_multimedia_service_api/inc/qtmssource.h Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappfw_plat/qt_telephony_multimedia_service_api/inc/qtmssource.h Wed Aug 18 10:16:02 2010 +0300
@@ -20,7 +20,8 @@
#include <qtms.h>
-namespace QTMS {
+namespace QTMS
+{
/**
* QTMSSource class
@@ -31,7 +32,7 @@
*
*/
class QTMSSource
- {
+{
public:
/**
* Returns type of the concrete data source object implementation.
@@ -46,7 +47,7 @@
*
*/
virtual gint GetType(QTMSSourceType& sourcetype) = 0;
- };
+};
} //namespace QTMS
--- a/mmappfw_plat/qt_telephony_multimedia_service_api/inc/qtmsspeakersink.h Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappfw_plat/qt_telephony_multimedia_service_api/inc/qtmsspeakersink.h Wed Aug 18 10:16:02 2010 +0300
@@ -24,11 +24,13 @@
#include "qtmswrapperexport.h"
// FORWARD DECLARATIONS
-namespace TMS {
+namespace TMS
+{
class TMSSink;
}
-namespace QTMS {
+namespace QTMS
+{
/**
* QTMSSpeakerSink class
@@ -40,7 +42,7 @@
*/
class QTMS_WRAPPER_DLL_EXPORT QTMSSpeakerSink : public QObject,
public QTMSSink
- {
+{
Q_OBJECT
public:
/**
@@ -70,11 +72,10 @@
protected:
TMS::TMSSink *iSink;
- };
+};
} //namespace QTMS
#endif //QTMS_SPEAKER_SINK_H
-
// End of file
--- a/mmappfw_plat/qt_telephony_multimedia_service_api/inc/qtmsstream.h Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappfw_plat/qt_telephony_multimedia_service_api/inc/qtmsstream.h Wed Aug 18 10:16:02 2010 +0300
@@ -24,11 +24,13 @@
#include "qtmswrapperexport.h"
// FORWARD DECLARATIONS
-namespace TMS {
+namespace TMS
+{
class TMSStream;
}
-namespace QTMS {
+namespace QTMS
+{
// Forward declarations
class QTMSSource;
@@ -120,7 +122,7 @@
*/
class QTMS_WRAPPER_DLL_EXPORT QTMSStream : public QObject
- {
+{
Q_OBJECT
public:
@@ -517,10 +519,9 @@
protected:
TMS::TMSStream *iStream;
- };
+};
} //namespace QTMS
#endif // QTMS_STREAM_H
-
// End of file
--- a/mmappfw_plat/qt_telephony_multimedia_service_api/inc/qtmsvolumeeffect.h Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappfw_plat/qt_telephony_multimedia_service_api/inc/qtmsvolumeeffect.h Wed Aug 18 10:16:02 2010 +0300
@@ -23,11 +23,13 @@
#include "qtmswrapperexport.h"
// FORWARD DECLARATIONS
-namespace TMS {
+namespace TMS
+{
class TMSEffect;
}
-namespace QTMS {
+namespace QTMS
+{
/**
* QTMSVolumeEffect class
@@ -39,7 +41,7 @@
*/
class QTMS_WRAPPER_DLL_EXPORT QTMSVolumeEffect : public QObject,
public QTMSEffect
- {
+{
Q_OBJECT
public:
/**
@@ -98,7 +100,7 @@
*/
virtual gint GetType(QTMSEffectType& effecttype);
-Q_SIGNALS:
+ Q_SIGNALS:
void EffectsEvent(const QTMSEffect& tmseffect, QTMSSignalEvent event);
protected:
@@ -109,7 +111,7 @@
protected:
TMS::TMSEffect *iEffect;
- };
+};
} //namespace QTMS
--- a/mmappfw_plat/qt_telephony_multimedia_service_api/tsrc/qtmscstest/qtmscstest.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappfw_plat/qt_telephony_multimedia_service_api/tsrc/qtmscstest/qtmscstest.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -1,19 +1,19 @@
/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: QTMS CS test
-*
-*/
+ * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description: QTMS CS test
+ *
+ */
#include <QObject>
#include <QtTest/QtTest>
#include "qtestmains60.h"
@@ -46,18 +46,17 @@
#include <tmsbuffer.h>
using namespace QTMS;
-
_LIT8(KRTBeepSequence, "\x00\x11\x0A\x0A\x08\x73\x0A\x40\x28\x0A\xF7\
\x05\xFC\x40\x64\x0A\x08\x40\x32\x0A\xF7\x06\x0B");
-_LIT16(KTestFile1, "c:\\data\\sounds\\digital\\test_8khz.wav");
+_LIT16(KTestFile1, "c:\\data\\sounds\\digital\\test_8khz.wav");
-class QTmsCsTest : public QObject
- {
+class QTmsCsTest: public QObject
+{
Q_OBJECT
private slots:
void initTestCase();
void CSCallSetup();
-
+
void CreateUplink();
void CreateDnlink();
void CreateMicSource();
@@ -68,7 +67,7 @@
void AddModemSourceToStream();
void CreateSpeakerSink();
void AddSpeakerSinkToStream();
-
+
void CreateStreamVol();
void CreateStreamGain();
@@ -78,30 +77,30 @@
void StartUplink();
void StopUplink();
void StartDnlink();
-
+
void StreamVol();
void StreamGain();
- // void StopDnlink();
-
+ // void StopDnlink();
+
void CreateGlobalVol();
void CreateGlobalGain();
void CreateRouting_data();
void CreateRouting();
-
+
void CreateInband_data();
void CreateInband();
void CreateDnlinkDtmf();
void CreateUplinkDtmf();
-
- void CreateRingTone();
+
+ void CreateRingTone();
void InitRingTonePlayerFromProfiles();
void PlayRingTone();
void PauseRingTone();
void MuteRingTone();
- void StopRingTone();
+ void StopRingTone();
void CloseRingTonePlayer();
-
+
void CloseUplink();
void CloseDownlink();
void cleanupTestCase();
@@ -111,24 +110,23 @@
//From TMSClientSinkObserver
void EffectsEvent(const QTMSEffect& tmseffect, QTMSSignalEvent event);
//From TMSGlobalRoutingObserver
- void GlobalRoutingEvent(const QTMSGlobalRouting& routing,
- QTMSSignalEvent event, QTMSAudioOutput output);
+ void GlobalRoutingEvent(const QTMSGlobalRouting& routing, QTMSSignalEvent event,
+ QTMSAudioOutput output);
//From TMSRingToneObserver
void RingtoneEvent(const QTMSRingTone& rt, QTMSSignalEvent event);
//From TMSDTMFObserver
void DTMFEvent(const QTMSDTMF& dtmf, QTMSSignalEvent event);
//From TMSInbandToneObserver
- void InbandToneEvent(const QTMSInbandTone& inbandtone,
- QTMSSignalEvent event);
+ void InbandToneEvent(const QTMSInbandTone& inbandtone, QTMSSignalEvent event);
-private:
+private:
void InitRingToneSequencePlayer();
- void InitRingTonePlayerFromFile();
+ void InitRingTonePlayerFromFile();
void StopDnlink();
void GetAvailableOutput();
void DisplayDevice(QTMSAudioOutput device);
-
-private:
+
+private:
QTMSFactory *m_Factory;
QTMSCall *m_Call;
QTMSDTMF *m_Dnlnkdtmf;
@@ -147,24 +145,24 @@
QTMSInbandTone *m_InbandTonePlayer;
QTMSRingTone *m_RingTonePlayer;
GString* m_RTStr;
- GString* m_TTSStr;
+ GString* m_TTSStr;
QSignalSpy *m_UplinkSpy;
QSignalSpy *m_DnlinkSpy;
QSignalSpy *m_InbandSpy;
- QSignalSpy *m_RoutingSpy;
- OutputVector m_Availableoutputs;
+ QSignalSpy *m_RoutingSpy;
+ OutputVector m_Availableoutputs;
- };
+};
void QTmsCsTest::initTestCase()
- {
+{
qDebug("Start QTms CS tests");
-
+
g_setenv("G_SLICE", "always-malloc", 1);
m_Factory = NULL;
m_Call = NULL;
m_Dnlink = NULL;
- m_Uplink = NULL;
+ m_Uplink = NULL;
m_MicSource = NULL;
m_ModemSource = NULL;
m_SpeakerSink = NULL;
@@ -173,62 +171,60 @@
m_Gain = NULL;
m_GlobalVol = NULL;
m_GlobalGain = NULL;
- m_Routing = NULL;
+ m_Routing = NULL;
m_Dnlnkdtmf = NULL;
m_Uplnkdtmf = NULL;
m_InbandTonePlayer = NULL;
m_RingTonePlayer = NULL;
m_UplinkSpy = NULL;
m_DnlinkSpy = NULL;
-
+
QTMSVer *ver(NULL);
gint status;
status = QTMSFactory::CreateFactory(m_Factory, *ver);
-
+
QVERIFY(status == QTMS_RESULT_SUCCESS);
-
- qRegisterMetaType<QTMSSignalEvent>("QTMSSignalEvent");
- qRegisterMetaType<QTMSAudioOutput>("QTMSAudioOutput");
-
- }
+ qRegisterMetaType<QTMSSignalEvent> ("QTMSSignalEvent");
+ qRegisterMetaType<QTMSAudioOutput> ("QTMSAudioOutput");
+
+}
void QTmsCsTest::cleanupTestCase()
- {
+{
qDebug("End QTms tests");
-
+
StopDnlink();
-
- m_Factory->DeleteSource(m_MicSource);
- m_Factory->DeleteSource(m_ModemSource);
+
+ m_Factory->DeleteSource(m_MicSource);
+ m_Factory->DeleteSource(m_ModemSource);
m_Factory->DeleteSink(m_ModemSink);
m_Factory->DeleteSink(m_SpeakerSink);
-
+
m_Factory->DeleteDTMF(m_Dnlnkdtmf);
m_Factory->DeleteInbandTonePlayer(m_InbandTonePlayer);
m_Factory->DeleteRingTonePlayer(m_RingTonePlayer);
-
+
m_Factory->DeleteEffect(m_Vol);
m_Factory->DeleteEffect(m_Gain);
m_Factory->DeleteEffect(m_GlobalVol);
m_Factory->DeleteEffect(m_GlobalGain);
-
+
m_Factory->DeleteGlobalRouting(m_Routing);
-
+
m_Call->DeleteStream(m_Uplink);
m_Call->DeleteStream(m_Dnlink);
-
+
m_Factory->DeleteCall(m_Call);
delete m_Factory;
-
- }
+
+}
void QTmsCsTest::CSCallSetup()
- {
+{
gint status(QTMS_RESULT_SUCCESS);
- if (m_Factory && !m_Call)
- {
+ if (m_Factory && !m_Call) {
gboolean issupported(FALSE);
m_Factory->IsCallTypeSupported(QTMS_CALL_CS, issupported);
QVERIFY(issupported == TRUE);
@@ -236,260 +232,233 @@
QVERIFY(status == QTMS_RESULT_SUCCESS);
QTMSCallType calltype = m_Call->GetCallType();
QVERIFY(calltype == QTMS_CALL_CS);
- }
+ }
QVERIFY(status == QTMS_RESULT_SUCCESS);
- }
+}
void QTmsCsTest::CreateUplink()
- {
+{
gint status(QTMS_RESULT_SUCCESS);
- if (m_Call)
- {
+ if (m_Call) {
status = m_Call->CreateStream(QTMS_STREAM_UPLINK, m_Uplink);
-
+
QVERIFY(status == QTMS_RESULT_SUCCESS);
m_UplinkSpy = new QSignalSpy(m_Uplink,
- SIGNAL(TMSStreamEvent(const QTMSStream&, QTMSSignalEvent)));
+ SIGNAL(TMSStreamEvent(const QTMSStream&, QTMSSignalEvent)));
QVERIFY( m_UplinkSpy->isValid() );
//QCOMPARE(m_UplinkSpy->count(), 0 );
-
- connect(m_Uplink,
- SIGNAL(TMSStreamEvent(const QTMSStream&, QTMSSignalEvent)),
- this,
- SLOT(TMSStreamEvent(const QTMSStream&, QTMSSignalEvent)));
+
+ connect(m_Uplink, SIGNAL(TMSStreamEvent(const QTMSStream&, QTMSSignalEvent)), this,
+ SLOT(TMSStreamEvent(const QTMSStream&, QTMSSignalEvent)));
- }
}
+}
- void QTmsCsTest::CreateDnlink()
- {
+void QTmsCsTest::CreateDnlink()
+{
gint status(QTMS_RESULT_SUCCESS);
- if (m_Call)
- {
+ if (m_Call) {
status = m_Call->CreateStream(QTMS_STREAM_DOWNLINK, m_Dnlink);
QVERIFY(status == QTMS_RESULT_SUCCESS);
-
+
m_DnlinkSpy = new QSignalSpy(m_Dnlink,
- SIGNAL(TMSStreamEvent(const QTMSStream&, QTMSSignalEvent)));
+ SIGNAL(TMSStreamEvent(const QTMSStream&, QTMSSignalEvent)));
QVERIFY( m_DnlinkSpy->isValid() );
//QCOMPARE(m_DnlinkSpy->count(), 0 );
-
- connect(m_Dnlink,
- SIGNAL(TMSStreamEvent(const QTMSStream&, QTMSSignalEvent)),
- this,
- SLOT(TMSStreamEvent(const QTMSStream&, QTMSSignalEvent)));
- }
+
+ connect(m_Dnlink, SIGNAL(TMSStreamEvent(const QTMSStream&, QTMSSignalEvent)), this,
+ SLOT(TMSStreamEvent(const QTMSStream&, QTMSSignalEvent)));
+ }
+}
+
+void QTmsCsTest::CreateModemSink()
+{
+ gint status(QTMS_RESULT_SUCCESS);
+
+ if (m_Factory && !m_ModemSink) {
+ status = m_Factory->CreateSink(QTMS_SINK_MODEM, m_ModemSink);
}
-
-
- void QTmsCsTest::CreateModemSink()
- {
- gint status(QTMS_RESULT_SUCCESS);
+ QVERIFY(status == QTMS_RESULT_SUCCESS);
+}
- if (m_Factory && !m_ModemSink)
- {
- status = m_Factory->CreateSink(QTMS_SINK_MODEM, m_ModemSink);
- }
- QVERIFY(status == QTMS_RESULT_SUCCESS);
- }
-
- void QTmsCsTest::CreateModemSource()
- {
- gint status(QTMS_RESULT_SUCCESS);
+void QTmsCsTest::CreateModemSource()
+{
+ gint status(QTMS_RESULT_SUCCESS);
+
+ if (m_Factory && !m_ModemSource) {
+ status = m_Factory->CreateSource(QTMS_SOURCE_MODEM, m_ModemSource);
+ }
+ QVERIFY(status == QTMS_RESULT_SUCCESS);
+}
- if (m_Factory && !m_ModemSource)
- {
- status = m_Factory->CreateSource(QTMS_SOURCE_MODEM, m_ModemSource);
- }
- QVERIFY(status == QTMS_RESULT_SUCCESS);
- }
+void QTmsCsTest::AddModemSinkToStream()
+{
+ gint status(QTMS_RESULT_SUCCESS);
+ if (m_Uplink && m_ModemSink) {
+ status = m_Uplink->AddSink(m_ModemSink);
+ }
+ QVERIFY(status == QTMS_RESULT_SUCCESS);
+}
- void QTmsCsTest::AddModemSinkToStream()
- {
- gint status(QTMS_RESULT_SUCCESS);
- if (m_Uplink && m_ModemSink)
- {
- status = m_Uplink->AddSink(m_ModemSink);
- }
- QVERIFY(status == QTMS_RESULT_SUCCESS);
- }
-
- void QTmsCsTest::AddModemSourceToStream()
- {
- gint status(QTMS_RESULT_SUCCESS);
- if (m_Dnlink && m_ModemSource)
- {
- status = m_Dnlink->AddSource(m_ModemSource);
- }
- QVERIFY(status == QTMS_RESULT_SUCCESS);
- }
+void QTmsCsTest::AddModemSourceToStream()
+{
+ gint status(QTMS_RESULT_SUCCESS);
+ if (m_Dnlink && m_ModemSource) {
+ status = m_Dnlink->AddSource(m_ModemSource);
+ }
+ QVERIFY(status == QTMS_RESULT_SUCCESS);
+}
+void QTmsCsTest::CreateMicSource()
+{
+ gint status(QTMS_RESULT_SUCCESS);
- void QTmsCsTest::CreateMicSource()
- {
- gint status(QTMS_RESULT_SUCCESS);
+ if (m_Factory && !m_MicSource) {
+ status = m_Factory->CreateSource(TMS_SOURCE_MIC, m_MicSource);
+ }
+ QVERIFY(status == QTMS_RESULT_SUCCESS);
+}
- if (m_Factory && !m_MicSource)
- {
- status = m_Factory->CreateSource(TMS_SOURCE_MIC, m_MicSource);
- }
- QVERIFY(status == QTMS_RESULT_SUCCESS);
- }
+void QTmsCsTest::AddMicSourceToStream()
+{
+ gint status(QTMS_RESULT_SUCCESS);
+ if (m_Uplink && m_MicSource) {
+ status = m_Uplink->AddSource(m_MicSource);
+ }
+ QVERIFY(status == QTMS_RESULT_SUCCESS);
+}
+
+void QTmsCsTest::CreateSpeakerSink()
+{
+ gint status(QTMS_RESULT_SUCCESS);
- void QTmsCsTest::AddMicSourceToStream()
- {
- gint status(QTMS_RESULT_SUCCESS);
- if (m_Uplink && m_MicSource)
- {
- status = m_Uplink->AddSource(m_MicSource);
- }
- QVERIFY(status == QTMS_RESULT_SUCCESS);
- }
+ if (m_Factory && !m_SpeakerSink) {
+ status = m_Factory->CreateSink(QTMS_SINK_SPEAKER, m_SpeakerSink);
+ }
+ QVERIFY(status == QTMS_RESULT_SUCCESS);
+}
- void QTmsCsTest::CreateSpeakerSink()
- {
- gint status(QTMS_RESULT_SUCCESS);
-
- if (m_Factory && !m_SpeakerSink)
- {
- status = m_Factory->CreateSink(QTMS_SINK_SPEAKER, m_SpeakerSink);
- }
- QVERIFY(status == QTMS_RESULT_SUCCESS);
- }
+void QTmsCsTest::AddSpeakerSinkToStream()
+{
+ gint status(QTMS_RESULT_SUCCESS);
+ if (m_Dnlink && m_SpeakerSink) {
+ status = m_Dnlink->AddSink(m_SpeakerSink);
+ qDebug("QTMS speaker sink added to stream");
+ }
+ QVERIFY(status == QTMS_RESULT_SUCCESS);
+}
- void QTmsCsTest::AddSpeakerSinkToStream()
- {
- gint status(QTMS_RESULT_SUCCESS);
- if (m_Dnlink && m_SpeakerSink)
- {
- status = m_Dnlink->AddSink(m_SpeakerSink);
- qDebug("QTMS speaker sink added to stream");
- }
- QVERIFY(status == QTMS_RESULT_SUCCESS);
- }
-
- void QTmsCsTest::InitUplink()
- {
- QVERIFY(m_Uplink->Init() == QTMS_RESULT_SUCCESS);
- QTest::qWait(1000);
- //QCOMPARE(m_UplinkSpy->count(), 1 );
- }
+void QTmsCsTest::InitUplink()
+{
+ QVERIFY(m_Uplink->Init() == QTMS_RESULT_SUCCESS);
+ QTest::qWait(1000);
+ //QCOMPARE(m_UplinkSpy->count(), 1 );
+}
+
+void QTmsCsTest::InitDnlink()
+{
+ QVERIFY(m_Dnlink->Init() == QTMS_RESULT_SUCCESS);
+ QTest::qWait(1000);
+ //QCOMPARE(m_DnlinkSpy->count(), 1 );
+}
- void QTmsCsTest::InitDnlink()
- {
- QVERIFY(m_Dnlink->Init() == QTMS_RESULT_SUCCESS);
- QTest::qWait(1000);
- //QCOMPARE(m_DnlinkSpy->count(), 1 );
- }
+void QTmsCsTest::StartUplink()
+{
+ QVERIFY(m_Uplink->Start() == QTMS_RESULT_SUCCESS);
+ QTest::qWait(1000);
+ //QCOMPARE(m_UplinkSpy->count(), 2 );
+}
- void QTmsCsTest::StartUplink()
- {
- QVERIFY(m_Uplink->Start() == QTMS_RESULT_SUCCESS);
- QTest::qWait(1000);
- //QCOMPARE(m_UplinkSpy->count(), 2 );
- }
-
- void QTmsCsTest::StartDnlink()
- {
+void QTmsCsTest::StartDnlink()
+{
QVERIFY(m_Dnlink->Start() == QTMS_RESULT_SUCCESS);
- QTest::qWait(1000);
+ QTest::qWait(1000);
//QCOMPARE(m_DnlinkSpy->count(), 2 );
- }
+}
void QTmsCsTest::StopUplink()
- {
+{
QVERIFY(m_Uplink->Stop() == QTMS_RESULT_SUCCESS);
QTest::qWait(1000);
//QCOMPARE(m_UplinkSpy->count(), 3 );
- }
+}
void QTmsCsTest::StopDnlink()
- {
+{
QVERIFY(m_Dnlink->Stop() == QTMS_RESULT_SUCCESS);
- QTest::qWait(1000);
+ QTest::qWait(1000);
//QCOMPARE(m_DnlinkSpy->count(), 3 );
- }
+}
void QTmsCsTest::CloseUplink()
- {
+{
m_Uplink->Deinit();
QTest::qWait(1000);
- if (m_Uplink)
- {
- if (m_Gain)
- {
+ if (m_Uplink) {
+ if (m_Gain) {
QVERIFY(m_Uplink->RemoveEffect(m_Gain)== QTMS_RESULT_SUCCESS);
- }
- if (m_MicSource)
- {
+ }
+ if (m_MicSource) {
QVERIFY(m_Uplink->RemoveSource(m_MicSource)== QTMS_RESULT_SUCCESS);
- }
- if (m_ModemSink)
- {
+ }
+ if (m_ModemSink) {
QVERIFY(m_Uplink->RemoveSink(m_ModemSink)== QTMS_RESULT_SUCCESS);
- }
+ }
+ }
+}
+
+void QTmsCsTest::CloseDownlink()
+{
+ m_Dnlink->Deinit();
+ QTest::qWait(1000);
+ if (m_Dnlink) {
+ if (m_Vol) {
+ QVERIFY(m_Dnlink->RemoveEffect(m_Vol)== QTMS_RESULT_SUCCESS);
+ }
+ if (m_ModemSource) {
+ QVERIFY(m_Dnlink->RemoveSource(m_ModemSource)== QTMS_RESULT_SUCCESS);
+ }
+ if (m_SpeakerSink) {
+ QVERIFY(m_Dnlink->RemoveSink(m_SpeakerSink) == QTMS_RESULT_SUCCESS);
}
}
-void QTmsCsTest::CloseDownlink()
- {
- m_Dnlink->Deinit();
- QTest::qWait(1000);
- if (m_Dnlink)
- {
- if (m_Vol)
- {
- QVERIFY(m_Dnlink->RemoveEffect(m_Vol)== QTMS_RESULT_SUCCESS);
- }
- if (m_ModemSource)
- {
- QVERIFY(m_Dnlink->RemoveSource(m_ModemSource)== QTMS_RESULT_SUCCESS);
- }
- if (m_SpeakerSink)
- {
- QVERIFY(m_Dnlink->RemoveSink(m_SpeakerSink) == QTMS_RESULT_SUCCESS);
- }
- }
-
- }
+}
void QTmsCsTest::CreateStreamVol()
- {
+{
gint status(QTMS_RESULT_SUCCESS);
- if (m_Factory && !m_Vol)
- {
+ if (m_Factory && !m_Vol) {
status = m_Factory->CreateEffect(QTMS_EFFECT_VOLUME, m_Vol);
QVERIFY(status == QTMS_RESULT_SUCCESS);
connect(static_cast<QTMSVolumeEffect*> (m_Vol),
- SIGNAL(EffectsEvent(const QTMSEffect&,QTMSSignalEvent)),
- this, SLOT(EffectsEvent(const QTMSEffect&,QTMSSignalEvent)));
-
- if(m_Dnlink)
- {
- status = m_Dnlink->AddEffect(m_Vol);
- }
+ SIGNAL(EffectsEvent(const QTMSEffect&,QTMSSignalEvent)), this,
+ SLOT(EffectsEvent(const QTMSEffect&,QTMSSignalEvent)));
+
+ if (m_Dnlink) {
+ status = m_Dnlink->AddEffect(m_Vol);
+ }
QVERIFY(status == QTMS_RESULT_SUCCESS);
- }
}
+}
void QTmsCsTest::StreamVol()
- {
+{
gint status(QTMS_RESULT_SUCCESS);
guint maxvol(0);
- if (m_Vol)
- {
+ if (m_Vol) {
status = static_cast<QTMSVolumeEffect*> (m_Vol)->GetMaxLevel(maxvol);
QVERIFY(status == QTMS_RESULT_SUCCESS);
@@ -502,37 +471,33 @@
QVERIFY(status == QTMS_RESULT_SUCCESS);
QCOMPARE(vol,maxvol);
- }
}
+}
void QTmsCsTest::CreateStreamGain()
- {
+{
gint status(QTMS_RESULT_SUCCESS);
- if (m_Factory && !m_Gain)
- {
+ if (m_Factory && !m_Gain) {
status = m_Factory->CreateEffect(QTMS_EFFECT_GAIN, m_Gain);
-
+
QVERIFY(status == QTMS_RESULT_SUCCESS);
connect(static_cast<QTMSGainEffect*> (m_Gain),
- SIGNAL(EffectsEvent(const QTMSEffect&,QTMSSignalEvent)),
- this,
- SLOT(EffectsEvent(const QTMSEffect&,QTMSSignalEvent)));
-
- if(m_Uplink)
- {
+ SIGNAL(EffectsEvent(const QTMSEffect&,QTMSSignalEvent)), this,
+ SLOT(EffectsEvent(const QTMSEffect&,QTMSSignalEvent)));
+
+ if (m_Uplink) {
status = m_Uplink->AddEffect(m_Gain);
- }
+ }
QVERIFY(status == QTMS_RESULT_SUCCESS);
- }
}
+}
void QTmsCsTest::StreamGain()
- {
+{
gint status(QTMS_RESULT_SUCCESS);
- if (m_Gain)
- {
+ if (m_Gain) {
guint maxgain(0);
static_cast<QTMSGainEffect*> (m_Gain)->GetMaxLevel(maxgain);
QVERIFY(status == QTMS_RESULT_SUCCESS);
@@ -546,32 +511,28 @@
QVERIFY(status == QTMS_RESULT_SUCCESS);
QCOMPARE(gain,maxgain);
- }
-
}
+}
void QTmsCsTest::CreateGlobalVol()
- {
+{
gint status(QTMS_RESULT_SUCCESS);
- if (m_Factory && !m_GlobalVol)
- {
+ if (m_Factory && !m_GlobalVol) {
status = m_Factory->CreateEffect(QTMS_EFFECT_GLOBAL_VOL, m_GlobalVol);
QVERIFY(status == QTMS_RESULT_SUCCESS);
connect(static_cast<QTMSGlobalVolEffect*> (m_GlobalVol),
- SIGNAL(EffectsEvent(const QTMSEffect&,QTMSSignalEvent)),
- this, SLOT(EffectsEvent(const QTMSEffect&,QTMSSignalEvent)));
+ SIGNAL(EffectsEvent(const QTMSEffect&,QTMSSignalEvent)), this,
+ SLOT(EffectsEvent(const QTMSEffect&,QTMSSignalEvent)));
guint maxvol(0);
- status = static_cast<QTMSGlobalVolEffect*>(m_GlobalVol)->GetMaxLevel(
- maxvol);
+ status = static_cast<QTMSGlobalVolEffect*> (m_GlobalVol)->GetMaxLevel(maxvol);
QVERIFY(status == QTMS_RESULT_SUCCESS);
- status = static_cast<QTMSGlobalVolEffect*>(m_GlobalVol)->SetLevel(
- maxvol);
+ status = static_cast<QTMSGlobalVolEffect*> (m_GlobalVol)->SetLevel(maxvol);
QVERIFY(status == QTMS_RESULT_SUCCESS);
QTest::qWait(1000);
@@ -581,298 +542,275 @@
QCOMPARE(vol,maxvol);
- }
}
-
+}
void QTmsCsTest::CreateGlobalGain()
- {
+{
gint status(QTMS_RESULT_SUCCESS);
- if (m_Factory && !m_GlobalGain)
- {
+ if (m_Factory && !m_GlobalGain) {
status = m_Factory->CreateEffect(QTMS_EFFECT_GLOBAL_GAIN, m_GlobalGain);
-
+
QVERIFY(status == QTMS_RESULT_SUCCESS);
connect(static_cast<QTMSGlobalGainEffect*> (m_GlobalGain),
- SIGNAL(EffectsEvent(const QTMSEffect&,QTMSSignalEvent)),
- this,
- SLOT(EffectsEvent(const QTMSEffect&,QTMSSignalEvent)));
-
+ SIGNAL(EffectsEvent(const QTMSEffect&,QTMSSignalEvent)), this,
+ SLOT(EffectsEvent(const QTMSEffect&,QTMSSignalEvent)));
+
guint maxgain(0);
- static_cast<QTMSGlobalGainEffect*>(m_GlobalGain)->GetMaxLevel(maxgain);
+ static_cast<QTMSGlobalGainEffect*> (m_GlobalGain)->GetMaxLevel(maxgain);
QVERIFY(status == QTMS_RESULT_SUCCESS);
-
- static_cast<QTMSGlobalGainEffect*>(m_GlobalGain)->SetLevel(maxgain);
+
+ static_cast<QTMSGlobalGainEffect*> (m_GlobalGain)->SetLevel(maxgain);
QVERIFY(status == QTMS_RESULT_SUCCESS);
QTest::qWait(1000);
-
+
guint gain(0);
- static_cast<QTMSGlobalGainEffect*>(m_GlobalGain)->GetLevel(gain);
+ static_cast<QTMSGlobalGainEffect*> (m_GlobalGain)->GetLevel(gain);
QVERIFY(status == QTMS_RESULT_SUCCESS);
-
+
QCOMPARE(gain,maxgain);
-
- }
+
}
+}
void QTmsCsTest::CreateRouting_data()
- {
+{
gint status;
- if (m_Factory && !m_Routing)
- {
+ if (m_Factory && !m_Routing) {
status = m_Factory->CreateGlobalRouting(m_Routing);
QVERIFY(status == QTMS_RESULT_SUCCESS);
m_RoutingSpy = new QSignalSpy(m_Routing,
- SIGNAL(GlobalRoutingEvent(const QTMSGlobalRouting&,
- QTMSSignalEvent,
- QTMSAudioOutput)));
+ SIGNAL(GlobalRoutingEvent(const QTMSGlobalRouting&,
+ QTMSSignalEvent,
+ QTMSAudioOutput)));
QVERIFY( m_RoutingSpy->isValid() );
- // QCOMPARE(m_RoutingSpy->count(), 0 );
- connect(m_Routing,
- SIGNAL(GlobalRoutingEvent(const QTMSGlobalRouting&,
- QTMSSignalEvent,QTMSAudioOutput)),
- this,
- SLOT(GlobalRoutingEvent(const QTMSGlobalRouting&,
- QTMSSignalEvent,QTMSAudioOutput)));
- }
+ // QCOMPARE(m_RoutingSpy->count(), 0 );
+ connect(m_Routing, SIGNAL(GlobalRoutingEvent(const QTMSGlobalRouting&,
+ QTMSSignalEvent,QTMSAudioOutput)), this,
+ SLOT(GlobalRoutingEvent(const QTMSGlobalRouting&,
+ QTMSSignalEvent,QTMSAudioOutput)));
+ }
//Populate data and test based on available output
GetAvailableOutput();
- }
+}
void QTmsCsTest::CreateRouting()
- {
+{
gint status(QTMS_RESULT_SUCCESS);
-
QFETCH(QTMSAudioOutput, routing);
-
- if(m_Routing)
- {
+
+ if (m_Routing) {
status = m_Routing->SetOutput(routing);
QVERIFY(status == QTMS_RESULT_SUCCESS);
#ifndef __WINSCW__
- QTest::qWait(1000);
- // QCOMPARE(m_RoutingSpy->count(), 1 );
+ QTest::qWait(1000);
+ // QCOMPARE(m_RoutingSpy->count(), 1 );
#endif
- QTMSAudioOutput current;
+ QTMSAudioOutput current;
status = m_Routing->GetOutput(current);
QVERIFY(status == QTMS_RESULT_SUCCESS);
QCOMPARE(routing,current);
-
+
QTMSAudioOutput previous;
status = m_Routing->GetPreviousOutput(previous);
QVERIFY(status == QTMS_RESULT_SUCCESS);
qDebug("Previous routing:");
DisplayDevice(previous);
- }
}
+}
void QTmsCsTest::GetAvailableOutput()
- {
+{
gint status(QTMS_RESULT_SUCCESS);
- if (m_Routing)
- {
+ if (m_Routing) {
status = m_Routing->GetAvailableOutputs(m_Availableoutputs);
QVERIFY(status == QTMS_RESULT_SUCCESS);
-
- qDebug("Available outputs: %d",m_Availableoutputs.size());
- std::vector<guint>::iterator iteroutputs =
- m_Availableoutputs.begin();
- for (; iteroutputs < m_Availableoutputs.end(); iteroutputs++)
- {
+
+ qDebug("Available outputs: %d", m_Availableoutputs.size());
+ std::vector<guint>::iterator iteroutputs = m_Availableoutputs.begin();
+ for (; iteroutputs < m_Availableoutputs.end(); iteroutputs++) {
DisplayDevice(*iteroutputs);
- }
}
}
+}
void QTmsCsTest::DisplayDevice(QTMSAudioOutput device)
- {
+{
QTest::addColumn<QTMSAudioOutput>("routing");
-
- switch (device)
- {
- case QTMS_AUDIO_OUTPUT_NONE:
- {
- qDebug("none");
- QTest::newRow("None")<<QTMS_AUDIO_OUTPUT_NONE;
- }
- break;
- case QTMS_AUDIO_OUTPUT_PUBLIC:
- {
- qDebug("Public");
- QTest::newRow("Public")<<QTMS_AUDIO_OUTPUT_PUBLIC;
- }
- break;
- case QTMS_AUDIO_OUTPUT_PRIVATE:
- {
- qDebug("Private");
- QTest::newRow("Private")<<QTMS_AUDIO_OUTPUT_PRIVATE;
- }
- break;
- case QTMS_AUDIO_OUTPUT_HANDSET:
- {
- qDebug("Handset");
- QTest::newRow("Handset")<<QTMS_AUDIO_OUTPUT_HANDSET;
- }
- break;
- case QTMS_AUDIO_OUTPUT_LOUDSPEAKER:
- {
- qDebug("Loudspeaker");
- QTest::newRow("Loud speaker")<< QTMS_AUDIO_OUTPUT_LOUDSPEAKER;
- }
- break;
- case QTMS_AUDIO_OUTPUT_WIRED_ACCESSORY:
- {
- qDebug("Wired accessory");
- QTest::newRow("Wired accessory")<<QTMS_AUDIO_OUTPUT_WIRED_ACCESSORY;
- }
- break;
- case QTMS_AUDIO_OUTPUT_ACCESSORY:
- {
- qDebug("Accessory");
- QTest::newRow("Accessory")<< QTMS_AUDIO_OUTPUT_ACCESSORY;
- }
- break;
- case QTMS_AUDIO_OUTPUT_ETTY:
- {
- qDebug("TTY");
- QTest::newRow("ETTY")<< QTMS_AUDIO_OUTPUT_ETTY;
- }
- break;
- default:
- break;
- }
+
+ switch (device) {
+ case QTMS_AUDIO_OUTPUT_NONE:
+ {
+ qDebug("none");
+ QTest::newRow("None") << QTMS_AUDIO_OUTPUT_NONE;
+ }
+ break;
+ case QTMS_AUDIO_OUTPUT_PUBLIC:
+ {
+ qDebug("Public");
+ QTest::newRow("Public") << QTMS_AUDIO_OUTPUT_PUBLIC;
+ }
+ break;
+ case QTMS_AUDIO_OUTPUT_PRIVATE:
+ {
+ qDebug("Private");
+ QTest::newRow("Private") << QTMS_AUDIO_OUTPUT_PRIVATE;
+ }
+ break;
+ case QTMS_AUDIO_OUTPUT_HANDSET:
+ {
+ qDebug("Handset");
+ QTest::newRow("Handset") << QTMS_AUDIO_OUTPUT_HANDSET;
}
+ break;
+ case QTMS_AUDIO_OUTPUT_LOUDSPEAKER:
+ {
+ qDebug("Loudspeaker");
+ QTest::newRow("Loud speaker") << QTMS_AUDIO_OUTPUT_LOUDSPEAKER;
+ }
+ break;
+ case QTMS_AUDIO_OUTPUT_WIRED_ACCESSORY:
+ {
+ qDebug("Wired accessory");
+ QTest::newRow("Wired accessory") << QTMS_AUDIO_OUTPUT_WIRED_ACCESSORY;
+ }
+ break;
+ case QTMS_AUDIO_OUTPUT_ACCESSORY:
+ {
+ qDebug("Accessory");
+ QTest::newRow("Accessory") << QTMS_AUDIO_OUTPUT_ACCESSORY;
+ }
+ break;
+ case QTMS_AUDIO_OUTPUT_ETTY:
+ {
+ qDebug("TTY");
+ QTest::newRow("ETTY") << QTMS_AUDIO_OUTPUT_ETTY;
+ }
+ break;
+ default:
+ break;
+ }
+}
void QTmsCsTest::CreateDnlinkDtmf()
- {
+{
gint status(QTMS_RESULT_SUCCESS);
GString* dtmfstring(NULL);
status = m_Factory->CreateDTMF(QTMS_STREAM_DOWNLINK, m_Dnlnkdtmf);
QVERIFY(status == QTMS_RESULT_SUCCESS);
- if (m_Dnlnkdtmf)
- {
- QSignalSpy dtmfspy(m_Dnlnkdtmf,
- SIGNAL(DTMFEvent(const QTMSDTMF&,QTMSSignalEvent)));
+ if (m_Dnlnkdtmf) {
+ QSignalSpy dtmfspy(m_Dnlnkdtmf, SIGNAL(DTMFEvent(const QTMSDTMF&,QTMSSignalEvent)));
QVERIFY( dtmfspy.isValid() );
//QCOMPARE(dtmfspy.count(), 0 );
-
- connect(m_Dnlnkdtmf,
- SIGNAL(DTMFEvent(const QTMSDTMF&,QTMSSignalEvent)), this,
- SLOT(DTMFEvent(const QTMSDTMF&,QTMSSignalEvent)));
+
+ connect(m_Dnlnkdtmf, SIGNAL(DTMFEvent(const QTMSDTMF&,QTMSSignalEvent)), this,
+ SLOT(DTMFEvent(const QTMSDTMF&,QTMSSignalEvent)));
dtmfstring = g_string_new("4723");
status = m_Dnlnkdtmf->SetTone(dtmfstring);
-
+
m_Dnlnkdtmf->Start();
QTest::qWait(1000);
g_string_free(dtmfstring, TRUE);
//QCOMPARE(dtmfspy.count(), 1 );
-
+
status = m_Dnlnkdtmf->Stop();
QVERIFY(status == QTMS_RESULT_SUCCESS);
QTest::qWait(1000);
//QCOMPARE(dtmfspy.count(), 2 );
- }
}
+}
void QTmsCsTest::CreateUplinkDtmf()
- {
+{
gint status(QTMS_RESULT_SUCCESS);
GString* dtmfstring(NULL);
status = m_Factory->CreateDTMF(QTMS_STREAM_UPLINK, m_Uplnkdtmf);
QVERIFY(status == QTMS_RESULT_SUCCESS);
- if (m_Uplnkdtmf)
- {
- QSignalSpy uplinkdtmfspy(m_Uplnkdtmf,
- SIGNAL(DTMFEvent(const QTMSDTMF&,QTMSSignalEvent)));
+ if (m_Uplnkdtmf) {
+ QSignalSpy uplinkdtmfspy(m_Uplnkdtmf, SIGNAL(DTMFEvent(const QTMSDTMF&,QTMSSignalEvent)));
QVERIFY( uplinkdtmfspy.isValid() );
//QCOMPARE(dtmfspy.count(), 0 );
-
- connect(m_Uplnkdtmf,
- SIGNAL(DTMFEvent(const QTMSDTMF&,QTMSSignalEvent)), this,
- SLOT(DTMFEvent(const QTMSDTMF&,QTMSSignalEvent)));
+
+ connect(m_Uplnkdtmf, SIGNAL(DTMFEvent(const QTMSDTMF&,QTMSSignalEvent)), this,
+ SLOT(DTMFEvent(const QTMSDTMF&,QTMSSignalEvent)));
dtmfstring = g_string_new("4723");
status = m_Uplnkdtmf->SetTone(dtmfstring);
-
+
m_Uplnkdtmf->Start();
QTest::qWait(1000);
g_string_free(dtmfstring, TRUE);
//QCOMPARE(dtmfspy.count(), 1 );
-
+
m_Uplnkdtmf->ContinueDTMFStringSending(FALSE);
-
+
status = m_Uplnkdtmf->Stop();
QVERIFY(status == QTMS_RESULT_SUCCESS);
QTest::qWait(1000);
//QCOMPARE(dtmfspy.count(), 2 );
- }
}
-
+}
void QTmsCsTest::CreateInband_data()
- {
-
+{
+
gint status(QTMS_RESULT_SUCCESS);
- if (m_Factory && !m_InbandTonePlayer)
- {
+ if (m_Factory && !m_InbandTonePlayer) {
status = m_Factory->CreateInbandTonePlayer(m_InbandTonePlayer);
- QVERIFY(status == QTMS_RESULT_SUCCESS);
- m_InbandSpy = new QSignalSpy(m_InbandTonePlayer,
- SIGNAL(InbandToneEvent(const QTMSInbandTone&,QTMSSignalEvent)));
+ QVERIFY(status == QTMS_RESULT_SUCCESS);
+ m_InbandSpy = new QSignalSpy(m_InbandTonePlayer,
+ SIGNAL(InbandToneEvent(const QTMSInbandTone&,QTMSSignalEvent)));
QVERIFY( m_InbandSpy->isValid() );
//QCOMPARE(m_InbandSpy->count(), 0 );
connect(m_InbandTonePlayer,
- SIGNAL(InbandToneEvent(const QTMSInbandTone&, QTMSSignalEvent)),
- this,
- SLOT(InbandToneEvent(const QTMSInbandTone&, QTMSSignalEvent)));
- }
-
+ SIGNAL(InbandToneEvent(const QTMSInbandTone&, QTMSSignalEvent)), this,
+ SLOT(InbandToneEvent(const QTMSInbandTone&, QTMSSignalEvent)));
+ }
+
QTest::addColumn<QTMSInbandToneType>("inbandTone");
- QTest::newRow("Busy")<<QTMS_INBAND_USER_BUSY;
- QTest::newRow("Path not avail")<<QTMS_INBAND_RADIO_PATH_NOT_AVAIL;
- QTest::newRow("Congestion")<< QTMS_INBAND_CONGESTION;
- QTest::newRow("Special info")<<QTMS_INBAND_SPECIAL_INFO;
- QTest::newRow("Reorder")<< QTMS_INBAND_REORDER;
- QTest::newRow("Remote alerting")<<QTMS_INBAND_REMOTE_ALEARTING;
- QTest::newRow("call waiting")<< QTMS_INBAND_CALL_WAITING;
- QTest::newRow("data call")<< QTMS_INBAND_DATA_CALL;
- QTest::newRow("no sequence")<< QTMS_INBAND_NO_SEQUENCE;
- QTest::newRow("beep sequence")<<QTMS_INBAND_BEEP_SEQUENCE;
-
- }
+ QTest::newRow("Busy") << QTMS_INBAND_USER_BUSY;
+ QTest::newRow("Path not avail") << QTMS_INBAND_RADIO_PATH_NOT_AVAIL;
+ QTest::newRow("Congestion") << QTMS_INBAND_CONGESTION;
+ QTest::newRow("Special info") << QTMS_INBAND_SPECIAL_INFO;
+ QTest::newRow("Reorder") << QTMS_INBAND_REORDER;
+ QTest::newRow("Remote alerting") << QTMS_INBAND_REMOTE_ALEARTING;
+ QTest::newRow("call waiting") << QTMS_INBAND_CALL_WAITING;
+ QTest::newRow("data call") << QTMS_INBAND_DATA_CALL;
+ QTest::newRow("no sequence") << QTMS_INBAND_NO_SEQUENCE;
+ QTest::newRow("beep sequence") << QTMS_INBAND_BEEP_SEQUENCE;
+}
void QTmsCsTest::CreateInband()
- {
+{
gint status(QTMS_RESULT_SUCCESS);
QFETCH(QTMSInbandToneType, inbandTone);
- if (m_InbandTonePlayer)
- {
+ if (m_InbandTonePlayer) {
status = m_InbandTonePlayer->Start(inbandTone);
QVERIFY(status == QTMS_RESULT_SUCCESS);
QTest::qWait(1000);
@@ -882,42 +820,36 @@
QVERIFY(status == QTMS_RESULT_SUCCESS);
QTest::qWait(1000);
// QCOMPARE(m_InbandSpy->count(), 2 );
- }
}
-
+}
void QTmsCsTest::CreateRingTone()
- {
+{
gint status(QTMS_RESULT_SUCCESS);
- if (m_Factory)
- {
+ if (m_Factory) {
status = m_Factory->CreateRingTonePlayer(m_RingTonePlayer);
QVERIFY(status == QTMS_RESULT_SUCCESS);
- connect(m_RingTonePlayer,
- SIGNAL(RingtoneEvent(const QTMSRingTone&,QTMSSignalEvent)),
- this,
- SLOT(RingtoneEvent(const QTMSRingTone&,QTMSSignalEvent)));
- }
-
+ connect(m_RingTonePlayer, SIGNAL(RingtoneEvent(const QTMSRingTone&,QTMSSignalEvent)), this,
+ SLOT(RingtoneEvent(const QTMSRingTone&,QTMSSignalEvent)));
}
+}
+
void QTmsCsTest::InitRingTonePlayerFromProfiles()
- {
- if (m_RingTonePlayer)
- {
+{
+ if (m_RingTonePlayer) {
gint status = m_RingTonePlayer->Init(QTMS_RINGTONE_DEFAULT);
QVERIFY(status == QTMS_RESULT_SUCCESS);
QTest::qWait(1000);
- }
-
}
+}
+
void QTmsCsTest::InitRingTonePlayerFromFile()
- {
- if (m_RingTonePlayer)
- {
+{
+ if (m_RingTonePlayer) {
TBuf<sizeof(KTestFile1)> buf(KTestFile1);
m_RTStr = g_string_new_len((gchar*) buf.Ptr(), buf.Length() * 2);
gint status = m_RingTonePlayer->Init(QTMS_RINGTONE_FILE, m_RTStr);
@@ -925,282 +857,251 @@
QTest::qWait(1000);
g_string_free(m_RTStr, TRUE);
m_RTStr = NULL;
- }
-
}
+}
void QTmsCsTest::InitRingToneSequencePlayer()
- {
- if (m_RingTonePlayer)
- {
+{
+ if (m_RingTonePlayer) {
TBuf8<sizeof(KRTBeepSequence)> buf(KRTBeepSequence);
m_RTStr = g_string_new_len((gchar*) buf.Ptr(), buf.Length());
gint status = m_RingTonePlayer->Init(QTMS_RINGTONE_SEQUENCE, m_RTStr);
QVERIFY(status == QTMS_RESULT_SUCCESS);
QTest::qWait(1000);
g_string_free(m_RTStr, TRUE);
- }
}
-
+}
void QTmsCsTest::PlayRingTone()
- {
- if (m_RingTonePlayer)
- {
+{
+ if (m_RingTonePlayer) {
gint status = m_RingTonePlayer->Play();
QVERIFY(status == QTMS_RESULT_SUCCESS);
QTest::qWait(1000);
- }
}
-
+}
void QTmsCsTest::PauseRingTone()
- {
- if (m_RingTonePlayer)
- {
+{
+ if (m_RingTonePlayer) {
gint status = m_RingTonePlayer->Pause(); //pause audio for video RT only
QVERIFY(status == QTMS_RESULT_SUCCESS);
QTest::qWait(1000);
- }
}
-
+}
void QTmsCsTest::StopRingTone()
- {
- if (m_RingTonePlayer)
- {
+{
+ if (m_RingTonePlayer) {
gint status = m_RingTonePlayer->Stop();
QVERIFY(status == QTMS_RESULT_SUCCESS);
QTest::qWait(1000);
- }
}
-
+}
void QTmsCsTest::MuteRingTone()
- {
- if (m_RingTonePlayer)
- {
+{
+ if (m_RingTonePlayer) {
m_RingTonePlayer->Mute();
- }
}
+}
void QTmsCsTest::CloseRingTonePlayer()
- {
- if (m_Factory && m_RingTonePlayer)
- {
+{
+ if (m_Factory && m_RingTonePlayer) {
m_RingTonePlayer->Deinit();
m_Factory->DeleteRingTonePlayer(m_RingTonePlayer);
- }
}
+}
-void QTmsCsTest::EffectsEvent(const QTMSEffect& tmseffect,
- QTMSSignalEvent event)
- {
+void QTmsCsTest::EffectsEvent(const QTMSEffect& tmseffect, QTMSSignalEvent event)
+{
QTMSEffectType effecttype;
const_cast<QTMSEffect&> (tmseffect).GetType(effecttype);
QVERIFY(event.reason == QTMS_RESULT_SUCCESS);
-
- switch (effecttype)
- {
- case TMS_EFFECT_GLOBAL_VOL:
- {
- switch (event.type)
- {
- case TMS_EVENT_EFFECT_VOL_CHANGED:
- qDebug("Global vol effect change");
- break;
- default:
- break;
- }
- }
+
+ switch (effecttype) {
+ case TMS_EFFECT_GLOBAL_VOL:
+ {
+ switch (event.type) {
+ case TMS_EVENT_EFFECT_VOL_CHANGED:
+ qDebug("Global vol effect change");
break;
- case TMS_EFFECT_GLOBAL_GAIN:
- {
- switch (event.type)
- {
- case TMS_EVENT_EFFECT_GAIN_CHANGED:
- qDebug("Global gain effect change");
- break;
- default:
- break;
- }
- }
+ default:
break;
- case TMS_EFFECT_VOLUME:
- qDebug("Stream vol effect change");
- break;
- case TMS_EFFECT_GAIN:
- qDebug("Stream gain effect change");
+ }
+ }
+ break;
+ case TMS_EFFECT_GLOBAL_GAIN:
+ {
+ switch (event.type) {
+ case TMS_EVENT_EFFECT_GAIN_CHANGED:
+ qDebug("Global gain effect change");
break;
default:
break;
}
}
-
+ break;
+ case TMS_EFFECT_VOLUME:
+ qDebug("Stream vol effect change");
+ break;
+ case TMS_EFFECT_GAIN:
+ qDebug("Stream gain effect change");
+ break;
+ default:
+ break;
+ }
+}
-void QTmsCsTest::GlobalRoutingEvent(const QTMSGlobalRouting& /*routing*/,
- QTMSSignalEvent event, QTMSAudioOutput /*output*/)
- {
+void QTmsCsTest::GlobalRoutingEvent(const QTMSGlobalRouting& /*routing*/, QTMSSignalEvent event,
+ QTMSAudioOutput /*output*/)
+{
QVERIFY(event.reason == QTMS_RESULT_SUCCESS);
- switch (event.type)
- {
- case TMS_EVENT_ROUTING_AVAIL_OUTPUTS_CHANGED:
- qDebug("Available outputs changed");
- break;
- case TMS_EVENT_ROUTING_OUTPUT_CHANGED:
- qDebug("output changed");
- break;
- case TMS_EVENT_ROUTING_SET_OUTPUT_COMPLETE:
- qDebug("set output complete");
- break;
- default:
- break;
- }
-
+ switch (event.type) {
+ case TMS_EVENT_ROUTING_AVAIL_OUTPUTS_CHANGED:
+ qDebug("Available outputs changed");
+ break;
+ case TMS_EVENT_ROUTING_OUTPUT_CHANGED:
+ qDebug("output changed");
+ break;
+ case TMS_EVENT_ROUTING_SET_OUTPUT_COMPLETE:
+ qDebug("set output complete");
+ break;
+ default:
+ break;
}
-void QTmsCsTest::TMSStreamEvent(const QTMSStream& stream,
- QTMSSignalEvent event)
- {
-
+}
+
+void QTmsCsTest::TMSStreamEvent(const QTMSStream& stream, QTMSSignalEvent event)
+{
+
QVERIFY(event.reason == QTMS_RESULT_SUCCESS);
-
+
gint streamId;
streamId = const_cast<QTMSStream&> (stream).GetStreamId();
- qDebug("StreamID %d",streamId);
+ qDebug("StreamID %d", streamId);
gint state;
state = const_cast<QTMSStream&> (stream).GetState();
QVERIFY(state == event.curr_state);
- switch (const_cast<QTMSStream&> (stream).GetStreamType())
+ switch (const_cast<QTMSStream&> (stream).GetStreamType()) {
+ case QTMS_STREAM_UPLINK:
+ {
+ switch (event.type) {
+ case QTMS_EVENT_STREAM_STATE_CHANGED:
{
- case QTMS_STREAM_UPLINK:
+ switch (event.curr_state) {
+ case QTMS_STREAM_INITIALIZED:
{
- switch (event.type)
- {
- case QTMS_EVENT_STREAM_STATE_CHANGED:
- {
- switch (event.curr_state)
- {
- case QTMS_STREAM_INITIALIZED:
- {
- qDebug("Uplink initialized ");
- break;
- }
- case QTMS_STREAM_UNINITIALIZED:
- qDebug("Uplink uninitialized ");
- break;
- case QTMS_STREAM_PAUSED:
- qDebug("Uplink paused ");
- break;
- case QTMS_STREAM_STARTED:
- qDebug("Uplink started ");
- break;
- default:
- break;
- }
- break;
- }
- default:
- break;
- }
+ qDebug("Uplink initialized ");
+ break;
+ }
+ case QTMS_STREAM_UNINITIALIZED:
+ qDebug("Uplink uninitialized ");
+ break;
+ case QTMS_STREAM_PAUSED:
+ qDebug("Uplink paused ");
+ break;
+ case QTMS_STREAM_STARTED:
+ qDebug("Uplink started ");
+ break;
+ default:
+ break;
+ }
break;
- }
- case QTMS_STREAM_DOWNLINK:
- {
- switch (event.type)
- {
- case QTMS_EVENT_STREAM_STATE_CHANGED:
- {
- switch (event.curr_state)
- {
- case QTMS_STREAM_INITIALIZED:
- {
- qDebug("Downlink initialized ");
- break;
- }
- case QTMS_STREAM_UNINITIALIZED:
- qDebug("Downlink uninitialized ");
- break;
- case QTMS_STREAM_PAUSED:
- qDebug("Downlink paused ");
- break;
- case QTMS_STREAM_STARTED:
- qDebug("Downlink started ");
- break;
- default:
- break;
- }
- break;
- }
- default:
- break;
- }
- break;
- }
+ }
default:
break;
}
+ break;
}
-
-
-void QTmsCsTest::RingtoneEvent(const QTMSRingTone& /*rt*/,
- QTMSSignalEvent event)
+ case QTMS_STREAM_DOWNLINK:
{
- QVERIFY(event.reason == QTMS_RESULT_SUCCESS);
- switch (event.type)
+ switch (event.type) {
+ case QTMS_EVENT_STREAM_STATE_CHANGED:
{
- case TMS_EVENT_RINGTONE_OPEN_COMPLETE:
- qDebug("RT Open Complete");
+ switch (event.curr_state) {
+ case QTMS_STREAM_INITIALIZED:
+ {
+ qDebug("Downlink initialized ");
+ break;
+ }
+ case QTMS_STREAM_UNINITIALIZED:
+ qDebug("Downlink uninitialized ");
+ break;
+ case QTMS_STREAM_PAUSED:
+ qDebug("Downlink paused ");
+ break;
+ case QTMS_STREAM_STARTED:
+ qDebug("Downlink started ");
+ break;
+ default:
+ break;
+ }
break;
- case TMS_EVENT_RINGTONE_PLAY_COMPLETE:
- qDebug("RT Play Complete");
- break;
+ }
default:
break;
}
+ break;
}
+ default:
+ break;
+ }
+}
+void QTmsCsTest::RingtoneEvent(const QTMSRingTone& /*rt*/, QTMSSignalEvent event)
+{
+ QVERIFY(event.reason == QTMS_RESULT_SUCCESS);
+ switch (event.type) {
+ case TMS_EVENT_RINGTONE_OPEN_COMPLETE:
+ qDebug("RT Open Complete");
+ break;
+ case TMS_EVENT_RINGTONE_PLAY_COMPLETE:
+ qDebug("RT Play Complete");
+ break;
+ default:
+ break;
+ }
+}
void QTmsCsTest::DTMFEvent(const QTMSDTMF& /*dtmf*/, QTMSSignalEvent event)
- {
- if(event.reason!= QTMS_RESULT_SUCCESS)
- {
+{
+ if (event.reason != QTMS_RESULT_SUCCESS) {
QEXPECT_FAIL("","Need to be in call, expect uplink dtmf to fail", Continue);
- }
+ }
QVERIFY(event.reason == QTMS_RESULT_SUCCESS);
-
- switch (event.type)
- {
- case QTMS_EVENT_DTMF_TONE_STARTED:
- qDebug("DTMF Started");
- break;
- case QTMS_EVENT_DTMF_TONE_STOPPED:
- qDebug("DTMF Stopped");
- break;
- default:
- break;
- }
+
+ switch (event.type) {
+ case QTMS_EVENT_DTMF_TONE_STARTED:
+ qDebug("DTMF Started");
+ break;
+ case QTMS_EVENT_DTMF_TONE_STOPPED:
+ qDebug("DTMF Stopped");
+ break;
+ default:
+ break;
}
+}
-void QTmsCsTest::InbandToneEvent(const QTMSInbandTone& /*inbandtone*/,
- QTMSSignalEvent event)
- {
+void QTmsCsTest::InbandToneEvent(const QTMSInbandTone& /*inbandtone*/, QTMSSignalEvent event)
+{
QVERIFY(event.reason == QTMS_RESULT_SUCCESS);
- switch (event.type)
- {
- case QTMS_EVENT_INBAND_TONE_STARTED:
- qDebug("Inband Tone Started");
- break;
- case QTMS_EVENT_INBAND_TONE_STOPPED:
- qDebug("Inband Tone Stopped");
- break;
- default:
- break;
- }
+ switch (event.type) {
+ case QTMS_EVENT_INBAND_TONE_STARTED:
+ qDebug("Inband Tone Started");
+ break;
+ case QTMS_EVENT_INBAND_TONE_STOPPED:
+ qDebug("Inband Tone Stopped");
+ break;
+ default:
+ break;
}
+}
QTEST_MAIN_S60(QTmsCsTest)
--- a/mmappfw_plat/qt_telephony_multimedia_service_api/tsrc/qtmsvoiptest/qtmsvoiptest.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappfw_plat/qt_telephony_multimedia_service_api/tsrc/qtmsvoiptest/qtmsvoiptest.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -1,19 +1,19 @@
/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: QTMS Voip test
-*
-*/
+ * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description: QTMS Voip test
+ *
+ */
#include <QObject>
#include <QtTest/QtTest>
#include "qtestmains60.h"
@@ -45,14 +45,14 @@
#include <qtmsinbandtone.h>
#include <tmsbuffer.h>
-
// CONSTANTS
#define __TEST_CODE_COVERAGE__
using namespace QTMS;
-class QTmsVoipTest : public QObject
- {
+
+class QTmsVoipTest: public QObject
+{
Q_OBJECT
private slots:
void initTestCase();
@@ -73,17 +73,17 @@
void cleanupTestCase();
public slots:
//From TMSClientSourceObserver
- void FillBuffer(TMS::TMSBuffer& buffer);
- void BufferProcessed(TMS::TMSBuffer* buffer, gint reason);
+ void FillBuffer(QTMSBuffer& buffer);
+ void BufferProcessed(QTMSBuffer* buffer, gint reason);
//From TMSClientSinkObserver
- void ProcessBuffer(const TMS::TMSBuffer* buffer);
+ void ProcessBuffer(const QTMSBuffer* buffer);
//From TMSStreamObserver
void TMSStreamEvent(const QTMSStream& stream, QTMSSignalEvent event);
//From TMSClientSinkObserver
void EffectsEvent(const QTMSEffect& tmseffect, QTMSSignalEvent event);
//From TMSGlobalRoutingObserver
- void GlobalRoutingEvent(const QTMSGlobalRouting& routing,
- QTMSSignalEvent event, QTMSAudioOutput output);
+ void GlobalRoutingEvent(const QTMSGlobalRouting& routing, QTMSSignalEvent event,
+ QTMSAudioOutput output);
//From TMSRingToneObserver
void RingtoneEvent(const QTMSRingTone& rt, QTMSSignalEvent event);
//From TMSDTMFObserver
@@ -209,31 +209,30 @@
gboolean m_Cng;
gboolean m_Plc;
- };
+};
void QTmsVoipTest::initTestCase()
- {
+{
qDebug("Start QTms Voip tests");
-
+
g_setenv("G_SLICE", "always-malloc", 1);
-
- qRegisterMetaType<QTMSSignalEvent>("QTMSSignalEvent");
- qRegisterMetaType<QTMSAudioOutput>("QTMSAudioOutput");
-
- }
+
+ qRegisterMetaType<QTMSSignalEvent> ("QTMSSignalEvent");
+ qRegisterMetaType<QTMSAudioOutput> ("QTMSAudioOutput");
+}
void QTmsVoipTest::cleanupTestCase()
- {
+{
qDebug("End QTms tests");
- }
+}
void QTmsVoipTest::init()
- {
+{
qDebug("****NEW TEST****");
m_Factory = NULL;
m_Call = NULL;
m_Dnlink = NULL;
- m_Uplink = NULL;
+ m_Uplink = NULL;
m_MicSource = NULL;
m_ClientSource = NULL;
m_SpeakerSink = NULL;
@@ -242,9 +241,9 @@
m_Gain = NULL;
m_GlobalVol = NULL;
m_GlobalGain = NULL;
- m_Routing = NULL;
+ m_Routing = NULL;
m_Dnlnkdtmf = NULL;
-
+
m_G711EncFormatIntfc = NULL;
m_G711DecFormatIntfc = NULL;
m_G729EncFormatIntfc = NULL;
@@ -258,33 +257,33 @@
m_UplinkSpy = NULL;
m_DnlinkSpy = NULL;
-
+
QTMSVer *ver(NULL);
gint status;
status = QTMSFactory::CreateFactory(m_Factory, *ver);
-
+
QVERIFY(status == QTMS_RESULT_SUCCESS);
-
+
VoipCallSetup();
-
+
CreateUplink();
CreateDnlink();
-
+
CreateMicSource();
AddMicSourceToStream();
-
+
CreateClientSink();
AddClientSinkToStream();
-
+
CreateClientSource();
AddClientSourceToStream();
-
+
CreateSpeakerSink();
AddSpeakerSinkToStream();
-
- }
+
+}
void QTmsVoipTest::cleanup()
- {
+{
qDebug("****END TEST******");
ResetUplnkFormat();
@@ -293,500 +292,485 @@
CloseUplink();
CloseDownlink();
- if (m_MicSource)
+ if (m_MicSource) {
m_Factory->DeleteSource(m_MicSource);
- if (m_ClientSource)
+ }
+ if (m_ClientSource) {
m_Factory->DeleteSource(m_ClientSource);
- if (m_ClientSink)
+ }
+ if (m_ClientSink) {
m_Factory->DeleteSink(m_ClientSink);
- if (m_SpeakerSink)
+ }
+ if (m_SpeakerSink) {
m_Factory->DeleteSink(m_SpeakerSink);
-
- if (m_Dnlnkdtmf)
- m_Factory->DeleteDTMF(m_Dnlnkdtmf);
-
- if (m_Vol)
- m_Factory->DeleteEffect(m_Vol);
- if (m_Gain)
- m_Factory->DeleteEffect(m_Gain);
- if (m_GlobalVol)
- m_Factory->DeleteEffect(m_GlobalVol);
- if (m_GlobalGain)
- m_Factory->DeleteEffect(m_GlobalGain);
-
- if (m_Routing)
- m_Factory->DeleteGlobalRouting(m_Routing);
+ }
- if (m_PCM16EncFormatIntfc)
- m_Factory->DeleteFormat(m_PCM16EncFormatIntfc);
- if (m_ILBCEncFormatIntfc)
- m_Factory->DeleteFormat(m_ILBCEncFormatIntfc);
- if (m_AMRNBEncFormatIntfc)
- m_Factory->DeleteFormat(m_AMRNBEncFormatIntfc);
- if (m_G711EncFormatIntfc)
- m_Factory->DeleteFormat(m_G711EncFormatIntfc);
- if (m_G729EncFormatIntfc)
- m_Factory->DeleteFormat(m_G729EncFormatIntfc);
- if (m_PCM16DecFormatIntfc)
- m_Factory->DeleteFormat(m_PCM16DecFormatIntfc);
- if (m_ILBCDecFormatIntfc)
- m_Factory->DeleteFormat(m_ILBCDecFormatIntfc);
- if (m_AMRNBDecFormatIntfc)
- m_Factory->DeleteFormat(m_AMRNBDecFormatIntfc);
- if (m_G711DecFormatIntfc)
- m_Factory->DeleteFormat(m_G711DecFormatIntfc);
- if (m_G729DecFormatIntfc)
- m_Factory->DeleteFormat(m_G729DecFormatIntfc);
+ if (m_Dnlnkdtmf) {
+ m_Factory->DeleteDTMF(m_Dnlnkdtmf);
+ }
- if (m_Uplink)
- m_Call->DeleteStream(m_Uplink);
- if (m_Dnlink)
- m_Call->DeleteStream(m_Dnlink);
+ if (m_Vol) {
+ m_Factory->DeleteEffect(m_Vol);
+ }
+ if (m_Gain) {
+ m_Factory->DeleteEffect(m_Gain);
+ }
+ if (m_GlobalVol) {
+ m_Factory->DeleteEffect(m_GlobalVol);
+ }
+ if (m_GlobalGain) {
+ m_Factory->DeleteEffect(m_GlobalGain);
+ }
- if (m_Call)
- m_Factory->DeleteCall(m_Call);
-
- if (m_Factory)
- delete m_Factory;
-
+ if (m_Routing) {
+ m_Factory->DeleteGlobalRouting(m_Routing);
}
+ if (m_PCM16EncFormatIntfc) {
+ m_Factory->DeleteFormat(m_PCM16EncFormatIntfc);
+ }
+ if (m_ILBCEncFormatIntfc) {
+ m_Factory->DeleteFormat(m_ILBCEncFormatIntfc);
+ }
+ if (m_AMRNBEncFormatIntfc) {
+ m_Factory->DeleteFormat(m_AMRNBEncFormatIntfc);
+ }
+ if (m_G711EncFormatIntfc) {
+ m_Factory->DeleteFormat(m_G711EncFormatIntfc);
+ }
+ if (m_G729EncFormatIntfc) {
+ m_Factory->DeleteFormat(m_G729EncFormatIntfc);
+ }
+ if (m_PCM16DecFormatIntfc) {
+ m_Factory->DeleteFormat(m_PCM16DecFormatIntfc);
+ }
+ if (m_ILBCDecFormatIntfc) {
+ m_Factory->DeleteFormat(m_ILBCDecFormatIntfc);
+ }
+ if (m_AMRNBDecFormatIntfc) {
+ m_Factory->DeleteFormat(m_AMRNBDecFormatIntfc);
+ }
+ if (m_G711DecFormatIntfc) {
+
+ m_Factory->DeleteFormat(m_G711DecFormatIntfc);
+ }
+ if (m_G729DecFormatIntfc) {
+ m_Factory->DeleteFormat(m_G729DecFormatIntfc);
+ }
+
+ if (m_Uplink) {
+ m_Call->DeleteStream(m_Uplink);
+ }
+ if (m_Dnlink) {
+ m_Call->DeleteStream(m_Dnlink);
+ }
+
+ if (m_Call) {
+ m_Factory->DeleteCall(m_Call);
+ }
+
+ if (m_Factory) {
+ delete m_Factory;
+ }
+
+}
+
void QTmsVoipTest::VoipCallSetup()
- {
+{
gint status(QTMS_RESULT_SUCCESS);
- if (m_Factory && !m_Call)
- {
+ if (m_Factory && !m_Call) {
gboolean issupported(FALSE);
- m_Factory->IsCallTypeSupported(QTMS_CALL_IP,issupported);
+ m_Factory->IsCallTypeSupported(QTMS_CALL_IP, issupported);
QVERIFY(issupported == TRUE);
status = m_Factory->CreateCall(QTMS_CALL_IP, m_Call, 0);
QVERIFY(status == QTMS_RESULT_SUCCESS);
guint ctxid;
m_Call->GetCallContextId(ctxid);
- }
-
}
+}
+
void QTmsVoipTest::SupportedFormats()
- {
+{
SupportedUplinkFormats();
SupportedDnlinkFormats();
- }
+}
void QTmsVoipTest::SupportedUplinkFormats()
- {
+{
gint status(QTMS_RESULT_SUCCESS);
- status = m_Factory->GetSupportedFormats(QTMS_STREAM_UPLINK,m_UplCodecs);
- QVERIFY(status == QTMS_RESULT_SUCCESS);
-
+ status = m_Factory->GetSupportedFormats(QTMS_STREAM_UPLINK, m_UplCodecs);
+ QVERIFY(status == QTMS_RESULT_SUCCESS);
+
qDebug("Supported UPL codecs");
std::vector<QTMSFormat*>::iterator codecs = m_UplCodecs.begin();
QTMSFormatType fmttype;
- for (; codecs < m_UplCodecs.end(); codecs++)
- {
+ for (; codecs < m_UplCodecs.end(); codecs++) {
(*codecs)->GetType(fmttype);
DisplayFormat(fmttype);
- }
+ }
gint size = m_UplCodecs.size();
- for (gint i = 0; i < size; i++)
- {
+ for (gint i = 0; i < size; i++) {
codecs = m_UplCodecs.begin();
m_Factory->DeleteFormat(*codecs);
m_UplCodecs.erase(codecs);
- }
-
}
+}
+
void QTmsVoipTest::SupportedDnlinkFormats()
- {
+{
gint status(QTMS_RESULT_SUCCESS);
- status = m_Factory->GetSupportedFormats(QTMS_STREAM_DOWNLINK,m_DnlCodecs);
- QVERIFY(status == QTMS_RESULT_SUCCESS);
-
+ status = m_Factory->GetSupportedFormats(QTMS_STREAM_DOWNLINK, m_DnlCodecs);
+ QVERIFY(status == QTMS_RESULT_SUCCESS);
+
qDebug("Supported DNL codecs");
std::vector<QTMSFormat*>::iterator codecs = m_DnlCodecs.begin();
QTMSFormatType fmttype;
- for (; codecs < m_DnlCodecs.end(); codecs++)
- {
+ for (; codecs < m_DnlCodecs.end(); codecs++) {
(*codecs)->GetType(fmttype);
DisplayFormat(fmttype);
- }
+ }
gint size = m_DnlCodecs.size();
- for (gint i = 0; i < size; i++)
- {
+ for (gint i = 0; i < size; i++) {
codecs = m_DnlCodecs.begin();
m_Factory->DeleteFormat(*codecs);
m_DnlCodecs.erase(codecs);
+ }
+}
+
+void QTmsVoipTest::DisplayFormat(QTMSFormatType format)
+{
+ switch (format) {
+ case QTMS_FORMAT_AMR:
+ qDebug("AMR-NB");
+ break;
+ case QTMS_FORMAT_G711:
+ qDebug("G.711");
+ break;
+ case QTMS_FORMAT_G729:
+ qDebug("G.729");
+ break;
+ case QTMS_FORMAT_ILBC:
+ qDebug("iLBC");
+ break;
+ case QTMS_FORMAT_PCM:
+ qDebug("PCM-16");
+ break;
+ default:
+ break;
+ }
+}
+
+void QTmsVoipTest::CreateUplink()
+{
+ gint status(QTMS_RESULT_SUCCESS);
+
+ if (m_Call) {
+ status = m_Call->CreateStream(QTMS_STREAM_UPLINK, m_Uplink);
+
+ m_UplinkSpy = new QSignalSpy(m_Uplink,
+ SIGNAL(TMSStreamEvent(const QTMSStream&, QTMSSignalEvent)));
+
+ QVERIFY( m_UplinkSpy->isValid() );
+
+ // QCOMPARE(m_UplinkSpy->count(), 0 );
+
+ QVERIFY(status == QTMS_RESULT_SUCCESS);
+ connect(m_Uplink, SIGNAL(TMSStreamEvent(const QTMSStream&, QTMSSignalEvent)), this,
+ SLOT(TMSStreamEvent(const QTMSStream&, QTMSSignalEvent)));
+ }
+}
+
+void QTmsVoipTest::CreateDnlink()
+{
+ gint status(QTMS_RESULT_SUCCESS);
+
+ if (m_Call) {
+ status = m_Call->CreateStream(QTMS_STREAM_DOWNLINK, m_Dnlink);
+
+ QVERIFY(status == QTMS_RESULT_SUCCESS);
+
+ m_DnlinkSpy = new QSignalSpy(m_Dnlink,
+ SIGNAL(TMSStreamEvent(const QTMSStream&, QTMSSignalEvent)));
+
+ QVERIFY( m_DnlinkSpy->isValid() );
+
+ // QCOMPARE(m_DnlinkSpy->count(), 0 );
+
+ connect(m_Dnlink, SIGNAL(TMSStreamEvent(const QTMSStream&, QTMSSignalEvent)), this,
+ SLOT(TMSStreamEvent(const QTMSStream&, QTMSSignalEvent)));
+ }
+}
+
+void QTmsVoipTest::CreateClientSource()
+{
+ gint status(QTMS_RESULT_SUCCESS);
+ if (m_Factory && !m_ClientSource) {
+ status = m_Factory->CreateSource(QTMS_SOURCE_CLIENT, m_ClientSource);
+ }
+ QVERIFY(status == QTMS_RESULT_SUCCESS);
+}
+
+void QTmsVoipTest::AddClientSourceToStream()
+{
+ gint status(QTMS_RESULT_SUCCESS);
+ if (m_Dnlink && m_ClientSource) {
+ connect(static_cast<QTMSClientSource*> (m_ClientSource),
+ SIGNAL(FillBuffer(QTMSBuffer&)), this, SLOT(FillBuffer(QTMSBuffer&)));
+ status = m_Dnlink->AddSource(m_ClientSource);
+
+#ifdef __TEST_CODE_COVERAGE__
+ QTMSSourceType st;
+ static_cast<QTMSClientSource*> (m_ClientSource)->GetType(st);
+ gboolean enqueue(FALSE);
+ static_cast<QTMSClientSource*> (m_ClientSource)->GetEnqueueMode(enqueue);
+ static_cast<QTMSClientSource*> (m_ClientSource)->SetEnqueueMode(FALSE);
+ static_cast<QTMSClientSource*> (m_ClientSource)->Flush();
+#endif //__TEST_CODE_COVERAGE__
+ }
+
+ QVERIFY(status == QTMS_RESULT_SUCCESS);
+}
+
+void QTmsVoipTest::CreateClientSink()
+{
+ gint status(QTMS_RESULT_SUCCESS);
+
+ if (m_Factory && !m_ClientSink) {
+ status = m_Factory->CreateSink(QTMS_SINK_CLIENT, m_ClientSink);
+ }
+ QVERIFY(status == QTMS_RESULT_SUCCESS);
+}
+
+void QTmsVoipTest::AddClientSinkToStream()
+{
+ gint status(QTMS_RESULT_SUCCESS);
+ if (m_Uplink && m_ClientSink) {
+ connect(static_cast<QTMSClientSink*> (m_ClientSink),
+ SIGNAL(ProcessBuffer(const QTMSBuffer*)), this,
+ SLOT(ProcessBuffer(const QTMSBuffer*)));
+ status = m_Uplink->AddSink(m_ClientSink);
+ }
+ QVERIFY(status == QTMS_RESULT_SUCCESS);
+}
+
+void QTmsVoipTest::CreateMicSource()
+{
+ gint status(QTMS_RESULT_SUCCESS);
+
+ if (m_Factory && !m_MicSource) {
+ status = m_Factory->CreateSource(TMS_SOURCE_MIC, m_MicSource);
+ }
+ QVERIFY(status == QTMS_RESULT_SUCCESS);
+}
+
+void QTmsVoipTest::AddMicSourceToStream()
+{
+ gint status(QTMS_RESULT_SUCCESS);
+ if (m_Uplink && m_MicSource) {
+ status = m_Uplink->AddSource(m_MicSource);
+ }
+ QVERIFY(status == QTMS_RESULT_SUCCESS);
+}
+
+void QTmsVoipTest::CreateSpeakerSink()
+{
+ gint status(QTMS_RESULT_SUCCESS);
+
+ if (m_Factory && !m_SpeakerSink) {
+ status = m_Factory->CreateSink(QTMS_SINK_SPEAKER, m_SpeakerSink);
+ }
+ QVERIFY(status == QTMS_RESULT_SUCCESS);
+}
+
+void QTmsVoipTest::AddSpeakerSinkToStream()
+{
+ gint status(QTMS_RESULT_SUCCESS);
+ if (m_Dnlink && m_SpeakerSink) {
+ status = m_Dnlink->AddSink(m_SpeakerSink);
+ }
+ QVERIFY(status == QTMS_RESULT_SUCCESS);
+}
+
+void QTmsVoipTest::InitUplink()
+{
+ QVERIFY(m_Uplink->Init() == QTMS_RESULT_SUCCESS);
+ QTest::qWait(1000);
+ //QCOMPARE(m_UplinkSpy->count(), 1 );
+
+ GetSupportedBitrates();
+ SelectMinBitrate();
+ SelectMaxBitrate();
+ GetBitrate();
+
+ ToggleVad();
+ GetVad();
+
+ SetUpLinkG711ALAW();
+ SetUpLinkG711uLAW();
+ GetUpLinkG711Mode();
+
+ SetUpLinkILBC20MS();
+ SetUpLinkILBC30MS();
+ GetUpLinkILBCMode();
+
+}
+
+void QTmsVoipTest::InitDnlink()
+{
+ QVERIFY(m_Dnlink->Init() == QTMS_RESULT_SUCCESS);
+ QTest::qWait(1000);
+ //QCOMPARE(m_DnlinkSpy->count(), 1 );
+ ToggleCng();
+ GetCng();
+ TogglePlc();
+ GetPlc();
+
+ SetDnLinkG711ALAW();
+ SetDnLinkG711uLAW();
+ GetDnLinkG711Mode();
+
+ SetDnLinkILBC20MS();
+ SetDnLinkILBC30MS();
+ GetDnLinkILBCMode();
+
+}
+void QTmsVoipTest::DeinitUplink()
+{
+ m_Uplink->Deinit();
+ QTest::qWait(1000);
+}
+
+void QTmsVoipTest::DeinitDnlink()
+{
+ m_Dnlink->Deinit();
+ QTest::qWait(1000);
+}
+
+void QTmsVoipTest::StartUplink()
+{
+ QVERIFY(m_Uplink->Start() == QTMS_RESULT_SUCCESS);
+ QTest::qWait(1000);
+ //QCOMPARE(m_UplinkSpy->count(), 2 );
+}
+
+void QTmsVoipTest::StartDnlink()
+{
+ QVERIFY(m_Dnlink->Start() == QTMS_RESULT_SUCCESS);
+ QTest::qWait(1000);
+ //QCOMPARE(m_DnlinkSpy->count(), 2 );
+}
+void QTmsVoipTest::StopUplink()
+{
+#ifdef __TEST_CODE_COVERAGE__
+ QVERIFY(m_Uplink->Pause()== QTMS_RESULT_SUCCESS);
+ QTest::qWait(1000);
+#endif //__TEST_CODE_COVERAGE__
+ QVERIFY(m_Uplink->Stop() == QTMS_RESULT_SUCCESS);
+ QTest::qWait(1000);
+ //QCOMPARE(m_UplinkSpy->count(), 3 );
+}
+
+void QTmsVoipTest::StopDnlink()
+{
+#ifdef __TEST_CODE_COVERAGE__
+ QVERIFY(m_Dnlink->Pause() == QTMS_RESULT_SUCCESS);
+ QTest::qWait(1000);
+#endif //__TEST_CODE_COVERAGE__
+ QVERIFY(m_Dnlink->Stop() == QTMS_RESULT_SUCCESS);
+ QTest::qWait(1000);
+ //QCOMPARE(m_DnlinkSpy->count(), 3 );
+}
+
+void QTmsVoipTest::CloseUplink()
+{
+ m_Uplink->Deinit();
+ QTest::qWait(1000);
+ if (m_Uplink) {
+ if (m_Gain) {
+ QVERIFY(m_Uplink->RemoveEffect(m_Gain)== QTMS_RESULT_SUCCESS);
+ }
+ if (m_MicSource) {
+ QVERIFY(m_Uplink->RemoveSource(m_MicSource)== QTMS_RESULT_SUCCESS);
+ }
+ if (m_ClientSink) {
+ QVERIFY(m_Uplink->RemoveSink(m_ClientSink)== QTMS_RESULT_SUCCESS);
+ }
+ }
+}
+
+void QTmsVoipTest::CloseDownlink()
+{
+ m_Dnlink->Deinit();
+ QTest::qWait(1000);
+ if (m_Dnlink) {
+ if (m_Vol) {
+ QVERIFY(m_Dnlink->RemoveEffect(m_Vol)== QTMS_RESULT_SUCCESS);
+ }
+ if (m_ClientSource) {
+ QVERIFY(m_Dnlink->RemoveSource(m_ClientSource)== QTMS_RESULT_SUCCESS);
+ }
+ if (m_SpeakerSink) {
+ QVERIFY(m_Dnlink->RemoveSink(m_SpeakerSink) == QTMS_RESULT_SUCCESS);
}
}
+}
-void QTmsVoipTest::DisplayFormat(QTMSFormatType format)
- {
- switch (format)
- {
+void QTmsVoipTest::ResetUplnkFormat()
+{
+ if (m_Uplink) {
+ switch (m_UpLinkCodec) {
+ case QTMS_FORMAT_PCM:
+ m_Uplink->ResetFormat(m_PCM16EncFormatIntfc);
+ break;
case QTMS_FORMAT_AMR:
- qDebug("AMR-NB");
+ m_Uplink->ResetFormat(m_AMRNBEncFormatIntfc);
break;
case QTMS_FORMAT_G711:
- qDebug("G.711");
+ m_Uplink->ResetFormat(m_G711EncFormatIntfc);
break;
case QTMS_FORMAT_G729:
- qDebug("G.729");
+ m_Uplink->ResetFormat(m_G729EncFormatIntfc);
break;
case QTMS_FORMAT_ILBC:
- qDebug("iLBC");
- break;
- case QTMS_FORMAT_PCM:
- qDebug("PCM-16");
+ m_Uplink->ResetFormat(m_ILBCEncFormatIntfc);
break;
default:
break;
}
}
-void QTmsVoipTest::CreateUplink()
- {
- gint status(QTMS_RESULT_SUCCESS);
-
- if (m_Call)
- {
- status = m_Call->CreateStream(QTMS_STREAM_UPLINK, m_Uplink);
-
- m_UplinkSpy = new QSignalSpy(m_Uplink,
- SIGNAL(TMSStreamEvent(const QTMSStream&, QTMSSignalEvent)));
-
- QVERIFY( m_UplinkSpy->isValid() );
-
- // QCOMPARE(m_UplinkSpy->count(), 0 );
+}
- QVERIFY(status == QTMS_RESULT_SUCCESS);
- connect(m_Uplink,
- SIGNAL(TMSStreamEvent(const QTMSStream&, QTMSSignalEvent)),
- this,
- SLOT(TMSStreamEvent(const QTMSStream&, QTMSSignalEvent)));
- }
- }
-
- void QTmsVoipTest::CreateDnlink()
- {
- gint status(QTMS_RESULT_SUCCESS);
-
- if (m_Call)
- {
- status = m_Call->CreateStream(QTMS_STREAM_DOWNLINK, m_Dnlink);
-
- QVERIFY(status == QTMS_RESULT_SUCCESS);
-
- m_DnlinkSpy = new QSignalSpy(m_Dnlink,
- SIGNAL(TMSStreamEvent(const QTMSStream&, QTMSSignalEvent)));
-
- QVERIFY( m_DnlinkSpy->isValid() );
-
- // QCOMPARE(m_DnlinkSpy->count(), 0 );
-
- connect(m_Dnlink,
- SIGNAL(TMSStreamEvent(const QTMSStream&, QTMSSignalEvent)),
- this,
- SLOT(TMSStreamEvent(const QTMSStream&, QTMSSignalEvent)));
+void QTmsVoipTest::ResetDnlnkFormat()
+{
+ if (m_Dnlink) {
+ switch (m_DnLinkCodec) {
+ case QTMS_FORMAT_PCM:
+ m_Dnlink->ResetFormat(m_PCM16DecFormatIntfc);
+ break;
+ case QTMS_FORMAT_AMR:
+ m_Dnlink->ResetFormat(m_AMRNBDecFormatIntfc);
+ break;
+ case QTMS_FORMAT_G711:
+ m_Dnlink->ResetFormat(m_G711DecFormatIntfc);
+ break;
+ case QTMS_FORMAT_G729:
+ m_Dnlink->ResetFormat(m_G729DecFormatIntfc);
+ break;
+ case QTMS_FORMAT_ILBC:
+ m_Dnlink->ResetFormat(m_ILBCDecFormatIntfc);
+ break;
+ default:
+ break;
}
}
-
-void QTmsVoipTest::CreateClientSource()
- {
- gint status(QTMS_RESULT_SUCCESS);
- if (m_Factory && !m_ClientSource)
- {
- status = m_Factory->CreateSource(QTMS_SOURCE_CLIENT, m_ClientSource);
- }
- QVERIFY(status == QTMS_RESULT_SUCCESS);
- }
-
-
-void QTmsVoipTest::AddClientSourceToStream()
- {
- gint status(QTMS_RESULT_SUCCESS);
- if (m_Dnlink && m_ClientSource)
- {
- connect(static_cast<QTMSClientSource*> (m_ClientSource),
- SIGNAL(FillBuffer(TMS::TMSBuffer&)), this,
- SLOT(FillBuffer(TMS::TMSBuffer&)));
- status = m_Dnlink->AddSource(m_ClientSource);
-
-#ifdef __TEST_CODE_COVERAGE__
- QTMSSourceType st;
- static_cast<QTMSClientSource*>(m_ClientSource)->GetType(st);
- gboolean enqueue(FALSE);
- static_cast<QTMSClientSource*>(m_ClientSource)->GetEnqueueMode(enqueue);
- static_cast<QTMSClientSource*>(m_ClientSource)->SetEnqueueMode(FALSE);
- static_cast<QTMSClientSource*>(m_ClientSource)->Flush();
-#endif //__TEST_CODE_COVERAGE__
- }
-
- QVERIFY(status == QTMS_RESULT_SUCCESS);
- }
-
-
- void QTmsVoipTest::CreateClientSink()
- {
- gint status(QTMS_RESULT_SUCCESS);
-
- if (m_Factory && !m_ClientSink)
- {
- status = m_Factory->CreateSink(QTMS_SINK_CLIENT, m_ClientSink);
- }
- QVERIFY(status == QTMS_RESULT_SUCCESS);
- }
-
- void QTmsVoipTest::AddClientSinkToStream()
- {
- gint status(QTMS_RESULT_SUCCESS);
- if (m_Uplink && m_ClientSink)
- {
- connect(static_cast<QTMSClientSink*> (m_ClientSink),
- SIGNAL(ProcessBuffer(const TMS::TMSBuffer*)), this,
- SLOT(ProcessBuffer(const TMS::TMSBuffer*)));
- status = m_Uplink->AddSink(m_ClientSink);
- }
- QVERIFY(status == QTMS_RESULT_SUCCESS);
- }
-
-
-
- void QTmsVoipTest::CreateMicSource()
- {
- gint status(QTMS_RESULT_SUCCESS);
-
- if (m_Factory && !m_MicSource)
- {
- status = m_Factory->CreateSource(TMS_SOURCE_MIC, m_MicSource);
- }
- QVERIFY(status == QTMS_RESULT_SUCCESS);
- }
-
- void QTmsVoipTest::AddMicSourceToStream()
- {
- gint status(QTMS_RESULT_SUCCESS);
- if (m_Uplink && m_MicSource)
- {
- status = m_Uplink->AddSource(m_MicSource);
- }
- QVERIFY(status == QTMS_RESULT_SUCCESS);
- }
-
- void QTmsVoipTest::CreateSpeakerSink()
- {
- gint status(QTMS_RESULT_SUCCESS);
-
- if (m_Factory && !m_SpeakerSink)
- {
- status = m_Factory->CreateSink(QTMS_SINK_SPEAKER, m_SpeakerSink);
- }
- QVERIFY(status == QTMS_RESULT_SUCCESS);
- }
-
- void QTmsVoipTest::AddSpeakerSinkToStream()
- {
- gint status(QTMS_RESULT_SUCCESS);
- if (m_Dnlink && m_SpeakerSink)
- {
- status = m_Dnlink->AddSink(m_SpeakerSink);
- }
- QVERIFY(status == QTMS_RESULT_SUCCESS);
- }
-
- void QTmsVoipTest::InitUplink()
- {
- QVERIFY(m_Uplink->Init() == QTMS_RESULT_SUCCESS);
- QTest::qWait(1000);
- //QCOMPARE(m_UplinkSpy->count(), 1 );
-
- GetSupportedBitrates();
- SelectMinBitrate();
- SelectMaxBitrate();
- GetBitrate();
-
- ToggleVad();
- GetVad();
-
- SetUpLinkG711ALAW();
- SetUpLinkG711uLAW();
- GetUpLinkG711Mode();
-
- SetUpLinkILBC20MS();
- SetUpLinkILBC30MS();
- GetUpLinkILBCMode();
-
- }
-
- void QTmsVoipTest::InitDnlink()
- {
- QVERIFY(m_Dnlink->Init() == QTMS_RESULT_SUCCESS);
- QTest::qWait(1000);
- //QCOMPARE(m_DnlinkSpy->count(), 1 );
- ToggleCng();
- GetCng();
- TogglePlc();
- GetPlc();
-
- SetDnLinkG711ALAW();
- SetDnLinkG711uLAW();
- GetDnLinkG711Mode();
-
- SetDnLinkILBC20MS();
- SetDnLinkILBC30MS();
- GetDnLinkILBCMode();
-
- }
- void QTmsVoipTest::DeinitUplink()
- {
- m_Uplink->Deinit();
- QTest::qWait(1000);
- }
-
- void QTmsVoipTest::DeinitDnlink()
- {
- m_Dnlink->Deinit();
- QTest::qWait(1000);
- }
-
- void QTmsVoipTest::StartUplink()
- {
- QVERIFY(m_Uplink->Start() == QTMS_RESULT_SUCCESS);
- QTest::qWait(1000);
- //QCOMPARE(m_UplinkSpy->count(), 2 );
- }
-
- void QTmsVoipTest::StartDnlink()
- {
- QVERIFY(m_Dnlink->Start() == QTMS_RESULT_SUCCESS);
- QTest::qWait(1000);
- //QCOMPARE(m_DnlinkSpy->count(), 2 );
- }
-void QTmsVoipTest::StopUplink()
- {
-#ifdef __TEST_CODE_COVERAGE__
- QVERIFY(m_Uplink->Pause()== QTMS_RESULT_SUCCESS);
- QTest::qWait(1000);
-#endif //__TEST_CODE_COVERAGE__
-
- QVERIFY(m_Uplink->Stop() == QTMS_RESULT_SUCCESS);
- QTest::qWait(1000);
- //QCOMPARE(m_UplinkSpy->count(), 3 );
- }
-
-void QTmsVoipTest::StopDnlink()
- {
-#ifdef __TEST_CODE_COVERAGE__
- QVERIFY(m_Dnlink->Pause() == QTMS_RESULT_SUCCESS);
- QTest::qWait(1000);
-#endif //__TEST_CODE_COVERAGE__
-
- QVERIFY(m_Dnlink->Stop() == QTMS_RESULT_SUCCESS);
- QTest::qWait(1000);
- //QCOMPARE(m_DnlinkSpy->count(), 3 );
- }
-
-void QTmsVoipTest::CloseUplink()
- {
- m_Uplink->Deinit();
- QTest::qWait(1000);
- if (m_Uplink)
- {
- if (m_Gain)
- {
- QVERIFY(m_Uplink->RemoveEffect(m_Gain)== QTMS_RESULT_SUCCESS);
- }
- if (m_MicSource)
- {
- QVERIFY(m_Uplink->RemoveSource(m_MicSource)== QTMS_RESULT_SUCCESS);
- }
- if (m_ClientSink)
- {
- QVERIFY(m_Uplink->RemoveSink(m_ClientSink)== QTMS_RESULT_SUCCESS);
- }
- }
- }
-
-void QTmsVoipTest::CloseDownlink()
- {
- m_Dnlink->Deinit();
- QTest::qWait(1000);
- if (m_Dnlink)
- {
- if (m_Vol)
- {
- QVERIFY(m_Dnlink->RemoveEffect(m_Vol)== QTMS_RESULT_SUCCESS);
- }
- if (m_ClientSource)
- {
- QVERIFY(m_Dnlink->RemoveSource(m_ClientSource)== QTMS_RESULT_SUCCESS);
- }
- if (m_SpeakerSink)
- {
- QVERIFY(m_Dnlink->RemoveSink(m_SpeakerSink) == QTMS_RESULT_SUCCESS);
- }
- }
-
- }
-
-void QTmsVoipTest::ResetUplnkFormat()
- {
- if (m_Uplink)
- {
- switch (m_UpLinkCodec)
- {
- case QTMS_FORMAT_PCM:
- m_Uplink->ResetFormat(m_PCM16EncFormatIntfc);
- break;
- case QTMS_FORMAT_AMR:
- m_Uplink->ResetFormat(m_AMRNBEncFormatIntfc);
- break;
- case QTMS_FORMAT_G711:
- m_Uplink->ResetFormat(m_G711EncFormatIntfc);
- break;
- case QTMS_FORMAT_G729:
- m_Uplink->ResetFormat(m_G729EncFormatIntfc);
- break;
- case QTMS_FORMAT_ILBC:
- m_Uplink->ResetFormat(m_ILBCEncFormatIntfc);
- break;
- default:
- break;
- }
- }
-
- }
-
-void QTmsVoipTest::ResetDnlnkFormat()
- {
- if (m_Dnlink)
- {
- switch (m_DnLinkCodec)
- {
- case QTMS_FORMAT_PCM:
- m_Dnlink->ResetFormat(m_PCM16DecFormatIntfc);
- break;
- case QTMS_FORMAT_AMR:
- m_Dnlink->ResetFormat(m_AMRNBDecFormatIntfc);
- break;
- case QTMS_FORMAT_G711:
- m_Dnlink->ResetFormat(m_G711DecFormatIntfc);
- break;
- case QTMS_FORMAT_G729:
- m_Dnlink->ResetFormat(m_G729DecFormatIntfc);
- break;
- case QTMS_FORMAT_ILBC:
- m_Dnlink->ResetFormat(m_ILBCDecFormatIntfc);
- break;
- default:
- break;
- }
- }
- }
+}
void QTmsVoipTest::CreateFormat_data()
- {
+{
QTest::addColumn<QTMSFormatType>("format");
#ifndef __WINSCW__
@@ -796,10 +780,10 @@
QTest::newRow("AMR")<<QTMS_FORMAT_AMR;
#endif
QTest::newRow("PCM") << QTMS_FORMAT_PCM;
- }
+}
void QTmsVoipTest::CreateFormat()
- {
+{
gint decstatus(QTMS_RESULT_SUCCESS);
gint encstatus(QTMS_RESULT_SUCCESS);
gint setencstatus(QTMS_RESULT_SUCCESS);
@@ -809,67 +793,56 @@
m_DnLinkCodec = format;
m_UpLinkCodec = format;
- switch (format)
- {
- case QTMS_FORMAT_G711:
- {
- decstatus = m_Factory->CreateFormat(QTMS_FORMAT_G711,
- m_G711DecFormatIntfc);
- encstatus = m_Factory->CreateFormat(QTMS_FORMAT_G711,
- m_G711EncFormatIntfc);
- setdecstatus = m_Dnlink->SetFormat(m_G711DecFormatIntfc);
- setencstatus = m_Uplink->SetFormat(m_G711EncFormatIntfc);
- qDebug("G.711 Set");
+ switch (format) {
+ case QTMS_FORMAT_G711:
+ {
+ decstatus = m_Factory->CreateFormat(QTMS_FORMAT_G711, m_G711DecFormatIntfc);
+ encstatus = m_Factory->CreateFormat(QTMS_FORMAT_G711, m_G711EncFormatIntfc);
+ setdecstatus = m_Dnlink->SetFormat(m_G711DecFormatIntfc);
+ setencstatus = m_Uplink->SetFormat(m_G711EncFormatIntfc);
+ qDebug("G.711 Set");
- }
- break;
- case QTMS_FORMAT_G729:
- {
- decstatus = m_Factory->CreateFormat(QTMS_FORMAT_G729,
- m_G729DecFormatIntfc);
- encstatus = m_Factory->CreateFormat(QTMS_FORMAT_G729,
- m_G729EncFormatIntfc);
- setdecstatus = m_Dnlink->SetFormat(m_G729DecFormatIntfc);
- setdecstatus = m_Uplink->SetFormat(m_G729EncFormatIntfc);
- qDebug("G.729 Set");
- }
- break;
- case QTMS_FORMAT_ILBC:
- {
- decstatus = m_Factory->CreateFormat(QTMS_FORMAT_ILBC,
- m_ILBCDecFormatIntfc);
- encstatus = m_Factory->CreateFormat(QTMS_FORMAT_ILBC,
- m_ILBCEncFormatIntfc);
- setdecstatus = m_Dnlink->SetFormat(m_ILBCDecFormatIntfc);
- setencstatus = m_Uplink->SetFormat(m_ILBCEncFormatIntfc);
- qDebug("iLBC Set");
- }
- break;
- case QTMS_FORMAT_AMR:
- {
- decstatus = m_Factory->CreateFormat(QTMS_FORMAT_AMR,
- m_AMRNBDecFormatIntfc);
- encstatus = m_Factory->CreateFormat(QTMS_FORMAT_AMR,
- m_AMRNBEncFormatIntfc);
- setdecstatus = m_Dnlink->SetFormat(m_AMRNBDecFormatIntfc);
- setencstatus = m_Uplink->SetFormat(m_AMRNBEncFormatIntfc);
- qDebug("AMR-NB Set");
- }
- break;
- case QTMS_FORMAT_PCM:
- {
- decstatus = m_Factory->CreateFormat(QTMS_FORMAT_PCM,
- m_PCM16DecFormatIntfc);
- encstatus = m_Factory->CreateFormat(QTMS_FORMAT_PCM,
- m_PCM16EncFormatIntfc);
- setdecstatus = m_Dnlink->SetFormat(m_PCM16DecFormatIntfc);
- setencstatus = m_Uplink->SetFormat(m_PCM16EncFormatIntfc);
- qDebug("PCM-16 Set");
- }
- break;
- default:
- break;
- }
+ }
+ break;
+ case QTMS_FORMAT_G729:
+ {
+ decstatus = m_Factory->CreateFormat(QTMS_FORMAT_G729, m_G729DecFormatIntfc);
+ encstatus = m_Factory->CreateFormat(QTMS_FORMAT_G729, m_G729EncFormatIntfc);
+ setdecstatus = m_Dnlink->SetFormat(m_G729DecFormatIntfc);
+ setdecstatus = m_Uplink->SetFormat(m_G729EncFormatIntfc);
+ qDebug("G.729 Set");
+ }
+ break;
+ case QTMS_FORMAT_ILBC:
+ {
+ decstatus = m_Factory->CreateFormat(QTMS_FORMAT_ILBC, m_ILBCDecFormatIntfc);
+ encstatus = m_Factory->CreateFormat(QTMS_FORMAT_ILBC, m_ILBCEncFormatIntfc);
+ setdecstatus = m_Dnlink->SetFormat(m_ILBCDecFormatIntfc);
+ setencstatus = m_Uplink->SetFormat(m_ILBCEncFormatIntfc);
+ qDebug("iLBC Set");
+ }
+ break;
+ case QTMS_FORMAT_AMR:
+ {
+ decstatus = m_Factory->CreateFormat(QTMS_FORMAT_AMR, m_AMRNBDecFormatIntfc);
+ encstatus = m_Factory->CreateFormat(QTMS_FORMAT_AMR, m_AMRNBEncFormatIntfc);
+ setdecstatus = m_Dnlink->SetFormat(m_AMRNBDecFormatIntfc);
+ setencstatus = m_Uplink->SetFormat(m_AMRNBEncFormatIntfc);
+ qDebug("AMR-NB Set");
+ }
+ break;
+ case QTMS_FORMAT_PCM:
+ {
+ decstatus = m_Factory->CreateFormat(QTMS_FORMAT_PCM, m_PCM16DecFormatIntfc);
+ encstatus = m_Factory->CreateFormat(QTMS_FORMAT_PCM, m_PCM16EncFormatIntfc);
+ setdecstatus = m_Dnlink->SetFormat(m_PCM16DecFormatIntfc);
+ setencstatus = m_Uplink->SetFormat(m_PCM16EncFormatIntfc);
+ qDebug("PCM-16 Set");
+ }
+ break;
+ default:
+ break;
+ }
QVERIFY(decstatus == QTMS_RESULT_SUCCESS);
QVERIFY(encstatus == QTMS_RESULT_SUCCESS);
@@ -878,205 +851,175 @@
InitUplink();
InitDnlink();
- }
-
+}
void QTmsVoipTest::ToggleVad()
- {
+{
//m_Vad = (m_Vad) ? EFalse : ETrue;
m_Vad = ETrue;
- switch (m_UpLinkCodec)
- {
- case QTMS_FORMAT_G711:
- static_cast<QTMSG711Format*> (m_G711EncFormatIntfc)->SetVADMode(
- m_Vad);
- qDebug("G711 VAD set %d", m_Vad);
- break;
- case QTMS_FORMAT_G729:
- static_cast<QTMSG729Format*> (m_G729EncFormatIntfc)->SetVADMode(
- m_Vad);
- qDebug("G729 VAD set %d",m_Vad);
- break;
- case QTMS_FORMAT_ILBC:
- static_cast<QTMSILBCFormat*> (m_ILBCEncFormatIntfc)->SetVADMode(
- m_Vad);
- qDebug("iLBC VAD set %d",m_Vad);
- break;
- case QTMS_FORMAT_AMR:
- //static_cast<TMSAMRFormat*>(iAMRNBEncFormatIntfc)->SetVADMode(m_Vad);
- break;
- case QTMS_FORMAT_PCM:
- // Not supported; just for testing failing condition
- //static_cast<QTMSPCMFormat*>(iPCM16EncFormatIntfc)->SetVADMode(m_Vad);
- break;
- default:
- break;
- }
+ switch (m_UpLinkCodec) {
+ case QTMS_FORMAT_G711:
+ static_cast<QTMSG711Format*> (m_G711EncFormatIntfc)->SetVADMode(m_Vad);
+ qDebug("G711 VAD set %d", m_Vad);
+ break;
+ case QTMS_FORMAT_G729:
+ static_cast<QTMSG729Format*> (m_G729EncFormatIntfc)->SetVADMode(m_Vad);
+ qDebug("G729 VAD set %d", m_Vad);
+ break;
+ case QTMS_FORMAT_ILBC:
+ static_cast<QTMSILBCFormat*> (m_ILBCEncFormatIntfc)->SetVADMode(m_Vad);
+ qDebug("iLBC VAD set %d", m_Vad);
+ break;
+ case QTMS_FORMAT_AMR:
+ //static_cast<TMSAMRFormat*>(iAMRNBEncFormatIntfc)->SetVADMode(m_Vad);
+ break;
+ case QTMS_FORMAT_PCM:
+ // Not supported; just for testing failing condition
+ //static_cast<QTMSPCMFormat*>(iPCM16EncFormatIntfc)->SetVADMode(m_Vad);
+ break;
+ default:
+ break;
}
-
+}
void QTmsVoipTest::GetVad()
- {
+{
gint status(QTMS_RESULT_SUCCESS);
gboolean vad = EFalse;
- switch (m_UpLinkCodec)
- {
- case QTMS_FORMAT_G711:
- status = static_cast<QTMSG711Format*> (m_G711EncFormatIntfc)->GetVADMode(
- vad);
- qDebug("get G711 VAD: %d", vad);
- break;
- case QTMS_FORMAT_G729:
- status = static_cast<QTMSG729Format*> (m_G729EncFormatIntfc)->GetVADMode(
- vad);
- qDebug("get G729 VAD: %d", vad);
- break;
- case QTMS_FORMAT_ILBC:
- status = static_cast<QTMSILBCFormat*> (m_ILBCEncFormatIntfc)->GetVADMode(
- vad);
- qDebug("get iLBC VAD: %d", vad);
- break;
- default:
- return;
- }
+ switch (m_UpLinkCodec) {
+ case QTMS_FORMAT_G711:
+ status = static_cast<QTMSG711Format*> (m_G711EncFormatIntfc)->GetVADMode(vad);
+ qDebug("get G711 VAD: %d", vad);
+ break;
+ case QTMS_FORMAT_G729:
+ status = static_cast<QTMSG729Format*> (m_G729EncFormatIntfc)->GetVADMode(vad);
+ qDebug("get G729 VAD: %d", vad);
+ break;
+ case QTMS_FORMAT_ILBC:
+ status = static_cast<QTMSILBCFormat*> (m_ILBCEncFormatIntfc)->GetVADMode(vad);
+ qDebug("get iLBC VAD: %d", vad);
+ break;
+ default:
+ return;
+ }
QVERIFY(status == QTMS_RESULT_SUCCESS);
- // QVERIFY(vad == m_Vad);
+ // QVERIFY(vad == m_Vad);
- }
+}
void QTmsVoipTest::ToggleCng()
- {
-// m_Cng = (m_Cng) ? EFalse : ETrue;
+{
+ // m_Cng = (m_Cng) ? EFalse : ETrue;
m_Cng = ETrue;
- switch (m_DnLinkCodec)
- {
- case QTMS_FORMAT_G711:
- //case EG711_10MS:
- static_cast<QTMSG711Format*> (m_G711DecFormatIntfc)->SetCNG(m_Cng);
- qDebug("G711 CNG set %d", m_Cng);
- break;
- case QTMS_FORMAT_ILBC:
- static_cast<QTMSILBCFormat*> (m_ILBCDecFormatIntfc)->SetCNG(m_Cng);
- qDebug("iLBC CNG set %d", m_Cng);
- break;
- default:
- break;
- }
+ switch (m_DnLinkCodec) {
+ case QTMS_FORMAT_G711:
+ //case EG711_10MS:
+ static_cast<QTMSG711Format*> (m_G711DecFormatIntfc)->SetCNG(m_Cng);
+ qDebug("G711 CNG set %d", m_Cng);
+ break;
+ case QTMS_FORMAT_ILBC:
+ static_cast<QTMSILBCFormat*> (m_ILBCDecFormatIntfc)->SetCNG(m_Cng);
+ qDebug("iLBC CNG set %d", m_Cng);
+ break;
+ default:
+ break;
}
-
+}
void QTmsVoipTest::GetCng()
- {
+{
gint status;
gboolean cng = EFalse;
- switch (m_DnLinkCodec)
- {
- case QTMS_FORMAT_G711:
- status = static_cast<QTMSG711Format*>(m_G711DecFormatIntfc)->GetCNG(cng);
- qDebug("G711 CNG: %d", cng);
- QVERIFY(status == QTMS_RESULT_SUCCESS);
- break;
- case QTMS_FORMAT_ILBC:
- status = static_cast<QTMSILBCFormat*>(m_ILBCDecFormatIntfc)->GetCNG(cng);
- qDebug("iLBC CNG: %d", cng);
- QVERIFY(status == QTMS_RESULT_SUCCESS);
- break;
- default:
- break;
- }
+ switch (m_DnLinkCodec) {
+ case QTMS_FORMAT_G711:
+ status = static_cast<QTMSG711Format*> (m_G711DecFormatIntfc)->GetCNG(cng);
+ qDebug("G711 CNG: %d", cng);
+ QVERIFY(status == QTMS_RESULT_SUCCESS);
+ break;
+ case QTMS_FORMAT_ILBC:
+ status = static_cast<QTMSILBCFormat*> (m_ILBCDecFormatIntfc)->GetCNG(cng);
+ qDebug("iLBC CNG: %d", cng);
+ QVERIFY(status == QTMS_RESULT_SUCCESS);
+ break;
+ default:
+ break;
+ }
// QVERIFY(cng == m_Cng);
- }
-
+}
void QTmsVoipTest::TogglePlc()
- {
-// m_Plc = (m_Plc) ? EFalse : ETrue;
+{
+ // m_Plc = (m_Plc) ? EFalse : ETrue;
m_Plc = ETrue;
- if (m_DnLinkCodec == QTMS_FORMAT_G711)
- {
+ if (m_DnLinkCodec == QTMS_FORMAT_G711) {
static_cast<QTMSG711Format*> (m_G711DecFormatIntfc)->SetPlc(m_Plc);
- qDebug("G711 PLC set %d",m_Plc );
- }
+ qDebug("G711 PLC set %d", m_Plc);
}
+}
void QTmsVoipTest::GetPlc()
- {
+{
gboolean plc = EFalse;
- if (m_G711DecFormatIntfc && m_DnLinkCodec == QTMS_FORMAT_G711)
- {
- gint status =
- static_cast<QTMSG711Format*> (m_G711DecFormatIntfc)->GetPlc(
- plc);
+ if (m_G711DecFormatIntfc && m_DnLinkCodec == QTMS_FORMAT_G711) {
+ gint status = static_cast<QTMSG711Format*> (m_G711DecFormatIntfc)->GetPlc(plc);
QVERIFY(status == QTMS_RESULT_SUCCESS);
qDebug("G711 PLC: %d", plc);
// QVERIFY(plc == m_Plc);
- }
}
-
-
+}
void QTmsVoipTest::SelectMinBitrate()
- {
- if (m_BitratesVector.size() > 0)
- {
+{
+ if (m_BitratesVector.size() > 0) {
std::vector<guint>::iterator bitrate = m_BitratesVector.begin();
iBitrate = *bitrate;
SetBitrate(iBitrate);
- qDebug("BR set %d",iBitrate);
- }
+ qDebug("BR set %d", iBitrate);
}
-
+}
void QTmsVoipTest::SelectMaxBitrate()
- {
- if (m_BitratesVector.size() > 0)
- {
+{
+ if (m_BitratesVector.size() > 0) {
iBitrate = m_BitratesVector.back();
SetBitrate(iBitrate);
- qDebug("BR set %d",iBitrate);
- }
+ qDebug("BR set %d", iBitrate);
}
-
+}
void QTmsVoipTest::SetBitrate(guint bitrate)
- {
- switch (m_UpLinkCodec)
- {
- case QTMS_FORMAT_G711:
- static_cast<QTMSG711Format*> (m_G711EncFormatIntfc)->SetBitRate(
- bitrate);
- qDebug("Set BR %d",bitrate);
- break;
- case QTMS_FORMAT_G729:
- static_cast<QTMSG729Format*> (m_G729EncFormatIntfc)->SetBitRate(
- bitrate);
- qDebug("Set BR %d",bitrate);
- break;
- case QTMS_FORMAT_ILBC:
- static_cast<QTMSILBCFormat*> (m_ILBCEncFormatIntfc)->SetBitRate(
- bitrate);
- qDebug("Set BR %d",bitrate);
- break;
- case QTMS_FORMAT_AMR:
- static_cast<QTMSAMRFormat*> (m_AMRNBEncFormatIntfc)->SetBitRate(
- bitrate);
- qDebug("Set BR %d",bitrate);
- break;
- case QTMS_FORMAT_PCM:
- default:
- break;
- }
+{
+ switch (m_UpLinkCodec) {
+ case QTMS_FORMAT_G711:
+ static_cast<QTMSG711Format*> (m_G711EncFormatIntfc)->SetBitRate(bitrate);
+ qDebug("Set BR %d", bitrate);
+ break;
+ case QTMS_FORMAT_G729:
+ static_cast<QTMSG729Format*> (m_G729EncFormatIntfc)->SetBitRate(bitrate);
+ qDebug("Set BR %d", bitrate);
+ break;
+ case QTMS_FORMAT_ILBC:
+ static_cast<QTMSILBCFormat*> (m_ILBCEncFormatIntfc)->SetBitRate(bitrate);
+ qDebug("Set BR %d", bitrate);
+ break;
+ case QTMS_FORMAT_AMR:
+ static_cast<QTMSAMRFormat*> (m_AMRNBEncFormatIntfc)->SetBitRate(bitrate);
+ qDebug("Set BR %d", bitrate);
+ break;
+ case QTMS_FORMAT_PCM:
+ default:
+ break;
}
-
+}
void QTmsVoipTest::GetSupportedBitrates()
- {
+{
gint numOfItems(0);
m_BitratesVector.clear();
gint status = GetSupportedBitrates(m_BitratesVector);
@@ -1084,310 +1027,255 @@
numOfItems = m_BitratesVector.size();
qDebug("BR Count %d", numOfItems);
std::vector<guint>::iterator itBitrates = m_BitratesVector.begin();
- for (; itBitrates < m_BitratesVector.end(); itBitrates++)
- {
+ for (; itBitrates < m_BitratesVector.end(); itBitrates++) {
qDebug("BR %d", *itBitrates);
- }
}
-
+}
gint QTmsVoipTest::GetSupportedBitrates(BitRateVector& aBrArr)
- {
+{
gint status(QTMS_RESULT_SUCCESS);
- switch (m_UpLinkCodec)
- {
- case QTMS_FORMAT_G711:
- status = m_G711EncFormatIntfc->GetSupportedBitRates(aBrArr);
- break;
- case QTMS_FORMAT_G729:
- status = m_G729EncFormatIntfc->GetSupportedBitRates(aBrArr);
- break;
- case QTMS_FORMAT_ILBC:
- status = m_ILBCEncFormatIntfc->GetSupportedBitRates(aBrArr);
- break;
- case QTMS_FORMAT_AMR:
- status = m_AMRNBEncFormatIntfc->GetSupportedBitRates(aBrArr);
- break;
- case QTMS_FORMAT_PCM:
- // not supported, but test for correct error handling
- //status = m_PCM16EncFormatIntfc->GetSupportedBitRates(aBrArr);
- break;
- default:
- status = KErrNotSupported;
- break;
- }
+ switch (m_UpLinkCodec) {
+ case QTMS_FORMAT_G711:
+ status = m_G711EncFormatIntfc->GetSupportedBitRates(aBrArr);
+ break;
+ case QTMS_FORMAT_G729:
+ status = m_G729EncFormatIntfc->GetSupportedBitRates(aBrArr);
+ break;
+ case QTMS_FORMAT_ILBC:
+ status = m_ILBCEncFormatIntfc->GetSupportedBitRates(aBrArr);
+ break;
+ case QTMS_FORMAT_AMR:
+ status = m_AMRNBEncFormatIntfc->GetSupportedBitRates(aBrArr);
+ break;
+ case QTMS_FORMAT_PCM:
+ // not supported, but test for correct error handling
+ //status = m_PCM16EncFormatIntfc->GetSupportedBitRates(aBrArr);
+ break;
+ default:
+ status = KErrNotSupported;
+ break;
+ }
return status;
- }
-
+}
void QTmsVoipTest::GetBitrate()
- {
+{
guint bitrate;
- switch (m_UpLinkCodec)
- {
- case QTMS_FORMAT_G711:
- static_cast<QTMSG711Format*> (m_G711EncFormatIntfc)->GetBitRate(
- bitrate);
- qDebug("G711 bitrate: %d", bitrate);
- break;
- case QTMS_FORMAT_G729:
- static_cast<QTMSG729Format*> (m_G729EncFormatIntfc)->GetBitRate(
- bitrate);
- qDebug("G729 bitrate: %d", bitrate);
- break;
- case QTMS_FORMAT_ILBC:
- static_cast<QTMSILBCFormat*> (m_ILBCEncFormatIntfc)->GetBitRate(
- bitrate);
- qDebug("iLBC bitrate: %d", bitrate);
- break;
- case QTMS_FORMAT_AMR:
- static_cast<QTMSAMRFormat*> (m_AMRNBEncFormatIntfc)->GetBitRate(
- bitrate);
- qDebug("AMR bitrate: %d", bitrate);
- break;
- case TMS_FORMAT_PCM:
- default:
- break;
- }
+ switch (m_UpLinkCodec) {
+ case QTMS_FORMAT_G711:
+ static_cast<QTMSG711Format*> (m_G711EncFormatIntfc)->GetBitRate(bitrate);
+ qDebug("G711 bitrate: %d", bitrate);
+ break;
+ case QTMS_FORMAT_G729:
+ static_cast<QTMSG729Format*> (m_G729EncFormatIntfc)->GetBitRate(bitrate);
+ qDebug("G729 bitrate: %d", bitrate);
+ break;
+ case QTMS_FORMAT_ILBC:
+ static_cast<QTMSILBCFormat*> (m_ILBCEncFormatIntfc)->GetBitRate(bitrate);
+ qDebug("iLBC bitrate: %d", bitrate);
+ break;
+ case QTMS_FORMAT_AMR:
+ static_cast<QTMSAMRFormat*> (m_AMRNBEncFormatIntfc)->GetBitRate(bitrate);
+ qDebug("AMR bitrate: %d", bitrate);
+ break;
+ case TMS_FORMAT_PCM:
+ default:
+ break;
}
-
+}
void QTmsVoipTest::SetDnLinkG711ALAW()
- {
- if (m_G711DecFormatIntfc && m_DnLinkCodec == QTMS_FORMAT_G711)
- {
+{
+ if (m_G711DecFormatIntfc && m_DnLinkCodec == QTMS_FORMAT_G711) {
gint status = static_cast<QTMSG711Format*> (m_G711DecFormatIntfc)->SetMode(
- QTMS_G711_CODEC_MODE_ALAW);
- qDebug("SetDnLinkG711ALAW status %d",status);
+ QTMS_G711_CODEC_MODE_ALAW);
+ qDebug("SetDnLinkG711ALAW status %d", status);
QVERIFY(status == QTMS_RESULT_SUCCESS);
qDebug("DNL G.711 Mode Set: [aLaw]");
- }
}
-
+}
void QTmsVoipTest::SetDnLinkG711uLAW()
- {
- if (m_G711DecFormatIntfc && m_DnLinkCodec == QTMS_FORMAT_G711)
- {
+{
+ if (m_G711DecFormatIntfc && m_DnLinkCodec == QTMS_FORMAT_G711) {
gint status = static_cast<QTMSG711Format*> (m_G711DecFormatIntfc)->SetMode(
- QTMS_G711_CODEC_MODE_MULAW);
- qDebug("SetDnLinkG711uLAW status %d",status);
+ QTMS_G711_CODEC_MODE_MULAW);
+ qDebug("SetDnLinkG711uLAW status %d", status);
QVERIFY(status == QTMS_RESULT_SUCCESS);
qDebug("DNL G.711 Mode Set: [uLaw]");
- }
}
-
+}
void QTmsVoipTest::GetDnLinkG711Mode()
- {
+{
QTMSG711CodecMode mode;
- if (m_G711DecFormatIntfc && m_DnLinkCodec == QTMS_FORMAT_G711)
- {
- gint status =
- static_cast<QTMSG711Format*> (m_G711DecFormatIntfc)->GetMode(
- mode);
- qDebug("GetDnLinkG711Mode status %d",status);
+ if (m_G711DecFormatIntfc && m_DnLinkCodec == QTMS_FORMAT_G711) {
+ gint status = static_cast<QTMSG711Format*> (m_G711DecFormatIntfc)->GetMode(mode);
+ qDebug("GetDnLinkG711Mode status %d", status);
QVERIFY(status == QTMS_RESULT_SUCCESS);
- if (mode == TMS_G711_CODEC_MODE_MULAW)
- {
+ if (mode == TMS_G711_CODEC_MODE_MULAW) {
qDebug("DNL G711 Mode: [uLaw]");
- }
- else
- {
+ }
+ else {
qDebug("DNL G711 Mode: [aLaw]");
- }
}
}
-
+}
void QTmsVoipTest::SetDnLinkILBC20MS()
- {
- if (m_ILBCDecFormatIntfc && m_DnLinkCodec == QTMS_FORMAT_ILBC)
- {
- gint status =
- static_cast<QTMSILBCFormat*> (m_ILBCDecFormatIntfc)->SetMode(
- TMS_ILBC_CODEC_MODE_20MS_FRAME);
- qDebug("SetDnLinkILBC20MS status %d",status);
+{
+ if (m_ILBCDecFormatIntfc && m_DnLinkCodec == QTMS_FORMAT_ILBC) {
+ gint status = static_cast<QTMSILBCFormat*> (m_ILBCDecFormatIntfc)->SetMode(
+ TMS_ILBC_CODEC_MODE_20MS_FRAME);
+ qDebug("SetDnLinkILBC20MS status %d", status);
QVERIFY(status == QTMS_RESULT_SUCCESS);
qDebug("DNL iLBC Mode Set: [20ms]");
+ }
+}
+
+void QTmsVoipTest::SetDnLinkILBC30MS()
+{
+ if (m_ILBCDecFormatIntfc && m_DnLinkCodec == QTMS_FORMAT_ILBC) {
+ gint status = static_cast<QTMSILBCFormat*> (m_ILBCDecFormatIntfc)->SetMode(
+ TMS_ILBC_CODEC_MODE_30MS_FRAME);
+ qDebug("SetDnLinkILBC30MS status %d", status);
+ QVERIFY(status == QTMS_RESULT_SUCCESS);
+ qDebug("DNL iLBC Mode Set: [30ms]");
+ }
+}
+
+void QTmsVoipTest::GetDnLinkILBCMode()
+{
+ QTMSILBCCodecMode mode;
+ if (m_ILBCDecFormatIntfc && m_DnLinkCodec == QTMS_FORMAT_ILBC) {
+ gint status = static_cast<QTMSILBCFormat*> (m_ILBCDecFormatIntfc)->GetMode(mode);
+ qDebug("GetDnLinkILBCMode status %d", status);
+
+ QVERIFY(status == QTMS_RESULT_SUCCESS);
+ if (mode == QTMS_ILBC_CODEC_MODE_30MS_FRAME) {
+ qDebug("DNL iLBC Mode: [30ms]");
+ }
+ else if (mode == QTMS_ILBC_CODEC_MODE_20MS_FRAME) {
+ qDebug("DNL iLBC Mode: [20ms]");
+ }
+ }
+}
+
+void QTmsVoipTest::SetUpLinkG711ALAW()
+{
+ if (m_G711EncFormatIntfc && m_UpLinkCodec == QTMS_FORMAT_G711) {
+ gint status = static_cast<QTMSG711Format*> (m_G711EncFormatIntfc)->SetMode(
+ QTMS_G711_CODEC_MODE_ALAW);
+
+ qDebug("SetUpLinkG711ALAW status %d", status);
+ QVERIFY(status == QTMS_RESULT_SUCCESS);
+ qDebug("UPL G.711 Mode Set: [aLaw]");
+ }
+}
+
+void QTmsVoipTest::SetUpLinkG711uLAW()
+{
+ if (m_G711EncFormatIntfc && m_UpLinkCodec == QTMS_FORMAT_G711) {
+ gint status = static_cast<QTMSG711Format*> (m_G711EncFormatIntfc)->SetMode(
+ QTMS_G711_CODEC_MODE_MULAW);
+ qDebug("SetUpLinkG711uLAW status %d", status);
+ QVERIFY(status == QTMS_RESULT_SUCCESS);
+ qDebug("UPL G.711 Mode Set: [uLaw]");
+ }
+}
+
+void QTmsVoipTest::GetUpLinkG711Mode()
+{
+ QTMSG711CodecMode mode;
+ if (m_G711EncFormatIntfc && m_UpLinkCodec == QTMS_FORMAT_G711) {
+ gint status = static_cast<QTMSG711Format*> (m_G711EncFormatIntfc)->GetMode(mode);
+ qDebug("GetUpLinkG711Mode status %d", status);
+ QVERIFY(status == QTMS_RESULT_SUCCESS);
+ if (mode == QTMS_G711_CODEC_MODE_MULAW) {
+ qDebug("UPL G.711 Mode: [uLaw]");
+ }
+ else if (mode == QTMS_G711_CODEC_MODE_ALAW) {
+ qDebug("UPL G.711 Mode: [aLaw]");
}
}
+}
-void QTmsVoipTest::SetDnLinkILBC30MS()
- {
- if (m_ILBCDecFormatIntfc && m_DnLinkCodec == QTMS_FORMAT_ILBC)
- {
- gint status =
- static_cast<QTMSILBCFormat*> (m_ILBCDecFormatIntfc)->SetMode(
- TMS_ILBC_CODEC_MODE_30MS_FRAME);
- qDebug("SetDnLinkILBC30MS status %d",status);
- QVERIFY(status == QTMS_RESULT_SUCCESS);
- qDebug("DNL iLBC Mode Set: [30ms]");
- }
- }
-
-
-void QTmsVoipTest::GetDnLinkILBCMode()
- {
- QTMSILBCCodecMode mode;
- if (m_ILBCDecFormatIntfc && m_DnLinkCodec == QTMS_FORMAT_ILBC)
- {
- gint status =
- static_cast<QTMSILBCFormat*> (m_ILBCDecFormatIntfc)->GetMode(
- mode);
- qDebug("GetDnLinkILBCMode status %d",status);
-
+void QTmsVoipTest::SetUpLinkILBC20MS()
+{
+ if (m_ILBCEncFormatIntfc && m_UpLinkCodec == QTMS_FORMAT_ILBC) {
+ gint status = static_cast<QTMSILBCFormat*> (m_ILBCEncFormatIntfc)->SetMode(
+ QTMS_ILBC_CODEC_MODE_20MS_FRAME);
+ qDebug("SetUpLinkILBC20MS status %d", status);
QVERIFY(status == QTMS_RESULT_SUCCESS);
- if (mode == QTMS_ILBC_CODEC_MODE_30MS_FRAME)
- {
- qDebug("DNL iLBC Mode: [30ms]");
- }
- else if (mode == QTMS_ILBC_CODEC_MODE_20MS_FRAME)
- {
- qDebug("DNL iLBC Mode: [20ms]");
- }
- }
+ qDebug("UPL iLBC Mode Set: [20ms]");
}
+}
-void QTmsVoipTest::SetUpLinkG711ALAW()
- {
- if (m_G711EncFormatIntfc && m_UpLinkCodec == QTMS_FORMAT_G711)
- {
- gint status =
- static_cast<QTMSG711Format*> (m_G711EncFormatIntfc)->SetMode(
- QTMS_G711_CODEC_MODE_ALAW);
-
- qDebug("SetUpLinkG711ALAW status %d",status);
+void QTmsVoipTest::SetUpLinkILBC30MS()
+{
+ if (m_ILBCEncFormatIntfc && m_UpLinkCodec == QTMS_FORMAT_ILBC) {
+ gint status = static_cast<QTMSILBCFormat*> (m_ILBCEncFormatIntfc)->SetMode(
+ QTMS_ILBC_CODEC_MODE_30MS_FRAME);
+ qDebug("SetUpLinkILBC30MS status %d", status);
QVERIFY(status == QTMS_RESULT_SUCCESS);
- qDebug("UPL G.711 Mode Set: [aLaw]");
+ qDebug("UPL iLBC Mode Set: [30ms]");
+ }
+}
+
+void QTmsVoipTest::GetUpLinkILBCMode()
+{
+ QTMSILBCCodecMode mode;
+ if (m_ILBCEncFormatIntfc && m_UpLinkCodec == QTMS_FORMAT_ILBC) {
+ gint status = static_cast<QTMSILBCFormat*> (m_ILBCEncFormatIntfc)->GetMode(mode);
+ qDebug("GetUpLinkILBCMode status %d", status);
+ QVERIFY(status == QTMS_RESULT_SUCCESS);
+ if (mode == QTMS_ILBC_CODEC_MODE_30MS_FRAME) {
+ qDebug("UPL iLBC Mode: [30ms]");
}
- }
-
-void QTmsVoipTest::SetUpLinkG711uLAW()
- {
- if (m_G711EncFormatIntfc && m_UpLinkCodec == QTMS_FORMAT_G711)
- {
- gint status =
- static_cast<QTMSG711Format*> (m_G711EncFormatIntfc)->SetMode(
- QTMS_G711_CODEC_MODE_MULAW);
- qDebug("SetUpLinkG711uLAW status %d",status);
- QVERIFY(status == QTMS_RESULT_SUCCESS);
- qDebug("UPL G.711 Mode Set: [uLaw]");
+ else if (mode == QTMS_ILBC_CODEC_MODE_20MS_FRAME) {
+ qDebug("UPL iLBC Mode: [20ms]");
}
}
-void QTmsVoipTest::GetUpLinkG711Mode()
- {
- QTMSG711CodecMode mode;
- if (m_G711EncFormatIntfc && m_UpLinkCodec == QTMS_FORMAT_G711)
- {
- gint status =
- static_cast<QTMSG711Format*> (m_G711EncFormatIntfc)->GetMode(
- mode);
- qDebug("GetUpLinkG711Mode status %d",status);
- QVERIFY(status == QTMS_RESULT_SUCCESS);
- if (mode == QTMS_G711_CODEC_MODE_MULAW)
- {
- qDebug("UPL G.711 Mode: [uLaw]");
- }
- else if (mode == QTMS_G711_CODEC_MODE_ALAW)
- {
- qDebug("UPL G.711 Mode: [aLaw]");
- }
- }
-
- }
-
-
-void QTmsVoipTest::SetUpLinkILBC20MS()
- {
- if (m_ILBCEncFormatIntfc && m_UpLinkCodec == QTMS_FORMAT_ILBC)
- {
- gint status =
- static_cast<QTMSILBCFormat*> (m_ILBCEncFormatIntfc)->SetMode(
- QTMS_ILBC_CODEC_MODE_20MS_FRAME);
- qDebug("SetUpLinkILBC20MS status %d",status);
- QVERIFY(status == QTMS_RESULT_SUCCESS);
- qDebug("UPL iLBC Mode Set: [20ms]");
- }
- }
-
-
-void QTmsVoipTest::SetUpLinkILBC30MS()
- {
- if (m_ILBCEncFormatIntfc && m_UpLinkCodec == QTMS_FORMAT_ILBC)
- {
- gint status =
- static_cast<QTMSILBCFormat*> (m_ILBCEncFormatIntfc)->SetMode(
- QTMS_ILBC_CODEC_MODE_30MS_FRAME);
- qDebug("SetUpLinkILBC30MS status %d",status);
- QVERIFY(status == QTMS_RESULT_SUCCESS);
- qDebug("UPL iLBC Mode Set: [30ms]");
- }
- }
-
-void QTmsVoipTest::GetUpLinkILBCMode()
- {
- QTMSILBCCodecMode mode;
- if (m_ILBCEncFormatIntfc && m_UpLinkCodec == QTMS_FORMAT_ILBC)
- {
- gint status =
- static_cast<QTMSILBCFormat*> (m_ILBCEncFormatIntfc)->GetMode(
- mode);
- qDebug("GetUpLinkILBCMode status %d",status);
- QVERIFY(status == QTMS_RESULT_SUCCESS);
- if (mode == QTMS_ILBC_CODEC_MODE_30MS_FRAME)
- {
- qDebug("UPL iLBC Mode: [30ms]");
- }
- else if (mode == QTMS_ILBC_CODEC_MODE_20MS_FRAME)
- {
- qDebug("UPL iLBC Mode: [20ms]");
- }
- }
-
- }
-
+}
void QTmsVoipTest::CreateStreamVol()
- {
+{
gint status(QTMS_RESULT_SUCCESS);
-
- if (m_Factory && m_Dnlink && !m_Vol)
- {
+
+ if (m_Factory && m_Dnlink && !m_Vol) {
m_Factory->CreateFormat(QTMS_FORMAT_PCM, m_PCM16DecFormatIntfc);
m_Dnlink->SetFormat(m_PCM16DecFormatIntfc);
-
+
status = m_Factory->CreateEffect(QTMS_EFFECT_VOLUME, m_Vol);
QVERIFY(status == QTMS_RESULT_SUCCESS);
connect(static_cast<QTMSVolumeEffect*> (m_Vol),
- SIGNAL(EffectsEvent(const QTMSEffect&,QTMSSignalEvent)),
- this, SLOT(EffectsEvent(const QTMSEffect&,QTMSSignalEvent)));
-
- if(m_Dnlink)
- {
- status = m_Dnlink->AddEffect(m_Vol);
- }
+ SIGNAL(EffectsEvent(const QTMSEffect&,QTMSSignalEvent)), this,
+ SLOT(EffectsEvent(const QTMSEffect&,QTMSSignalEvent)));
+
+ if (m_Dnlink) {
+ status = m_Dnlink->AddEffect(m_Vol);
+ }
QVERIFY(status == QTMS_RESULT_SUCCESS);
-
+
InitDnlink();
-
+
StreamVol();
- }
}
+}
void QTmsVoipTest::StreamVol()
- {
+{
gint status(QTMS_RESULT_SUCCESS);
guint maxvol(0);
- if (m_Vol)
- {
+ if (m_Vol) {
status = static_cast<QTMSVolumeEffect*> (m_Vol)->GetMaxLevel(maxvol);
QVERIFY(status == QTMS_RESULT_SUCCESS);
@@ -1400,41 +1288,38 @@
QVERIFY(status == QTMS_RESULT_SUCCESS);
QCOMPARE(vol,maxvol);
- }
}
+}
void QTmsVoipTest::CreateStreamGain()
- {
+{
gint status(QTMS_RESULT_SUCCESS);
- if (m_Factory && m_Uplink && !m_Gain)
- {
-
+ if (m_Factory && m_Uplink && !m_Gain) {
+
m_Factory->CreateFormat(QTMS_FORMAT_PCM, m_PCM16EncFormatIntfc);
m_Uplink->SetFormat(m_PCM16EncFormatIntfc);
status = m_Factory->CreateEffect(QTMS_EFFECT_GAIN, m_Gain);
-
+
QVERIFY(status == QTMS_RESULT_SUCCESS);
connect(static_cast<QTMSGainEffect*> (m_Gain),
- SIGNAL(EffectsEvent(const QTMSEffect&,QTMSSignalEvent)),
- this,
- SLOT(EffectsEvent(const QTMSEffect&,QTMSSignalEvent)));
-
- status = m_Uplink->AddEffect(m_Gain);
+ SIGNAL(EffectsEvent(const QTMSEffect&,QTMSSignalEvent)), this,
+ SLOT(EffectsEvent(const QTMSEffect&,QTMSSignalEvent)));
+
+ status = m_Uplink->AddEffect(m_Gain);
QVERIFY(status == QTMS_RESULT_SUCCESS);
-
+
InitUplink();
-
+
StreamGain();
- }
}
+}
void QTmsVoipTest::StreamGain()
- {
+{
gint status(QTMS_RESULT_SUCCESS);
- if (m_Gain)
- {
+ if (m_Gain) {
guint maxgain(0);
static_cast<QTMSGainEffect*> (m_Gain)->GetMaxLevel(maxgain);
QVERIFY(status == QTMS_RESULT_SUCCESS);
@@ -1448,132 +1333,122 @@
QVERIFY(status == QTMS_RESULT_SUCCESS);
QCOMPARE(gain,maxgain);
- }
+ }
- }
+}
void QTmsVoipTest::CreateGlobalVol()
- {
+{
gint status(QTMS_RESULT_SUCCESS);
- if (m_Factory && !m_GlobalVol)
- {
+ if (m_Factory && !m_GlobalVol) {
status = m_Factory->CreateEffect(QTMS_EFFECT_GLOBAL_VOL, m_GlobalVol);
QVERIFY(status == QTMS_RESULT_SUCCESS);
connect(static_cast<QTMSGlobalVolEffect*> (m_GlobalVol),
- SIGNAL(EffectsEvent(const QTMSEffect&,QTMSSignalEvent)),
- this, SLOT(EffectsEvent(const QTMSEffect&,QTMSSignalEvent)));
+ SIGNAL(EffectsEvent(const QTMSEffect&,QTMSSignalEvent)), this,
+ SLOT(EffectsEvent(const QTMSEffect&,QTMSSignalEvent)));
guint maxvol(0);
- status = static_cast<QTMSGlobalVolEffect*>(m_GlobalVol)->GetMaxLevel(
- maxvol);
+ status = static_cast<QTMSGlobalVolEffect*> (m_GlobalVol)->GetMaxLevel(maxvol);
QVERIFY(status == QTMS_RESULT_SUCCESS);
- qDebug("global max vol %d",maxvol);
+ qDebug("global max vol %d", maxvol);
- status = static_cast<QTMSGlobalVolEffect*>(m_GlobalVol)->SetLevel(
- maxvol);
+ status = static_cast<QTMSGlobalVolEffect*> (m_GlobalVol)->SetLevel(maxvol);
QVERIFY(status == QTMS_RESULT_SUCCESS);
QTest::qWait(1000);
guint vol(0);
status = static_cast<QTMSGlobalVolEffect*> (m_GlobalVol)->GetLevel(vol);
QVERIFY(status == QTMS_RESULT_SUCCESS);
- qDebug("global vol %d",vol);
+ qDebug("global vol %d", vol);
QCOMPARE(vol,maxvol);
- }
}
-
+}
void QTmsVoipTest::CreateGlobalGain()
- {
+{
gint status(QTMS_RESULT_SUCCESS);
- if (m_Factory && !m_GlobalGain)
- {
+ if (m_Factory && !m_GlobalGain) {
status = m_Factory->CreateEffect(QTMS_EFFECT_GLOBAL_GAIN, m_GlobalGain);
-
+
QVERIFY(status == QTMS_RESULT_SUCCESS);
connect(static_cast<QTMSGlobalGainEffect*> (m_GlobalGain),
- SIGNAL(EffectsEvent(const QTMSEffect&,QTMSSignalEvent)),
- this,
- SLOT(EffectsEvent(const QTMSEffect&,QTMSSignalEvent)));
-
+ SIGNAL(EffectsEvent(const QTMSEffect&,QTMSSignalEvent)), this,
+ SLOT(EffectsEvent(const QTMSEffect&,QTMSSignalEvent)));
+
guint maxgain(0);
- static_cast<QTMSGlobalGainEffect*>(m_GlobalGain)->GetMaxLevel(maxgain);
+ static_cast<QTMSGlobalGainEffect*> (m_GlobalGain)->GetMaxLevel(maxgain);
QVERIFY(status == QTMS_RESULT_SUCCESS);
- qDebug("global max gain %d",maxgain);
-
- static_cast<QTMSGlobalGainEffect*>(m_GlobalGain)->SetLevel(maxgain);
+ qDebug("global max gain %d", maxgain);
+
+ static_cast<QTMSGlobalGainEffect*> (m_GlobalGain)->SetLevel(maxgain);
QVERIFY(status == QTMS_RESULT_SUCCESS);
QTest::qWait(1000);
-
+
guint gain(0);
- static_cast<QTMSGlobalGainEffect*>(m_GlobalGain)->GetLevel(gain);
+ static_cast<QTMSGlobalGainEffect*> (m_GlobalGain)->GetLevel(gain);
QVERIFY(status == QTMS_RESULT_SUCCESS);
- qDebug("global gain %d",gain);
-
+ qDebug("global gain %d", gain);
+
QCOMPARE(gain,maxgain);
-
- }
+
}
+}
void QTmsVoipTest::CreateRouting_data()
- {
-
+{
+
QTest::addColumn<QTMSAudioOutput>("routing");
-
- QTest::newRow("Public")<<QTMS_AUDIO_OUTPUT_PUBLIC;
- QTest::newRow("Private")<<QTMS_AUDIO_OUTPUT_PRIVATE;
-
- }
+ QTest::newRow("Public") << QTMS_AUDIO_OUTPUT_PUBLIC;
+ QTest::newRow("Private") << QTMS_AUDIO_OUTPUT_PRIVATE;
+
+}
void QTmsVoipTest::CreateRouting()
- {
+{
gint status(QTMS_RESULT_SUCCESS);
-
QFETCH(QTMSAudioOutput, routing);
-
- if (m_Factory && !m_Routing)
- {
+
+ if (m_Factory && !m_Routing) {
m_UpLinkCodec = QTMS_FORMAT_PCM;
m_Factory->CreateFormat(QTMS_FORMAT_PCM, m_PCM16DecFormatIntfc);
m_Dnlink->SetFormat(m_PCM16DecFormatIntfc);
InitDnlink();
StartDnlink();
-
+
status = m_Factory->CreateGlobalRouting(m_Routing);
QVERIFY(status == QTMS_RESULT_SUCCESS);
m_RoutingSpy = new QSignalSpy(m_Routing,
- SIGNAL(GlobalRoutingEvent(const QTMSGlobalRouting&,
- QTMSSignalEvent,
- QTMSAudioOutput)));
+ SIGNAL(GlobalRoutingEvent(const QTMSGlobalRouting&,
+ QTMSSignalEvent,
+ QTMSAudioOutput)));
QVERIFY( m_RoutingSpy->isValid() );
//QCOMPARE(m_RoutingSpy->count(), 0 );
connect(m_Routing,
- SIGNAL(GlobalRoutingEvent(const QTMSGlobalRouting&,QTMSSignalEvent,QTMSAudioOutput)),
- this,
- SLOT(GlobalRoutingEvent(const QTMSGlobalRouting&,QTMSSignalEvent,QTMSAudioOutput)));
- }
-
- if(m_Routing)
- {
+ SIGNAL(GlobalRoutingEvent(const QTMSGlobalRouting&,QTMSSignalEvent,QTMSAudioOutput)),
+ this,
+ SLOT(GlobalRoutingEvent(const QTMSGlobalRouting&,QTMSSignalEvent,QTMSAudioOutput)));
+ }
+
+ if (m_Routing) {
status = m_Routing->SetOutput(routing);
QVERIFY(status == QTMS_RESULT_SUCCESS);
#ifndef __WINSCW__
- QTest::qWait(1000);
+ QTest::qWait(1000);
//QCOMPARE(m_RoutingSpy->count(), 1 );
#endif
- QTMSAudioOutput current;
+ QTMSAudioOutput current;
status = m_Routing->GetOutput(current);
DisplayDevice(current);
@@ -1582,44 +1457,40 @@
QCOMPARE(routing,current);
#endif
StopDnlink();
- }
}
-
+}
void QTmsVoipTest::DisplayDevice(QTMSAudioOutput device)
- {
+{
qDebug("Current Output:");
-
- switch (device)
- {
- case QTMS_AUDIO_OUTPUT_NONE:
- {
- qDebug("none");
- }
- break;
- case QTMS_AUDIO_OUTPUT_PUBLIC:
- {
- qDebug("Public");
- }
- break;
- case QTMS_AUDIO_OUTPUT_PRIVATE:
- {
- qDebug("Private");
- }
- break;
- default:
- break;
- }
+
+ switch (device) {
+ case QTMS_AUDIO_OUTPUT_NONE:
+ {
+ qDebug("none");
+ }
+ break;
+ case QTMS_AUDIO_OUTPUT_PUBLIC:
+ {
+ qDebug("Public");
}
-
+ break;
+ case QTMS_AUDIO_OUTPUT_PRIVATE:
+ {
+ qDebug("Private");
+ }
+ break;
+ default:
+ break;
+ }
+}
void QTmsVoipTest::CreateDnlinkDtmf()
- {
+{
gint status(QTMS_RESULT_SUCCESS);
GString* dtmfstring(NULL);
- if (m_Factory && m_Dnlink && !m_Dnlnkdtmf)
- {
+ if (m_Factory && m_Dnlink && !m_Dnlnkdtmf) {
m_UpLinkCodec = QTMS_FORMAT_PCM;
m_Factory->CreateFormat(QTMS_FORMAT_PCM, m_PCM16DecFormatIntfc);
m_Dnlink->SetFormat(m_PCM16DecFormatIntfc);
@@ -1630,16 +1501,14 @@
QVERIFY(status == QTMS_RESULT_SUCCESS);
- QSignalSpy dtmfspy(m_Dnlnkdtmf,
- SIGNAL(DTMFEvent(const QTMSDTMF&,QTMSSignalEvent)));
+ QSignalSpy dtmfspy(m_Dnlnkdtmf, SIGNAL(DTMFEvent(const QTMSDTMF&,QTMSSignalEvent)));
QVERIFY( dtmfspy.isValid() );
//QCOMPARE(dtmfspy.count(), 0 );
- connect(m_Dnlnkdtmf,
- SIGNAL(DTMFEvent(const QTMSDTMF&,QTMSSignalEvent)), this,
- SLOT(DTMFEvent(const QTMSDTMF&,QTMSSignalEvent)));
+ connect(m_Dnlnkdtmf, SIGNAL(DTMFEvent(const QTMSDTMF&,QTMSSignalEvent)), this,
+ SLOT(DTMFEvent(const QTMSDTMF&,QTMSSignalEvent)));
dtmfstring = g_string_new("4723");
status = m_Dnlnkdtmf->SetTone(dtmfstring);
@@ -1653,28 +1522,24 @@
QVERIFY(status == QTMS_RESULT_SUCCESS);
QTest::qWait(1000);
//QCOMPARE(dtmfspy.count(), 2 );
- }
}
+}
void QTmsVoipTest::CreateRingTone()
- {
+{
- }
-
+}
void QTmsVoipTest::CreateBuffer()
- {
+{
gint status(QTMS_RESULT_SUCCESS);
- if (m_Factory)
- {
+ if (m_Factory) {
QTMSBuffer* qtmsbuffer(NULL);
QTMSBufferType buftype(QTMS_BUFFER_MEMORY);
guint size(100);
- status = m_Factory->CreateBuffer(QTMS_BUFFER_MEMORY,
- size, qtmsbuffer);
+ status = m_Factory->CreateBuffer(QTMS_BUFFER_MEMORY, size, qtmsbuffer);
QVERIFY(status == QTMS_RESULT_SUCCESS);
- if (qtmsbuffer)
- {
+ if (qtmsbuffer) {
qtmsbuffer->GetType(buftype);
qtmsbuffer->GetDataSize(size);
qtmsbuffer->SetDataSize(size);
@@ -1684,248 +1549,220 @@
qtmsbuffer->GetTimeStamp(ts);
qtmsbuffer->SetTimeStamp(ts);
m_Factory->DeleteBuffer(qtmsbuffer);
- }
}
}
-
+}
-void QTmsVoipTest::FillBuffer(TMS::TMSBuffer& buffer)
- {
+void QTmsVoipTest::FillBuffer(QTMSBuffer& buffer)
+{
//TODO: add loopback test and file playback
#ifdef __TEST_CODE_COVERAGE__
- if(m_ClientSource)
- {
- static_cast<QTMSClientSource*> (m_ClientSource)->BufferFilled(
- buffer);
- }
-#endif
-
+ if (m_ClientSource) {
+ static_cast<QTMSClientSource*> (m_ClientSource)->BufferFilled(buffer);
}
+#endif
-void QTmsVoipTest::BufferProcessed(TMS::TMSBuffer* /*buffer*/, gint /*reason*/)
- {
- }
+}
-void QTmsVoipTest::ProcessBuffer(const TMS::TMSBuffer* buffer)
- {
+void QTmsVoipTest::BufferProcessed(QTMSBuffer* /*buffer*/, gint /*reason*/)
+{
+}
+
+void QTmsVoipTest::ProcessBuffer(const QTMSBuffer* buffer)
+{
//TODO: add loopback test
#ifdef __TEST_CODE_COVERAGE__
- TMS::TMSBuffer* recBuf(NULL);
- recBuf = const_cast<TMS::TMSBuffer*> (buffer);
- if(m_ClientSink)
- {
- static_cast<QTMSClientSink*> (m_ClientSink)->BufferProcessed(
- recBuf);
- }
+ QTMSBuffer* recBuf(NULL);
+ recBuf = const_cast<QTMS::QTMSBuffer*> (buffer);
+ if (m_ClientSink) {
+ static_cast<QTMSClientSink*> (m_ClientSink)->BufferProcessed(recBuf);
+ }
#endif
- }
-
-
+}
-void QTmsVoipTest::EffectsEvent(const QTMSEffect& tmseffect,
- QTMSSignalEvent event)
- {
+void QTmsVoipTest::EffectsEvent(const QTMSEffect& tmseffect, QTMSSignalEvent event)
+{
QTMSEffectType effecttype;
const_cast<QTMSEffect&> (tmseffect).GetType(effecttype);
QVERIFY(event.reason == QTMS_RESULT_SUCCESS);
- switch (effecttype)
- {
- case QTMS_EFFECT_GLOBAL_VOL:
- {
- switch (event.type)
- {
- case QTMS_EVENT_EFFECT_VOL_CHANGED:
- qDebug("Global vol effect change");
- break;
- default:
- break;
- }
- }
+ switch (effecttype) {
+ case QTMS_EFFECT_GLOBAL_VOL:
+ {
+ switch (event.type) {
+ case QTMS_EVENT_EFFECT_VOL_CHANGED:
+ qDebug("Global vol effect change");
+ break;
+ default:
+ break;
+ }
+ }
+ break;
+ case QTMS_EFFECT_GLOBAL_GAIN:
+ {
+ switch (event.type) {
+ case QTMS_EVENT_EFFECT_GAIN_CHANGED:
+ qDebug("Global gain effect change");
+ break;
+ default:
break;
- case QTMS_EFFECT_GLOBAL_GAIN:
- {
- switch (event.type)
- {
- case QTMS_EVENT_EFFECT_GAIN_CHANGED:
- qDebug("Global gain effect change");
- break;
- default:
- break;
- }
- }
+ }
+ }
+ break;
+ case QTMS_EFFECT_VOLUME:
+ {
+ switch (event.type) {
+ case QTMS_EVENT_EFFECT_GAIN_CHANGED:
+ qDebug("Stream vol effect change");
break;
- case QTMS_EFFECT_VOLUME:
- {
- switch (event.type)
- {
- case QTMS_EVENT_EFFECT_GAIN_CHANGED:
- qDebug("Stream vol effect change");
- break;
- default:
- break;
- }
- }
+ default:
break;
- case QTMS_EFFECT_GAIN:
- {
- switch (event.type)
- {
- case QTMS_EVENT_EFFECT_GAIN_CHANGED:
- qDebug("Stream gain effect change");
- break;
- default:
- break;
- }
- }
+ }
+ }
+ break;
+ case QTMS_EFFECT_GAIN:
+ {
+ switch (event.type) {
+ case QTMS_EVENT_EFFECT_GAIN_CHANGED:
+ qDebug("Stream gain effect change");
break;
default:
break;
}
}
-
-
+ break;
+ default:
+ break;
+ }
+}
-void QTmsVoipTest::GlobalRoutingEvent(const QTMSGlobalRouting& /*routing*/,
- QTMSSignalEvent event, QTMSAudioOutput /*output*/)
- {
+void QTmsVoipTest::GlobalRoutingEvent(const QTMSGlobalRouting& /*routing*/, QTMSSignalEvent event,
+ QTMSAudioOutput /*output*/)
+{
QVERIFY(event.reason == QTMS_RESULT_SUCCESS);
- switch (event.type)
- {
- case QTMS_EVENT_ROUTING_AVAIL_OUTPUTS_CHANGED:
- qDebug("Available outputs changed");
- break;
- case QTMS_EVENT_ROUTING_OUTPUT_CHANGED:
- qDebug("output changed");
- break;
- case QTMS_EVENT_ROUTING_SET_OUTPUT_COMPLETE:
- qDebug("set output complete");
- break;
- default:
- break;
- }
-
+ switch (event.type) {
+ case QTMS_EVENT_ROUTING_AVAIL_OUTPUTS_CHANGED:
+ qDebug("Available outputs changed");
+ break;
+ case QTMS_EVENT_ROUTING_OUTPUT_CHANGED:
+ qDebug("output changed");
+ break;
+ case QTMS_EVENT_ROUTING_SET_OUTPUT_COMPLETE:
+ qDebug("set output complete");
+ break;
+ default:
+ break;
}
-void QTmsVoipTest::TMSStreamEvent(const QTMSStream& stream,
- QTMSSignalEvent event)
- {
-
+}
+
+void QTmsVoipTest::TMSStreamEvent(const QTMSStream& stream, QTMSSignalEvent event)
+{
+
QVERIFY(event.reason == QTMS_RESULT_SUCCESS);
-
+
gint streamId;
streamId = const_cast<QTMSStream&> (stream).GetStreamId();
- qDebug("StreamID %d",streamId);
+ qDebug("StreamID %d", streamId);
gint state;
state = const_cast<QTMSStream&> (stream).GetState();
QVERIFY(state == event.curr_state);
-
- switch (const_cast<QTMSStream&> (stream).GetStreamType())
+
+ switch (const_cast<QTMSStream&> (stream).GetStreamType()) {
+ case QTMS_STREAM_UPLINK:
+ {
+ switch (event.type) {
+ case QTMS_EVENT_STREAM_STATE_CHANGED:
{
- case QTMS_STREAM_UPLINK:
+ switch (event.curr_state) {
+ case QTMS_STREAM_INITIALIZED:
{
- switch (event.type)
- {
- case QTMS_EVENT_STREAM_STATE_CHANGED:
- {
- switch (event.curr_state)
- {
- case QTMS_STREAM_INITIALIZED:
- {
- qDebug("Uplink initialized ");
- break;
- }
- case QTMS_STREAM_UNINITIALIZED:
- qDebug("Uplink uninitialized ");
- break;
- case QTMS_STREAM_PAUSED:
- qDebug("Uplink paused ");
- break;
- case QTMS_STREAM_STARTED:
- qDebug("Uplink started ");
- break;
- default:
- break;
- }
- break;
- }
- default:
- break;
- }
- break;
+ qDebug("Uplink initialized ");
+ break;
}
- case QTMS_STREAM_DOWNLINK:
- {
- switch (event.type)
- {
- case QTMS_EVENT_STREAM_STATE_CHANGED:
- {
- switch (event.curr_state)
- {
- case QTMS_STREAM_INITIALIZED:
- qDebug("Downlink initialized ");
- break;
- case QTMS_STREAM_UNINITIALIZED:
- qDebug("Downlink uninitialized ");
- break;
- case QTMS_STREAM_PAUSED:
- qDebug("Downlink paused ");
- break;
- case QTMS_STREAM_STARTED:
- qDebug("Downlink started ");
- break;
- default:
- break;
- }
- break;
- }
- default:
- break;
- }
+ case QTMS_STREAM_UNINITIALIZED:
+ qDebug("Uplink uninitialized ");
+ break;
+ case QTMS_STREAM_PAUSED:
+ qDebug("Uplink paused ");
+ break;
+ case QTMS_STREAM_STARTED:
+ qDebug("Uplink started ");
+ break;
+ default:
+ break;
+ }
break;
- }
+ }
default:
break;
}
+ break;
}
-
-
-void QTmsVoipTest::RingtoneEvent(const QTMSRingTone& /*rt*/,
- QTMSSignalEvent event)
+ case QTMS_STREAM_DOWNLINK:
{
- QVERIFY(event.reason == QTMS_RESULT_SUCCESS);
- switch (event.type)
+ switch (event.type) {
+ case QTMS_EVENT_STREAM_STATE_CHANGED:
{
- case QTMS_EVENT_RINGTONE_OPEN_COMPLETE:
- qDebug("RT Open Complete");
+ switch (event.curr_state) {
+ case QTMS_STREAM_INITIALIZED:
+ qDebug("Downlink initialized ");
+ break;
+ case QTMS_STREAM_UNINITIALIZED:
+ qDebug("Downlink uninitialized ");
+ break;
+ case QTMS_STREAM_PAUSED:
+ qDebug("Downlink paused ");
+ break;
+ case QTMS_STREAM_STARTED:
+ qDebug("Downlink started ");
+ break;
+ default:
+ break;
+ }
break;
- case QTMS_EVENT_RINGTONE_PLAY_COMPLETE:
- qDebug("RT Play Complete");
- break;
+ }
default:
break;
}
+ break;
}
+ default:
+ break;
+ }
+}
+void QTmsVoipTest::RingtoneEvent(const QTMSRingTone& /*rt*/, QTMSSignalEvent event)
+{
+ QVERIFY(event.reason == QTMS_RESULT_SUCCESS);
+ switch (event.type) {
+ case QTMS_EVENT_RINGTONE_OPEN_COMPLETE:
+ qDebug("RT Open Complete");
+ break;
+ case QTMS_EVENT_RINGTONE_PLAY_COMPLETE:
+ qDebug("RT Play Complete");
+ break;
+ default:
+ break;
+ }
+}
void QTmsVoipTest::DTMFEvent(const QTMSDTMF& /*dtmf*/, QTMSSignalEvent event)
- {
-
+{
+
QVERIFY(event.reason == QTMS_RESULT_SUCCESS);
- switch (event.type)
- {
- case QTMS_EVENT_DTMF_TONE_STARTED:
- qDebug("DTMF Started");
- break;
- case QTMS_EVENT_DTMF_TONE_STOPPED:
- qDebug("DTMF Stopped");
- break;
- default:
- break;
- }
+ switch (event.type) {
+ case QTMS_EVENT_DTMF_TONE_STARTED:
+ qDebug("DTMF Started");
+ break;
+ case QTMS_EVENT_DTMF_TONE_STOPPED:
+ qDebug("DTMF Stopped");
+ break;
+ default:
+ break;
}
-
+}
QTEST_MAIN_S60(QTmsVoipTest)
--- a/mpx/collectionframework/collectionengine/group/mpxcollectionengine.mmp Tue Jul 06 14:48:59 2010 +0300
+++ b/mpx/collectionframework/collectionengine/group/mpxcollectionengine.mmp Wed Aug 18 10:16:02 2010 +0300
@@ -48,3 +48,5 @@
deffile ../bwinscw/
#endif
+SMPSAFE
+
--- a/mpx/collectionframework/collectionengine/src/mpxcollectioncache.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/mpx/collectionframework/collectionengine/src/mpxcollectioncache.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -28,6 +28,7 @@
#include <mpxcollectionopenlresultdef.h>
#include <mpxlog.h>
#include "mpxcollectioncache.h"
+#include <mmf/common/mmfcontrollerpluginresolver.h>
// CONSTANTS
const TInt KMPXRootNodeId = 0;
@@ -589,6 +590,7 @@
void CMPXCollectionCacheNode::HandleChangeL( TMPXItemId aChangeItemId,
RPointerArray<CMPXCollectionCacheNode>& aArray )
{
+ CleanupResetAndDestroyPushL(aArray);
// This node is affected
// All child nodes are invalid!
//
@@ -647,6 +649,7 @@
} // for
} // if iResults
} // if no children
+ CleanupStack::Pop(&aArray);
}
// ----------------------------------------------------------------------------
@@ -827,6 +830,7 @@
// O(n^2) complexity here is OK, Merging keeps the number of items
// very small. Less than 3 items are alive at a time
//
+ CleanupClosePushL( aArray );
RArray<TMPXOpenDataBlock> newArray;
CleanupClosePushL( newArray );
@@ -869,6 +873,7 @@
MPX_DEBUG3("Order: %i %i", newArray[i].iOffset, newArray[i].iSize );
}
CleanupStack::PopAndDestroy( &newArray );
+ CleanupStack::Pop();
}
#ifdef _DEBUG
--- a/mpx/collectionframework/collectionengine/src/mpxcollectionclientcontext.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/mpx/collectionframework/collectionengine/src/mpxcollectionclientcontext.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -2483,7 +2483,10 @@
{
iCacheMedia = AttributesCacheableL( iBrowsePath->OpenAttributes(), *iBrowsePath );
}
- plugin->OpenL(*iBrowsePath, iBrowsePath->OpenAttributes(), iFilter);
+ if( iBrowsePath )
+ {
+ plugin->OpenL(*iBrowsePath, iBrowsePath->OpenAttributes(), iFilter);
+ }
}
}
--- a/mpx/collectionframework/collectionengine/src/mpxcollectionengine.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/mpx/collectionframework/collectionengine/src/mpxcollectionengine.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -36,6 +36,7 @@
#include <mpxmessagegeneraldefs.h>
#include <mpxmessagecontainerdefs.h>
#include <mpxmessagepluginupdatedefs.h>
+#include <mmf/common/mmfcontrollerpluginresolver.h>
#include "mpxcollectionpluginhandler.h"
#include "mpxcollectioncache.h"
@@ -211,12 +212,21 @@
break;
}
case EMcMsgDiskInserted:
+ {
+ // inverting the notification order, this to get the message to
+ // the UI faster.
for( TInt i=0; i<count; ++i )
{
context = iContexts[i];
context->NotifyL( aMsg, aData );
}
notify = EFalse;
+ command = EMcReOpenCollection;
+ data = aData;
+ // Clear the cache
+ clearCache = ETrue;
+ break;
+ }
case EMcMsgFormatEnd:
case EMcMsgUSBMassStorageEnd:
{
@@ -224,7 +234,7 @@
data = aData;
// Clear the cache
- clearCache = ETrue;
+ clearCache = ETrue;
break;
}
case EMcMsgUSBMTPStart:
@@ -316,6 +326,7 @@
EXPORT_C void CMPXCollectionEngine::GetSupportedTypesL(
RPointerArray<CMPXCollectionType>& aArray )
{
+ CleanupResetAndDestroyPushL(aArray);
RArray<TUid> uids;
CleanupClosePushL(uids);
iPluginHandler->GetPluginUids(uids);
@@ -340,6 +351,7 @@
CleanupStack::Pop(type);
}
CleanupStack::PopAndDestroy(&uids);
+ CleanupStack::Pop(&aArray);
}
// ----------------------------------------------------------------------------
--- a/mpx/collectionframework/collectionserver/group/mpxcollectionserver.mmp Tue Jul 06 14:48:59 2010 +0300
+++ b/mpx/collectionframework/collectionserver/group/mpxcollectionserver.mmp Wed Aug 18 10:16:02 2010 +0300
@@ -25,7 +25,7 @@
UID 0 0x101FFC31
VENDORID VID_DEFAULT
CAPABILITY ALL -TCB
-#ifdef __WINS__
+#ifdef WINS
EPOCHEAPSIZE 0x1000 0x2800000 // 40MB
#else
EPOCHEAPSIZE 0x1000 0x3E00000 // 62 MB
@@ -49,3 +49,5 @@
LIBRARY mpxcollectionengine.lib
LIBRARY mpxcommon.lib
+SMPSAFE
+
--- a/mpx/collectionframework/collectionutility/group/mpxcollectionutility.mmp Tue Jul 06 14:48:59 2010 +0300
+++ b/mpx/collectionframework/collectionutility/group/mpxcollectionutility.mmp Wed Aug 18 10:16:02 2010 +0300
@@ -47,3 +47,5 @@
deffile ../bwinscw/
#endif
+SMPSAFE
+
--- a/mpx/commonframework/common/group/mpxcommon.mmp Tue Jul 06 14:48:59 2010 +0300
+++ b/mpx/commonframework/common/group/mpxcommon.mmp Wed Aug 18 10:16:02 2010 +0300
@@ -92,4 +92,6 @@
deffile ../bwinscw/
#endif
+SMPSAFE
+
// End of file
--- a/mpx/commonframework/common/src/mpxcollectionpath.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/mpx/commonframework/common/src/mpxcollectionpath.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -606,6 +606,7 @@
//
EXPORT_C void CMPXCollectionPath::SelectionL(RArray<TMPXItemId>& aIds) const
{
+ CleanupClosePushL(aIds);
aIds.Reset();
TInt idCount(iIds.Count());
TInt selCount(iSelection.Count());
@@ -617,6 +618,7 @@
aIds.AppendL(iIds[idIndex]);
}
}
+ CleanupStack::Pop();
}
// -----------------------------------------------------------------------------
--- a/mpx/commonframework/common/src/mpxdataarray.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/mpx/commonframework/common/src/mpxdataarray.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -43,7 +43,7 @@
d->Release(aClientHandle);
}
// Now free the actual buffer
- RMPXHeapManager& m=RMPXHeapManager::HeapManager(aClientHandle);
+ RMPXHeapManager::HeapManager(aClientHandle);
iUid=0;
iBufLen=0;
}
--- a/mpx/commonframework/common/src/mpxdrmmediawmaagent.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/mpx/commonframework/common/src/mpxdrmmediawmaagent.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -705,6 +705,8 @@
User::LeaveIfError( lex.Val( dateInt ) );
--dateInt;
// convert back to buffer
+ // coverity[size_error]
+ // coverity[buffer_alloc]
HBufC* datebuf = HBufC::NewLC( KMPXWmaDrmMaxTimeBufSize );
TPtr datebufPtr = datebuf->Des();
--- a/mpx/commonframework/common/src/mpxheapmanager.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/mpx/commonframework/common/src/mpxheapmanager.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -80,7 +80,7 @@
//
// Create first free heap cell
//
- RMPXHeapCell* cell=new(aChunk.Base()+hmSize)RMPXHeapCell(0,iEndOffset-hmSize);
+ new(aChunk.Base()+hmSize)RMPXHeapCell(0,iEndOffset-hmSize);
// set up free cell list header
iFree.iNextOffset = hmSize;
iFree.iLen = 0;
--- a/mpx/commonframework/common/src/mpxpluginhandlerbase.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/mpx/commonframework/common/src/mpxpluginhandlerbase.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -539,7 +539,7 @@
//
EXPORT_C const TDesC& CMPXPluginHandlerBase::PluginName(const TUid& aUid) const
{
- const TDesC* name=&KNullDesC;
+ const TDesC* name;
TInt index(IndexOf(aUid));
MPX_ASSERT(KErrNotFound!=index && index<iPluginInfoArray.Count());
name = &iPluginInfoArray[index]->DisplayName();
--- a/mpx/commonframework/common/src/mpxplugininfo.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/mpx/commonframework/common/src/mpxplugininfo.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -427,6 +427,7 @@
EXPORT_C void CMPXPluginInfo::ExtractUidsFromTextL( const TDesC8& aData,
RArray<TUid>& aArray )
{
+ CleanupClosePushL(aArray);
aArray.Reset();
const TUint8* p = aData.Ptr();
TInt startPos(0);
@@ -461,6 +462,7 @@
TaggedDataParser::ConvertText8ToTIntL(element, val);
aArray.AppendL(TUid::Uid(val));
}
+ CleanupStack::Pop();
}
// ---------------------------------------------------------------------------
--- a/mpx/commonframework/common/src/mpxuser.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/mpx/commonframework/common/src/mpxuser.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -256,6 +256,7 @@
const TArray<TMPXAttribute>& aSrc,
RArray<TMPXAttribute>& aDest)
{
+ CleanupClosePushL(aDest);
aDest.Reset();
for (TInt i = 0; i < aSrc.Count(); i++)
{
@@ -271,6 +272,7 @@
d = TMPXAttribute(d.ContentId(), d.AttributeId() | s.AttributeId());
}
}
+ CleanupStack::Pop();
}
// ----------------------------------------------------------------------------
@@ -384,6 +386,7 @@
//
EXPORT_C void MPXUser::InternalizeL(RArray<TMPXItemId>& aArray, RReadStream& aStream)
{
+ CleanupClosePushL(aArray);
TInt n=aStream.ReadInt32L();
for (TInt i=0;i<n;++i)
{
@@ -391,6 +394,7 @@
TUint32 id2(aStream.ReadUint32L());
aArray.AppendL(TMPXItemId(id1,id2));
}
+ CleanupStack::Pop();
}
// ----------------------------------------------------------------------------
--- a/mpx/commonframework/group/bld.inf Tue Jul 06 14:48:59 2010 +0300
+++ b/mpx/commonframework/group/bld.inf Wed Aug 18 10:16:02 2010 +0300
@@ -23,9 +23,9 @@
PRJ_EXPORTS
// Secure backup & restore
-backup_registration.xml /epoc32/release/winscw/urel/z/private/101ffc02/backup_registration.xml
-backup_registration.xml /epoc32/release/winscw/udeb/z/private/101ffc02/backup_registration.xml
-backup_registration.xml /epoc32/data/z/private/101ffc02/backup_registration.xml
+backup_registration.xml z:/private/101ffc02/backup_registration.xml
+
+
../rom/mpxcommonframework.iby CORE_MW_LAYER_IBY_EXPORT_PATH(mpxcommonframework.iby)
--- a/mpx/playbackframework/playbackengine/group/mpxplaybackengine.mmp Tue Jul 06 14:48:59 2010 +0300
+++ b/mpx/playbackframework/playbackengine/group/mpxplaybackengine.mmp Wed Aug 18 10:16:02 2010 +0300
@@ -60,4 +60,6 @@
deffile ../bwinscw/
#endif
+SMPSAFE
+
// End of file
--- a/mpx/playbackframework/playbackengine/src/mpxplaybackmediahelper.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/mpx/playbackframework/playbackengine/src/mpxplaybackmediahelper.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -243,73 +243,33 @@
{
MPX_FUNC_EX("CMPXPlaybackMediaHelper::HandleCollectionMediaL");
MPX_DEBUG2("CMPXPlaybackMediaHelper::HandleCollectionMediaL(): error %d", aError);
-
- // First check if media attributes supported, if not, need to retrieve
- // from playback plugin
- TBool mediaOk( ETrue );
- // Note: The following block is for uPnP remote playlist which does not contain
- // metadata in the remote playlist. However, uPnP update to gurantee that titles
- // are available in the collection plugin. If KMPXMediaColDetailMediaNotAvailable
- // returned, UI can at least update title anyway anyway.
- //
- // We could not call MediaFromPluginL before the plugin initiliazed. uPnP made
- // changes so that it will call back media after the new track is initialized.
- // So we don't need call plugin API MediaL.
- /*if ( KErrNone == aError )
- { // media object is ok
- if ( aMedia.IsSupported( KMPXMediaColDetailMediaNotAvailable ))
- {
- TBool mediaNotSupported(
- aMedia.ValueTObjectL<TBool>( KMPXMediaColDetailMediaNotAvailable ));
- MPX_DEBUG2("HandleCollectionMediaL media not inCollection %d",
- mediaNotSupported);
- if ( mediaNotSupported)
- { // It must be uPnP remote playlist, media request can only be
- // sent to plugin at initialising, playing & pause state
- mediaOk = EFalse;
- // need to create a copy of buf since that will be delete when
- // this task is completed
- const TDesC8& data( iTaskQueue->BufData() );
- CBufBase* buf( MPXUser::CreateBufferLC( data.Size() ));
- buf->Write( 0, data );
- iEngine.MediaFromPluginL(
- static_cast<MMPXPlaybackEngineObserver*>(
- iTaskQueue->Callback() ),
- buf );
- CleanupStack::Pop( buf );
- } //otherwise, just send uri to clients.
- }
- }*/
-
- if ( mediaOk || aError )
+ MPX_DEBUG2("CMPXPlaybackMediaHelper::HandleCollectionMediaL task %d",
+ iTaskQueue->Task());
+
+ if ( iTaskQueue->Param() )
{
- MPX_DEBUG2("CMPXPlaybackMediaHelper::HandleCollectionMediaL task %d",
- iTaskQueue->Task());
-
- if ( iTaskQueue->Param() )
- {
- // Broadcast
- CMPXMessage* msg( CMPXMessage::NewL() );
- CleanupStack::PushL( msg );
- msg->SetTObjectValueL<TMPXMessageId>( KMPXMessageGeneralId,
- KMPXMessagePbMediaChanged );
- msg->SetCObjectValueL<CMPXMedia>( KMPXMessagePbMedia,
- const_cast<CMPXMedia*>( &aMedia ));
- CMPXClientList* clientList(
- static_cast<CMPXClientList*>( iTaskQueue->Callback() ));
- clientList->SendMsg(msg, KErrNone);
- CleanupStack::PopAndDestroy( msg );
- }
- else
- {
- // Callback
- MPX_DEBUG2("CMPXPlaybackMediaHelper::HandleCollectionMediaL task cb 0x%08x",
- iTaskQueue->Callback());
- MMPXPlaybackEngineObserver* callback(
- static_cast<MMPXPlaybackEngineObserver*>( iTaskQueue->Callback() ));
- callback->HandleMedia( aMedia, aError );
- }
+ // Broadcast
+ CMPXMessage* msg( CMPXMessage::NewL() );
+ CleanupStack::PushL( msg );
+ msg->SetTObjectValueL<TMPXMessageId>( KMPXMessageGeneralId,
+ KMPXMessagePbMediaChanged );
+ msg->SetCObjectValueL<CMPXMedia>( KMPXMessagePbMedia,
+ const_cast<CMPXMedia*>( &aMedia ));
+ CMPXClientList* clientList(
+ static_cast<CMPXClientList*>( iTaskQueue->Callback() ));
+ clientList->SendMsg(msg, KErrNone);
+ CleanupStack::PopAndDestroy( msg );
}
+ else
+ {
+ // Callback
+ MPX_DEBUG2("CMPXPlaybackMediaHelper::HandleCollectionMediaL task cb 0x%08x",
+ iTaskQueue->Callback());
+ MMPXPlaybackEngineObserver* callback(
+ static_cast<MMPXPlaybackEngineObserver*>( iTaskQueue->Callback() ));
+ callback->HandleMedia( aMedia, aError );
+ }
+
MPX_DEBUG1("CMPXPlaybackMediaHelper::HandleCollectionMediaL complete task");
iTaskQueue->CompleteTask();
}
--- a/mpx/playbackframework/playbackserver/group/mpxplaybackserver.mmp Tue Jul 06 14:48:59 2010 +0300
+++ b/mpx/playbackframework/playbackserver/group/mpxplaybackserver.mmp Wed Aug 18 10:16:02 2010 +0300
@@ -49,5 +49,8 @@
#ifdef RD_TSP_CLIENT_MAPPER
LIBRARY tspclientmapper.lib
#endif
+
+SMPSAFE
+
// End of file
--- a/mpx/playbackframework/playbackutility/group/mpxplaybackutility.mmp Tue Jul 06 14:48:59 2010 +0300
+++ b/mpx/playbackframework/playbackutility/group/mpxplaybackutility.mmp Wed Aug 18 10:16:02 2010 +0300
@@ -49,3 +49,5 @@
deffile ../bwinscw/
#endif
+SMPSAFE
+
--- a/mpx/viewframework/baseviewplugins/group/mpxviewplugin.mmp Tue Jul 06 14:48:59 2010 +0300
+++ b/mpx/viewframework/baseviewplugins/group/mpxviewplugin.mmp Wed Aug 18 10:16:02 2010 +0300
@@ -50,4 +50,6 @@
deffile ../bwinscw/
#endif
+SMPSAFE
+
// End of File
--- a/mpx/viewframework/viewutility/group/mpxviewutility.mmp Tue Jul 06 14:48:59 2010 +0300
+++ b/mpx/viewframework/viewutility/group/mpxviewutility.mmp Wed Aug 18 10:16:02 2010 +0300
@@ -55,4 +55,6 @@
deffile ../bwinscw/
#endif
+SMPSAFE
+
// End of File
--- a/mpx/viewframework/viewutility/src/mpxviewplugininfo.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/mpx/viewframework/viewutility/src/mpxviewplugininfo.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -189,6 +189,7 @@
const TDesC8& aData,
RArray<TUid>& aArray )
{
+ CleanupClosePushL(aArray);
aArray.Reset();
TInt nextPos( 0 );
@@ -205,6 +206,7 @@
aArray.AppendL( TUid::Uid( pluginUid ) );
}
} while ( KErrNotFound != nextPos );
+ CleanupStack::Pop();
}
// ---------------------------------------------------------------------------
--- a/qtms/inc/qtmsamrimpl.h Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/inc/qtmsamrimpl.h Wed Aug 18 10:16:02 2010 +0300
@@ -22,15 +22,17 @@
#include <qtmsamrformat.h>
// FORWARD DECLARATIONS
-namespace TMS {
+namespace TMS
+{
class TMSFormat;
}
-namespace QTMS {
+namespace QTMS
+{
// Class declaration
-class QTMSAMRFormatImpl : public QTMSAMRFormat
- {
+class QTMSAMRFormatImpl: public QTMSAMRFormat
+{
public:
static gint Create(QTMSFormat*& qformat, TMS::TMSFormat*& tmsformat);
@@ -44,10 +46,9 @@
private:
QTMSAMRFormatImpl();
gint PostConstruct();
- };
+};
} //namespace QTMS
#endif // QTMS_AMR_FORMAT_IMPL_H
-
// End of file
--- a/qtms/inc/qtmsbufferimpl.h Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/inc/qtmsbufferimpl.h Wed Aug 18 10:16:02 2010 +0300
@@ -21,26 +21,26 @@
#include <qtms.h>
// FORWARD DECLARATION
-namespace TMS {
+namespace TMS
+{
class TMSBuffer;
}
-namespace QTMS {
+namespace QTMS
+{
// FORWARD DECLARATIONS
class QTMSBuffer;
// TMSBufferImpl class
class QTMSBufferImpl
- {
+{
public:
- static gint Create(QTMSBufferType ctype, QTMSBuffer*& buffer,
- TMS::TMSBuffer*& tmsbuffer);
+ static gint Create(QTMSBufferType ctype, QTMSBuffer*& buffer, TMS::TMSBuffer*& tmsbuffer);
static gint Delete(QTMSBuffer*& buffer);
- };
+};
} //namespace QTMS
#endif // QTMS_BUFFER_IMPL_H
-
// End of file
--- a/qtms/inc/qtmscallimpl.h Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/inc/qtmscallimpl.h Wed Aug 18 10:16:02 2010 +0300
@@ -22,11 +22,13 @@
#include <qtmscall.h>
// FORWARD DECLARATIONS
-namespace TMS {
+namespace TMS
+{
class TMSCall;
}
-namespace QTMS {
+namespace QTMS
+{
// FORWARD DECLARATIONS
class QTMSStream;
@@ -34,8 +36,8 @@
class QTMSRingTone;
// QTMSCallImpl class
-class QTMSCallImpl : public QTMSCall
- {
+class QTMSCallImpl: public QTMSCall
+{
public:
static gint Create(QTMSCall*& qtmscall, TMS::TMSCall*& tmscall);
@@ -51,10 +53,9 @@
// TMS::TMSCall* iTmsCall;
QTMSCallImpl();
gint PostConstruct();
- };
+};
} //namespace QTMS
#endif // QTMS_CALL_IMPL_H
-
// End of file
--- a/qtms/inc/qtmsclientsinkimpl.h Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/inc/qtmsclientsinkimpl.h Wed Aug 18 10:16:02 2010 +0300
@@ -23,17 +23,18 @@
#include <tmsclientsinkobsrvr.h>
// FORWARD DECLARATIONS
-namespace TMS {
+namespace TMS
+{
class TMSBuffer;
class TMSSink;
}
-namespace QTMS {
+namespace QTMS
+{
// QTMSClientSinkImpl class
-class QTMSClientSinkImpl : public QTMSClientSink,
- public TMS::TMSClientSinkObserver
- {
+class QTMSClientSinkImpl: public QTMSClientSink, public TMS::TMSClientSinkObserver
+{
public:
static gint Create(QTMSSink*& qsink, TMS::TMSSink*& tmsclientsink);
virtual ~QTMSClientSinkImpl();
@@ -49,10 +50,9 @@
private:
QTMSClientSinkImpl();
gint PostConstruct();
- };
+};
} //namespace QTMS
#endif // QTMS_CLIENT_SINK_IMPL_H
-
// End of file
--- a/qtms/inc/qtmsclientsourceimpl.h Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/inc/qtmsclientsourceimpl.h Wed Aug 18 10:16:02 2010 +0300
@@ -23,17 +23,18 @@
#include <tmsclientsourceobsrvr.h>
// FORWARD DECLARATIONS
-namespace TMS {
+namespace TMS
+{
class TMSBuffer;
class TMSSource;
}
-namespace QTMS {
+namespace QTMS
+{
// QTMSClientSourceImpl class
-class QTMSClientSourceImpl : public QTMSClientSource,
- public TMS::TMSClientSourceObserver
- {
+class QTMSClientSourceImpl: public QTMSClientSource, public TMS::TMSClientSourceObserver
+{
public:
static gint Create(QTMSSource*& qsource, TMS::TMSSource*& tmssource);
@@ -51,10 +52,9 @@
private:
QTMSClientSourceImpl();
gint PostConstruct();
- };
+};
} //namespace QTMS
#endif // QTMS_CLIENT_SOURCE_IMPL_H
-
// End of file
--- a/qtms/inc/qtmsdtmfimpl.h Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/inc/qtmsdtmfimpl.h Wed Aug 18 10:16:02 2010 +0300
@@ -24,16 +24,17 @@
#include <qtmsdtmf.h>
// FORWARD DECLARATIONS
-namespace TMS {
+namespace TMS
+{
class TMSDTMF;
}
-namespace QTMS {
+namespace QTMS
+{
// QTMSDTMFImpl class
-class QTMSDTMFImpl : public QTMSDTMF,
- public TMS::TMSDTMFObserver
- {
+class QTMSDTMFImpl: public QTMSDTMF, public TMS::TMSDTMFObserver
+{
public:
static gint Create(QTMSDTMF*& qdtmf, TMS::TMSDTMF*& tmsdtmf);
virtual ~QTMSDTMFImpl();
@@ -47,10 +48,9 @@
private:
QTMSDTMFImpl();
gint PostConstruct();
- };
+};
} //namespace QTMS
#endif // QTMS_DTMF_IMPL_H
-
// End of file
--- a/qtms/inc/qtmsfactoryimpl.h Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/inc/qtmsfactoryimpl.h Wed Aug 18 10:16:02 2010 +0300
@@ -22,11 +22,13 @@
#include <qtms.h>
// FORWARD DECLARATIONS
-namespace TMS {
+namespace TMS
+{
class TMSFactory;
}
-namespace QTMS {
+namespace QTMS
+{
// FORWARD DECLARATIONS
class QTMSCall;
@@ -43,7 +45,7 @@
// CLASS DECLARATION
class QTMSFactoryImpl
- {
+{
public:
QTMSFactoryImpl();
virtual ~QTMSFactoryImpl();
@@ -51,15 +53,12 @@
gint CreateCall(QTMSCallType ctype, QTMSCall*& QTMScall, guint ctxid);
gint DeleteCall(QTMSCall*& QTMSct);
gint IsCallTypeSupported(QTMSCallType ctype, gboolean& flag);
- gint GetSupportedFormats(const QTMSStreamType strmtype,
- FormatVector& fmtlist);
+ gint GetSupportedFormats(const QTMSStreamType strmtype, FormatVector& fmtlist);
gint CreateFormat(QTMSFormatType fmttype, QTMSFormat*& QTMSfmt);
gint DeleteFormat(QTMSFormat*& QTMSfmt);
- gint CreateEffect(QTMSEffectType QTMSeffecttype,
- QTMSEffect*& QTMSeffect);
+ gint CreateEffect(QTMSEffectType QTMSeffecttype, QTMSEffect*& QTMSeffect);
gint DeleteEffect(QTMSEffect*& QTMSeffect);
- gint CreateBuffer(QTMSBufferType buffertype, guint size,
- QTMSBuffer*& QTMSbuffer);
+ gint CreateBuffer(QTMSBufferType buffertype, guint size, QTMSBuffer*& QTMSbuffer);
gint DeleteBuffer(QTMSBuffer*& QTMSbuffer);
gint CreateSource(QTMSSourceType srctype, QTMSSource*& QTMSsrc);
gint DeleteSource(QTMSSource*& QTMSsrc);
@@ -76,7 +75,7 @@
private:
TMS::TMSFactory *iFactory;
- };
+};
} //namespace QTMS
--- a/qtms/inc/qtmsg711impl.h Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/inc/qtmsg711impl.h Wed Aug 18 10:16:02 2010 +0300
@@ -22,15 +22,17 @@
#include <qtmsg711format.h>
// FORWARD DECLARATIONS
-namespace TMS {
+namespace TMS
+{
class TMSFormat;
}
-namespace QTMS {
+namespace QTMS
+{
// QTMSG711FormatImpl class
-class QTMSG711FormatImpl : public QTMSG711Format
- {
+class QTMSG711FormatImpl: public QTMSG711Format
+{
public:
static gint Create(QTMSFormat*& qformat, TMS::TMSFormat*& tmsformat);
virtual ~QTMSG711FormatImpl();
@@ -43,10 +45,9 @@
private:
QTMSG711FormatImpl();
gint PostConstruct();
- };
+};
} //namespace QTMS
#endif // QTMS_G711_FORMAT_IMPL_H
-
// End of file
--- a/qtms/inc/qtmsg729impl.h Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/inc/qtmsg729impl.h Wed Aug 18 10:16:02 2010 +0300
@@ -22,15 +22,17 @@
#include <qtmsg729format.h>
// FORWARD DECLARATIONS
-namespace TMS {
+namespace TMS
+{
class TMSFormat;
}
-namespace QTMS {
+namespace QTMS
+{
// QTMSG729FormatImpl class
-class QTMSG729FormatImpl : public QTMSG729Format
- {
+class QTMSG729FormatImpl: public QTMSG729Format
+{
public:
static gint Create(QTMSFormat*& qformat, TMS::TMSFormat*& tmsformat);
@@ -44,10 +46,9 @@
private:
QTMSG729FormatImpl();
gint PostConstruct();
- };
+};
} //namespace QTMS
#endif // QTMS_G729_FORMAT_IMPL_H
-
// End of file
--- a/qtms/inc/qtmsgaineffectimpl.h Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/inc/qtmsgaineffectimpl.h Wed Aug 18 10:16:02 2010 +0300
@@ -24,16 +24,17 @@
#include <tmseffectobsrvr.h>
// FORWARD DECLARATIONS
-namespace TMS {
+namespace TMS
+{
class TMSEffect;
}
-namespace QTMS {
+namespace QTMS
+{
// QTMSGainEffectImpl class
-class QTMSGainEffectImpl : public QTMSGainEffect,
- public TMS::TMSEffectObserver
- {
+class QTMSGainEffectImpl: public QTMSGainEffect, public TMS::TMSEffectObserver
+{
public:
static gint Create(QTMSEffect*& qvol, TMS::TMSEffect*& tmsvol);
virtual ~QTMSGainEffectImpl();
@@ -44,16 +45,14 @@
gint GetEffect(TMS::TMSEffect*& tmseffect);
//From TMSEffectObserver
- void EffectsEvent(const TMS::TMSEffect& tmseffect,
- TMS::TMSSignalEvent event);
+ void EffectsEvent(const TMS::TMSEffect& tmseffect, TMS::TMSSignalEvent event);
private:
QTMSGainEffectImpl();
gint PostConstruct();
- };
+};
} //namespace QTMS
#endif // QTMS_GAIN_EFFECT_IMPL_H
-
// End of file
--- a/qtms/inc/qtmsglobalgaineffectimpl.h Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/inc/qtmsglobalgaineffectimpl.h Wed Aug 18 10:16:02 2010 +0300
@@ -23,38 +23,36 @@
#include <tmseffectobsrvr.h>
// FORWARD DECLARATIONS
-namespace TMS {
+namespace TMS
+{
class TMSEffect;
}
-namespace QTMS {
+namespace QTMS
+{
// FORWARD DECLARATIONS
class QTMSEffect;
// QTMSGlobalGainEffectImpl class
-class QTMSGlobalGainEffectImpl : public QTMSGlobalGainEffect,
- public TMS::TMSEffectObserver
- {
+class QTMSGlobalGainEffectImpl: public QTMSGlobalGainEffect, public TMS::TMSEffectObserver
+{
public:
- static gint Create(QTMSEffect*& qglobalgain,
- TMS::TMSEffect*& tmsglobalgain);
+ static gint Create(QTMSEffect*& qglobalgain, TMS::TMSEffect*& tmsglobalgain);
virtual ~QTMSGlobalGainEffectImpl();
gint AddObserver(TMS::TMSEffectObserver& obsrvr, gpointer user_data);
gint RemoveObserver(TMS::TMSEffectObserver& obsrvr);
//from TMSEffectObserver
- void EffectsEvent(const TMS::TMSEffect& tmseffect,
- TMS::TMSSignalEvent event);
+ void EffectsEvent(const TMS::TMSEffect& tmseffect, TMS::TMSSignalEvent event);
private:
QTMSGlobalGainEffectImpl();
gint PostConstruct();
- };
+};
} //namespace QTMS
#endif // QTMS_GLOBAL_GAIN_EFFECT_IMPL_H
-
// End of file
--- a/qtms/inc/qtmsglobalroutingimpl.h Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/inc/qtmsglobalroutingimpl.h Wed Aug 18 10:16:02 2010 +0300
@@ -24,36 +24,35 @@
#include <tmsglobalroutingobsrvr.h>
// FORWARD DECLARATIONS
-namespace TMS {
+namespace TMS
+{
class TMSGlobalRouting;
}
-namespace QTMS {
+namespace QTMS
+{
// QTMSGlobalRoutingImpl class
-class QTMSGlobalRoutingImpl : public QTMSGlobalRouting,
- public TMS::TMSGlobalRoutingObserver
- {
+class QTMSGlobalRoutingImpl: public QTMSGlobalRouting, public TMS::TMSGlobalRoutingObserver
+{
public:
- static gint Create(QTMSGlobalRouting*& qrouting,
- TMS::TMSGlobalRouting*& tmsrouting);
+ static gint Create(QTMSGlobalRouting*& qrouting, TMS::TMSGlobalRouting*& tmsrouting);
virtual ~QTMSGlobalRoutingImpl();
gint AddObserver(TMS::TMSGlobalRoutingObserver& obsrvr, gpointer user_data);
gint RemoveObserver(TMS::TMSGlobalRoutingObserver& obsrvr);
//from TMSGlobalRoutingObserver
- void GlobalRoutingEvent(const TMS::TMSGlobalRouting& routing,
- TMS::TMSSignalEvent event, TMS::TMSAudioOutput output);
+ void GlobalRoutingEvent(const TMS::TMSGlobalRouting& routing, TMS::TMSSignalEvent event,
+ TMS::TMSAudioOutput output);
private:
QTMSGlobalRoutingImpl();
gint PostConstruct();
- };
+};
} //namespace QTMS
#endif // QTMS_GLOBAL_ROUTING_IMPL_H
-
// End of file
--- a/qtms/inc/qtmsglobalvoleffectimpl.h Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/inc/qtmsglobalvoleffectimpl.h Wed Aug 18 10:16:02 2010 +0300
@@ -23,19 +23,20 @@
#include <tmseffectobsrvr.h>
// FORWARD DECLARATIONS
-namespace TMS {
+namespace TMS
+{
class TMSEffect;
}
-namespace QTMS {
+namespace QTMS
+{
// FORWARD DECLARATIONS
class QTMSEffect;
// QTMSGlobalVolEffectImpl class
-class QTMSGlobalVolEffectImpl : public QTMSGlobalVolEffect,
- public TMS::TMSEffectObserver
- {
+class QTMSGlobalVolEffectImpl: public QTMSGlobalVolEffect, public TMS::TMSEffectObserver
+{
public:
static gint Create(QTMSEffect*& qglobalvol, TMS::TMSEffect*& tmsglobalvol);
@@ -45,16 +46,14 @@
gint RemoveObserver(TMS::TMSEffectObserver& obsrvr);
//from TMSEffectObserver
- void EffectsEvent(const TMS::TMSEffect& tmseffect,
- TMS::TMSSignalEvent event);
+ void EffectsEvent(const TMS::TMSEffect& tmseffect, TMS::TMSSignalEvent event);
private:
QTMSGlobalVolEffectImpl();
gint PostConstruct();
- };
+};
} //namespace QTMS
#endif // QTMS_GLOBAL_VOLUME_EFFECT_IMPL_H
-
// End of file
--- a/qtms/inc/qtmsilbcimpl.h Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/inc/qtmsilbcimpl.h Wed Aug 18 10:16:02 2010 +0300
@@ -22,15 +22,17 @@
#include <qtmsilbcformat.h>
// FORWARD DECLARATIONS
-namespace TMS {
+namespace TMS
+{
class TMSFormat;
}
-namespace QTMS {
+namespace QTMS
+{
// QTMSILBCFormatImpl class
-class QTMSILBCFormatImpl : public QTMSILBCFormat
- {
+class QTMSILBCFormatImpl: public QTMSILBCFormat
+{
public:
static gint Create(QTMSFormat*& qformat, TMS::TMSFormat*& tmsformat);
virtual ~QTMSILBCFormatImpl();
@@ -43,10 +45,9 @@
private:
QTMSILBCFormatImpl();
gint PostConstruct();
- };
+};
} //namespace QTMS
#endif // QTMS_ILBC_FORMAT_IMPL_H
-
// End of file
--- a/qtms/inc/qtmsinbandtoneimpl.h Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/inc/qtmsinbandtoneimpl.h Wed Aug 18 10:16:02 2010 +0300
@@ -23,35 +23,33 @@
#include <qtmsinbandtone.h>
// FORWARD DECLARATIONS
-namespace TMS {
+namespace TMS
+{
class TMSInbandTone;
}
-namespace QTMS {
+namespace QTMS
+{
// QTMSInbandImpl class
-class QTMSInbandToneImpl : public QTMSInbandTone,
- public TMS::TMSInbandToneObserver
- {
+class QTMSInbandToneImpl: public QTMSInbandTone, public TMS::TMSInbandToneObserver
+{
public:
- static gint Create(QTMSInbandTone*& qinband,
- TMS::TMSInbandTone*& tmsinband);
+ static gint Create(QTMSInbandTone*& qinband, TMS::TMSInbandTone*& tmsinband);
virtual ~QTMSInbandToneImpl();
gint AddObserver(TMS::TMSInbandToneObserver& obsrvr, gpointer user_data);
gint RemoveObserver(TMS::TMSInbandToneObserver& obsrvr);
//from TMS::TMSInbandToneObserver
- void InbandToneEvent(const TMS::TMSInbandTone& inbandtone,
- TMS::TMSSignalEvent event);
+ void InbandToneEvent(const TMS::TMSInbandTone& inbandtone, TMS::TMSSignalEvent event);
private:
QTMSInbandToneImpl();
gint PostConstruct();
- };
+};
} //namespace QTMS
#endif // QTMS_DTMF_IMPL_H
-
// End of file
--- a/qtms/inc/qtmsmembuffer.h Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/inc/qtmsmembuffer.h Wed Aug 18 10:16:02 2010 +0300
@@ -21,15 +21,17 @@
#include <qtmsbuffer.h>
// FORWARD DECLARATION
-namespace TMS {
+namespace TMS
+{
class TMSBuffer;
}
-namespace QTMS {
+namespace QTMS
+{
// QTMSMemBuffer class
-class QTMSMemBuffer : public QTMSBuffer
- {
+class QTMSMemBuffer: public QTMSBuffer
+{
public:
virtual ~QTMSMemBuffer();
@@ -108,7 +110,7 @@
guint64 iTimeStamp;
guint8* iDataPtr;
gboolean iOwnsBuffer;
- };
+};
} //namespace QTMS
--- a/qtms/inc/qtmsmicsourceimpl.h Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/inc/qtmsmicsourceimpl.h Wed Aug 18 10:16:02 2010 +0300
@@ -22,15 +22,17 @@
#include <qtmsmicsource.h>
// FORWARD DECLARATIONS
-namespace TMS {
+namespace TMS
+{
class TMSSource;
}
-namespace QTMS {
+namespace QTMS
+{
// QTMSMicSourceImpl class
-class QTMSMicSourceImpl : public QTMSMicSource
- {
+class QTMSMicSourceImpl: public QTMSMicSource
+{
public:
static gint Create(QTMSSource*& qsource, TMS::TMSSource*& tmssource);
virtual ~QTMSMicSourceImpl();
@@ -39,10 +41,9 @@
private:
QTMSMicSourceImpl();
gint PostConstruct();
- };
+};
} //namespace QTMS
#endif // QTMS_MIC_SOURCE_IMPL_H
-
// End of file
--- a/qtms/inc/qtmsmodemsinkimpl.h Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/inc/qtmsmodemsinkimpl.h Wed Aug 18 10:16:02 2010 +0300
@@ -23,15 +23,17 @@
#include <qtmssink.h>
// FORWARD DECLARATIONS
-namespace TMS {
+namespace TMS
+{
class TMSSink;
}
-namespace QTMS {
+namespace QTMS
+{
// QTMSModemSinkImpl class
-class QTMSModemSinkImpl : public QTMSModemSink
- {
+class QTMSModemSinkImpl: public QTMSModemSink
+{
public:
static gint Create(QTMSSink*& qsink, TMS::TMSSink*& tmssink);
virtual ~QTMSModemSinkImpl();
@@ -41,10 +43,9 @@
private:
QTMSModemSinkImpl();
gint PostConstruct();
- };
+};
} //namespace QTMS
#endif // QTMS_MODEM_SINK_IMPL_H
-
// End of file
--- a/qtms/inc/qtmsmodemsourceimpl.h Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/inc/qtmsmodemsourceimpl.h Wed Aug 18 10:16:02 2010 +0300
@@ -22,15 +22,17 @@
#include <qtmsmodemsource.h>
// FORWARD DECLARATIONS
-namespace TMS {
+namespace TMS
+{
class TMSSource;
}
-namespace QTMS {
+namespace QTMS
+{
// QTMSModemSourceImpl class
-class QTMSModemSourceImpl : public QTMSModemSource
- {
+class QTMSModemSourceImpl: public QTMSModemSource
+{
public:
static gint Create(QTMSSource*& qsource, TMS::TMSSource*& tmssource);
virtual ~QTMSModemSourceImpl();
@@ -40,10 +42,9 @@
private:
QTMSModemSourceImpl();
gint PostConstruct();
- };
+};
} //namespace QTMS
#endif // QTMS_MODEM_SOURCE_IMPL_H
-
// End of file
--- a/qtms/inc/qtmspcmimpl.h Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/inc/qtmspcmimpl.h Wed Aug 18 10:16:02 2010 +0300
@@ -22,15 +22,17 @@
#include <qtmspcmformat.h>
// FORWARD DECLARATIONS
-namespace TMS {
+namespace TMS
+{
class TMSFormat;
}
-namespace QTMS {
+namespace QTMS
+{
// QTMSPCMFormatImpl class
-class QTMSPCMFormatImpl : public QTMSPCMFormat
- {
+class QTMSPCMFormatImpl: public QTMSPCMFormat
+{
public:
static gint Create(QTMSFormat*& qformat, TMS::TMSFormat*& tmsformat);
virtual ~QTMSPCMFormatImpl();
@@ -43,10 +45,9 @@
private:
QTMSPCMFormatImpl();
gint PostConstruct();
- };
+};
} //namespace QTMS
#endif // QTMS_PCM_FORMAT_IMPL_H
-
// End of file
--- a/qtms/inc/qtmsringtoneimpl.h Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/inc/qtmsringtoneimpl.h Wed Aug 18 10:16:02 2010 +0300
@@ -24,16 +24,17 @@
#include <qtmsringtone.h>
// FORWARD DECLARATIONS
-namespace TMS {
+namespace TMS
+{
class TMSRingTone;
}
-namespace QTMS {
+namespace QTMS
+{
// QTMSRingToneImpl class
-class QTMSRingToneImpl : public QTMSRingTone,
- public TMS::TMSRingToneObserver
- {
+class QTMSRingToneImpl: public QTMSRingTone, public TMS::TMSRingToneObserver
+{
public:
static gint Create(QTMSRingTone*& qrt, TMS::TMSRingTone*& tmsrt);
virtual ~QTMSRingToneImpl();
@@ -47,11 +48,10 @@
private:
QTMSRingToneImpl();
gint PostConstruct();
- };
+};
} //namespace QTMS
#endif //QTMSRINGTONEBODYIMPL_H
-
// End of file
--- a/qtms/inc/qtmssinkimpl.h Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/inc/qtmssinkimpl.h Wed Aug 18 10:16:02 2010 +0300
@@ -20,18 +20,19 @@
#include <qtms.h>
-namespace QTMS {
+namespace QTMS
+{
// FORWARD DECLARATIONS
class QTMSSink;
// TMSSinkImpl class
class QTMSSinkImpl
- {
+{
public:
static gint Create(QTMSSinkType sinktype, QTMSSink*& tmssink);
static gint Delete(QTMSSink*& tmssink);
- };
+};
} //namespace QTMS
--- a/qtms/inc/qtmssourceimpl.h Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/inc/qtmssourceimpl.h Wed Aug 18 10:16:02 2010 +0300
@@ -27,11 +27,11 @@
// TMSSourceImpl class
class QTMSSourceImpl
- {
+{
public:
static gint Create(QTMSSourceType sourcetype, QTMSSource*& tmssource);
static gint Delete(QTMSSource*& tmssource);
- };
+};
} //namespace QTMS
--- a/qtms/inc/qtmsspeakersinkimpl.h Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/inc/qtmsspeakersinkimpl.h Wed Aug 18 10:16:02 2010 +0300
@@ -22,15 +22,17 @@
#include <qtmsspeakersink.h>
// FORWARD DECLARATIONS
-namespace TMS {
+namespace TMS
+{
class TMSSink;
}
-namespace QTMS {
+namespace QTMS
+{
// QTMSSpeakerSinkImpl class
-class QTMSSpeakerSinkImpl : public QTMSSpeakerSink
- {
+class QTMSSpeakerSinkImpl: public QTMSSpeakerSink
+{
public:
static gint Create(QTMSSink*& qsink, TMS::TMSSink*& tmssink);
virtual ~QTMSSpeakerSinkImpl();
@@ -40,10 +42,9 @@
private:
QTMSSpeakerSinkImpl();
gint PostConstruct();
- };
+};
} //namespace QTMS
#endif // QTMS_SPEAKER_SINK_IMPL_H
-
// End of file
--- a/qtms/inc/qtmsstreamimpl.h Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/inc/qtmsstreamimpl.h Wed Aug 18 10:16:02 2010 +0300
@@ -24,19 +24,20 @@
#include <QObject>
// FORWARD DECLARATIONS
-namespace TMS {
+namespace TMS
+{
class TMSStream;
}
-namespace QTMS {
+namespace QTMS
+{
// QTMSStreamImpl class
-class QTMSStreamImpl : public QTMSStream,
- public TMS::TMSStreamObserver
- {
+class QTMSStreamImpl: public QTMSStream, public TMS::TMSStreamObserver
+{
public:
- static gint Create(QTMSCallType callType, QTMSStreamType stype,
- QTMSStream*& qstrm, TMS::TMSStream*& tmsstrm);
+ static gint Create(QTMSCallType callType, QTMSStreamType stype, QTMSStream*& qstrm,
+ TMS::TMSStream*& tmsstrm);
virtual ~QTMSStreamImpl();
@@ -45,21 +46,18 @@
gint RemoveObserver(TMS::TMSStreamObserver& obsrvr);
// From TMSStreamObserver
- void TMSStreamEvent(const TMS::TMSStream& stream,
- TMS::TMSSignalEvent event);
+ void TMSStreamEvent(const TMS::TMSStream& stream, TMS::TMSSignalEvent event);
protected:
QTMSStreamImpl();
- gint PostConstruct(QTMSCallType callType, QTMSStreamType stype,
- QTMSStream& parent);
+ gint PostConstruct(QTMSCallType callType, QTMSStreamType stype, QTMSStream& parent);
gint CreateQueue(const gint aNumSlots);
void ReceiveMsgQHandlerEventsL();
- };
+};
} //namespace QTMS
#endif // QTMS_STREAM_IMPL_H
-
// End of file
--- a/qtms/inc/qtmsvolumeeffectimpl.h Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/inc/qtmsvolumeeffectimpl.h Wed Aug 18 10:16:02 2010 +0300
@@ -24,16 +24,17 @@
#include <tmseffectobsrvr.h>
// FORWARD DECLARATIONS
-namespace TMS {
+namespace TMS
+{
class TMSEffect;
}
-namespace QTMS {
+namespace QTMS
+{
// QTMSVolumeEffectImpl class
-class QTMSVolumeEffectImpl : public QTMSVolumeEffect,
- public TMS::TMSEffectObserver
- {
+class QTMSVolumeEffectImpl: public QTMSVolumeEffect, public TMS::TMSEffectObserver
+{
public:
static gint Create(QTMSEffect*& qvol, TMS::TMSEffect*& tmsvol);
virtual ~QTMSVolumeEffectImpl();
@@ -44,16 +45,14 @@
gint GetEffect(TMS::TMSEffect*& tmseffect);
//From TMSEffectObserver
- void EffectsEvent(const TMS::TMSEffect& tmseffect,
- TMS::TMSSignalEvent event);
+ void EffectsEvent(const TMS::TMSEffect& tmseffect, TMS::TMSSignalEvent event);
private:
QTMSVolumeEffectImpl();
gint PostConstruct();
- };
+};
} //namespace QTMS
#endif // QTMS_VOLUME_EFFECT_IMPL_H
-
// End of file
--- a/qtms/inc/qtmswrapperexport.h Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/inc/qtmswrapperexport.h Wed Aug 18 10:16:02 2010 +0300
@@ -1,19 +1,19 @@
/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
+ * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of the License "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description:
+ *
+ */
#ifndef QTMS_WRAPPER_EXPORT_H_
#define QTMS_WRAPPER_EXPORT_H_
@@ -22,9 +22,9 @@
#include <qglobal.h>
#ifdef BUILD_TMS_WRAPPER_DLL
- #define QTMS_WRAPPER_DLL_EXPORT Q_DECL_EXPORT
+#define QTMS_WRAPPER_DLL_EXPORT Q_DECL_EXPORT
#else
- #define QTMS_WRAPPER_DLL_EXPORT Q_DECL_IMPORT
+#define QTMS_WRAPPER_DLL_EXPORT Q_DECL_IMPORT
#endif
#endif // QTMS_WRAPPER_EXPORT_H_
--- a/qtms/qtmsapi.pro Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/qtmsapi.pro Wed Aug 18 10:16:02 2010 +0300
@@ -33,7 +33,7 @@
DEPENDPATH += . inc
INCLUDEPATH += . \
- .\inc
+ ./inc
defBlock = \
"$${LITERAL_HASH}if defined(EABI)" \
--- a/qtms/src/qtmsamr.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/src/qtmsamr.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -20,11 +20,11 @@
using namespace QTMS;
QTMSAMRFormat::QTMSAMRFormat()
- {
- }
+{
+}
QTMSAMRFormat::~QTMSAMRFormat()
- {
- }
+{
+}
// End of file
--- a/qtms/src/qtmsamrimpl.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/src/qtmsamrimpl.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -24,59 +24,55 @@
using namespace TMS;
QTMSAMRFormatImpl::QTMSAMRFormatImpl()
- {
- }
+{
+}
QTMSAMRFormatImpl::~QTMSAMRFormatImpl()
- {
+{
TRACE_PRN_FN_ENT;
TRACE_PRN_FN_EXT;
- }
+}
gint QTMSAMRFormatImpl::Create(QTMSFormat*& qformat, TMS::TMSFormat*& tmsformat)
- {
+{
gint ret(TMS_RESULT_INSUFFICIENT_MEMORY);
QTMSAMRFormatImpl* self = new QTMSAMRFormatImpl();
- if (self)
- {
+ if (self) {
ret = self->PostConstruct();
- if (ret != TMS_RESULT_SUCCESS)
- {
+ if (ret != TMS_RESULT_SUCCESS) {
delete self;
self = NULL;
- }
+ }
self->iFormat = tmsformat;
- }
+ }
qformat = self;
return ret;
- }
+}
gint QTMSAMRFormatImpl::PostConstruct()
- {
+{
gint ret(TMS_RESULT_SUCCESS);
return ret;
- }
+}
gint QTMSAMRFormatImpl::GetFormat(TMS::TMSFormat*& fmt)
- {
+{
gint ret(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iFormat)
- {
+ if (iFormat) {
fmt = iFormat;
ret = QTMS_RESULT_SUCCESS;
- }
+ }
return ret;
- }
+}
gint QTMSAMRFormatImpl::GetType(QTMSFormatType& fmttype)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iFormat)
- {
+ if (iFormat) {
status = iFormat->GetType(fmttype);
- }
+ }
return status;
- }
+}
// End of file
--- a/qtms/src/qtmsbufferimpl.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/src/qtmsbufferimpl.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -23,44 +23,42 @@
using namespace QTMS;
gint QTMSBufferImpl::Create(QTMSBufferType buffertype, QTMSBuffer*& buffer,
- TMS::TMSBuffer*& tmsbuffer)
- {
+ TMS::TMSBuffer*& tmsbuffer)
+{
gint ret(QTMS_RESULT_INSUFFICIENT_MEMORY);
TRACE_PRN_FN_ENT;
- switch (buffertype)
- {
- case QTMS_BUFFER_MEMORY:
- ret = QTMSMemBuffer::Create(buffer, tmsbuffer);
- break;
- default:
- ret = QTMS_RESULT_BUFFER_TYPE_NOT_SUPPORTED;
- break;
- }
+ switch (buffertype) {
+ case QTMS_BUFFER_MEMORY:
+ ret = QTMSMemBuffer::Create(buffer, tmsbuffer);
+ break;
+ default:
+ ret = QTMS_RESULT_BUFFER_TYPE_NOT_SUPPORTED;
+ break;
+ }
TRACE_PRN_FN_EXT;
return ret;
- }
+}
gint QTMSBufferImpl::Delete(QTMSBuffer*& buffer)
- {
+{
gint ret(QTMS_RESULT_INVALID_ARGUMENT);
TRACE_PRN_FN_ENT;
QTMSBufferType buffertype;
ret = buffer->GetType(buffertype);
- switch (buffertype)
- {
- case QTMS_BUFFER_MEMORY:
- delete (static_cast<QTMSMemBuffer*> (buffer));
- buffer = NULL;
- ret = QTMS_RESULT_SUCCESS;
- break;
- default:
- ret = QTMS_RESULT_BUFFER_TYPE_NOT_SUPPORTED;
- break;
- }
+ switch (buffertype) {
+ case QTMS_BUFFER_MEMORY:
+ delete (static_cast<QTMSMemBuffer*> (buffer));
+ buffer = NULL;
+ ret = QTMS_RESULT_SUCCESS;
+ break;
+ default:
+ ret = QTMS_RESULT_BUFFER_TYPE_NOT_SUPPORTED;
+ break;
+ }
TRACE_PRN_FN_EXT;
return ret;
- }
+}
// End of file
--- a/qtms/src/qtmscall.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/src/qtmscall.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -26,66 +26,61 @@
QTMSCall::QTMSCall() :
iTmsCall(NULL)
- {
- }
+{
+}
QTMSCall::~QTMSCall()
- {
- }
+{
+}
QTMSCallType QTMSCall::GetCallType()
- {
+{
QTMSCallType calltype(-1);
- if (iTmsCall)
- {
+ if (iTmsCall) {
calltype = iTmsCall->GetCallType();
- }
+ }
return calltype;
- }
+}
gint QTMSCall::GetCallContextId(guint& ctxid)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iTmsCall)
- {
+ if (iTmsCall) {
status = iTmsCall->GetCallContextId(ctxid);
- }
+ }
return status;
- }
+}
gint QTMSCall::CreateStream(const QTMSStreamType type, QTMSStream*& qstrm)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
TMSStream* tmsstrm(NULL);
- if (iTmsCall)
- {
+ if (iTmsCall) {
status = iTmsCall->CreateStream(type, tmsstrm);
- }
-
- if (status == TMS_RESULT_SUCCESS)
- {
- QTMSCallType calltype = iTmsCall->GetCallType();
- switch (type)
- {
- case TMS_STREAM_UPLINK:
- case TMS_STREAM_DOWNLINK:
- status = QTMSStreamImpl::Create(calltype, type, qstrm, tmsstrm);
- break;
- default:
- status = QTMS_RESULT_STREAM_TYPE_NOT_SUPPORTED;
- break;
- }
- }
- return status;
}
+ if (status == TMS_RESULT_SUCCESS) {
+ QTMSCallType calltype = iTmsCall->GetCallType();
+ switch (type) {
+ case TMS_STREAM_UPLINK:
+ case TMS_STREAM_DOWNLINK:
+ status = QTMSStreamImpl::Create(calltype, type, qstrm, tmsstrm);
+ break;
+ default:
+ status = QTMS_RESULT_STREAM_TYPE_NOT_SUPPORTED;
+ break;
+ }
+ }
+ return status;
+}
+
gint QTMSCall::DeleteStream(QTMSStream*& strm)
- {
+{
gint status(QTMS_RESULT_SUCCESS);
delete strm;
strm = NULL;
return status;
- }
+}
// End of file
--- a/qtms/src/qtmscallimpl.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/src/qtmscallimpl.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -23,30 +23,28 @@
using namespace TMS;
QTMSCallImpl::QTMSCallImpl()
- {
- }
+{
+}
QTMSCallImpl::~QTMSCallImpl()
- {
- }
+{
+}
gint QTMSCallImpl::Create(QTMSCall*& qtmscall, TMS::TMSCall*& tmscall)
- {
+{
gint ret(QTMS_RESULT_INSUFFICIENT_MEMORY);
QTMSCallImpl* self = new QTMSCallImpl();
- if (self)
- {
+ if (self) {
ret = self->PostConstruct();
- if (ret != QTMS_RESULT_SUCCESS)
- {
+ if (ret != QTMS_RESULT_SUCCESS) {
delete self;
self = NULL;
- }
+ }
self->iTmsCall = tmscall;
- }
+ }
qtmscall = self;
return ret;
- }
+}
gint QTMSCallImpl::PostConstruct()
{
--- a/qtms/src/qtmsclientsink.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/src/qtmsclientsink.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -24,33 +24,31 @@
QTMSClientSink::QTMSClientSink() :
iSink(NULL)
- {
- }
+{
+}
QTMSClientSink::~QTMSClientSink()
- {
+{
delete iSink;
- }
+}
gint QTMSClientSink::BufferProcessed(QTMSBuffer* buffer)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iSink)
- {
+ if (iSink) {
TMSBuffer* buf(reinterpret_cast<TMSBuffer*> (buffer));
status = static_cast<TMSClientSink*> (iSink)->BufferProcessed(buf);
- }
+ }
return status;
- }
+}
gint QTMSClientSink::GetType(QTMSSinkType& sinktype)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iSink)
- {
+ if (iSink) {
status = static_cast<TMSClientSink*> (iSink)->GetType(sinktype);
- }
+ }
return status;
- }
+}
// End of file
--- a/qtms/src/qtmsclientsinkimpl.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/src/qtmsclientsinkimpl.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -25,78 +25,71 @@
using namespace TMS;
QTMSClientSinkImpl::QTMSClientSinkImpl()
- {
- }
+{
+}
QTMSClientSinkImpl::~QTMSClientSinkImpl()
- {
+{
RemoveObserver(*this);
- }
+}
gint QTMSClientSinkImpl::Create(QTMSSink*& qsink, TMS::TMSSink*& tmssink)
- {
+{
gint ret(QTMS_RESULT_INSUFFICIENT_MEMORY);
QTMSClientSinkImpl* self = new QTMSClientSinkImpl();
- if (self)
- {
+ if (self) {
ret = self->PostConstruct();
- if (ret != QTMS_RESULT_SUCCESS)
- {
+ if (ret != QTMS_RESULT_SUCCESS) {
delete self;
self = NULL;
- }
+ }
self->iSink = tmssink;
self->AddObserver(*self, NULL);
- }
+ }
qsink = self;
return ret;
- }
+}
gint QTMSClientSinkImpl::PostConstruct()
- {
+{
gint ret(QTMS_RESULT_SUCCESS);
return ret;
- }
+}
-gint QTMSClientSinkImpl::AddObserver(TMS::TMSClientSinkObserver& obsrvr,
- gpointer user_data)
- {
+gint QTMSClientSinkImpl::AddObserver(TMS::TMSClientSinkObserver& obsrvr, gpointer user_data)
+{
gint ret(QTMS_RESULT_SUCCESS);
- if (iSink)
- {
- ret = static_cast<TMSClientSink*> (iSink)->AddObserver(obsrvr,
- user_data);
- }
+ if (iSink) {
+ ret = static_cast<TMSClientSink*> (iSink)->AddObserver(obsrvr, user_data);
+ }
return ret;
- }
+}
gint QTMSClientSinkImpl::RemoveObserver(TMS::TMSClientSinkObserver& obsrvr)
- {
+{
gint ret(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iSink)
- {
+ if (iSink) {
ret = static_cast<TMSClientSink*> (iSink)->RemoveObserver(obsrvr);
- }
+ }
return ret;
- }
+}
gint QTMSClientSinkImpl::GetSink(TMS::TMSSink*& tmssink)
- {
+{
gint ret(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iSink)
- {
+ if (iSink) {
tmssink = iSink;
ret = QTMS_RESULT_SUCCESS;
- }
+ }
return ret;
- }
+}
void QTMSClientSinkImpl::ProcessBuffer(const TMS::TMSBuffer* buffer)
- {
+{
TMSBuffer* buf(const_cast<TMSBuffer*> (buffer));
QTMSBuffer* qtbuf(reinterpret_cast<QTMSBuffer*> (buf));
emit QTMSClientSink::ProcessBuffer(qtbuf);
- }
+}
// End of file
--- a/qtms/src/qtmsclientsource.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/src/qtmsclientsource.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -24,77 +24,69 @@
QTMSClientSource::QTMSClientSource() :
iSource(NULL)
- {
- }
+{
+}
QTMSClientSource::~QTMSClientSource()
- {
+{
delete iSource;
- }
+}
gint QTMSClientSource::SetEnqueueMode(const gboolean enable)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iSource)
- {
- status = static_cast<TMSClientSource*> (iSource)->SetEnqueueMode(
- enable);
- }
+ if (iSource) {
+ status = static_cast<TMSClientSource*> (iSource)->SetEnqueueMode(enable);
+ }
return status;
- }
+}
gint QTMSClientSource::GetEnqueueMode(gboolean& enable)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iSource)
- {
- status = static_cast<TMSClientSource*> (iSource)->GetEnqueueMode(
- enable);
- }
+ if (iSource) {
+ status = static_cast<TMSClientSource*> (iSource)->GetEnqueueMode(enable);
+ }
return status;
- }
+}
gint QTMSClientSource::Flush()
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iSource)
- {
+ if (iSource) {
status = static_cast<TMSClientSource*> (iSource)->Flush();
- }
+ }
return status;
- }
+}
gint QTMSClientSource::GetType(QTMSSourceType& sourcetype)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iSource)
- {
+ if (iSource) {
status = static_cast<TMSClientSource*> (iSource)->GetType(sourcetype);
- }
+ }
return status;
- }
+}
gint QTMSClientSource::BufferFilled(QTMSBuffer& buffer)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iSource)
- {
- TMSBuffer& buf(reinterpret_cast<TMSBuffer&>(buffer));
+ if (iSource) {
+ TMSBuffer& buf(reinterpret_cast<TMSBuffer&> (buffer));
status = static_cast<TMSClientSource*> (iSource)->BufferFilled(buf);
- }
+ }
return status;
- }
+}
// Push mode
gint QTMSClientSource::ProcessBuffer(QTMSBuffer* buffer)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iSource)
- {
- TMSBuffer* buf(reinterpret_cast<TMSBuffer*>(buffer));
+ if (iSource) {
+ TMSBuffer* buf(reinterpret_cast<TMSBuffer*> (buffer));
status = static_cast<TMSClientSource*> (iSource)->ProcessBuffer(buf);
- }
+ }
return status;
- }
+}
// End of file
--- a/qtms/src/qtmsclientsourceimpl.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/src/qtmsclientsourceimpl.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -25,85 +25,75 @@
using namespace TMS;
QTMSClientSourceImpl::QTMSClientSourceImpl()
- {
- }
+{
+}
QTMSClientSourceImpl::~QTMSClientSourceImpl()
- {
+{
RemoveObserver(*this);
- }
+}
gint QTMSClientSourceImpl::Create(QTMSSource*& qsource, TMSSource*& tmssource)
- {
+{
gint ret(QTMS_RESULT_INSUFFICIENT_MEMORY);
QTMSClientSourceImpl* self = new QTMSClientSourceImpl();
- if (self)
- {
+ if (self) {
ret = self->PostConstruct();
- if (ret != QTMS_RESULT_SUCCESS)
- {
+ if (ret != QTMS_RESULT_SUCCESS) {
delete self;
self = NULL;
- }
+ }
self->iSource = tmssource;
self->AddObserver(*self, NULL);
- }
+ }
qsource = self;
return ret;
- }
+}
gint QTMSClientSourceImpl::PostConstruct()
- {
+{
gint ret(QTMS_RESULT_SUCCESS);
return ret;
- }
+}
-gint QTMSClientSourceImpl::AddObserver(TMS::TMSClientSourceObserver& obsrvr,
- gpointer user_data)
- {
+gint QTMSClientSourceImpl::AddObserver(TMS::TMSClientSourceObserver& obsrvr, gpointer user_data)
+{
gint ret(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iSource)
- {
- ret = static_cast<TMSClientSource*> (iSource)->AddObserver(obsrvr,
- user_data);
- }
+ if (iSource) {
+ ret = static_cast<TMSClientSource*> (iSource)->AddObserver(obsrvr, user_data);
+ }
return ret;
- }
+}
-gint QTMSClientSourceImpl::RemoveObserver(
- TMS::TMSClientSourceObserver& obsrvr)
- {
+gint QTMSClientSourceImpl::RemoveObserver(TMS::TMSClientSourceObserver& obsrvr)
+{
gint ret(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iSource)
- {
+ if (iSource) {
ret = static_cast<TMSClientSource*> (iSource)->RemoveObserver(obsrvr);
- }
+ }
return ret;
- }
+}
gint QTMSClientSourceImpl::GetSource(TMS::TMSSource*& tmssource)
- {
+{
gint ret(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iSource)
- {
+ if (iSource) {
tmssource = iSource;
ret = QTMS_RESULT_SUCCESS;
- }
+ }
return ret;
- }
+}
void QTMSClientSourceImpl::FillBuffer(TMS::TMSBuffer& buffer)
- {
+{
emit QTMSClientSource::FillBuffer(reinterpret_cast<QTMSBuffer&> (buffer));
- }
+}
-void QTMSClientSourceImpl::BufferProcessed(const TMS::TMSBuffer* buffer,
- gint reason)
- {
+void QTMSClientSourceImpl::BufferProcessed(const TMS::TMSBuffer* buffer, gint reason)
+{
TMSBuffer* buf(const_cast<TMSBuffer*> (buffer));
- emit QTMSClientSource::BufferProcessed(
- reinterpret_cast<QTMSBuffer*> (buf), reason);
- }
+ emit QTMSClientSource::BufferProcessed(reinterpret_cast<QTMSBuffer*> (buf), reason);
+}
// End of file
--- a/qtms/src/qtmsdtmf.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/src/qtmsdtmf.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -24,50 +24,46 @@
QTMSDTMF::QTMSDTMF(void) :
iDtmf(NULL)
- {
- }
+{
+}
QTMSDTMF::~QTMSDTMF(void)
- {
+{
delete iDtmf;
- }
+}
gint QTMSDTMF::Start()
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iDtmf)
- {
+ if (iDtmf) {
status = iDtmf->Start();
- }
+ }
return status;
- }
+}
gint QTMSDTMF::Stop()
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iDtmf)
- {
+ if (iDtmf) {
status = iDtmf->Stop();
- }
+ }
return status;
- }
+}
gint QTMSDTMF::SetTone(GString* string)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iDtmf)
- {
+ if (iDtmf) {
status = iDtmf->SetTone(string);
- }
+ }
return status;
- }
+}
gint QTMSDTMF::ContinueDTMFStringSending(gboolean aContinue)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iDtmf)
- {
+ if (iDtmf) {
status = iDtmf->ContinueDTMFStringSending(aContinue);
- }
+ }
return status;
- }
+}
--- a/qtms/src/qtmsdtmfimpl.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/src/qtmsdtmfimpl.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -23,65 +23,59 @@
using namespace TMS;
QTMSDTMFImpl::QTMSDTMFImpl()
- {
- }
+{
+}
QTMSDTMFImpl::~QTMSDTMFImpl()
- {
+{
RemoveObserver(*this);
- }
+}
gint QTMSDTMFImpl::Create(QTMSDTMF*& qdtmf, TMS::TMSDTMF*& tmsdtmf)
- {
+{
gint ret(TMS_RESULT_INSUFFICIENT_MEMORY);
QTMSDTMFImpl* self = new QTMSDTMFImpl();
- if (self)
- {
+ if (self) {
ret = self->PostConstruct();
- if (ret != QTMS_RESULT_SUCCESS)
- {
+ if (ret != QTMS_RESULT_SUCCESS) {
delete self;
self = NULL;
- }
+ }
self->iDtmf = tmsdtmf;
ret = self->AddObserver(*self, NULL);
- }
+ }
qdtmf = self;
return ret;
- }
+}
gint QTMSDTMFImpl::PostConstruct()
- {
+{
gint ret(QTMS_RESULT_SUCCESS);
return ret;
- }
+}
-gint QTMSDTMFImpl::AddObserver(TMS::TMSDTMFObserver& obsrvr,
- gpointer user_data)
- {
+gint QTMSDTMFImpl::AddObserver(TMS::TMSDTMFObserver& obsrvr, gpointer user_data)
+{
gint ret(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iDtmf)
- {
+ if (iDtmf) {
ret = iDtmf->AddObserver(obsrvr, user_data);
- }
+ }
return ret;
- }
+}
gint QTMSDTMFImpl::RemoveObserver(TMS::TMSDTMFObserver& obsrvr)
- {
+{
gint ret(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iDtmf)
- {
+ if (iDtmf) {
ret = iDtmf->RemoveObserver(obsrvr);
- }
+ }
return ret;
- }
+}
-void QTMSDTMFImpl::DTMFEvent(const TMS::TMSDTMF& /*dtmf*/,
- TMS::TMSSignalEvent event)
- {
+void QTMSDTMFImpl::DTMFEvent(const TMS::TMSDTMF& /*dtmf*/, TMS::TMSSignalEvent event)
+{
QTMSSignalEvent qevent;
qevent.type = event.type;
@@ -92,6 +86,6 @@
qevent.user_data = event.user_data;
emit QTMS::QTMSDTMF::DTMFEvent(static_cast<QTMSDTMF&> (*this), qevent);
- }
+}
// End of file
--- a/qtms/src/qtmseffect.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/src/qtmseffect.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -21,14 +21,16 @@
void QTMSEffect::Construct(QTMSEffectImpl* impl)
- {
+{
QTMSeffectimpl = impl;
- }
+}
QTMSEffect::QTMSEffect(void)
- {
- }
+{
+
+}
QTMSEffect::~QTMSEffect(void)
- {
- }
+{
+
+}
--- a/qtms/src/qtmsfactory.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/src/qtmsfactory.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -24,243 +24,217 @@
using namespace QTMS;
QTMSFactory::QTMSFactory()
- {
+{
impl = new QTMSFactoryImpl();
- }
+}
QTMSFactory::~QTMSFactory()
- {
+{
delete impl;
- }
+}
gint QTMSFactory::CreateFactory(QTMSFactory*& tmsfactory, QTMSVer& /*ver*/)
- {
+{
QTMSFactory* self = new QTMSFactory();
tmsfactory = self;
return QTMS_RESULT_SUCCESS;
- }
+}
-gint QTMSFactory::CreateCall(QTMSCallType ctype, QTMSCall*& tmscall,
- guint ctxid)
- {
+gint QTMSFactory::CreateCall(QTMSCallType ctype, QTMSCall*& tmscall, guint ctxid)
+{
gint status(TMS_RESULT_UNINITIALIZED_OBJECT);
- if (impl)
- {
+ if (impl) {
status = impl->CreateCall(ctype, tmscall, ctxid);
- }
+ }
return status;
- }
+}
gint QTMSFactory::DeleteCall(QTMSCall*& tmscall)
- {
+{
gint status(TMS_RESULT_UNINITIALIZED_OBJECT);
- if (impl)
- {
+ if (impl) {
status = impl->DeleteCall(tmscall);
- }
+ }
return status;
- }
+}
gint QTMSFactory::IsCallTypeSupported(QTMSCallType ctype, gboolean& flag)
- {
+{
gint status(TMS_RESULT_UNINITIALIZED_OBJECT);
- if (impl)
- {
+ if (impl) {
status = impl->IsCallTypeSupported(ctype, flag);
- }
+ }
return status;
- }
+}
-gint QTMSFactory::GetSupportedFormats(const QTMSStreamType strmtype,
- FormatVector& fmtlist)
- {
+gint QTMSFactory::GetSupportedFormats(const QTMSStreamType strmtype, FormatVector& fmtlist)
+{
gint status(TMS_RESULT_UNINITIALIZED_OBJECT);
- if (impl)
- {
+ if (impl) {
status = impl->GetSupportedFormats(strmtype, fmtlist);
- }
+ }
return status;
- }
+}
gint QTMSFactory::CreateFormat(QTMSFormatType qfmttype, QTMSFormat*& qfmt)
- {
+{
gint status(TMS_RESULT_UNINITIALIZED_OBJECT);
- if (impl)
- {
+ if (impl) {
status = impl->CreateFormat(qfmttype, qfmt);
- }
+ }
return status;
- }
+}
gint QTMSFactory::DeleteFormat(QTMSFormat*& qfmt)
- {
+{
gint status(TMS_RESULT_UNINITIALIZED_OBJECT);
- if (impl)
- {
+ if (impl) {
status = impl->DeleteFormat(qfmt);
- }
+ }
return status;
- }
+}
-gint QTMSFactory::CreateEffect(QTMSEffectType tmseffecttype,
- QTMSEffect*& tmseffect)
- {
+gint QTMSFactory::CreateEffect(QTMSEffectType tmseffecttype, QTMSEffect*& tmseffect)
+{
gint status(TMS_RESULT_UNINITIALIZED_OBJECT);
- if (impl)
- {
+ if (impl) {
status = impl->CreateEffect(tmseffecttype, tmseffect);
- }
+ }
return status;
- }
+}
gint QTMSFactory::DeleteEffect(QTMSEffect*& qtmseffect)
- {
+{
gint status(TMS_RESULT_UNINITIALIZED_OBJECT);
- if (impl)
- {
+ if (impl) {
impl->DeleteEffect(qtmseffect);
- }
+ }
return status;
- }
+}
-gint QTMSFactory::CreateBuffer(QTMSBufferType buffertype, guint size,
- QTMSBuffer*& qbuffer)
- {
+gint QTMSFactory::CreateBuffer(QTMSBufferType buffertype, guint size, QTMSBuffer*& qbuffer)
+{
gint status(TMS_RESULT_UNINITIALIZED_OBJECT);
- if (impl)
- {
+ if (impl) {
status = impl->CreateBuffer(buffertype, size, qbuffer);
- }
+ }
return status;
- }
+}
gint QTMSFactory::DeleteBuffer(QTMSBuffer*& qbuffer)
- {
+{
gint status(TMS_RESULT_UNINITIALIZED_OBJECT);
- if (impl)
- {
+ if (impl) {
status = impl->DeleteBuffer(qbuffer);
- }
+ }
return status;
- }
+}
gint QTMSFactory::CreateSource(QTMSSourceType srctype, QTMSSource*& qtmssrc)
- {
+{
gint status(TMS_RESULT_UNINITIALIZED_OBJECT);
- if (impl)
- {
+ if (impl) {
status = impl->CreateSource(srctype, qtmssrc);
- }
+ }
return status;
- }
+}
gint QTMSFactory::DeleteSource(QTMSSource*& qtmssrc)
- {
+{
gint status(TMS_RESULT_UNINITIALIZED_OBJECT);
- if (impl)
- {
+ if (impl) {
status = impl->DeleteSource(qtmssrc);
- }
+ }
return status;
- }
+}
gint QTMSFactory::CreateSink(QTMSSinkType sinktype, QTMSSink*& qtmssink)
- {
+{
gint status(TMS_RESULT_UNINITIALIZED_OBJECT);
- if (impl)
- {
+ if (impl) {
status = impl->CreateSink(sinktype, qtmssink);
- }
+ }
return status;
- }
+}
gint QTMSFactory::DeleteSink(QTMSSink*& qtmssink)
- {
+{
gint status(TMS_RESULT_UNINITIALIZED_OBJECT);
- if (impl)
- {
+ if (impl) {
status = impl->DeleteSink(qtmssink);
- }
+ }
return status;
- }
+}
gint QTMSFactory::CreateGlobalRouting(QTMSGlobalRouting*& globalrouting)
- {
+{
gint status(TMS_RESULT_UNINITIALIZED_OBJECT);
- if (impl)
- {
+ if (impl) {
status = impl->CreateGlobalRouting(globalrouting);
- }
+ }
return status;
- }
+}
gint QTMSFactory::DeleteGlobalRouting(QTMSGlobalRouting*& globrouting)
- {
+{
gint status(TMS_RESULT_UNINITIALIZED_OBJECT);
- if (impl)
- {
+ if (impl) {
status = impl->DeleteGlobalRouting(globrouting);
- }
+ }
return status;
- }
+}
gint QTMSFactory::CreateDTMF(QTMSStreamType streamtype, QTMSDTMF*& dtmf)
- {
+{
gint status(TMS_RESULT_UNINITIALIZED_OBJECT);
- if (impl)
- {
+ if (impl) {
status = impl->CreateDTMF(streamtype, dtmf);
- }
+ }
return status;
- }
+}
gint QTMSFactory::DeleteDTMF(QTMSDTMF*& dtmf)
- {
+{
gint status(TMS_RESULT_UNINITIALIZED_OBJECT);
- if (impl)
- {
+ if (impl) {
status = impl->DeleteDTMF(dtmf);
- }
+ }
return status;
- }
+}
gint QTMSFactory::CreateRingTonePlayer(QTMSRingTone*& rt)
- {
+{
gint status(TMS_RESULT_UNINITIALIZED_OBJECT);
- if (impl)
- {
+ if (impl) {
status = impl->CreateRingTonePlayer(rt);
- }
+ }
return status;
- }
+}
gint QTMSFactory::DeleteRingTonePlayer(QTMSRingTone*& rt)
- {
+{
gint status(TMS_RESULT_UNINITIALIZED_OBJECT);
- if (impl)
- {
+ if (impl) {
status = impl->DeleteRingTonePlayer(rt);
- }
+ }
return status;
- }
+}
gint QTMSFactory::CreateInbandTonePlayer(QTMSInbandTone*& inbandtone)
- {
+{
gint status(TMS_RESULT_UNINITIALIZED_OBJECT);
- if (impl)
- {
+ if (impl) {
status = impl->CreateInbandTonePlayer(inbandtone);
- }
+ }
return status;
- }
+}
gint QTMSFactory::DeleteInbandTonePlayer(QTMSInbandTone*& inbandtone)
- {
+{
gint status(TMS_RESULT_UNINITIALIZED_OBJECT);
- if (impl)
- {
+ if (impl) {
status = impl->DeleteInbandTonePlayer(inbandtone);
- }
+ }
return status;
- }
+}
--- a/qtms/src/qtmsfactoryimpl.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/src/qtmsfactoryimpl.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -56,559 +56,515 @@
using namespace TMS;
QTMSFactoryImpl::QTMSFactoryImpl()
- {
+{
TRACE_PRN_FN_ENT;
TMSVer* ver = NULL;
TMSFactory::CreateFactory(iFactory, *ver);
TRACE_PRN_FN_EXT;
- }
+}
QTMSFactoryImpl::~QTMSFactoryImpl()
- {
+{
TRACE_PRN_FN_ENT;
delete iFactory;
TRACE_PRN_FN_EXT;
- }
+}
-gint QTMSFactoryImpl::CreateCall(QTMSCallType ctype, QTMSCall*& qtmscall,
- guint /*ctxid*/)
- {
+gint QTMSFactoryImpl::CreateCall(QTMSCallType ctype, QTMSCall*& qtmscall, guint /*ctxid*/)
+{
TRACE_PRN_FN_ENT;
gint ret(QTMS_RESULT_UNINITIALIZED_OBJECT);
TMSCall* tmscall(NULL);
- if (iFactory)
- {
+ if (iFactory) {
ret = iFactory->CreateCall((TMSCallType) ctype, tmscall);
- if (ret == TMS_RESULT_SUCCESS)
- {
+ if (ret == TMS_RESULT_SUCCESS) {
ret = QTMSCallImpl::Create(qtmscall, tmscall);
- }
}
+ }
TRACE_PRN_FN_EXT;
return ret;
- }
+}
gint QTMSFactoryImpl::DeleteCall(QTMSCall*& qtmscall)
- {
+{
TRACE_PRN_FN_ENT;
gint ret(QTMS_RESULT_SUCCESS);
delete qtmscall;
qtmscall = NULL;
TRACE_PRN_FN_EXT;
return ret;
- }
+}
gint QTMSFactoryImpl::IsCallTypeSupported(QTMSCallType ctype, gboolean& flag)
- {
+{
gint ret(QTMS_RESULT_SUCCESS);
- switch (ctype)
- {
- case QTMS_CALL_CS:
- case QTMS_CALL_IP:
- flag = ETrue;
- break;
- case QTMS_CALL_ECS: //from TB 10.1
- default:
- flag = EFalse;
- break;
- }
+ switch (ctype) {
+ case QTMS_CALL_CS:
+ case QTMS_CALL_IP:
+ flag = ETrue;
+ break;
+ case QTMS_CALL_ECS: //from TB 10.1
+ default:
+ flag = EFalse;
+ break;
+ }
return ret;
- }
+}
-gint QTMSFactoryImpl::GetSupportedFormats(const QTMSStreamType strmtype,
- FormatVector& fmtlist)
- {
+gint QTMSFactoryImpl::GetSupportedFormats(const QTMSStreamType strmtype, FormatVector& fmtlist)
+{
TRACE_PRN_FN_ENT;
gint ret(QTMS_RESULT_UNINITIALIZED_OBJECT);
TMS::FormatVector tmsfmtlist;
- if (iFactory)
- {
- ret = iFactory->GetSupportedFormats((TMSStreamType) strmtype,
- tmsfmtlist);
- }
+ if (iFactory) {
+ ret = iFactory->GetSupportedFormats((TMSStreamType) strmtype, tmsfmtlist);
+ }
std::vector<TMSFormat*>::iterator itCodecs = tmsfmtlist.begin();
TMSFormatType fmttype;
- for (; itCodecs < tmsfmtlist.end(); itCodecs++)
- {
+ for (; itCodecs < tmsfmtlist.end(); itCodecs++) {
(*itCodecs)->GetType(fmttype);
QTMSFormat* qtmsfmt(NULL);
- switch (fmttype)
- {
- case QTMS_FORMAT_PCM:
- ret = QTMSPCMFormatImpl::Create(qtmsfmt,*itCodecs);
- break;
- case QTMS_FORMAT_AMR:
- ret = QTMSAMRFormatImpl::Create(qtmsfmt,*itCodecs);
- break;
- case QTMS_FORMAT_G711:
- ret = QTMSG711FormatImpl::Create(qtmsfmt,*itCodecs);
- break;
- case QTMS_FORMAT_G729:
- ret = QTMSG729FormatImpl::Create(qtmsfmt,*itCodecs);
- break;
- case QTMS_FORMAT_ILBC:
- ret = QTMSILBCFormatImpl::Create(qtmsfmt,*itCodecs);
- break;
- default:
- break;
- }
+ switch (fmttype) {
+ case QTMS_FORMAT_PCM:
+ ret = QTMSPCMFormatImpl::Create(qtmsfmt, *itCodecs);
+ break;
+ case QTMS_FORMAT_AMR:
+ ret = QTMSAMRFormatImpl::Create(qtmsfmt, *itCodecs);
+ break;
+ case QTMS_FORMAT_G711:
+ ret = QTMSG711FormatImpl::Create(qtmsfmt, *itCodecs);
+ break;
+ case QTMS_FORMAT_G729:
+ ret = QTMSG729FormatImpl::Create(qtmsfmt, *itCodecs);
+ break;
+ case QTMS_FORMAT_ILBC:
+ ret = QTMSILBCFormatImpl::Create(qtmsfmt, *itCodecs);
+ break;
+ default:
+ break;
+ }
- if (qtmsfmt)
- {
+ if (qtmsfmt) {
fmtlist.push_back(qtmsfmt);
- }
}
+ }
TRACE_PRN_FN_EXT;
return ret;
- }
+}
-gint QTMSFactoryImpl::CreateFormat(QTMSFormatType fmttype,
- QTMSFormat*& qtmsfmt)
- {
+gint QTMSFactoryImpl::CreateFormat(QTMSFormatType fmttype, QTMSFormat*& qtmsfmt)
+{
TRACE_PRN_FN_ENT;
gint ret(QTMS_RESULT_UNINITIALIZED_OBJECT);
TMSFormat* tmsformat(NULL);
- if (iFactory)
- {
+ if (iFactory) {
ret = iFactory->CreateFormat((TMSFormatType) fmttype, tmsformat);
- if (ret == TMS_RESULT_SUCCESS)
- {
- switch (fmttype)
- {
- case QTMS_FORMAT_PCM:
- ret = QTMSPCMFormatImpl::Create(qtmsfmt, tmsformat);
- break;
- case QTMS_FORMAT_AMR:
- ret = QTMSAMRFormatImpl::Create(qtmsfmt, tmsformat);
- break;
- case QTMS_FORMAT_G711:
- ret = QTMSG711FormatImpl::Create(qtmsfmt, tmsformat);
- break;
- case QTMS_FORMAT_G729:
- ret = QTMSG729FormatImpl::Create(qtmsfmt, tmsformat);
- break;
- case QTMS_FORMAT_ILBC:
- ret = QTMSILBCFormatImpl::Create(qtmsfmt, tmsformat);
- break;
- default:
- ret = QTMS_RESULT_FORMAT_TYPE_NOT_SUPPORTED;
- break;
- }
+ if (ret == TMS_RESULT_SUCCESS) {
+ switch (fmttype) {
+ case QTMS_FORMAT_PCM:
+ ret = QTMSPCMFormatImpl::Create(qtmsfmt, tmsformat);
+ break;
+ case QTMS_FORMAT_AMR:
+ ret = QTMSAMRFormatImpl::Create(qtmsfmt, tmsformat);
+ break;
+ case QTMS_FORMAT_G711:
+ ret = QTMSG711FormatImpl::Create(qtmsfmt, tmsformat);
+ break;
+ case QTMS_FORMAT_G729:
+ ret = QTMSG729FormatImpl::Create(qtmsfmt, tmsformat);
+ break;
+ case QTMS_FORMAT_ILBC:
+ ret = QTMSILBCFormatImpl::Create(qtmsfmt, tmsformat);
+ break;
+ default:
+ ret = QTMS_RESULT_FORMAT_TYPE_NOT_SUPPORTED;
+ break;
}
}
+ }
TRACE_PRN_FN_EXT;
return ret;
- }
+}
gint QTMSFactoryImpl::DeleteFormat(QTMSFormat*& qtmsfmt)
- {
+{
TRACE_PRN_FN_ENT;
__ASSERT_ALWAYS(qtmsfmt, PANIC(QTMS_RESULT_NULL_ARGUMENT));
gint ret(QTMS_RESULT_SUCCESS);
QTMSFormatType fmttype;
ret = qtmsfmt->GetType(fmttype);
- switch (fmttype)
- {
- case QTMS_FORMAT_PCM:
- delete (static_cast<QTMSPCMFormatImpl*>(qtmsfmt));
- qtmsfmt = NULL;
- break;
- case QTMS_FORMAT_AMR:
- delete (static_cast<QTMSAMRFormatImpl*>(qtmsfmt));
- qtmsfmt = NULL;
- break;
- case QTMS_FORMAT_G711:
- delete (static_cast<QTMSG711FormatImpl*>(qtmsfmt));
- qtmsfmt = NULL;
- break;
- case QTMS_FORMAT_G729:
- delete (static_cast<QTMSG729FormatImpl*>(qtmsfmt));
- qtmsfmt = NULL;
- break;
- case QTMS_FORMAT_ILBC:
- delete (static_cast<QTMSILBCFormatImpl*>(qtmsfmt));
- qtmsfmt = NULL;
- break;
- default:
- ret = QTMS_RESULT_FORMAT_TYPE_NOT_SUPPORTED;
- break;
- }
+ switch (fmttype) {
+ case QTMS_FORMAT_PCM:
+ delete (static_cast<QTMSPCMFormatImpl*> (qtmsfmt));
+ qtmsfmt = NULL;
+ break;
+ case QTMS_FORMAT_AMR:
+ delete (static_cast<QTMSAMRFormatImpl*> (qtmsfmt));
+ qtmsfmt = NULL;
+ break;
+ case QTMS_FORMAT_G711:
+ delete (static_cast<QTMSG711FormatImpl*> (qtmsfmt));
+ qtmsfmt = NULL;
+ break;
+ case QTMS_FORMAT_G729:
+ delete (static_cast<QTMSG729FormatImpl*> (qtmsfmt));
+ qtmsfmt = NULL;
+ break;
+ case QTMS_FORMAT_ILBC:
+ delete (static_cast<QTMSILBCFormatImpl*> (qtmsfmt));
+ qtmsfmt = NULL;
+ break;
+ default:
+ ret = QTMS_RESULT_FORMAT_TYPE_NOT_SUPPORTED;
+ break;
+ }
TRACE_PRN_FN_EXT;
return ret;
- }
+}
-gint QTMSFactoryImpl::CreateEffect(QTMSEffectType tmseffecttype,
- QTMSEffect*& qtmseffect)
- {
+gint QTMSFactoryImpl::CreateEffect(QTMSEffectType tmseffecttype, QTMSEffect*& qtmseffect)
+{
TRACE_PRN_FN_ENT;
gint ret(QTMS_RESULT_UNINITIALIZED_OBJECT);
TMSEffect* tmseffect(NULL);
- if (iFactory)
- {
+ if (iFactory) {
ret = iFactory->CreateEffect((TMSEffectType) tmseffecttype, tmseffect);
- if (ret == TMS_RESULT_SUCCESS)
- {
- switch (tmseffecttype)
- {
- case TMS_EFFECT_VOLUME:
- ret = QTMSVolumeEffectImpl::Create(qtmseffect, tmseffect);
- break;
- case TMS_EFFECT_GAIN:
- ret = QTMSGainEffectImpl::Create(qtmseffect, tmseffect);
- break;
- case TMS_EFFECT_GLOBAL_VOL:
- ret = QTMSGlobalVolEffectImpl::Create(qtmseffect,
- tmseffect);
- break;
- case TMS_EFFECT_GLOBAL_GAIN:
- ret = QTMSGlobalGainEffectImpl::Create(qtmseffect,
- tmseffect);
- break;
- default:
- ret = TMS_RESULT_EFFECT_TYPE_NOT_SUPPORTED;
- break;
- }
+ if (ret == TMS_RESULT_SUCCESS) {
+ switch (tmseffecttype) {
+ case TMS_EFFECT_VOLUME:
+ ret = QTMSVolumeEffectImpl::Create(qtmseffect, tmseffect);
+ break;
+ case TMS_EFFECT_GAIN:
+ ret = QTMSGainEffectImpl::Create(qtmseffect, tmseffect);
+ break;
+ case TMS_EFFECT_GLOBAL_VOL:
+ ret = QTMSGlobalVolEffectImpl::Create(qtmseffect, tmseffect);
+ break;
+ case TMS_EFFECT_GLOBAL_GAIN:
+ ret = QTMSGlobalGainEffectImpl::Create(qtmseffect, tmseffect);
+ break;
+ default:
+ ret = TMS_RESULT_EFFECT_TYPE_NOT_SUPPORTED;
+ break;
}
}
+ }
TRACE_PRN_FN_EXT;
return ret;
- }
+}
gint QTMSFactoryImpl::DeleteEffect(QTMSEffect*& qtmseffect)
- {
+{
TRACE_PRN_FN_ENT;
gint ret(QTMS_RESULT_SUCCESS);
QTMSEffectType effecttype;
ret = qtmseffect->GetType(effecttype);
- switch (effecttype)
- {
- case QTMS_EFFECT_VOLUME:
- delete (static_cast<QTMSVolumeEffectImpl*> (qtmseffect));
- qtmseffect = NULL;
- break;
- case QTMS_EFFECT_GAIN:
- delete (static_cast<QTMSGainEffectImpl*> (qtmseffect));
- qtmseffect = NULL;
- break;
- case QTMS_EFFECT_GLOBAL_VOL:
- delete (static_cast<QTMSGlobalVolEffectImpl*> (qtmseffect));
- qtmseffect = NULL;
- break;
- case QTMS_EFFECT_GLOBAL_GAIN:
- delete (static_cast<QTMSGlobalGainEffectImpl*> (qtmseffect));
- qtmseffect = NULL;
- break;
- default:
- ret = QTMS_RESULT_EFFECT_TYPE_NOT_SUPPORTED;
- break;
- }
+ switch (effecttype) {
+ case QTMS_EFFECT_VOLUME:
+ delete (static_cast<QTMSVolumeEffectImpl*> (qtmseffect));
+ qtmseffect = NULL;
+ break;
+ case QTMS_EFFECT_GAIN:
+ delete (static_cast<QTMSGainEffectImpl*> (qtmseffect));
+ qtmseffect = NULL;
+ break;
+ case QTMS_EFFECT_GLOBAL_VOL:
+ delete (static_cast<QTMSGlobalVolEffectImpl*> (qtmseffect));
+ qtmseffect = NULL;
+ break;
+ case QTMS_EFFECT_GLOBAL_GAIN:
+ delete (static_cast<QTMSGlobalGainEffectImpl*> (qtmseffect));
+ qtmseffect = NULL;
+ break;
+ default:
+ ret = QTMS_RESULT_EFFECT_TYPE_NOT_SUPPORTED;
+ break;
+ }
TRACE_PRN_FN_EXT;
return ret;
- }
+}
-gint QTMSFactoryImpl::CreateBuffer(QTMSBufferType buffertype, guint size,
- QTMSBuffer*& buffer)
- {
+gint QTMSFactoryImpl::CreateBuffer(QTMSBufferType buffertype, guint size, QTMSBuffer*& buffer)
+{
TRACE_PRN_FN_ENT;
gint ret(QTMS_RESULT_UNINITIALIZED_OBJECT);
TMSBuffer* tmsbuffer(NULL);
- if (iFactory)
- {
- ret = iFactory->CreateBuffer((TMSBufferType) buffertype, size,
- tmsbuffer);
- if (ret == TMS_RESULT_SUCCESS)
- {
- switch (buffertype)
- {
- case QTMS_BUFFER_MEMORY:
- ret = QTMSBufferImpl::Create(buffertype, buffer, tmsbuffer);
- break;
- default:
- ret = QTMS_RESULT_BUFFER_TYPE_NOT_SUPPORTED;
- break;
- }
+ if (iFactory) {
+ ret = iFactory->CreateBuffer((TMSBufferType) buffertype, size, tmsbuffer);
+ if (ret == TMS_RESULT_SUCCESS) {
+ switch (buffertype) {
+ case QTMS_BUFFER_MEMORY:
+ ret = QTMSBufferImpl::Create(buffertype, buffer, tmsbuffer);
+ break;
+ default:
+ ret = QTMS_RESULT_BUFFER_TYPE_NOT_SUPPORTED;
+ break;
}
}
+ }
TRACE_PRN_FN_EXT;
return ret;
- }
+}
gint QTMSFactoryImpl::DeleteBuffer(QTMSBuffer*& qtmsbuffer)
- {
+{
TRACE_PRN_FN_ENT;
gint ret(QTMS_RESULT_SUCCESS);
delete qtmsbuffer;
qtmsbuffer = NULL;
TRACE_PRN_FN_EXT;
return ret;
- }
+}
-gint QTMSFactoryImpl::CreateSource(QTMSSourceType srctype,
- QTMSSource*& qtmssrc)
- {
+gint QTMSFactoryImpl::CreateSource(QTMSSourceType srctype, QTMSSource*& qtmssrc)
+{
TRACE_PRN_FN_ENT;
gint ret(QTMS_RESULT_UNINITIALIZED_OBJECT);
TMS::TMSSource* tmssource(NULL);
- if (iFactory)
- {
+ if (iFactory) {
ret = iFactory->CreateSource((TMSSourceType) srctype, tmssource);
- if (ret == TMS_RESULT_SUCCESS)
- {
- switch (srctype)
- {
- case QTMS_SOURCE_CLIENT:
- ret = QTMSClientSourceImpl::Create(qtmssrc, tmssource);
- break;
- case QTMS_SOURCE_MODEM:
- ret = QTMSModemSourceImpl::Create(qtmssrc, tmssource);
- break;
- case QTMS_SOURCE_MIC:
- ret = QTMSMicSourceImpl::Create(qtmssrc, tmssource);
- break;
- default:
- ret = TMS_RESULT_SOURCE_TYPE_NOT_SUPPORTED;
- break;
- }
+ if (ret == TMS_RESULT_SUCCESS) {
+ switch (srctype) {
+ case QTMS_SOURCE_CLIENT:
+ ret = QTMSClientSourceImpl::Create(qtmssrc, tmssource);
+ break;
+ case QTMS_SOURCE_MODEM:
+ ret = QTMSModemSourceImpl::Create(qtmssrc, tmssource);
+ break;
+ case QTMS_SOURCE_MIC:
+ ret = QTMSMicSourceImpl::Create(qtmssrc, tmssource);
+ break;
+ default:
+ ret = TMS_RESULT_SOURCE_TYPE_NOT_SUPPORTED;
+ break;
}
}
+ }
TRACE_PRN_FN_EXT;
return ret;
- }
+}
gint QTMSFactoryImpl::DeleteSource(QTMSSource*& qtmssrc)
- {
+{
TRACE_PRN_FN_ENT;
__ASSERT_ALWAYS(qtmssrc, PANIC(QTMS_RESULT_NULL_ARGUMENT));
gint ret(QTMS_RESULT_SUCCESS);
QTMSSourceType sourcetype;
ret = qtmssrc->GetType(sourcetype);
- switch (sourcetype)
- {
- case QTMS_SOURCE_CLIENT:
- delete (static_cast<QTMSClientSourceImpl*>(qtmssrc));
- qtmssrc = NULL;
- break;
- case QTMS_SOURCE_MODEM:
- {
- delete (static_cast<QTMSModemSourceImpl*>(qtmssrc));
- qtmssrc = NULL;
- }
- break;
- case TMS_SOURCE_MIC:
- {
- delete (static_cast<QTMSMicSourceImpl*>(qtmssrc));
- qtmssrc = NULL;
- }
- break;
- default:
- ret = TMS_RESULT_SOURCE_TYPE_NOT_SUPPORTED;
- break;
- }
+ switch (sourcetype) {
+ case QTMS_SOURCE_CLIENT:
+ delete (static_cast<QTMSClientSourceImpl*> (qtmssrc));
+ qtmssrc = NULL;
+ break;
+ case QTMS_SOURCE_MODEM:
+ {
+ delete (static_cast<QTMSModemSourceImpl*> (qtmssrc));
+ qtmssrc = NULL;
+ }
+ break;
+ case TMS_SOURCE_MIC:
+ {
+ delete (static_cast<QTMSMicSourceImpl*> (qtmssrc));
+ qtmssrc = NULL;
+ }
+ break;
+ default:
+ ret = TMS_RESULT_SOURCE_TYPE_NOT_SUPPORTED;
+ break;
+ }
TRACE_PRN_FN_EXT;
return ret;
- }
+}
gint QTMSFactoryImpl::CreateSink(QTMSSinkType sinktype, QTMSSink*& qtmssink)
- {
+{
TRACE_PRN_FN_ENT;
gint ret(QTMS_RESULT_UNINITIALIZED_OBJECT);
TMS::TMSSink* tmssink(NULL);
- if (iFactory)
- {
+ if (iFactory) {
ret = iFactory->CreateSink((TMSSinkType) sinktype, tmssink);
- if (ret == TMS_RESULT_SUCCESS)
- {
- switch (sinktype)
- {
- case QTMS_SINK_CLIENT:
- ret = QTMSClientSinkImpl::Create(qtmssink, tmssink);
- break;
- case QTMS_SINK_MODEM:
- ret = QTMSModemSinkImpl::Create(qtmssink, tmssink);
- break;
- case QTMS_SINK_SPEAKER:
- ret = QTMSSpeakerSinkImpl::Create(qtmssink, tmssink);
- break;
- default:
- ret = TMS_RESULT_SINK_TYPE_NOT_SUPPORTED;
- break;
- }
+ if (ret == TMS_RESULT_SUCCESS) {
+ switch (sinktype) {
+ case QTMS_SINK_CLIENT:
+ ret = QTMSClientSinkImpl::Create(qtmssink, tmssink);
+ break;
+ case QTMS_SINK_MODEM:
+ ret = QTMSModemSinkImpl::Create(qtmssink, tmssink);
+ break;
+ case QTMS_SINK_SPEAKER:
+ ret = QTMSSpeakerSinkImpl::Create(qtmssink, tmssink);
+ break;
+ default:
+ ret = TMS_RESULT_SINK_TYPE_NOT_SUPPORTED;
+ break;
}
}
+ }
TRACE_PRN_FN_EXT;
return ret;
- }
+}
gint QTMSFactoryImpl::DeleteSink(QTMSSink*& qtmssink)
- {
+{
TRACE_PRN_FN_ENT;
__ASSERT_ALWAYS(qtmssink, PANIC(QTMS_RESULT_NULL_ARGUMENT));
gint ret(QTMS_RESULT_SUCCESS);
QTMSSinkType sinktype;
ret = qtmssink->GetType(sinktype);
- switch (sinktype)
- {
- case QTMS_SINK_CLIENT:
- {
- delete (static_cast<QTMSClientSinkImpl*>(qtmssink));
- qtmssink = NULL;
- }
- break;
- case QTMS_SINK_MODEM:
- {
- delete (static_cast<QTMSModemSinkImpl*>(qtmssink));
- qtmssink = NULL;
- }
- break;
- case QTMS_SINK_SPEAKER:
- {
- delete (static_cast<QTMSSpeakerSinkImpl*>(qtmssink));
- qtmssink = NULL;
- }
- break;
- default:
- ret = QTMS_RESULT_SINK_TYPE_NOT_SUPPORTED;
- break;
- }
+ switch (sinktype) {
+ case QTMS_SINK_CLIENT:
+ {
+ delete (static_cast<QTMSClientSinkImpl*> (qtmssink));
+ qtmssink = NULL;
+ }
+ break;
+ case QTMS_SINK_MODEM:
+ {
+ delete (static_cast<QTMSModemSinkImpl*> (qtmssink));
+ qtmssink = NULL;
+ }
+ break;
+ case QTMS_SINK_SPEAKER:
+ {
+ delete (static_cast<QTMSSpeakerSinkImpl*> (qtmssink));
+ qtmssink = NULL;
+ }
+ break;
+ default:
+ ret = QTMS_RESULT_SINK_TYPE_NOT_SUPPORTED;
+ break;
+ }
TRACE_PRN_FN_EXT;
return ret;
- }
+}
gint QTMSFactoryImpl::CreateGlobalRouting(QTMSGlobalRouting*& qrouting)
- {
+{
TRACE_PRN_FN_ENT;
gint ret(QTMS_RESULT_UNINITIALIZED_OBJECT);
TMS::TMSGlobalRouting* tmsrouting(NULL);
- if (iFactory)
- {
+ if (iFactory) {
ret = iFactory->CreateGlobalRouting(tmsrouting);
- if (ret == TMS_RESULT_SUCCESS)
- {
+ if (ret == TMS_RESULT_SUCCESS) {
ret = QTMSGlobalRoutingImpl::Create(qrouting, tmsrouting);
- }
}
+ }
TRACE_PRN_FN_EXT;
return ret;
- }
+}
gint QTMSFactoryImpl::DeleteGlobalRouting(QTMSGlobalRouting*& globalrouting)
- {
+{
TRACE_PRN_FN_ENT;
gint ret(QTMS_RESULT_SUCCESS);
- delete (static_cast<QTMSGlobalRoutingImpl*>(globalrouting));
+ delete (static_cast<QTMSGlobalRoutingImpl*> (globalrouting));
globalrouting = NULL;
TRACE_PRN_FN_EXT;
return ret;
- }
+}
gint QTMSFactoryImpl::CreateDTMF(QTMSStreamType streamtype, QTMSDTMF*& qdtmf)
- {
+{
TRACE_PRN_FN_ENT;
gint ret(QTMS_RESULT_UNINITIALIZED_OBJECT);
TMS::TMSDTMF* tmsdtmf = NULL;
- if (iFactory)
- {
+ if (iFactory) {
ret = iFactory->CreateDTMF((TMSStreamType) streamtype, tmsdtmf);
- if (ret == TMS_RESULT_SUCCESS)
- {
+ if (ret == TMS_RESULT_SUCCESS) {
ret = QTMSDTMFImpl::Create(qdtmf, tmsdtmf);
- }
}
+ }
TRACE_PRN_FN_EXT;
return ret;
- }
+}
gint QTMSFactoryImpl::DeleteDTMF(QTMSDTMF*& dtmf)
- {
+{
TRACE_PRN_FN_ENT;
gint ret(QTMS_RESULT_SUCCESS);
- delete (static_cast<QTMSDTMFImpl*>(dtmf));
+ delete (static_cast<QTMSDTMFImpl*> (dtmf));
dtmf = NULL;
TRACE_PRN_FN_EXT;
return ret;
- }
+}
gint QTMSFactoryImpl::CreateRingTonePlayer(QTMSRingTone*& rt)
- {
+{
TRACE_PRN_FN_ENT;
gint ret(QTMS_RESULT_UNINITIALIZED_OBJECT);
TMS::TMSRingTone* tmsrt = NULL;
- if (iFactory)
- {
+ if (iFactory) {
ret = iFactory->CreateRingTonePlayer(tmsrt);
- if (ret == TMS_RESULT_SUCCESS)
- {
+ if (ret == TMS_RESULT_SUCCESS) {
ret = QTMSRingToneImpl::Create(rt, tmsrt);
- }
}
+ }
TRACE_PRN_FN_EXT;
return ret;
- }
+}
gint QTMSFactoryImpl::DeleteRingTonePlayer(QTMSRingTone*& rt)
- {
+{
TRACE_PRN_FN_ENT;
gint ret(QTMS_RESULT_SUCCESS);
- delete (static_cast<QTMSRingToneImpl*>(rt));
+ delete (static_cast<QTMSRingToneImpl*> (rt));
rt = NULL;
TRACE_PRN_FN_EXT;
return ret;
- }
+}
gint QTMSFactoryImpl::CreateInbandTonePlayer(QTMSInbandTone*& qinbandtone)
- {
+{
TRACE_PRN_FN_ENT;
gint ret(QTMS_RESULT_UNINITIALIZED_OBJECT);
TMS::TMSInbandTone* tmsinband = NULL;
- if (iFactory)
- {
+ if (iFactory) {
ret = iFactory->CreateInbandTonePlayer(tmsinband);
- if (ret == TMS_RESULT_SUCCESS)
- {
+ if (ret == TMS_RESULT_SUCCESS) {
ret = QTMSInbandToneImpl::Create(qinbandtone, tmsinband);
- }
}
+ }
TRACE_PRN_FN_EXT;
return ret;
- }
+}
gint QTMSFactoryImpl::DeleteInbandTonePlayer(QTMSInbandTone*& inbandtone)
- {
+{
TRACE_PRN_FN_ENT;
gint ret(QTMS_RESULT_SUCCESS);
- delete (static_cast<QTMSInbandToneImpl*>(inbandtone));
+ delete (static_cast<QTMSInbandToneImpl*> (inbandtone));
inbandtone = NULL;
TRACE_PRN_FN_EXT;
return ret;
- }
+}
// End of file
--- a/qtms/src/qtmsformat.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/src/qtmsformat.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -22,52 +22,48 @@
QTMSFormat::QTMSFormat() :
iFormat(NULL)
- {
- }
+{
+}
QTMSFormat::~QTMSFormat()
- {
+{
delete iFormat;
- }
+}
gint QTMSFormat::GetSupportedBitRates(BitRateVector& aVector)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iFormat)
- {
+ if (iFormat) {
status = iFormat->GetSupportedBitRates(aVector);
- }
+ }
return status;
- }
+}
gint QTMSFormat::SetBitRate(const guint aBitrate)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iFormat)
- {
+ if (iFormat) {
status = iFormat->SetBitRate(aBitrate);
- }
+ }
return status;
- }
+}
gint QTMSFormat::GetBitRate(guint& aBitrate)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iFormat)
- {
+ if (iFormat) {
status = iFormat->GetBitRate(aBitrate);
- }
+ }
return status;
- }
+}
gint QTMSFormat::GetType(QTMSFormatType& fmttype)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iFormat)
- {
+ if (iFormat) {
status = iFormat->GetType(fmttype);
- }
+ }
return status;
- }
+}
// End of file
--- a/qtms/src/qtmsg711.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/src/qtmsg711.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -22,91 +22,83 @@
using namespace TMS;
QTMSG711Format::QTMSG711Format()
- {
- }
+{
+}
QTMSG711Format::~QTMSG711Format()
- {
- }
+{
+}
gint QTMSG711Format::SetMode(const QTMSG711CodecMode aMode)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iFormat)
- {
+ if (iFormat) {
status = static_cast<TMSG711Format*> (iFormat)->SetMode(aMode);
- }
+ }
return status;
- }
+}
gint QTMSG711Format::GetMode(QTMSG711CodecMode& aMode)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iFormat)
- {
+ if (iFormat) {
status = static_cast<TMSG711Format*> (iFormat)->GetMode(aMode);
- }
+ }
return status;
- }
+}
gint QTMSG711Format::SetCNG(const gboolean aCng)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iFormat)
- {
+ if (iFormat) {
status = static_cast<TMSG711Format*> (iFormat)->SetCNG(aCng);
- }
+ }
return status;
- }
+}
gint QTMSG711Format::GetCNG(gboolean& aCng)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iFormat)
- {
+ if (iFormat) {
status = static_cast<TMSG711Format*> (iFormat)->GetCNG(aCng);
- }
+ }
return status;
- }
+}
gint QTMSG711Format::SetPlc(const gboolean aPlc)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iFormat)
- {
+ if (iFormat) {
status = static_cast<TMSG711Format*> (iFormat)->SetPlc(aPlc);
- }
+ }
return status;
- }
+}
gint QTMSG711Format::GetPlc(gboolean& aPlc)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iFormat)
- {
+ if (iFormat) {
status = static_cast<TMSG711Format*> (iFormat)->GetPlc(aPlc);
- }
+ }
return status;
- }
+}
gint QTMSG711Format::SetVADMode(const gboolean aVad)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iFormat)
- {
+ if (iFormat) {
status = static_cast<TMSG711Format*> (iFormat)->SetVADMode(aVad);
- }
+ }
return status;
- }
+}
gint QTMSG711Format::GetVADMode(gboolean& aVad)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iFormat)
- {
+ if (iFormat) {
status = static_cast<TMSG711Format*> (iFormat)->GetVADMode(aVad);
- }
+ }
return status;
- }
+}
// End of file
--- a/qtms/src/qtmsg711impl.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/src/qtmsg711impl.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -23,58 +23,53 @@
using namespace TMS;
QTMSG711FormatImpl::QTMSG711FormatImpl()
- {
- }
+{
+}
QTMSG711FormatImpl::~QTMSG711FormatImpl()
- {
- }
+{
+}
-gint QTMSG711FormatImpl::Create(QTMSFormat*& qformat,
- TMS::TMSFormat*& tmsformat)
- {
+gint QTMSG711FormatImpl::Create(QTMSFormat*& qformat, TMS::TMSFormat*& tmsformat)
+{
gint ret(QTMS_RESULT_INSUFFICIENT_MEMORY);
QTMSG711FormatImpl* self = new QTMSG711FormatImpl();
- if (self)
- {
+ if (self) {
ret = self->PostConstruct();
- if (ret != QTMS_RESULT_SUCCESS)
- {
+ if (ret != QTMS_RESULT_SUCCESS) {
delete self;
self = NULL;
- }
+ }
self->iFormat = tmsformat;
- }
+ }
qformat = self;
return ret;
- }
+}
gint QTMSG711FormatImpl::PostConstruct()
- {
+{
gint ret(QTMS_RESULT_SUCCESS);
return ret;
- }
+}
gint QTMSG711FormatImpl::GetFormat(TMS::TMSFormat*& fmt)
- {
+{
gint ret(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iFormat)
- {
+ if (iFormat) {
fmt = iFormat;
ret = QTMS_RESULT_SUCCESS;
- }
+ }
return ret;
- }
+}
gint QTMSG711FormatImpl::GetType(QTMSFormatType& fmttype)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iFormat)
- {
+ if (iFormat) {
status = iFormat->GetType(fmttype);
- }
+ }
return status;
- }
+}
// End of file
--- a/qtms/src/qtmsg729.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/src/qtmsg729.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -23,31 +23,29 @@
using namespace TMS;
QTMSG729Format::QTMSG729Format()
- {
- }
+{
+}
QTMSG729Format::~QTMSG729Format()
- {
- }
+{
+}
gint QTMSG729Format::SetVADMode(const gboolean aVad)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iFormat)
- {
+ if (iFormat) {
status = static_cast<TMSG729Format*> (iFormat)->SetVADMode(aVad);
- }
+ }
return status;
- }
+}
gint QTMSG729Format::GetVADMode(gboolean& aVad)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iFormat)
- {
+ if (iFormat) {
status = static_cast<TMSG729Format*> (iFormat)->GetVADMode(aVad);
- }
+ }
return status;
- }
+}
// End of file
--- a/qtms/src/qtmsg729impl.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/src/qtmsg729impl.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -24,60 +24,55 @@
using namespace TMS;
QTMSG729FormatImpl::QTMSG729FormatImpl()
- {
- }
+{
+}
QTMSG729FormatImpl::~QTMSG729FormatImpl()
- {
+{
TRACE_PRN_FN_ENT;
TRACE_PRN_FN_EXT;
- }
+}
-gint QTMSG729FormatImpl::Create(QTMSFormat*& qformat,
- TMS::TMSFormat*& tmsformat)
- {
+gint QTMSG729FormatImpl::Create(QTMSFormat*& qformat, TMS::TMSFormat*& tmsformat)
+{
gint ret(QTMS_RESULT_INSUFFICIENT_MEMORY);
QTMSG729FormatImpl* self = new QTMSG729FormatImpl();
- if (self)
- {
+ if (self) {
ret = self->PostConstruct();
- if (ret != QTMS_RESULT_SUCCESS)
- {
+ if (ret != QTMS_RESULT_SUCCESS) {
delete self;
self = NULL;
- }
+ }
self->iFormat = tmsformat;
- }
+ }
qformat = self;
return ret;
- }
+}
gint QTMSG729FormatImpl::PostConstruct()
- {
+{
gint ret(QTMS_RESULT_SUCCESS);
return ret;
- }
+}
gint QTMSG729FormatImpl::GetFormat(TMS::TMSFormat*& fmt)
- {
+{
gint ret(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iFormat)
- {
+ if (iFormat) {
fmt = iFormat;
ret = QTMS_RESULT_SUCCESS;
- }
+ }
return ret;
- }
+}
gint QTMSG729FormatImpl::GetType(QTMSFormatType& fmttype)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iFormat)
- {
+ if (iFormat) {
status = iFormat->GetType(fmttype);
- }
+ }
return status;
- }
+}
// End of file
--- a/qtms/src/qtmsgaineffect.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/src/qtmsgaineffect.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -25,52 +25,48 @@
QTMSGainEffect::QTMSGainEffect() :
iEffect(NULL)
- {
- }
+{
+}
QTMSGainEffect::~QTMSGainEffect()
- {
+{
delete iEffect;
- }
+}
gint QTMSGainEffect::GetLevel(guint& level)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iEffect)
- {
+ if (iEffect) {
status = static_cast<TMSGainEffect*> (iEffect)->GetLevel(level);
- }
+ }
return status;
- }
+}
gint QTMSGainEffect::SetLevel(const guint level)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iEffect)
- {
+ if (iEffect) {
status = static_cast<TMSGainEffect*> (iEffect)->SetLevel(level);
- }
+ }
return status;
- }
+}
gint QTMSGainEffect::GetMaxLevel(guint& level)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iEffect)
- {
+ if (iEffect) {
status = static_cast<TMSGainEffect*> (iEffect)->GetMaxLevel(level);
- }
+ }
return status;
- }
+}
gint QTMSGainEffect::GetType(QTMSSourceType& sourcetype)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iEffect)
- {
+ if (iEffect) {
status = static_cast<TMSGainEffect*> (iEffect)->GetType(sourcetype);
- }
+ }
return status;
- }
+}
// End of file
--- a/qtms/src/qtmsgaineffectimpl.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/src/qtmsgaineffectimpl.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -23,78 +23,71 @@
using namespace TMS;
QTMSGainEffectImpl::QTMSGainEffectImpl()
- {
- }
+{
+}
QTMSGainEffectImpl::~QTMSGainEffectImpl()
- {
+{
RemoveObserver(*this);
- }
+}
gint QTMSGainEffectImpl::Create(QTMSEffect*& qgain, TMS::TMSEffect*& tmsgain)
- {
+{
gint ret(QTMS_RESULT_INSUFFICIENT_MEMORY);
QTMSGainEffectImpl* self = new QTMSGainEffectImpl();
- if (self)
- {
+ if (self) {
ret = self->PostConstruct();
- if (ret != QTMS_RESULT_SUCCESS)
- {
+ if (ret != QTMS_RESULT_SUCCESS) {
delete self;
self = NULL;
- }
+ }
self->iEffect = tmsgain;
ret = self->AddObserver(*self, NULL);
- }
+ }
qgain = self;
return ret;
- }
+}
gint QTMSGainEffectImpl::PostConstruct()
- {
+{
gint ret(QTMS_RESULT_SUCCESS);
return ret;
- }
+}
-gint QTMSGainEffectImpl::AddObserver(TMS::TMSEffectObserver& obsrvr,
- gpointer user_data)
- {
+gint QTMSGainEffectImpl::AddObserver(TMS::TMSEffectObserver& obsrvr, gpointer user_data)
+{
gint ret(QTMS_RESULT_SUCCESS);
- if (iEffect)
- {
- ret = static_cast<TMSGainEffect*> (iEffect)->AddObserver(obsrvr,
- user_data);
- }
+ if (iEffect) {
+ ret = static_cast<TMSGainEffect*> (iEffect)->AddObserver(obsrvr, user_data);
+ }
return ret;
- }
+}
gint QTMSGainEffectImpl::RemoveObserver(TMS::TMSEffectObserver& obsrvr)
- {
+{
gint ret(QTMS_RESULT_SUCCESS);
- if (iEffect)
- {
+ if (iEffect) {
ret = static_cast<TMSGainEffect*> (iEffect)->RemoveObserver(obsrvr);
- }
+ }
return ret;
- }
+}
gint QTMSGainEffectImpl::GetEffect(TMS::TMSEffect*& tmseffect)
- {
+{
gint ret(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iEffect)
- {
+ if (iEffect) {
tmseffect = iEffect;
ret = QTMS_RESULT_SUCCESS;
- }
+ }
return ret;
- }
+}
void QTMSGainEffectImpl::EffectsEvent(const TMS::TMSEffect& /*tmseffect*/,
- TMS::TMSSignalEvent event)
- {
+ TMS::TMSSignalEvent event)
+{
QTMSSignalEvent qevent;
qevent.type = event.type;
@@ -104,8 +97,7 @@
qevent.event_data = event.event_data;
qevent.user_data = event.user_data;
- emit QTMS::QTMSGainEffect::EffectsEvent(static_cast<QTMSEffect&> (*this),
- qevent);
- }
+ emit QTMS::QTMSGainEffect::EffectsEvent(static_cast<QTMSEffect&> (*this), qevent);
+}
// End of file
--- a/qtms/src/qtmsglobalgaineffect.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/src/qtmsglobalgaineffect.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -25,54 +25,48 @@
QTMSGlobalGainEffect::QTMSGlobalGainEffect() :
iEffect(NULL)
- {
- }
+{
+}
QTMSGlobalGainEffect::~QTMSGlobalGainEffect()
- {
- delete (static_cast<TMSGlobalGainEffect*>(iEffect));
- }
+{
+ delete (static_cast<TMSGlobalGainEffect*> (iEffect));
+}
gint QTMSGlobalGainEffect::GetLevel(guint& level)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iEffect)
- {
+ if (iEffect) {
status = static_cast<TMSGlobalGainEffect*> (iEffect)->GetLevel(level);
- }
+ }
return status;
- }
+}
gint QTMSGlobalGainEffect::SetLevel(const guint level)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iEffect)
- {
+ if (iEffect) {
status = static_cast<TMSGlobalGainEffect*> (iEffect)->SetLevel(level);
- }
+ }
return status;
- }
+}
gint QTMSGlobalGainEffect::GetMaxLevel(guint& level)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iEffect)
- {
- status = static_cast<TMSGlobalGainEffect*> (iEffect)->GetMaxLevel(
- level);
- }
+ if (iEffect) {
+ status = static_cast<TMSGlobalGainEffect*> (iEffect)->GetMaxLevel(level);
+ }
return status;
- }
+}
gint QTMSGlobalGainEffect::GetType(QTMSSourceType& sourcetype)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iEffect)
- {
- status = static_cast<TMSGlobalGainEffect*> (iEffect)->GetType(
- sourcetype);
- }
+ if (iEffect) {
+ status = static_cast<TMSGlobalGainEffect*> (iEffect)->GetType(sourcetype);
+ }
return status;
- }
+}
// End of file
--- a/qtms/src/qtmsglobalgaineffectimpl.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/src/qtmsglobalgaineffectimpl.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -24,68 +24,60 @@
using namespace TMS;
QTMSGlobalGainEffectImpl::QTMSGlobalGainEffectImpl()
- {
- }
+{
+}
QTMSGlobalGainEffectImpl::~QTMSGlobalGainEffectImpl()
- {
+{
RemoveObserver(*this);
- }
+}
-gint QTMSGlobalGainEffectImpl::Create(QTMSEffect*& qglobalgain,
- TMS::TMSEffect*& tmsglobalgain)
- {
+gint QTMSGlobalGainEffectImpl::Create(QTMSEffect*& qglobalgain, TMS::TMSEffect*& tmsglobalgain)
+{
gint ret(QTMS_RESULT_INSUFFICIENT_MEMORY);
QTMSGlobalGainEffectImpl* self = new QTMSGlobalGainEffectImpl();
- if (self)
- {
+ if (self) {
ret = self->PostConstruct();
- if (ret != QTMS_RESULT_SUCCESS)
- {
+ if (ret != QTMS_RESULT_SUCCESS) {
delete self;
self = NULL;
- }
+ }
self->iEffect = tmsglobalgain;
ret = self->AddObserver(*self, NULL);
- }
+ }
qglobalgain = self;
return ret;
- }
+}
gint QTMSGlobalGainEffectImpl::PostConstruct()
- {
+{
gint ret(QTMS_RESULT_SUCCESS);
return ret;
- }
+}
-gint QTMSGlobalGainEffectImpl::AddObserver(TMS::TMSEffectObserver& obsrvr,
- gpointer user_data)
- {
+gint QTMSGlobalGainEffectImpl::AddObserver(TMS::TMSEffectObserver& obsrvr, gpointer user_data)
+{
gint ret(QTMS_RESULT_SUCCESS);
- if (iEffect)
- {
- ret = static_cast<TMSGlobalGainEffect*> (iEffect)->AddObserver(obsrvr,
- user_data);
- }
+ if (iEffect) {
+ ret = static_cast<TMSGlobalGainEffect*> (iEffect)->AddObserver(obsrvr, user_data);
+ }
return ret;
- }
+}
gint QTMSGlobalGainEffectImpl::RemoveObserver(TMS::TMSEffectObserver& obsrvr)
- {
+{
gint ret(QTMS_RESULT_SUCCESS);
- if (iEffect)
- {
- ret = static_cast<TMSGlobalGainEffect*> (iEffect)->RemoveObserver(
- obsrvr);
- }
+ if (iEffect) {
+ ret = static_cast<TMSGlobalGainEffect*> (iEffect)->RemoveObserver(obsrvr);
+ }
return ret;
- }
+}
-void QTMSGlobalGainEffectImpl::EffectsEvent(
- const TMS::TMSEffect& /*tmseffect*/, TMS::TMSSignalEvent event)
- {
+void QTMSGlobalGainEffectImpl::EffectsEvent(const TMS::TMSEffect& /*tmseffect*/,
+ TMS::TMSSignalEvent event)
+{
QTMSSignalEvent qevent;
qevent.type = event.type;
@@ -95,8 +87,7 @@
qevent.event_data = event.event_data;
qevent.user_data = event.user_data;
- emit QTMS::QTMSGlobalGainEffect::EffectsEvent(
- static_cast<QTMSEffect&> (*this), qevent);
- }
+ emit QTMS::QTMSGlobalGainEffect::EffectsEvent(static_cast<QTMSEffect&> (*this), qevent);
+}
// End of file
--- a/qtms/src/qtmsglobalrouting.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/src/qtmsglobalrouting.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -25,52 +25,48 @@
QTMSGlobalRouting::QTMSGlobalRouting() :
iRouting(NULL)
- {
- }
+{
+}
QTMSGlobalRouting::~QTMSGlobalRouting()
- {
+{
delete iRouting;
- }
+}
gint QTMSGlobalRouting::SetOutput(const QTMSAudioOutput output)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iRouting)
- {
+ if (iRouting) {
status = iRouting->SetOutput(output);
- }
+ }
return status;
- }
+}
gint QTMSGlobalRouting::GetOutput(QTMSAudioOutput& output)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iRouting)
- {
+ if (iRouting) {
status = iRouting->GetOutput(output);
- }
+ }
return status;
- }
+}
gint QTMSGlobalRouting::GetPreviousOutput(QTMSAudioOutput& output)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iRouting)
- {
+ if (iRouting) {
status = iRouting->GetPreviousOutput(output);
- }
+ }
return status;
- }
+}
gint QTMSGlobalRouting::GetAvailableOutputs(OutputVector& outputs)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iRouting)
- {
+ if (iRouting) {
status = iRouting->GetAvailableOutputs(outputs);
- }
+ }
return status;
- }
+}
// End of file
--- a/qtms/src/qtmsglobalroutingimpl.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/src/qtmsglobalroutingimpl.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -24,68 +24,60 @@
using namespace TMS;
QTMSGlobalRoutingImpl::QTMSGlobalRoutingImpl()
- {
- }
+{
+}
QTMSGlobalRoutingImpl::~QTMSGlobalRoutingImpl()
- {
+{
RemoveObserver(*this);
- }
+}
-gint QTMSGlobalRoutingImpl::Create(QTMSGlobalRouting*& qrouting,
- TMS::TMSGlobalRouting*& tmsrouting)
- {
+gint QTMSGlobalRoutingImpl::Create(QTMSGlobalRouting*& qrouting, TMS::TMSGlobalRouting*& tmsrouting)
+{
gint ret(QTMS_RESULT_INSUFFICIENT_MEMORY);
QTMSGlobalRoutingImpl* self = new QTMSGlobalRoutingImpl();
- if (self)
- {
+ if (self) {
ret = self->PostConstruct();
- if (ret != QTMS_RESULT_SUCCESS)
- {
+ if (ret != QTMS_RESULT_SUCCESS) {
delete self;
self = NULL;
- }
+ }
self->iRouting = tmsrouting;
ret = self->AddObserver(*self, NULL);
- }
+ }
qrouting = self;
return ret;
- }
+}
gint QTMSGlobalRoutingImpl::PostConstruct()
- {
+{
gint ret(QTMS_RESULT_SUCCESS);
return ret;
- }
+}
-gint QTMSGlobalRoutingImpl::AddObserver(TMS::TMSGlobalRoutingObserver& obsrvr,
- gpointer user_data)
- {
+gint QTMSGlobalRoutingImpl::AddObserver(TMS::TMSGlobalRoutingObserver& obsrvr, gpointer user_data)
+{
gint ret(QTMS_RESULT_SUCCESS);
- if (iRouting)
- {
+ if (iRouting) {
ret = iRouting->AddObserver(obsrvr, user_data);
- }
+ }
return ret;
- }
+}
-gint QTMSGlobalRoutingImpl::RemoveObserver(
- TMS::TMSGlobalRoutingObserver& obsrvr)
- {
+gint QTMSGlobalRoutingImpl::RemoveObserver(TMS::TMSGlobalRoutingObserver& obsrvr)
+{
gint ret(QTMS_RESULT_SUCCESS);
- if (iRouting)
- {
+ if (iRouting) {
ret = iRouting->RemoveObserver(obsrvr);
- }
- return ret;
}
+ return ret;
+}
-void QTMSGlobalRoutingImpl::GlobalRoutingEvent(
- const TMS::TMSGlobalRouting& /*routing*/, TMS::TMSSignalEvent event,
- TMS::TMSAudioOutput output)
- {
+void QTMSGlobalRoutingImpl::GlobalRoutingEvent(const TMS::TMSGlobalRouting& /*routing*/,
+ TMS::TMSSignalEvent event, TMS::TMSAudioOutput output)
+{
QTMSSignalEvent qevent;
QTMSAudioOutput qoutput;
@@ -97,8 +89,8 @@
qevent.user_data = event.user_data;
qoutput = output;
- emit QTMS::QTMSGlobalRouting::GlobalRoutingEvent(
- static_cast<QTMSGlobalRouting&> (*this), qevent, qoutput);
- }
+ emit QTMS::QTMSGlobalRouting::GlobalRoutingEvent(static_cast<QTMSGlobalRouting&> (*this),
+ qevent, qoutput);
+}
// End of file
--- a/qtms/src/qtmsglobalvoleffect.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/src/qtmsglobalvoleffect.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -25,54 +25,48 @@
QTMSGlobalVolEffect::QTMSGlobalVolEffect() :
iEffect(NULL)
- {
- }
+{
+}
QTMSGlobalVolEffect::~QTMSGlobalVolEffect()
- {
- delete (static_cast<TMSGlobalVolEffect*>(iEffect));
- }
+{
+ delete (static_cast<TMSGlobalVolEffect*> (iEffect));
+}
gint QTMSGlobalVolEffect::GetLevel(guint& level)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iEffect)
- {
+ if (iEffect) {
status = static_cast<TMSGlobalVolEffect*> (iEffect)->GetLevel(level);
- }
+ }
return status;
- }
+}
gint QTMSGlobalVolEffect::SetLevel(const guint level)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iEffect)
- {
+ if (iEffect) {
status = static_cast<TMSGlobalVolEffect*> (iEffect)->SetLevel(level);
- }
+ }
return status;
- }
+}
gint QTMSGlobalVolEffect::GetMaxLevel(guint& level)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iEffect)
- {
- status = static_cast<TMSGlobalVolEffect*> (iEffect)->GetMaxLevel(
- level);
- }
+ if (iEffect) {
+ status = static_cast<TMSGlobalVolEffect*> (iEffect)->GetMaxLevel(level);
+ }
return status;
- }
+}
gint QTMSGlobalVolEffect::GetType(QTMSSourceType& sourcetype)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iEffect)
- {
- status = static_cast<TMSGlobalVolEffect*> (iEffect)->GetType(
- sourcetype);
- }
+ if (iEffect) {
+ status = static_cast<TMSGlobalVolEffect*> (iEffect)->GetType(sourcetype);
+ }
return status;
- }
+}
// End of file
--- a/qtms/src/qtmsglobalvoleffectimpl.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/src/qtmsglobalvoleffectimpl.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -24,68 +24,60 @@
using namespace TMS;
QTMSGlobalVolEffectImpl::QTMSGlobalVolEffectImpl()
- {
- }
+{
+}
QTMSGlobalVolEffectImpl::~QTMSGlobalVolEffectImpl()
- {
+{
RemoveObserver(*this);
- }
+}
-gint QTMSGlobalVolEffectImpl::Create(QTMSEffect*& qglobalvol,
- TMS::TMSEffect*& tmsglobalvol)
- {
+gint QTMSGlobalVolEffectImpl::Create(QTMSEffect*& qglobalvol, TMS::TMSEffect*& tmsglobalvol)
+{
gint ret(QTMS_RESULT_INSUFFICIENT_MEMORY);
QTMSGlobalVolEffectImpl* self = new QTMSGlobalVolEffectImpl();
- if (self)
- {
+ if (self) {
ret = self->PostConstruct();
- if (ret != QTMS_RESULT_SUCCESS)
- {
+ if (ret != QTMS_RESULT_SUCCESS) {
delete self;
self = NULL;
- }
+ }
self->iEffect = tmsglobalvol;
ret = self->AddObserver(*self, NULL);
- }
+ }
qglobalvol = self;
return ret;
- }
+}
gint QTMSGlobalVolEffectImpl::PostConstruct()
- {
+{
gint ret(QTMS_RESULT_SUCCESS);
return ret;
- }
+}
-gint QTMSGlobalVolEffectImpl::AddObserver(TMS::TMSEffectObserver& obsrvr,
- gpointer user_data)
- {
+gint QTMSGlobalVolEffectImpl::AddObserver(TMS::TMSEffectObserver& obsrvr, gpointer user_data)
+{
gint ret(QTMS_RESULT_SUCCESS);
- if (iEffect)
- {
- ret = static_cast<TMSGlobalVolEffect*> (iEffect)->AddObserver(obsrvr,
- user_data);
- }
+ if (iEffect) {
+ ret = static_cast<TMSGlobalVolEffect*> (iEffect)->AddObserver(obsrvr, user_data);
+ }
return ret;
- }
+}
gint QTMSGlobalVolEffectImpl::RemoveObserver(TMS::TMSEffectObserver& obsrvr)
- {
+{
gint ret(QTMS_RESULT_SUCCESS);
- if (iEffect)
- {
- ret = static_cast<TMSGlobalVolEffect*> (iEffect)->RemoveObserver(
- obsrvr);
- }
+ if (iEffect) {
+ ret = static_cast<TMSGlobalVolEffect*> (iEffect)->RemoveObserver(obsrvr);
+ }
return ret;
- }
+}
void QTMSGlobalVolEffectImpl::EffectsEvent(const TMS::TMSEffect& /*tmseffect*/,
- TMS::TMSSignalEvent event)
- {
+ TMS::TMSSignalEvent event)
+{
QTMSSignalEvent qevent;
qevent.type = event.type;
@@ -95,8 +87,7 @@
qevent.event_data = event.event_data;
qevent.user_data = event.user_data;
- emit QTMS::QTMSGlobalVolEffect::EffectsEvent(static_cast<QTMSEffect&>
- (*this), qevent);
- }
+ emit QTMS::QTMSGlobalVolEffect::EffectsEvent(static_cast<QTMSEffect&> (*this), qevent);
+}
// End of file
--- a/qtms/src/qtmsilbc.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/src/qtmsilbc.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -23,71 +23,65 @@
using namespace TMS;
QTMSILBCFormat::QTMSILBCFormat()
- {
- }
+{
+}
QTMSILBCFormat::~QTMSILBCFormat()
- {
- }
+{
+}
gint QTMSILBCFormat::SetMode(const QTMSG711CodecMode aMode)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iFormat)
- {
+ if (iFormat) {
status = static_cast<TMSILBCFormat*> (iFormat)->SetMode(aMode);
- }
+ }
return status;
- }
+}
gint QTMSILBCFormat::GetMode(QTMSG711CodecMode& aMode)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iFormat)
- {
+ if (iFormat) {
status = static_cast<TMSILBCFormat*> (iFormat)->GetMode(aMode);
- }
+ }
return status;
- }
+}
gint QTMSILBCFormat::SetCNG(const gboolean aCng)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iFormat)
- {
+ if (iFormat) {
status = static_cast<TMSILBCFormat*> (iFormat)->SetCNG(aCng);
- }
+ }
return status;
- }
+}
gint QTMSILBCFormat::GetCNG(gboolean& aCng)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iFormat)
- {
+ if (iFormat) {
status = static_cast<TMSILBCFormat*> (iFormat)->GetCNG(aCng);
- }
+ }
return status;
- }
+}
gint QTMSILBCFormat::SetVADMode(const gboolean aVad)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iFormat)
- {
+ if (iFormat) {
status = static_cast<TMSILBCFormat*> (iFormat)->SetVADMode(aVad);
- }
+ }
return status;
- }
+}
gint QTMSILBCFormat::GetVADMode(gboolean& aVad)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iFormat)
- {
+ if (iFormat) {
status = static_cast<TMSILBCFormat*> (iFormat)->GetVADMode(aVad);
- }
+ }
return status;
- }
+}
// End of file
--- a/qtms/src/qtmsilbcimpl.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/src/qtmsilbcimpl.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -23,58 +23,53 @@
using namespace TMS;
QTMSILBCFormatImpl::QTMSILBCFormatImpl()
- {
- }
+{
+}
QTMSILBCFormatImpl::~QTMSILBCFormatImpl()
- {
- }
+{
+}
-gint QTMSILBCFormatImpl::Create(QTMSFormat*& qformat,
- TMS::TMSFormat*& tmsformat)
- {
+gint QTMSILBCFormatImpl::Create(QTMSFormat*& qformat, TMS::TMSFormat*& tmsformat)
+{
gint ret(QTMS_RESULT_INSUFFICIENT_MEMORY);
QTMSILBCFormatImpl* self = new QTMSILBCFormatImpl();
- if (self)
- {
+ if (self) {
ret = self->PostConstruct();
- if (ret != QTMS_RESULT_SUCCESS)
- {
+ if (ret != QTMS_RESULT_SUCCESS) {
delete self;
self = NULL;
- }
+ }
self->iFormat = tmsformat;
- }
+ }
qformat = self;
return ret;
- }
+}
gint QTMSILBCFormatImpl::PostConstruct()
- {
+{
gint ret(QTMS_RESULT_SUCCESS);
return ret;
- }
+}
gint QTMSILBCFormatImpl::GetFormat(TMS::TMSFormat*& fmt)
- {
+{
gint ret(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iFormat)
- {
+ if (iFormat) {
fmt = iFormat;
ret = QTMS_RESULT_SUCCESS;
- }
+ }
return ret;
- }
+}
gint QTMSILBCFormatImpl::GetType(QTMSFormatType& fmttype)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iFormat)
- {
+ if (iFormat) {
status = iFormat->GetType(fmttype);
- }
+ }
return status;
- }
+}
// End of file
--- a/qtms/src/qtmsinbandtone.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/src/qtmsinbandtone.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -24,31 +24,29 @@
QTMSInbandTone::QTMSInbandTone(void) :
iInbandTone(NULL)
- {
- }
+{
+}
QTMSInbandTone::~QTMSInbandTone(void)
- {
+{
delete iInbandTone;
- }
+}
gint QTMSInbandTone::Start(QTMSInbandToneType inbandtonetype)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iInbandTone)
- {
+ if (iInbandTone) {
status = iInbandTone->Start(inbandtonetype);
- }
+ }
return status;
- }
+}
gint QTMSInbandTone::Stop()
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iInbandTone)
- {
+ if (iInbandTone) {
status = iInbandTone->Stop();
- }
+ }
return status;
- }
+}
--- a/qtms/src/qtmsinbandtoneimpl.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/src/qtmsinbandtoneimpl.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -24,66 +24,60 @@
using namespace TMS;
QTMSInbandToneImpl::QTMSInbandToneImpl()
- {
- }
+{
+}
QTMSInbandToneImpl::~QTMSInbandToneImpl()
- {
+{
RemoveObserver(*this);
- }
+}
-gint QTMSInbandToneImpl::Create(QTMSInbandTone*& qinband,
- TMS::TMSInbandTone*& tmsinband)
- {
+gint QTMSInbandToneImpl::Create(QTMSInbandTone*& qinband, TMS::TMSInbandTone*& tmsinband)
+{
gint ret(QTMS_RESULT_INSUFFICIENT_MEMORY);
QTMSInbandToneImpl* self = new QTMSInbandToneImpl();
- if (self)
- {
+ if (self) {
ret = self->PostConstruct();
- if (ret != QTMS_RESULT_SUCCESS)
- {
+ if (ret != QTMS_RESULT_SUCCESS) {
delete self;
self = NULL;
- }
+ }
self->iInbandTone = tmsinband;
self->AddObserver(*self, NULL);
- }
+ }
qinband = self;
return ret;
- }
+}
gint QTMSInbandToneImpl::PostConstruct()
- {
+{
gint ret(QTMS_RESULT_SUCCESS);
return ret;
- }
+}
-gint QTMSInbandToneImpl::AddObserver(TMS::TMSInbandToneObserver& obsrvr,
- gpointer user_data)
- {
+gint QTMSInbandToneImpl::AddObserver(TMS::TMSInbandToneObserver& obsrvr, gpointer user_data)
+{
gint ret(QTMS_RESULT_SUCCESS);
- if (iInbandTone)
- {
+ if (iInbandTone) {
ret = iInbandTone->AddObserver(obsrvr, user_data);
- }
+ }
return ret;
- }
+}
gint QTMSInbandToneImpl::RemoveObserver(TMS::TMSInbandToneObserver& obsrvr)
- {
+{
gint ret(QTMS_RESULT_SUCCESS);
- if (iInbandTone)
- {
+ if (iInbandTone) {
ret = iInbandTone->RemoveObserver(obsrvr);
- }
+ }
return ret;
- }
+}
-void QTMSInbandToneImpl::InbandToneEvent(
- const TMS::TMSInbandTone& /*inbandtone*/, TMS::TMSSignalEvent event)
- {
+void QTMSInbandToneImpl::InbandToneEvent(const TMS::TMSInbandTone& /*inbandtone*/,
+ TMS::TMSSignalEvent event)
+{
QTMSSignalEvent qevent;
qevent.type = event.type;
qevent.reason = event.reason;
@@ -92,8 +86,7 @@
qevent.event_data = event.event_data;
qevent.user_data = event.user_data;
- emit QTMS::QTMSInbandTone::InbandToneEvent(
- static_cast<QTMSInbandTone&> (*this), qevent);
- }
+ emit QTMS::QTMSInbandTone::InbandToneEvent(static_cast<QTMSInbandTone&> (*this), qevent);
+}
// End of file
--- a/qtms/src/qtmsmembuffer.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/src/qtmsmembuffer.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -24,43 +24,42 @@
using namespace TMS;
QTMSMemBuffer::QTMSMemBuffer()
- {
+{
iTmsBuffer = NULL;
iOwnsBuffer = FALSE;
- }
+}
QTMSMemBuffer::~QTMSMemBuffer()
- {
- if (iOwnsBuffer)
- {
+{
+ if (iOwnsBuffer) {
free(iDataPtr);
- }
}
+}
gint QTMSMemBuffer::Create(QTMSBuffer*& buffer, TMS::TMSBuffer*& tmsbuffer)
- {
+{
gint ret(QTMS_RESULT_INSUFFICIENT_MEMORY);
TRACE_PRN_FN_ENT;
QTMSMemBuffer* self = new QTMSMemBuffer();
- if (self)
- {
+ if (self) {
self->iTmsBuffer = tmsbuffer;
tmsbuffer->GetDataPtr(self->iDataPtr);
tmsbuffer->GetDataSize(self->iBufferSize);
tmsbuffer->GetTimeStamp(self->iTimeStamp);
self->iOwnsBuffer = FALSE;
- }
+ ret = QTMS_RESULT_SUCCESS;
+ }
buffer = self;
TRACE_PRN_FN_EXT;
return ret;
- }
+}
gint QTMSMemBuffer::GetType(QTMSBufferType& buffertype)
- {
+{
gint ret(TMS_RESULT_SUCCESS);
buffertype = QTMS_BUFFER_MEMORY;
return ret;
- }
+}
/**
* Gets the timestamp on the Buffer so that the framework can
@@ -71,11 +70,11 @@
*
*/
gint QTMSMemBuffer::GetTimeStamp(guint64& ts)
- {
+{
gint ret(QTMS_RESULT_SUCCESS);
ts = iTimeStamp;
return ret;
- }
+}
/**
* Sets the timestamp on the Buffer so that the framework can
@@ -86,12 +85,12 @@
*
*/
gint QTMSMemBuffer::SetTimeStamp(const guint64 ts)
- {
+{
gint ret(QTMS_RESULT_SUCCESS);
iTimeStamp = ts;
ret = iTmsBuffer->SetTimeStamp(ts);
return ret;
- }
+}
/**
* Gets the size of data in the buffer specified by the client.
@@ -100,11 +99,11 @@
*
*/
gint QTMSMemBuffer::GetDataSize(guint& size)
- {
+{
gint ret(QTMS_RESULT_SUCCESS);
size = iBufferSize;
return ret;
- }
+}
/**
* Sets the size of data in the buffer after the client fill it.
@@ -113,12 +112,12 @@
*
*/
gint QTMSMemBuffer::SetDataSize(const guint size)
- {
+{
gint ret(QTMS_RESULT_SUCCESS);
ret = iTmsBuffer->SetDataSize(size);
iBufferSize = size; //TODO: should realloc when new size > old size (?)
return ret;
- }
+}
/**
* Gets the pointer to the memory location associated with this
@@ -128,9 +127,9 @@
*
*/
gint QTMSMemBuffer::GetDataPtr(guint8*& bufptr)
- {
+{
gint ret(QTMS_RESULT_SUCCESS);
bufptr = iDataPtr;
return ret;
- }
+}
--- a/qtms/src/qtmsmicsource.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/src/qtmsmicsource.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -25,23 +25,22 @@
QTMSMicSource::QTMSMicSource() :
iSource(NULL)
- {
- }
+{
+}
QTMSMicSource::~QTMSMicSource()
- {
+{
delete (static_cast<TMSMicSource*> (iSource));
- }
+}
gint QTMSMicSource::GetType(QTMSSourceType& sourcetype)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iSource)
- {
+ if (iSource) {
//status = iSource->GetType(sourcetype);
status = static_cast<TMSMicSource*> (iSource)->GetType(sourcetype);
- }
+ }
return status;
- }
+}
// End of file
--- a/qtms/src/qtmsmicsourceimpl.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/src/qtmsmicsourceimpl.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -23,46 +23,43 @@
using namespace TMS;
QTMSMicSourceImpl::QTMSMicSourceImpl()
- {
- }
+{
+}
QTMSMicSourceImpl::~QTMSMicSourceImpl()
- {
- }
+{
+}
gint QTMSMicSourceImpl::Create(QTMSSource*& qsource, TMS::TMSSource*& tmssource)
- {
+{
gint ret(QTMS_RESULT_INSUFFICIENT_MEMORY);
QTMSMicSourceImpl* self = new QTMSMicSourceImpl();
- if (self)
- {
+ if (self) {
ret = self->PostConstruct();
- if (ret != QTMS_RESULT_SUCCESS)
- {
+ if (ret != QTMS_RESULT_SUCCESS) {
delete self;
self = NULL;
- }
+ }
self->iSource = tmssource;
- }
+ }
qsource = self;
return ret;
- }
+}
gint QTMSMicSourceImpl::PostConstruct()
- {
+{
gint ret(QTMS_RESULT_SUCCESS);
return ret;
- }
+}
gint QTMSMicSourceImpl::GetSource(TMS::TMSSource*& tmssource)
- {
+{
gint ret(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iSource)
- {
+ if (iSource) {
tmssource = iSource;
ret = QTMS_RESULT_SUCCESS;
- }
+ }
return ret;
- }
+}
// End of file
--- a/qtms/src/qtmsmodemsink.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/src/qtmsmodemsink.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -25,23 +25,22 @@
QTMSModemSink::QTMSModemSink() :
iSink(NULL)
- {
- }
+{
+}
QTMSModemSink::~QTMSModemSink()
- {
- delete (static_cast<TMSModemSink*>(iSink));
- }
+{
+ delete (static_cast<TMSModemSink*> (iSink));
+}
gint QTMSModemSink::GetType(QTMSSinkType& sinktype)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iSink)
- {
+ if (iSink) {
//status = iSink->GetType(sinktype);
status = static_cast<TMSModemSink*> (iSink)->GetType(sinktype);
- }
+ }
return status;
- }
+}
// End of file
--- a/qtms/src/qtmsmodemsinkimpl.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/src/qtmsmodemsinkimpl.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -23,46 +23,43 @@
using namespace TMS;
QTMSModemSinkImpl::QTMSModemSinkImpl()
- {
- }
+{
+}
QTMSModemSinkImpl::~QTMSModemSinkImpl()
- {
- }
+{
+}
-gint QTMSModemSinkImpl::Create(QTMSSink*& qsink,TMS::TMSSink*& tmssink)
- {
+gint QTMSModemSinkImpl::Create(QTMSSink*& qsink, TMS::TMSSink*& tmssink)
+{
gint ret(QTMS_RESULT_INSUFFICIENT_MEMORY);
QTMSModemSinkImpl* self = new QTMSModemSinkImpl();
- if (self)
- {
+ if (self) {
ret = self->PostConstruct();
- if (ret != QTMS_RESULT_SUCCESS)
- {
+ if (ret != QTMS_RESULT_SUCCESS) {
delete self;
self = NULL;
- }
+ }
self->iSink = tmssink;
- }
+ }
qsink = self;
return ret;
- }
+}
gint QTMSModemSinkImpl::PostConstruct()
- {
+{
gint ret(QTMS_RESULT_SUCCESS);
return ret;
- }
+}
gint QTMSModemSinkImpl::GetSink(TMS::TMSSink*& tmssink)
- {
+{
gint ret(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iSink)
- {
+ if (iSink) {
tmssink = iSink;
ret = QTMS_RESULT_SUCCESS;
- }
+ }
return ret;
- }
+}
// End of file
--- a/qtms/src/qtmsmodemsource.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/src/qtmsmodemsource.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -23,23 +23,22 @@
QTMSModemSource::QTMSModemSource() :
iSource(NULL)
- {
- }
+{
+}
QTMSModemSource::~QTMSModemSource()
- {
+{
delete (static_cast<TMSModemSource*> (iSource));
- }
+}
gint QTMSModemSource::GetType(QTMSSourceType& sourcetype)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iSource)
- {
+ if (iSource) {
//status = iSource->GetType(sourcetype);
status = static_cast<TMSModemSource*> (iSource)->GetType(sourcetype);
- }
+ }
return status;
- }
+}
// End of file
--- a/qtms/src/qtmsmodemsourceimpl.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/src/qtmsmodemsourceimpl.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -23,47 +23,43 @@
using namespace TMS;
QTMSModemSourceImpl::QTMSModemSourceImpl()
- {
- }
+{
+}
QTMSModemSourceImpl::~QTMSModemSourceImpl()
- {
- }
+{
+}
-gint QTMSModemSourceImpl::Create(QTMSSource*& qsource,
- TMS::TMSSource*& tmssource)
- {
+gint QTMSModemSourceImpl::Create(QTMSSource*& qsource, TMS::TMSSource*& tmssource)
+{
gint ret(QTMS_RESULT_INSUFFICIENT_MEMORY);
QTMSModemSourceImpl* self = new QTMSModemSourceImpl();
- if (self)
- {
+ if (self) {
ret = self->PostConstruct();
- if (ret != QTMS_RESULT_SUCCESS)
- {
+ if (ret != QTMS_RESULT_SUCCESS) {
delete self;
self = NULL;
- }
+ }
self->iSource = tmssource;
- }
+ }
qsource = self;
return ret;
- }
+}
gint QTMSModemSourceImpl::PostConstruct()
- {
+{
gint ret(QTMS_RESULT_SUCCESS);
return ret;
- }
+}
gint QTMSModemSourceImpl::GetSource(TMS::TMSSource*& tmssource)
- {
+{
gint ret(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iSource)
- {
+ if (iSource) {
tmssource = iSource;
ret = QTMS_RESULT_SUCCESS;
- }
+ }
return ret;
- }
+}
// End of file
--- a/qtms/src/qtmspcm.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/src/qtmspcm.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -20,11 +20,11 @@
using namespace QTMS;
QTMSPCMFormat::QTMSPCMFormat()
- {
- }
+{
+}
QTMSPCMFormat::~QTMSPCMFormat()
- {
- }
+{
+}
// End of file
--- a/qtms/src/qtmspcmimpl.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/src/qtmspcmimpl.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -24,59 +24,55 @@
using namespace TMS;
QTMSPCMFormatImpl::QTMSPCMFormatImpl()
- {
- }
+{
+}
QTMSPCMFormatImpl::~QTMSPCMFormatImpl()
- {
+{
TRACE_PRN_FN_ENT;
TRACE_PRN_FN_EXT;
- }
+}
gint QTMSPCMFormatImpl::Create(QTMSFormat*& qformat, TMS::TMSFormat*& tmsformat)
- {
+{
gint ret(QTMS_RESULT_INSUFFICIENT_MEMORY);
QTMSPCMFormatImpl* self = new QTMSPCMFormatImpl();
- if (self)
- {
+ if (self) {
ret = self->PostConstruct();
- if (ret != QTMS_RESULT_SUCCESS)
- {
+ if (ret != QTMS_RESULT_SUCCESS) {
delete self;
self = NULL;
- }
+ }
self->iFormat = tmsformat;
- }
+ }
qformat = self;
return ret;
- }
+}
gint QTMSPCMFormatImpl::PostConstruct()
- {
+{
gint ret(QTMS_RESULT_SUCCESS);
return ret;
- }
+}
gint QTMSPCMFormatImpl::GetFormat(TMS::TMSFormat*& fmt)
- {
+{
gint ret(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iFormat)
- {
+ if (iFormat) {
fmt = iFormat;
ret = QTMS_RESULT_SUCCESS;
- }
+ }
return ret;
- }
+}
gint QTMSPCMFormatImpl::GetType(QTMSFormatType& fmttype)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iFormat)
- {
+ if (iFormat) {
status = iFormat->GetType(fmttype);
- }
+ }
return status;
- }
+}
// End of file
--- a/qtms/src/qtmsringtone.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/src/qtmsringtone.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -23,72 +23,66 @@
QTMSRingTone::QTMSRingTone() :
iRingTone(NULL)
- {
- }
+{
+}
QTMSRingTone::~QTMSRingTone()
- {
+{
delete iRingTone;
- }
+}
gint QTMSRingTone::Init(const QTMSRingToneType type, GString* str, GString* tts)
- {
+{
gint status(TMS_RESULT_UNINITIALIZED_OBJECT);
- if (iRingTone)
- {
+ if (iRingTone) {
status = iRingTone->Init(type, str, tts);
- }
+ }
return status;
- }
+}
gint QTMSRingTone::Deinit()
- {
+{
gint status(TMS_RESULT_UNINITIALIZED_OBJECT);
- if (iRingTone)
- {
+ if (iRingTone) {
status = iRingTone->Deinit();
- }
+ }
return status;
- }
+}
gint QTMSRingTone::Play()
- {
+{
gint status(TMS_RESULT_UNINITIALIZED_OBJECT);
- if (iRingTone)
- {
+ if (iRingTone) {
status = iRingTone->Play();
- }
+ }
return status;
- }
+}
gint QTMSRingTone::Stop()
- {
+{
gint status(TMS_RESULT_UNINITIALIZED_OBJECT);
- if (iRingTone)
- {
+ if (iRingTone) {
status = iRingTone->Stop();
- }
+ }
return status;
- }
+}
gint QTMSRingTone::Pause()
- {
+{
gint status(TMS_RESULT_UNINITIALIZED_OBJECT);
- if (iRingTone)
- {
+ if (iRingTone) {
status = iRingTone->Pause();
- }
+ }
return status;
- }
+}
gint QTMSRingTone::Mute()
- {
+{
gint status(TMS_RESULT_UNINITIALIZED_OBJECT);
- if (iRingTone)
- {
+ if (iRingTone) {
status = iRingTone->Mute();
- }
+ }
return status;
- }
+}
// End of file
--- a/qtms/src/qtmsringtoneimpl.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/src/qtmsringtoneimpl.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -24,63 +24,57 @@
using namespace TMS;
QTMSRingToneImpl::QTMSRingToneImpl()
- {
- }
+{
+}
QTMSRingToneImpl::~QTMSRingToneImpl()
- {
+{
RemoveObserver(*this);
- }
+}
gint QTMSRingToneImpl::Create(QTMSRingTone*& qrt, TMS::TMSRingTone*& tmsrt)
- {
+{
gint ret(QTMS_RESULT_INSUFFICIENT_MEMORY);
QTMSRingToneImpl* self = new QTMSRingToneImpl();
- if (self)
- {
+ if (self) {
ret = self->PostConstruct();
- if (ret != QTMS_RESULT_SUCCESS)
- {
+ if (ret != QTMS_RESULT_SUCCESS) {
delete self;
self = NULL;
- }
+ }
self->iRingTone = tmsrt;
ret = self->AddObserver(*self, NULL);
- }
+ }
qrt = self;
return ret;
- }
+}
gint QTMSRingToneImpl::PostConstruct()
- {
+{
gint ret(QTMS_RESULT_SUCCESS);
return ret;
- }
+}
-gint QTMSRingToneImpl::AddObserver(TMS::TMSRingToneObserver& obsrvr,
- gpointer user_data)
- {
+gint QTMSRingToneImpl::AddObserver(TMS::TMSRingToneObserver& obsrvr, gpointer user_data)
+{
gint ret(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iRingTone)
- {
+ if (iRingTone) {
ret = iRingTone->AddObserver(obsrvr, user_data);
- }
+ }
return ret;
- }
+}
gint QTMSRingToneImpl::RemoveObserver(TMS::TMSRingToneObserver& obsrvr)
- {
+{
gint ret(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iRingTone)
- {
+ if (iRingTone) {
ret = iRingTone->RemoveObserver(obsrvr);
- }
+ }
return ret;
- }
+}
-void QTMSRingToneImpl::RingtoneEvent(const TMS::TMSRingTone& /*rt*/,
- TMS::TMSSignalEvent event)
- {
+void QTMSRingToneImpl::RingtoneEvent(const TMS::TMSRingTone& /*rt*/, TMS::TMSSignalEvent event)
+{
QTMSSignalEvent qevent;
qevent.type = event.type;
qevent.reason = event.reason;
@@ -89,8 +83,7 @@
qevent.event_data = event.event_data;
qevent.user_data = event.user_data;
- emit QTMS::QTMSRingTone::RingtoneEvent(static_cast<QTMSRingTone&> (*this),
- qevent);
- }
+ emit QTMS::QTMSRingTone::RingtoneEvent(static_cast<QTMSRingTone&> (*this), qevent);
+}
// End of file
--- a/qtms/src/qtmsspeakersink.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/src/qtmsspeakersink.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -23,23 +23,22 @@
QTMSSpeakerSink::QTMSSpeakerSink() :
iSink(NULL)
- {
- }
+{
+}
QTMSSpeakerSink::~QTMSSpeakerSink()
- {
+{
delete (static_cast<TMSSpeakerSink*> (iSink));
- }
+}
gint QTMSSpeakerSink::GetType(QTMSSinkType& sinktype)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iSink)
- {
+ if (iSink) {
//status = iSink->GetType(sinktype); //should be ok
status = static_cast<TMSSpeakerSink*> (iSink)->GetType(sinktype);
- }
+ }
return status;
- }
+}
// End of file
--- a/qtms/src/qtmsspeakersinkimpl.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/src/qtmsspeakersinkimpl.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -23,47 +23,44 @@
using namespace TMS;
QTMSSpeakerSinkImpl::QTMSSpeakerSinkImpl()
- {
- }
+{
+}
QTMSSpeakerSinkImpl::~QTMSSpeakerSinkImpl()
- {
- }
+{
+}
gint QTMSSpeakerSinkImpl::Create(QTMSSink*& qsink, TMS::TMSSink*& tmssink)
- {
+{
gint ret(QTMS_RESULT_INSUFFICIENT_MEMORY);
QTMSSpeakerSinkImpl* self = new QTMSSpeakerSinkImpl();
- if (self)
- {
+ if (self) {
ret = self->PostConstruct();
- if (ret != QTMS_RESULT_SUCCESS)
- {
+ if (ret != QTMS_RESULT_SUCCESS) {
delete self;
self = NULL;
- }
+ }
self->iSink = tmssink;
- }
+ }
qsink = self;
return ret;
- }
+}
gint QTMSSpeakerSinkImpl::PostConstruct()
- {
+{
gint ret(QTMS_RESULT_SUCCESS);
return ret;
- }
+}
gint QTMSSpeakerSinkImpl::GetSink(TMS::TMSSink*& tmssink)
- {
+{
gint ret(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iSink)
- {
+ if (iSink) {
tmssink = iSink;
ret = QTMS_RESULT_SUCCESS;
- }
+ }
return ret;
- }
+}
// End of file
--- a/qtms/src/qtmsstream.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/src/qtmsstream.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -42,370 +42,316 @@
QTMSStream::QTMSStream(void) :
iStream(NULL)
- {
- }
+{
+}
QTMSStream::~QTMSStream()
- {
+{
//delete iStream;
//delete (static_cast<QTMSStreamImpl*> (iStream));
- }
+}
gint QTMSStream::AddSource(QTMSSource* qsource)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iStream && qsource)
- {
+ if (iStream && qsource) {
QTMSSourceType qsrctype;
TMSSource* tmssource(NULL);
qsource->GetType(qsrctype);
- switch (qsrctype)
- {
- case QTMS_SOURCE_CLIENT:
- status = static_cast<QTMSClientSourceImpl*>
- (qsource)->GetSource(tmssource);
- break;
- case QTMS_SOURCE_MODEM:
- status = static_cast<QTMSModemSourceImpl*>
- (qsource)->GetSource(tmssource);
- break;
- case QTMS_SOURCE_MIC:
- status = static_cast<QTMSMicSourceImpl*>
- (qsource)->GetSource(tmssource);
- break;
- default:
- break;
- }
- if (status == QTMS_RESULT_SUCCESS && tmssource)
- {
+ switch (qsrctype) {
+ case QTMS_SOURCE_CLIENT:
+ status = static_cast<QTMSClientSourceImpl*> (qsource)->GetSource(tmssource);
+ break;
+ case QTMS_SOURCE_MODEM:
+ status = static_cast<QTMSModemSourceImpl*> (qsource)->GetSource(tmssource);
+ break;
+ case QTMS_SOURCE_MIC:
+ status = static_cast<QTMSMicSourceImpl*> (qsource)->GetSource(tmssource);
+ break;
+ default:
+ break;
+ }
+ if (status == QTMS_RESULT_SUCCESS && tmssource) {
status = iStream->AddSource(tmssource);
- }
}
+ }
return status;
- }
+}
gint QTMSStream::RemoveSource(QTMSSource* qsource)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iStream && qsource)
- {
+ if (iStream && qsource) {
QTMSSourceType qsrctype;
TMSSource* tmssource(NULL);
qsource->GetType(qsrctype);
- switch (qsrctype)
- {
- case QTMS_SOURCE_CLIENT:
- status = static_cast<QTMSClientSourceImpl*>
- (qsource)->GetSource(tmssource);
- break;
- case QTMS_SOURCE_MODEM:
- status = static_cast<QTMSModemSourceImpl*>
- (qsource)->GetSource(tmssource);
- break;
- case QTMS_SOURCE_MIC:
- status = static_cast<QTMSMicSourceImpl*>
- (qsource)->GetSource(tmssource);
- break;
- default:
- break;
- }
- if (status == QTMS_RESULT_SUCCESS && tmssource)
- {
+ switch (qsrctype) {
+ case QTMS_SOURCE_CLIENT:
+ status = static_cast<QTMSClientSourceImpl*> (qsource)->GetSource(tmssource);
+ break;
+ case QTMS_SOURCE_MODEM:
+ status = static_cast<QTMSModemSourceImpl*> (qsource)->GetSource(tmssource);
+ break;
+ case QTMS_SOURCE_MIC:
+ status = static_cast<QTMSMicSourceImpl*> (qsource)->GetSource(tmssource);
+ break;
+ default:
+ break;
+ }
+ if (status == QTMS_RESULT_SUCCESS && tmssource) {
status = iStream->RemoveSource(tmssource);
- }
}
+ }
return status;
- }
+}
gint QTMSStream::AddSink(QTMSSink* qsink)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iStream && qsink)
- {
+ if (iStream && qsink) {
QTMSSinkType qsinktype;
TMSSink* tmssink(NULL);
qsink->GetType(qsinktype);
- switch (qsinktype)
- {
- case QTMS_SINK_CLIENT:
- status = static_cast<QTMSClientSinkImpl*>
- (qsink)->GetSink(tmssink);
- break;
- case QTMS_SINK_MODEM:
- status = static_cast<QTMSModemSinkImpl*>
- (qsink)->GetSink(tmssink);
- break;
- case QTMS_SINK_SPEAKER:
- status = static_cast<QTMSSpeakerSinkImpl*>
- (qsink)->GetSink(tmssink);
- break;
- default:
- break;
- }
- if (status == QTMS_RESULT_SUCCESS && tmssink)
- {
+ switch (qsinktype) {
+ case QTMS_SINK_CLIENT:
+ status = static_cast<QTMSClientSinkImpl*> (qsink)->GetSink(tmssink);
+ break;
+ case QTMS_SINK_MODEM:
+ status = static_cast<QTMSModemSinkImpl*> (qsink)->GetSink(tmssink);
+ break;
+ case QTMS_SINK_SPEAKER:
+ status = static_cast<QTMSSpeakerSinkImpl*> (qsink)->GetSink(tmssink);
+ break;
+ default:
+ break;
+ }
+ if (status == QTMS_RESULT_SUCCESS && tmssink) {
status = iStream->AddSink(tmssink);
- }
}
+ }
return status;
- }
+}
gint QTMSStream::RemoveSink(QTMSSink* qsink)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iStream && qsink)
- {
+ if (iStream && qsink) {
QTMSSinkType qsinktype;
TMSSink* tmssink(NULL);
qsink->GetType(qsinktype);
- switch (qsinktype)
- {
- case QTMS_SINK_CLIENT:
- status = static_cast<QTMSClientSinkImpl*>
- (qsink)->GetSink(tmssink);
- break;
- case QTMS_SINK_MODEM:
- status = static_cast<QTMSModemSinkImpl*>
- (qsink)->GetSink(tmssink);
- break;
- case QTMS_SINK_SPEAKER:
- status = static_cast<QTMSSpeakerSinkImpl*>
- (qsink)->GetSink(tmssink);
- break;
- default:
- break;
- }
- if (status == QTMS_RESULT_SUCCESS && tmssink)
- {
+ switch (qsinktype) {
+ case QTMS_SINK_CLIENT:
+ status = static_cast<QTMSClientSinkImpl*> (qsink)->GetSink(tmssink);
+ break;
+ case QTMS_SINK_MODEM:
+ status = static_cast<QTMSModemSinkImpl*> (qsink)->GetSink(tmssink);
+ break;
+ case QTMS_SINK_SPEAKER:
+ status = static_cast<QTMSSpeakerSinkImpl*> (qsink)->GetSink(tmssink);
+ break;
+ default:
+ break;
+ }
+ if (status == QTMS_RESULT_SUCCESS && tmssink) {
status = iStream->RemoveSink(tmssink);
- }
}
+ }
return status;
- }
+}
gint QTMSStream::SetFormat(QTMSFormat* qformat)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iStream && qformat)
- {
+ if (iStream && qformat) {
QTMSFormatType fmttype;
TMSFormat* tmsformat(NULL);
qformat->GetType(fmttype);
- switch (fmttype)
- {
- case QTMS_FORMAT_PCM:
- status = static_cast<QTMSPCMFormatImpl*>
- (qformat)->GetFormat(tmsformat);
- break;
- case QTMS_FORMAT_AMR:
- status = static_cast<QTMSAMRFormatImpl*>
- (qformat)->GetFormat(tmsformat);
- break;
- case QTMS_FORMAT_G711:
- status = static_cast<QTMSG711FormatImpl*>
- (qformat)->GetFormat(tmsformat);
- break;
- case QTMS_FORMAT_G729:
- status = static_cast<QTMSG729FormatImpl*>
- (qformat)->GetFormat(tmsformat);
- break;
- case QTMS_FORMAT_ILBC:
- status = static_cast<QTMSILBCFormatImpl*>
- (qformat)->GetFormat(tmsformat);
- break;
- default:
- break;
- }
+ switch (fmttype) {
+ case QTMS_FORMAT_PCM:
+ status = static_cast<QTMSPCMFormatImpl*> (qformat)->GetFormat(tmsformat);
+ break;
+ case QTMS_FORMAT_AMR:
+ status = static_cast<QTMSAMRFormatImpl*> (qformat)->GetFormat(tmsformat);
+ break;
+ case QTMS_FORMAT_G711:
+ status = static_cast<QTMSG711FormatImpl*> (qformat)->GetFormat(tmsformat);
+ break;
+ case QTMS_FORMAT_G729:
+ status = static_cast<QTMSG729FormatImpl*> (qformat)->GetFormat(tmsformat);
+ break;
+ case QTMS_FORMAT_ILBC:
+ status = static_cast<QTMSILBCFormatImpl*> (qformat)->GetFormat(tmsformat);
+ break;
+ default:
+ break;
+ }
status = iStream->SetFormat(tmsformat);
- }
+ }
return status;
- }
+}
gint QTMSStream::ResetFormat(QTMSFormat* qformat)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iStream && qformat)
- {
+ if (iStream && qformat) {
QTMSFormatType fmttype;
TMSFormat* tmsformat(NULL);
qformat->GetType(fmttype);
- switch (fmttype)
- {
- case QTMS_FORMAT_PCM:
- status = static_cast<QTMSPCMFormatImpl*>
- (qformat)->GetFormat(tmsformat);
- break;
- case QTMS_FORMAT_AMR:
- status = static_cast<QTMSAMRFormatImpl*>
- (qformat)->GetFormat(tmsformat);
- break;
- case QTMS_FORMAT_G711:
- status = static_cast<QTMSG711FormatImpl*>
- (qformat)->GetFormat(tmsformat);
- break;
- case QTMS_FORMAT_G729:
- status = static_cast<QTMSG729FormatImpl*>
- (qformat)->GetFormat(tmsformat);
- break;
- case QTMS_FORMAT_ILBC:
- status = static_cast<QTMSILBCFormatImpl*>
- (qformat)->GetFormat(tmsformat);
- break;
- default:
- break;
- }
+ switch (fmttype) {
+ case QTMS_FORMAT_PCM:
+ status = static_cast<QTMSPCMFormatImpl*> (qformat)->GetFormat(tmsformat);
+ break;
+ case QTMS_FORMAT_AMR:
+ status = static_cast<QTMSAMRFormatImpl*> (qformat)->GetFormat(tmsformat);
+ break;
+ case QTMS_FORMAT_G711:
+ status = static_cast<QTMSG711FormatImpl*> (qformat)->GetFormat(tmsformat);
+ break;
+ case QTMS_FORMAT_G729:
+ status = static_cast<QTMSG729FormatImpl*> (qformat)->GetFormat(tmsformat);
+ break;
+ case QTMS_FORMAT_ILBC:
+ status = static_cast<QTMSILBCFormatImpl*> (qformat)->GetFormat(tmsformat);
+ break;
+ default:
+ break;
+ }
status = iStream->ResetFormat(tmsformat);
- }
+ }
return status;
- }
+}
gint QTMSStream::AddEffect(QTMSEffect* qeffect)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iStream && qeffect)
- {
+ if (iStream && qeffect) {
QTMSEffectType effecttype;
TMSEffect* tmseffect(NULL);
qeffect->GetType(effecttype);
- switch (effecttype)
- {
- case QTMS_EFFECT_VOLUME:
- status = static_cast<QTMSVolumeEffectImpl*>
- (qeffect)->GetEffect(tmseffect);
- break;
- case QTMS_EFFECT_GAIN:
- status = static_cast<QTMSGainEffectImpl*>
- (qeffect)->GetEffect(tmseffect);
- break;
- default:
- break;
- }
+ switch (effecttype) {
+ case QTMS_EFFECT_VOLUME:
+ status = static_cast<QTMSVolumeEffectImpl*> (qeffect)->GetEffect(tmseffect);
+ break;
+ case QTMS_EFFECT_GAIN:
+ status = static_cast<QTMSGainEffectImpl*> (qeffect)->GetEffect(tmseffect);
+ break;
+ default:
+ break;
+ }
status = iStream->AddEffect(tmseffect);
- }
+ }
return status;
- }
+}
gint QTMSStream::RemoveEffect(QTMSEffect* qeffect)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iStream && qeffect)
- {
+ if (iStream && qeffect) {
QTMSEffectType effecttype;
TMSEffect* tmseffect(NULL);
qeffect->GetType(effecttype);
- switch (effecttype)
- {
- case QTMS_EFFECT_VOLUME:
- status = static_cast<QTMSVolumeEffectImpl*>
- (qeffect)->GetEffect(tmseffect);
- break;
- case QTMS_EFFECT_GAIN:
- status = static_cast<QTMSGainEffectImpl*>
- (qeffect)->GetEffect(tmseffect);
- break;
- default:
- break;
- }
+ switch (effecttype) {
+ case QTMS_EFFECT_VOLUME:
+ status = static_cast<QTMSVolumeEffectImpl*> (qeffect)->GetEffect(tmseffect);
+ break;
+ case QTMS_EFFECT_GAIN:
+ status = static_cast<QTMSGainEffectImpl*> (qeffect)->GetEffect(tmseffect);
+ break;
+ default:
+ break;
+ }
status = iStream->RemoveEffect(tmseffect);
- }
+ }
return status;
- }
+}
gint QTMSStream::GetState()
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iStream)
- {
+ if (iStream) {
status = iStream->GetState();
- }
+ }
return status;
- }
+}
gint QTMSStream::GetStreamType()
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iStream)
- {
+ if (iStream) {
status = iStream->GetStreamType();
- }
+ }
return status;
- }
+}
gint QTMSStream::GetStreamId()
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iStream)
- {
+ if (iStream) {
status = iStream->GetStreamId();
- }
+ }
return status;
- }
+}
gint QTMSStream::Init(gint retrytime)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iStream)
- {
+ if (iStream) {
status = iStream->Init(retrytime);
- }
+ }
return status;
- }
+}
gint QTMSStream::Pause()
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iStream)
- {
+ if (iStream) {
status = iStream->Pause();
- }
+ }
return status;
- }
+}
gint QTMSStream::Start(gint retrytime)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iStream)
- {
+ if (iStream) {
status = iStream->Start(retrytime);
- }
+ }
return status;
- }
+}
gint QTMSStream::Stop()
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iStream)
- {
+ if (iStream) {
status = iStream->Stop();
- }
+ }
return status;
- }
+}
void QTMSStream::Deinit()
- {
- if (iStream)
- {
+{
+ if (iStream) {
iStream->Deinit();
- }
}
+}
--- a/qtms/src/qtmsstreamimpl.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/src/qtmsstreamimpl.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -25,69 +25,62 @@
using namespace TMS;
QTMSStreamImpl::QTMSStreamImpl()
- {
- }
+{
+}
QTMSStreamImpl::~QTMSStreamImpl()
- {
+{
RemoveObserver(*this);
- }
+}
-gint QTMSStreamImpl::Create(QTMSCallType callType, QTMSStreamType stype,
- QTMSStream*& qstrm, TMS::TMSStream*& tmsstrm)
- {
+gint QTMSStreamImpl::Create(QTMSCallType callType, QTMSStreamType stype, QTMSStream*& qstrm,
+ TMS::TMSStream*& tmsstrm)
+{
gint ret(QTMS_RESULT_INSUFFICIENT_MEMORY);
QTMSStreamImpl* self = new QTMSStreamImpl();
- if (self)
- {
+ if (self) {
ret = self->PostConstruct(callType, stype, *self);
- if (ret != QTMS_RESULT_SUCCESS)
- {
+ if (ret != QTMS_RESULT_SUCCESS) {
delete self;
self = NULL;
- }
+ }
self->iStream = tmsstrm;
self->AddObserver(*self, NULL);
- }
+ }
qstrm = self;
return ret;
+}
+
+gint QTMSStreamImpl::PostConstruct(QTMSCallType /*callType*/, QTMSStreamType /*stype*/, QTMSStream& /*parent*/)
+{
+ gint status(QTMS_RESULT_SUCCESS);
+ return status;
+}
+
+gint QTMSStreamImpl::AddObserver(TMS::TMSStreamObserver& obsrvr, gpointer user_data)
+{
+ gint ret(QTMS_RESULT_SUCCESS);
+
+ if (iStream) {
+ iStream->AddObserver(obsrvr, user_data);
}
-gint QTMSStreamImpl::PostConstruct(QTMSCallType /*callType*/,
- QTMSStreamType /*stype*/, QTMSStream& /*parent*/)
- {
- gint status(QTMS_RESULT_SUCCESS);
- return status;
- }
+ return ret;
+}
-gint QTMSStreamImpl::AddObserver(TMS::TMSStreamObserver& obsrvr,
- gpointer user_data)
- {
+gint QTMSStreamImpl::RemoveObserver(TMS::TMSStreamObserver& obsrvr)
+{
gint ret(QTMS_RESULT_SUCCESS);
- if (iStream)
- {
- iStream->AddObserver(obsrvr, user_data);
- }
+ if (iStream) {
+ ret = iStream->RemoveObserver(obsrvr);
+ }
return ret;
- }
-
-gint QTMSStreamImpl::RemoveObserver(TMS::TMSStreamObserver& obsrvr)
- {
- gint ret(QTMS_RESULT_SUCCESS);
+}
- if (iStream)
- {
- ret = iStream->RemoveObserver(obsrvr);
- }
-
- return ret;
- }
-
-void QTMSStreamImpl::TMSStreamEvent(const TMS::TMSStream& /*stream*/,
- TMS::TMSSignalEvent event)
- {
+void QTMSStreamImpl::TMSStreamEvent(const TMS::TMSStream& /*stream*/, TMS::TMSSignalEvent event)
+{
QTMSSignalEvent qevent;
qevent.type = event.type;
@@ -97,6 +90,5 @@
qevent.event_data = event.event_data;
qevent.user_data = event.user_data;
- emit QTMS::QTMSStream::TMSStreamEvent(static_cast<QTMSStream&> (*this),
- qevent);
- }
+ emit QTMS::QTMSStream::TMSStreamEvent(static_cast<QTMSStream&> (*this), qevent);
+}
--- a/qtms/src/qtmsvolumeeffect.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/src/qtmsvolumeeffect.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -25,52 +25,48 @@
QTMSVolumeEffect::QTMSVolumeEffect() :
iEffect(NULL)
- {
- }
+{
+}
QTMSVolumeEffect::~QTMSVolumeEffect()
- {
- delete (static_cast<TMSVolumeEffect*>(iEffect));
- }
+{
+ delete (static_cast<TMSVolumeEffect*> (iEffect));
+}
gint QTMSVolumeEffect::GetLevel(guint& level)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iEffect)
- {
+ if (iEffect) {
status = static_cast<TMSVolumeEffect*> (iEffect)->GetLevel(level);
- }
+ }
return status;
- }
+}
gint QTMSVolumeEffect::SetLevel(const guint level)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iEffect)
- {
+ if (iEffect) {
status = static_cast<TMSVolumeEffect*> (iEffect)->SetLevel(level);
- }
+ }
return status;
- }
+}
gint QTMSVolumeEffect::GetMaxLevel(guint& level)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iEffect)
- {
+ if (iEffect) {
status = static_cast<TMSVolumeEffect*> (iEffect)->GetMaxLevel(level);
- }
+ }
return status;
- }
+}
gint QTMSVolumeEffect::GetType(QTMSSourceType& sourcetype)
- {
+{
gint status(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iEffect)
- {
+ if (iEffect) {
status = static_cast<TMSVolumeEffect*> (iEffect)->GetType(sourcetype);
- }
+ }
return status;
- }
+}
// End of file
--- a/qtms/src/qtmsvolumeeffectimpl.cpp Tue Jul 06 14:48:59 2010 +0300
+++ b/qtms/src/qtmsvolumeeffectimpl.cpp Wed Aug 18 10:16:02 2010 +0300
@@ -23,78 +23,71 @@
using namespace TMS;
QTMSVolumeEffectImpl::QTMSVolumeEffectImpl()
- {
- }
+{
+}
QTMSVolumeEffectImpl::~QTMSVolumeEffectImpl()
- {
+{
RemoveObserver(*this);
- }
+}
gint QTMSVolumeEffectImpl::Create(QTMSEffect*& qvol, TMS::TMSEffect*& tmsvol)
- {
+{
gint ret(QTMS_RESULT_INSUFFICIENT_MEMORY);
QTMSVolumeEffectImpl* self = new QTMSVolumeEffectImpl();
- if (self)
- {
+ if (self) {
ret = self->PostConstruct();
- if (ret != QTMS_RESULT_SUCCESS)
- {
+ if (ret != QTMS_RESULT_SUCCESS) {
delete self;
self = NULL;
- }
+ }
self->iEffect = tmsvol;
ret = self->AddObserver(*self, NULL);
- }
+ }
qvol = self;
return ret;
- }
+}
gint QTMSVolumeEffectImpl::PostConstruct()
- {
+{
gint ret(QTMS_RESULT_SUCCESS);
return ret;
- }
+}
-gint QTMSVolumeEffectImpl::AddObserver(TMS::TMSEffectObserver& obsrvr,
- gpointer user_data)
- {
+gint QTMSVolumeEffectImpl::AddObserver(TMS::TMSEffectObserver& obsrvr, gpointer user_data)
+{
gint ret(QTMS_RESULT_SUCCESS);
- if (iEffect)
- {
- ret = static_cast<TMSVolumeEffect*> (iEffect)->AddObserver(obsrvr,
- user_data);
- }
+ if (iEffect) {
+ ret = static_cast<TMSVolumeEffect*> (iEffect)->AddObserver(obsrvr, user_data);
+ }
return ret;
- }
+}
gint QTMSVolumeEffectImpl::RemoveObserver(TMS::TMSEffectObserver& obsrvr)
- {
+{
gint ret(QTMS_RESULT_SUCCESS);
- if (iEffect)
- {
+ if (iEffect) {
ret = static_cast<TMSVolumeEffect*> (iEffect)->RemoveObserver(obsrvr);
- }
+ }
return ret;
- }
+}
gint QTMSVolumeEffectImpl::GetEffect(TMS::TMSEffect*& tmseffect)
- {
+{
gint ret(QTMS_RESULT_UNINITIALIZED_OBJECT);
- if (iEffect)
- {
+ if (iEffect) {
tmseffect = iEffect;
ret = QTMS_RESULT_SUCCESS;
- }
+ }
return ret;
- }
+}
void QTMSVolumeEffectImpl::EffectsEvent(const TMS::TMSEffect& /*tmseffect*/,
- TMS::TMSSignalEvent event)
- {
+ TMS::TMSSignalEvent event)
+{
QTMSSignalEvent qevent;
qevent.type = event.type;
@@ -104,8 +97,7 @@
qevent.event_data = event.event_data;
qevent.user_data = event.user_data;
- emit QTMS::QTMSVolumeEffect::EffectsEvent(
- static_cast<QTMSEffect&> (*this), qevent);
- }
+ emit QTMS::QTMSVolumeEffect::EffectsEvent(static_cast<QTMSEffect&> (*this), qevent);
+}
// End of file