--- a/inc/mpengine.h	Fri Jun 25 17:21:37 2010 -0500
+++ b/inc/mpengine.h	Fri Jul 09 16:27:03 2010 -0500
@@ -30,7 +30,6 @@
 class MpMediaKeyHandler;
 class MpMpxCollectionFrameworkWrapper;
 class MpMpxPlaybackFrameworkWrapper;
-class MpMpxDetailsFrameworkWrapper;
 class MpMpxCollectionData;
 class MpPlaybackData;
 class MpSongData;
@@ -110,7 +109,7 @@
 
     // Details related
     MpSongData *songData();
-    void retrieveSong();
+    void retrieveSongDetails( int index = -1 );
 
     // Audio Effects related
     int balance();
@@ -135,7 +134,6 @@
     void unableToCotinueDueUSB();
     void usbSynchronizationStarted();
     void usbSynchronizationFinished();
-    void libraryRefreshNeeded();
 
     // Collection related
     void collectionPlaylistOpened();
@@ -215,9 +213,6 @@
     // Playback related
     MpMpxPlaybackFrameworkWrapper        *mMpxPlaybackWrapper; //Own
 
-    // Details related
-    MpMpxDetailsFrameworkWrapper         *mMpxDetailsWrapper;  // Own
-
     // Audio Effects related
     MpAudioEffectsFrameworkWrapper       *mAudioEffectsWrapper; // Own
 
@@ -225,6 +220,8 @@
     MpEqualizerFrameworkWrapper          *mEqualizerWrapper; // Own
     int                                  mCurrentPresetIndex;
 
+    MpSongData                           *mSongData;            // Owned
+
     // General
     UsbBlockingState                     mUsbBlockingState;
     UsbBlockingState                     mPreviousUsbState;