--- a/inc/mpengine.h Tue Jul 06 14:13:36 2010 +0300
+++ b/inc/mpengine.h Wed Aug 18 09:46:20 2010 +0300
@@ -27,10 +27,8 @@
class QStringList;
class MpMpxHarvesterFrameworkWrapper;
class MpSongScanner;
-class MpMediaKeyHandler;
class MpMpxCollectionFrameworkWrapper;
class MpMpxPlaybackFrameworkWrapper;
-class MpMpxDetailsFrameworkWrapper;
class MpMpxCollectionData;
class MpPlaybackData;
class MpSongData;
@@ -110,7 +108,7 @@
// Details related
MpSongData *songData();
- void retrieveSong();
+ void retrieveSongDetails( int index = -1 );
// Audio Effects related
int balance();
@@ -135,7 +133,6 @@
void unableToCotinueDueUSB();
void usbSynchronizationStarted();
void usbSynchronizationFinished();
- void libraryRefreshNeeded();
// Collection related
void collectionPlaylistOpened();
@@ -148,6 +145,9 @@
void containerContentsChanged();
void restorePathFailed();
+ // Playback related
+ void volumePropertyChanged( MpCommon::MpVolumeProperty property, int value );
+
// Equalizer related
void equalizerReady();
@@ -170,6 +170,8 @@
// Playback related
void playEmbedded( QString aFilename );
void playEmbedded( const XQSharableFile& file );
+ void play();
+ void pause();
void playPause();
void stop();
void skipForward();
@@ -180,6 +182,14 @@
void setPosition( int position );
void setShuffle( bool mode );
void setRepeat( bool mode );
+ void getMaxVolume();
+ void getVolume();
+ void increaseVolume();
+ void decreaseVolume();
+ void setVolume( int value );
+ void getMuteState();
+ void mute();
+ void unmute();
// Audio Effects related
void setBalance( int balance );
@@ -207,7 +217,6 @@
// Harvesting related
MpMpxHarvesterFrameworkWrapper *mMpxHarvesterWrapper; // Own
MpSongScanner *mSongScanner; // Own
- MpMediaKeyHandler *mMediaKeyHandler; // Own
// Collection related
MpMpxCollectionFrameworkWrapper *mMpxCollectionWrapper; //Own
@@ -215,9 +224,6 @@
// Playback related
MpMpxPlaybackFrameworkWrapper *mMpxPlaybackWrapper; //Own
- // Details related
- MpMpxDetailsFrameworkWrapper *mMpxDetailsWrapper; // Own
-
// Audio Effects related
MpAudioEffectsFrameworkWrapper *mAudioEffectsWrapper; // Own
@@ -225,9 +231,12 @@
MpEqualizerFrameworkWrapper *mEqualizerWrapper; // Own
int mCurrentPresetIndex;
+ MpSongData *mSongData; // Owned
+
// General
UsbBlockingState mUsbBlockingState;
- UsbBlockingState mPreviousUsbState;
+ UsbBlockingState mPreviousUsbState;
+ bool mHandleMediaCommands;
TUid mHostUid;
};