FCL/sf/app/videoplayer: comparison videocollection/videocollectionwrapper/src/videocollectionclient.cpp

equal deleted inserted replaced

-:3738fe97f027
+:8aed59de29f9
 *
 * Description:   VideoCollectionClient class implementation
 *
 */
+// Version : %version: 39 %
 // INCLUDE FILES
-#include <QObject>
+#include <qobject.h>
 #include <centralrepository.h>
 #include <mpxcollectionutility.h>
 #include <mpxcollectionpath.h>
 #include <mpxmediageneraldefs.h>
 #include <mpxmessagegeneraldefs.h>
 #include <vcxmyvideosuids.h>
 #include "videodatasignalreceiver.h"
 #include "videocollectionclient.h"
 #include "videocollectionlistener.h"
+#include "videocollectiontrace.h"
 // -----------------------------------------------------------------------------
 // VideoCollectionClient()
 // -----------------------------------------------------------------------------
 //
-VideoCollectionClient::VideoCollectionClient() :
+VideoCollectionClient::VideoCollectionClient()
-mCollectionUtility(0),
+: mCollectionUtility( 0 )
-mCollectionOpenStatus(ECollectionNotOpen),
+, mCollectionOpenStatus( ECollectionNotOpen )
-mCollectionListener(0),
+, mCollectionListener( 0 )
-mOpenCategoryAlbum(TMPXItemId::InvalidId()),
+, mOpenCategoryAlbum( TMPXItemId::InvalidId() )
-mCollectionPathLevel(VideoCollectionCommon::ELevelInvalid)
+, mCollectionPathLevel( VideoCollectionCommon::ELevelInvalid )
 {
+	FUNC_LOG;
 }
 // -----------------------------------------------------------------------------
 // initialize()
 // -----------------------------------------------------------------------------
 //
 int VideoCollectionClient::initialize(VideoDataSignalReceiver *signalReceiver)
 {
+	FUNC_LOG;
 if(!signalReceiver)
 {
 return -1;
 }
 if(mCollectionUtility && mCollectionListener)
 {
-// already initialized
+INFO("VideoCollectionClient::initialize() already initialized.");
 return 0;
 }
 if(!mCollectionListener)
 {
 mCollectionListener = new VideoCollectionListener(*this, *signalReceiver);
 if(!mCollectionUtility)
 {
 TRAPD( error, mCollectionUtility = MMPXCollectionUtility::NewL( mCollectionListener, KMcModeDefault ) );
 if(error)
 {
+ERROR(error, "VideoCollectionClient::initialize() construction of collection utility failed.");
 delete mCollectionListener;
 mCollectionListener = 0;
 return error;
 }
 }
 // ~VideoCollectionClient()
 // -----------------------------------------------------------------------------
 //
 VideoCollectionClient::~VideoCollectionClient()
 {
+	FUNC_LOG;
 if (mCollectionUtility)
 {
 // closing deallocates collection utility pointer
 mCollectionUtility->Close();
 }
 // ---------------------------------------------------------------------------
 //
 void VideoCollectionClient::getCategoryId(TMPXItemId &id)
 {
+	FUNC_LOG;
 id = mOpenCategoryAlbum;
 }
 // ---------------------------------------------------------------------------
 // getCollectionLevel
 // ---------------------------------------------------------------------------
 //
 int VideoCollectionClient::getCollectionLevel()
 {
+	FUNC_LOG;
 return mCollectionPathLevel;
 }
 // ---------------------------------------------------------------------------
 // getOpenStatus
 // ---------------------------------------------------------------------------
 //
 int VideoCollectionClient::getOpenStatus()
 {
+	FUNC_LOG;
 	return mCollectionOpenStatus;
 }
 // ---------------------------------------------------------------------------
 // setOpenStatus
 // ---------------------------------------------------------------------------
 //
-void VideoCollectionClient::setOpenStatus(int status)
+void VideoCollectionClient::setOpenStatus(int status, bool startOpening)
 {
+	FUNC_LOG;
+	INFO_2("VideoCollectionClient::setOpenStatus() status: %d start opening %d", status, startOpening);
 mCollectionOpenStatus = status;
-if(mCollectionOpenStatus == ECollectionOpened)
+if(mCollectionOpenStatus == ECollectionOpened && startOpening)
 {
 startOpenCurrentState();
 }
 }
 // startOpenCollection
 // -----------------------------------------------------------------------------
 //
 int VideoCollectionClient::startOpenCollection(int level)
 {
+	FUNC_LOG;
+	INFO_1("VideoCollectionClient::startOpenCollection() opening level: %d", level);
 if(!mCollectionUtility)
 {
 return -1;
 }
 // startOpenCurrentState
 // -----------------------------------------------------------------------------
 //
 int VideoCollectionClient::startOpenCurrentState()
 {
+	FUNC_LOG;
 int error = -1;
 if(mCollectionUtility && mCollectionOpenStatus == ECollectionOpened)
 {
 TRAP(error, mCollectionUtility->Collection().OpenL());
 }
 // -----------------------------------------------------------------------------
 // deleteFile
 // -----------------------------------------------------------------------------
 int VideoCollectionClient::deleteVideos(QList<TMPXItemId> *mediaIds)
 {
+	FUNC_LOG;
 if(!mCollectionUtility || !mediaIds)
 {
 return -1;
 }
 TRAPD(error, deleteVideosL(*mediaIds));
 // openItem
 // -----------------------------------------------------------------------------
 //
 int VideoCollectionClient::openItem(TMPXItemId &mediaId)
 {
+	FUNC_LOG;
 if(!mCollectionUtility)
 {
 return -1;
 }
 // back
 // -----------------------------------------------------------------------------
 //
 int VideoCollectionClient::back()
 {
+	FUNC_LOG;
 if(!mCollectionUtility)
 {
 return -1;
 }
 TRAPD(error, backL());
 // fetchMpxMediaByMpxId
 // -----------------------------------------------------------------------------
 //
 int VideoCollectionClient::fetchMpxMediaByMpxId(TMPXItemId &mpxId)
 {
+	FUNC_LOG;
 if(!mCollectionUtility)
 {
 return -1;
 }
 // getVideoDetails
 // -----------------------------------------------------------------------------
 //
 int VideoCollectionClient::getVideoDetails(TMPXItemId &mediaId)
 {
+	FUNC_LOG;
 if(!mCollectionUtility)
 {
 return -1;
 }
 // addNewAlbum
 // -----------------------------------------------------------------------------
 //
 TMPXItemId VideoCollectionClient::addNewAlbum(const QString &title)
 {
+	FUNC_LOG;
 TMPXItemId id = TMPXItemId::InvalidId();
 if (mCollectionUtility && title.length())
 {
 TRAPD(err, id = createAlbumL(title));
 // removeAlbums
 // -----------------------------------------------------------------------------
 //
 int VideoCollectionClient::removeAlbums(const QList<TMPXItemId> &mediaIds)
 {
+	FUNC_LOG;
 int err(-1);
 if (mCollectionUtility && mediaIds.count())
 {
 TRAP(err, removeAlbumsL(mediaIds));
 // -----------------------------------------------------------------------------
 // addItemsInAlbum
 // -----------------------------------------------------------------------------
 //
 int VideoCollectionClient::addItemsInAlbum(TMPXItemId &albumId,
 const QList<TMPXItemId> &mediaIds)
 {
+	FUNC_LOG;
 int err(-1);
 if (mCollectionUtility && albumId != TMPXItemId::InvalidId() &&
 albumId.iId2 == KVcxMvcMediaTypeAlbum && mediaIds.count())
 {
 // -----------------------------------------------------------------------------
 // removeItemsFromAlbum
 // -----------------------------------------------------------------------------
 //
 int VideoCollectionClient::removeItemsFromAlbum(TMPXItemId &albumId,
 const QList<TMPXItemId> &mediaIds)
 {
+	FUNC_LOG;
 int err(-1);
 if (mCollectionUtility && albumId != TMPXItemId::InvalidId() &&
 albumId.iId2 == KVcxMvcMediaTypeAlbum && mediaIds.count())
 {
 return err;
 }
 // -----------------------------------------------------------------------------
+// renameAlbum
+// -----------------------------------------------------------------------------
+//
+int VideoCollectionClient::renameAlbum(const TMPXItemId &albumId,
+const QString &newTitle)
+{
+	FUNC_LOG;
+int err(-1);
+if(mCollectionUtility && albumId.iId2 == KVcxMvcMediaTypeAlbum &&
+!newTitle.isEmpty())
+{
+TRAP(err, renameAlbumL(albumId, newTitle));
+}
+return err;
+}
+// -----------------------------------------------------------------------------
 // startOpenCollectionL
 // -----------------------------------------------------------------------------
 //
 void VideoCollectionClient::startOpenCollectionL(int level)
 {
+	FUNC_LOG;
+	INFO_1("VideoCollectionClient::startOpenCollectionL() level: %d", level);
 if(!mCollectionUtility)
 {
 User::Leave(KErrGeneral);
 }
 CMPXCollectionPath* collectionPath = CMPXCollectionPath::NewL();
 collectionPath->AppendL( KVcxUidMyVideosMpxCollection );
 if (level == VideoCollectionCommon::ELevelVideos)
 {
 	collectionPath->AppendL( KVcxMvcCategoryIdAll );
-		mOpenCategoryAlbum.iId1 = KVcxMvcCategoryIdAll;
+	mOpenCategoryAlbum = TMPXItemId(KVcxMvcCategoryIdAll, KVcxMvcMediaTypeCategory);
-	mOpenCategoryAlbum.iId2 = 1;
 	mCollectionPathLevel = VideoCollectionCommon::ELevelVideos;
 }
 else
 {
 mOpenCategoryAlbum = TMPXItemId::InvalidId();
 	mCollectionPathLevel = VideoCollectionCommon::ELevelCategory;
 }
 mCollectionUtility->Collection().OpenL( *collectionPath );
 CleanupStack::PopAndDestroy( collectionPath );
 mCollectionOpenStatus = ECollectionOpening;
 }
 // -----------------------------------------------------------------------------
 // deleteVideosL
 // -----------------------------------------------------------------------------
 //
 void VideoCollectionClient::deleteVideosL(QList<TMPXItemId> &mediaIds)
 {
+	FUNC_LOG;
 if(!mCollectionUtility || mediaIds.count() == 0)
 {
 User::Leave(KErrGeneral);
 }
 CMPXMediaArray* mediasToDelete = CMPXMediaArray::NewL();
 // openVideoL
 // -----------------------------------------------------------------------------
 //
 void VideoCollectionClient::openVideoL(TMPXItemId &videoId)
 {
+	FUNC_LOG;
 if(!mCollectionUtility)
 {
 User::Leave(KErrGeneral);
 }
 CMPXCollectionPath* path = CMPXCollectionPath::NewL();
 // openCategoryL
 // -----------------------------------------------------------------------------
 //
 void VideoCollectionClient::openCategoryL(TMPXItemId &id)
 {
+	FUNC_LOG;
 if(!mCollectionUtility)
 {
 User::Leave(KErrGeneral);
 }
 CMPXCollectionPath* collectionPath = CMPXCollectionPath::NewL();
 // backL
 // -----------------------------------------------------------------------------
 //
 void VideoCollectionClient::backL()
 {
+	FUNC_LOG;
 if(!mCollectionUtility)
 {
 User::Leave(KErrGeneral);
 }
 if (getCollectionLevel() > 2 )
 {
 	mCollectionUtility->Collection().BackL();
 	mCollectionOpenStatus = ECollectionOpening;
 // getVideoDetailsL
 // -----------------------------------------------------------------------------
 //
 void VideoCollectionClient::getVideoDetailsL(TMPXItemId &videoId)
 {
+	FUNC_LOG;
 if(!mCollectionUtility)
 {
 User::Leave(KErrGeneral);
 }
 CMPXCommand* cmd = CMPXCommand::NewL();
 // removeAlbumsL
 // -----------------------------------------------------------------------------
 //
 void VideoCollectionClient::removeAlbumsL(const QList<TMPXItemId> &mediaIds)
 {
+	FUNC_LOG;
 if(!mCollectionUtility)
 {
 User::Leave(KErrGeneral);
 }
 mCollectionUtility->Collection().CommandL(*cmd);
 }
 else
 {
 // invalid data provided
+ERROR(KErrGeneral, "VideoCollectionClient::removeItemsFromAlbumL() no albums found");
 User::Leave(KErrGeneral);
 }
 CleanupStack::PopAndDestroy( array );
 CleanupStack::PopAndDestroy( cmd );
 // createAlbumL
 // -----------------------------------------------------------------------------
 //
 TMPXItemId VideoCollectionClient::createAlbumL(const QString &title)
 {
+	FUNC_LOG;
 TMPXItemId albumId = TMPXItemId::InvalidId();
 CMPXCommand* cmd = CMPXCommand::NewL();
 CleanupStack::PushL( cmd );
 // -----------------------------------------------------------------------------
 //
 void VideoCollectionClient::addItemsInAlbumL(TMPXItemId &albumId,
 const QList<TMPXItemId> &mediaIds)
 {
+	FUNC_LOG;
 CMPXCommand* cmd = CMPXCommand::NewL();
 CleanupStack::PushL(cmd);
 cmd->SetTObjectValueL(KMPXCommandGeneralId, KVcxCommandIdMyVideos);
 cmd->SetTObjectValueL(KVcxMediaMyVideosCommandId, KVcxCommandMyVideosAddToAlbum);
 cmd->SetTObjectValueL(KVcxMediaMyVideosUint32Value, albumId.iId1);
 mCollectionUtility->Collection().CommandL(*cmd);
 }
 else
 {
 // invalid data provided
+ERROR(KErrGeneral, "VideoCollectionClient::removeItemsFromAlbumL() no videos found");
 User::Leave(KErrGeneral);
 }
 CleanupStack::PopAndDestroy(array);
 CleanupStack::PopAndDestroy(cmd);
 // -----------------------------------------------------------------------------
 //
 void VideoCollectionClient::removeItemsFromAlbumL(TMPXItemId &albumId,
 const QList<TMPXItemId> &mediaIds)
 {
+	FUNC_LOG;
 CMPXCommand* cmd = CMPXCommand::NewL();
 CleanupStack::PushL(cmd);
 cmd->SetTObjectValueL(KMPXCommandGeneralId, KVcxCommandIdMyVideos);
 cmd->SetTObjectValueL(KVcxMediaMyVideosCommandId, KVcxCommandMyVideosRemoveFromAlbum);
 cmd->SetTObjectValueL(KVcxMediaMyVideosUint32Value, albumId.iId1);
 mCollectionUtility->Collection().CommandL(*cmd);
 }
 else
 {
 // invalid data provided
+ERROR(KErrGeneral, "VideoCollectionClient::removeItemsFromAlbumL() no videos found");
 User::Leave(KErrGeneral);
 }
 CleanupStack::PopAndDestroy(array);
 CleanupStack::PopAndDestroy(cmd);
 }
 // -----------------------------------------------------------------------------
+// renameAlbumL
+// -----------------------------------------------------------------------------
+//
+void VideoCollectionClient::renameAlbumL(const TMPXItemId &albumId, const QString newTitle)
+{
+	FUNC_LOG;
+CMPXMedia *media = CMPXMedia::NewL();
+CleanupStack::PushL(media);
+TPtrC titlePtrC(newTitle.utf16());
+media->SetTObjectValueL<TMPXItemId>(KMPXMediaGeneralId, albumId);
+media->SetTextValueL(KMPXMediaGeneralTitle, titlePtrC);
+CMPXCommand* cmd = CMPXMedia::NewL();
+CleanupStack::PushL( cmd );
+cmd->SetTObjectValueL(KMPXCommandGeneralId, KMPXCommandIdCollectionSet);
+cmd->SetCObjectValueL<CMPXMedia>(KMPXCommandColSetMedia, media);
+cmd->SetTObjectValueL(KMPXCommandGeneralDoSync, ETrue);
+cmd->SetTObjectValueL(KMPXCommandGeneralCollectionId,
+TUid::Uid(KVcxUidMyVideosMpxCollection));
+mCollectionUtility->Collection().CommandL(*cmd);
+CleanupStack::PopAndDestroy(cmd);
+CleanupStack::PopAndDestroy(media);
+}
+// -----------------------------------------------------------------------------
 // fetchMpxMediaByMpxIdL
 // -----------------------------------------------------------------------------
 //
 void VideoCollectionClient::fetchMpxMediaByMpxIdL(TMPXItemId &aMpxId)
 {
+	FUNC_LOG;
 if(!mCollectionUtility)
 {
 User::Leave(KErrGeneral);
 }
 CleanupStack::PopAndDestroy( media );
 CleanupStack::PopAndDestroy( idMediaArray );
 CleanupStack::PopAndDestroy( cmd );
 }
+// End of file.

changeset 36	8aed59de29f9
parent 35	3738fe97f027
child 50	21fe8338c6bf