[Amis-vcs] SF.net SVN: amis: [2357] branches/amis3

[<dan...@us...>]

Revision: 2357
          http://amis.svn.sourceforge.net/amis/?rev=2357&view=rev
Author:   daniel_weck
Date:     2008-02-29 10:08:28 -0800 (Fri, 29 Feb 2008)

Log Message:
-----------
fixed compile errors

Modified Paths:
--------------
    branches/amis3/AmisAudio/src/AmisAudio.cpp
    branches/amis3/AmisGuiMFC2/src/gui/MenuManip.cpp

Modified: branches/amis3/AmisAudio/src/AmisAudio.cpp
===================================================================
--- branches/amis3/AmisAudio/src/AmisAudio.cpp	2008-02-29 17:55:58 UTC (rev 2356)
+++ branches/amis3/AmisAudio/src/AmisAudio.cpp	2008-02-29 18:08:28 UTC (rev 2357)
@@ -83,9 +83,8 @@
 		void AmisAudio::play(const char * url,char* clipBegin,char* clipEnd)
 		{
 			if (m_playerToKill != NULL) {
-		delete m_playerToKill;
-		
-	}
+				//delete m_playerToKill;
+			}
 			m_playerToKill=0;
 			if (m_player) {
 				delete m_player; // stop() and release_player() handled by destructor

Modified: branches/amis3/AmisGuiMFC2/src/gui/MenuManip.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/MenuManip.cpp	2008-02-29 17:55:58 UTC (rev 2356)
+++ branches/amis3/AmisGuiMFC2/src/gui/MenuManip.cpp	2008-02-29 18:08:28 UTC (rev 2357)
@@ -133,66 +133,6 @@
 	//remember that other enabling/disabling is done in CMainFrame's ON_UPDATE_COMMAND_UI handlers
 }
 
-void MenuManip::setupMenusNothingOpen()
-{
-	//get the main menu
-	CMenu* p_main_menu = NULL;
-	p_main_menu = MainWndParts::Instance()->mpMainFrame->GetMenu();
-	assert(p_main_menu);	
-
-	return;
-
-	//play menu
-	p_main_menu->EnableMenuItem(2, MF_BYPOSITION | MF_GRAYED);
-	
-	//navigate menu
-	p_main_menu->EnableMenuItem(3, MF_BYPOSITION | MF_GRAYED);
-
-	//bookmarks menu
-	p_main_menu->EnableMenuItem(4, MF_BYPOSITION | MF_GRAYED);
-
-	//info menu
-	p_main_menu->EnableMenuItem(5, MF_BYPOSITION | MF_GRAYED);
-
-	//remember that other enabling/disabling is done in CMainFrame's ON_UPDATE_COMMAND_UI handlers
-}
-
-void MenuManip::setupMenusSomethingOpen(amis::dtb::BookmarkSet* pBookmarks)
-{
-	//get the main menu
-	CMenu* p_main_menu = NULL;
-	p_main_menu = MainWndParts::Instance()->mpMainFrame->GetMenu();
-	assert(p_main_menu);
-
-
-	//play menu
-	p_main_menu->EnableMenuItem(2, MF_BYPOSITION | MF_ENABLED);
-
-	/*p_menu = NULL;
-	p_menu = p_main_menu->GetSubMenu(2);
-	assert(p_menu);
-	p_menu->EnableMenuItem(ID_MENU_PLAY_FASTER, MF_BYCOMMAND | MF_ENABLED);
-	p_menu->EnableMenuItem(ID_MENU_PLAY_SLOWER, MF_BYCOMMAND | MF_ENABLED);
-	p_menu->EnableMenuItem(ID_MENU_PLAY_NORMALSPEED, MF_BYCOMMAND | MF_ENABLED);
-	p_menu->EnableMenuItem(ID_MENU_PLAY_VOLDOWN, MF_BYCOMMAND | MF_ENABLED);
-	p_menu->EnableMenuItem(ID_MENU_PLAY_VOLUP, MF_BYCOMMAND | MF_ENABLED);
-	*/
-
-	//navigate menu
-	p_main_menu->EnableMenuItem(3, MF_BYPOSITION | MF_ENABLED);
-
-	//bookmarks menu
-	p_main_menu->EnableMenuItem(4, MF_BYPOSITION | MF_ENABLED);
-
-	//info menu
-	p_main_menu->EnableMenuItem(5, MF_BYPOSITION | MF_ENABLED);
-
-	setupNavigationOptions();
-	loadBookmarks(pBookmarks);
-
-	//remember that other enabling/disabling is done in CMainFrame's ON_UPDATE_COMMAND_UI handlers
-}
-
 void MenuManip::setViewItemCheckmark(bool isChecked, UINT itemId)
 {
 	CMenu* p_menu = NULL;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.