diff -r ce5ada96ab30 -r 5294c000a26d videoplayerapp/mpxvideoplayer/inc/mpxvideoplayerappuiengine.h --- a/videoplayerapp/mpxvideoplayer/inc/mpxvideoplayerappuiengine.h Fri Mar 12 15:43:00 2010 +0200 +++ b/videoplayerapp/mpxvideoplayer/inc/mpxvideoplayerappuiengine.h Mon Mar 15 12:40:47 2010 +0200 @@ -15,7 +15,7 @@ * */ -// Version : %version: e92_31 % +// Version : %version: e92_33 % #ifndef CMPXVIDEOPLAYERAPPUIENGINE_H @@ -63,10 +63,11 @@ virtual ~CMpxVideoPlayerAppUiEngine(); public: + /* - * Retrieve the playback utility pointer + * Retrieves playback utility and creates it if needed */ - inline MMPXPlaybackUtility* PlaybackUtility(); + MMPXPlaybackUtility& PlaybackUtilityL(); /** * Opens the specified file in response to a corresponding message. @@ -186,7 +187,7 @@ */ void HandleEmbeddedOpenL( TInt aErr, TMPXGeneralCategory aCategory ); - void CreateEmbeddedPdlPlaybackUtilityMemberVariablesL(); + void PreLoadPdlPlaybackViewL(); /* * Handles the "back" button. @@ -223,8 +224,14 @@ void InitializeFileL( const TDesC& aFileName ); void ClosePlaybackPluginL(); + + void SignalViewPdlReloadingL(); - void SignalViewPdlReloading(); + /* + * Activates an active object to finish the + * initialization of the standalone application + */ + void ActivateLateConstructTimerL(); private: /** @@ -266,8 +273,6 @@ */ void DoHandleCollectionMessageL( CMPXMessage* aMessage ); - void CreatePlaybackUtilityMemberVariablesL(); - void CreateCollectionUtilityMemberVariablesL(); void CreateRemoteControlListenerL(); @@ -293,6 +298,21 @@ void InitializeStreamingLinkL( const TDesC& aUri ); void InitializePlaylistL( const CMPXCollectionPlaylist& aPlaylist, TBool aPlay ); + /* + * Provides the static function for the callback to + * finish the standalone application construction + * Called by CPeriodic iConstructTimer + * @param aPtr Pointer to callback class + * @return KErrNone + */ + static TInt LateConstructCallback( TAny* aPtr ); + + /* + * Called to finalize the standalone + * application initialization. + */ + virtual void DoLateConstructL(); + private: // data CMpxVideoPlayerAppUi* iAppUi; @@ -305,8 +325,7 @@ MMPXCollectionUtility* iCollectionUtility; MMPXCollectionUiHelper* iCollectionUiHelper; // own - TUid iVideoCollectionId; - + CPeriodic* iConstructTimer; CIdle* iExitAo; CMediaRecognizer* iRecognizer; // own CMpxVideoEmbeddedPdlHandler* iPdlHandler; // own @@ -315,15 +334,6 @@ TBool iMultilinkPlaylist; TBool iSeekable; TBool iUpdateSeekInfo; -}; - -// -// Inline methods -// -inline -MMPXPlaybackUtility* CMpxVideoPlayerAppUiEngine::PlaybackUtility() -{ - return iPlaybackUtility; -} + }; #endif // CMPXVIDEOPLAYERAPPUIENGINE_H