--- a/mpviewplugins/mpcollectionviewplugin/inc/mpcollectionview.h	Fri Apr 30 19:33:32 2010 -0500
+++ b/mpviewplugins/mpcollectionviewplugin/inc/mpcollectionview.h	Fri May 14 18:54:37 2010 -0500
@@ -69,11 +69,12 @@
     void openArtists();
     void openAlbums();
     void openPlaylists();
-    void openGenres();
     void find();
     void openMusicStore();
 
     void openIndex( int index );
+    void findAlbumSongs( int index );
+    void playAlbumSongs( int albumIndex, int songIndex );
 
     void back();
     void exit();
@@ -134,8 +135,8 @@
     bool                            mBannerAttached;
 
     HbMainWindow                    *mWindow;               // Not own
-    HbAction                        *mNavigationQuit;       // Not own
-    HbAction                        *mNavigationBack;       // Not own
+    HbAction                        *mSoftKeyQuit;          // Not own
+    HbAction                        *mSoftKeyBack;          // Not own
 
     MpCollectionDocumentLoader      *mDocumentLoader;       // Own
     HbWidget                        *mMainContainer;        // Own