--- a/mpxplugins/viewplugins/views/collectionviewhg/inc/mpxcollectionviewhgimp.h	Fri Feb 19 22:48:30 2010 +0200
+++ b/mpxplugins/viewplugins/views/collectionviewhg/inc/mpxcollectionviewhgimp.h	Fri Mar 12 15:42:25 2010 +0200
@@ -36,6 +36,7 @@
 #include "mpxcollectionviewhg.h"
 #include "mpxplaybackframeworkdefs.h" // TMPXPlaybackPlayerType
 #include "mpxwaitnotedefs.h"
+#include "mpxselectedalbumhandler.h"
 
 // FORWARD DECLARATIONS
 class CAiwGenericParamList;
@@ -83,7 +84,8 @@
                                              public MMPXViewActivationObserver,
                                              public MCoeViewDeactivationObserver,
                                              public MCoeViewActivationObserver,
-                                             public MMpxCbaHandler
+                                             public MMpxCbaHandler,
+                                             public MMPXSelectedAlbumHandler
     {
 public:
 
@@ -115,6 +117,20 @@
      */
     void LaunchMusicShopL();
 
+    /**
+     *  Saves selected album.
+     *
+     *  @param aMedia Album to be stored
+     */
+     void SaveSelectedAlbum (CMPXMedia &aMedia);
+
+     /**
+     *  Restores selected album.
+     *
+     *  @return media of restored album
+     */
+     const CMPXMedia* RestoreSelectedAlbum ();
+
 
 private:
 
@@ -163,11 +179,6 @@
     void HandleError( TInt aError );
 
     /**
-     * Updates the navi pane
-     */
-    void UpdateNaviPaneL();
-
-    /**
      * Updates the title pane
      */
     void UpdateTitlePaneL();
@@ -842,8 +853,14 @@
  	void ChangeCbaVisibility( TBool aVisible );
 
  	void UpdateCba();
- 	
+
+	TBool NowPlayingOptionVisibilityL();
     void HandleInitMusicMenuPaneL(CEikMenuPane* aMenuPane );
+    void DynInitMenuPaneAlbumL(TInt aResourceId, CEikMenuPane* aMenuPane );
+    void DynInitMenuPanePlaylistL(TInt aResourceId, CEikMenuPane* aMenuPane );
+    void DynInitMenuPaneGenreL(TInt aResourceId, CEikMenuPane* aMenuPane );
+    void DynInitMenuPaneSongsL(TInt aResourceId, CEikMenuPane* aMenuPane );
+    void DynInitMenuPanePlaylistSongsL(TInt aResourceId, CEikMenuPane* aMenuPane );
 
     void OpenAllSongsL();
     void OpenArtistAlbumsL();
@@ -851,8 +868,6 @@
     void OpenGenreL();
     void OpenPodcastsL();
 
-    static TInt IADCheckTimerCallBack(TAny* aHgViewObject); //directly called
-    void StartCheckingforIADUpdates(); //indirectly called
 
 private:    // Data
 
@@ -906,10 +921,6 @@
     TInt                        iCachedCommand; // for incremental open
     CListBoxView::CSelectionIndexArray* iCachedSelectionIndex;
 
-    CAknNavigationDecorator*        iNaviDecorator;
-    CAknNaviLabel*                  iNaviLabel;
-    CAknNavigationControlContainer* iNaviPane;
-
     CEikButtonGroupContainer*       iCurrentCba;
 
     CAknQueryDialog*            iConfirmationDlg;
@@ -980,8 +991,7 @@
     TBool iOpeningNote; // Waitnote is opening
 	TBool iMarkedAll;
 	TBool iFirstIncrementalBatch;
-
-    CPeriodic* iTimer;
+    CMPXMedia *iStoredAlbum; // owned
     };
 
 #endif  // C_CMPXCOLLECTIONVIEWHGIMP_H