FCL/sf/app/musicplayer: comparison inc/mpengine.h

equal deleted inserted replaced

-:c5b304f4d89b
+:ed94e1e8390e
 class MpSongData;
 class XQSharableFile;
 class MpEngineFactory;
 class MpAudioEffectsFrameworkWrapper;
 class MpEqualizerFrameworkWrapper;
+class MpApplicationMonitor;
 #if defined(BUILD_MPENGINE_LIB)
 #define MPENGINE_EXPORT Q_DECL_EXPORT
 #else
 #define MPENGINE_EXPORT Q_DECL_IMPORT
 public:
 enum EngineMode{
 StandAlone,
 Fetch,
 Embedded,
-MediaBrowsing
+MediaBrowsing,
+HomeScreen
 };
 private:
 enum UsbBlockingState {
 USB_NotConnected,          // Not connected
 signals:
 // Harvester related
 void libraryAboutToUpdate();
+void libraryUpdateStarted();
 void libraryUpdated();
 void usbBlocked( bool blocked );
 void unableToCotinueDueUSB();
 void usbSynchronizationStarted();
 void usbSynchronizationFinished();
 void decreaseVolume();
 void setVolume( int value );
 void getMuteState();
 void mute();
 void unmute();
+void handleCorruptedStop( bool lastSong );
 // Audio Effects related
 void setBalance( int balance );
 void setLoudness( bool mode );
 // Equalizer related
 void handleEqualizerReady();
 private:
-void initialize( TUid hostUid, EngineMode mode);
+void initialize( quint32 clientSecureId, EngineMode mode);
 // Harvester related
 void handleUsbMassStorageStartEvent();
 void handleUsbMassStorageEndEvent();
 void handleUsbMtpStartEvent();
 void handleUsbMtpEndEvent();
 void handleUsbMtpNotActive();
 void changeUsbBlockingState( UsbBlockingState state );
+void autoRefreshLibrary( bool automaticRequest=false );
 private:
 Q_DISABLE_COPY( MpEngine )
+EngineMode                          mEngineMode;
 // Harvesting related
-MpMpxHarvesterFrameworkWrapper       *mMpxHarvesterWrapper;  // Own
+MpMpxHarvesterFrameworkWrapper      *mMpxHarvesterWrapper;  // Own
-MpSongScanner                        *mSongScanner;          // Own
+MpSongScanner                       *mSongScanner;          // Own
 // Collection related
-MpMpxCollectionFrameworkWrapper      *mMpxCollectionWrapper; //Own
+MpMpxCollectionFrameworkWrapper     *mMpxCollectionWrapper; // Own
 // Playback related
-MpMpxPlaybackFrameworkWrapper        *mMpxPlaybackWrapper; //Own
+MpMpxPlaybackFrameworkWrapper       *mMpxPlaybackWrapper;   // Own
 // Audio Effects related
-MpAudioEffectsFrameworkWrapper       *mAudioEffectsWrapper; // Own
+MpAudioEffectsFrameworkWrapper      *mAudioEffectsWrapper;  // Own
 // Equalizer related
-MpEqualizerFrameworkWrapper          *mEqualizerWrapper; // Own
+MpEqualizerFrameworkWrapper         *mEqualizerWrapper;     // Own
-int                                  mCurrentPresetIndex;
+int                                 mCurrentPresetIndex;
-MpSongData                           *mSongData;            // Owned
+MpSongData                          *mSongData;             // Own
+MpApplicationMonitor                *mApplicationMonitor;   // Own
-// General
-UsbBlockingState                     mUsbBlockingState;
+UsbBlockingState                    mUsbBlockingState;
-UsbBlockingState                     mPreviousUsbState;
+UsbBlockingState                    mPreviousUsbState;
-bool                                 mHandleMediaCommands;
+bool                                mHandleMediaCommands;
-TUid                                 mHostUid;
 };
 #endif // MPENGINE_H

changeset 58	ed94e1e8390e
parent 54	c5b304f4d89b
child 61	3cd404d31176