--- a/tsrc/musenginestub/src/musengclipsession.cpp Thu Aug 19 09:51:39 2010 +0300
+++ b/tsrc/musenginestub/src/musengclipsession.cpp Tue Aug 31 15:12:07 2010 +0300
@@ -18,45 +18,18 @@
// USER
#include "musengclipsession.h"
-#include "musengclipsessionobserver.h"
-#include "musengsessionobserver.h"
-#include "musengmceoutsession.h"
-#include "musenglivesession.h"
-
-
-// SYSTEM
-/*#include <mcesession.h>
-#include <mcefilesource.h>
-#include <mcemediastream.h>
-#include <mcevideostream.h>
-#include <mceaudiostream.h>
-#include <mcertpsink.h>
-#include <mcedisplaysink.h>
-#include <mcespeakersink.h>
-#include <drmcommon.h>
-*/
-
-// CONSTANTS
-
-const TInt KMicroSecondsInOneSecond = 1000000;
// -----------------------------------------------------------------------------
//
// -----------------------------------------------------------------------------
//
-EXPORT_C CMusEngClipSession* CMusEngClipSession::NewL(
- const TDesC& aFileName,
- const TRect& aRect,
- MMusEngClipSessionObserver* aSessionObserver,
- TUint aSipProfileId )
+CMusEngClipSession* CMusEngClipSession::NewL(
+ const TRect& aRect )
{
- CMusEngClipSession* self = new( ELeave ) CMusEngClipSession(
- aSessionObserver,
- aRect,
- aSipProfileId );
+ CMusEngClipSession* self = new( ELeave ) CMusEngClipSession( aRect );
CleanupStack::PushL( self );
- self->ConstructL( aFileName );
+ self->ConstructL();
CleanupStack::Pop( self );
return self;
}
@@ -70,60 +43,12 @@
{
}
-
// -----------------------------------------------------------------------------
//
// -----------------------------------------------------------------------------
//
-EXPORT_C void CMusEngClipSession::ChangeClipL( const TDesC& aFileName )
- {
- }
-
-
-// -----------------------------------------------------------------------------
-// TODO: At the moment behavior of MCE is not known and all the FFWD commands
-// are only forwarded to MCE.
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CMusEngClipSession::FastForwardL( TBool aUseFFWD )
- {
- }
-
-
-// -----------------------------------------------------------------------------
-// TODO: At the moment behavior of MCE is not known and all the FRWD commands
-// are only forwarded to MCE.
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CMusEngClipSession::FastRewindL( TBool aUseFRWD )
- {
- }
-
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TTimeIntervalSeconds CMusEngClipSession::PositionL()
- {
- }
-
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TTimeIntervalSeconds CMusEngClipSession::DurationL()
- {
- }
-
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CMusEngClipSession::SetPositionL (
- const TTimeIntervalSeconds& aPosition )
+CMusEngClipSession::CMusEngClipSession( const TRect& aRect )
+ : CMusEngMceOutSession( aRect )
{
}
@@ -132,78 +57,11 @@
//
// -----------------------------------------------------------------------------
//
-EXPORT_C void CMusEngClipSession::SetSessionObserver(
- MMusEngClipSessionObserver* aSessionObserver)
- {
- }
-
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CMusEngClipSession::PlayL()
+void CMusEngClipSession::ConstructL()
{
- }
-
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CMusEngClipSession::PauseL()
- {
- }
-
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-//
-void CMusEngClipSession::CompleteSessionStructureL()
- {
+ CMusEngMceOutSession::ConstructL();
}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-//
-CMusEngClipSession::CMusEngClipSession(
- MMusEngClipSessionObserver* aSessionObserver,
- const TRect& aRect,
- TUint aSipProfileId )
- : CMusEngMceOutSession( aRect, aSipProfileId )
- {
- }
-
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-//
-void CMusEngClipSession::ConstructL( const TDesC& aFileName )
- {
- }
+
+// End of file
-
-// -----------------------------------------------------------------------------
-// Check is file DRM protected.
-//
-// -----------------------------------------------------------------------------
-//
-TBool CMusEngClipSession::IsProtectedFileL( const TDesC& aClipFile )
- {
- }
-
-
-// -----------------------------------------------------------------------------
-// If member file contains audio, add appropriate amount of audio streams to
-// session structure
-// -----------------------------------------------------------------------------
-//
-void CMusEngClipSession::ConstructAudioStructureL()
- {
- }
-
-