[Amis-vcs] SF.net SVN: amis: [2248] branches/amis3
Brought to you by:
julienq,
marisademeglio
From: <dan...@us...> - 2007-12-04 17:22:45
|
Revision: 2248 http://amis.svn.sourceforge.net/amis/?rev=2248&view=rev Author: daniel_weck Date: 2007-12-04 09:22:34 -0800 (Tue, 04 Dec 2007) Log Message: ----------- - Daniel WECK * Fixed URL vs FILE syntax problem (e.g. space escaped with %20) Modified Paths: -------------- branches/amis3/AmisCore/src/io/RecentBooksFileIO.cpp branches/amis3/AmisGuiMFC2/src/gui/AmisGuiMFC2.cpp Modified: branches/amis3/AmisCore/src/io/RecentBooksFileIO.cpp =================================================================== --- branches/amis3/AmisCore/src/io/RecentBooksFileIO.cpp 2007-12-04 13:45:00 UTC (rev 2247) +++ branches/amis3/AmisCore/src/io/RecentBooksFileIO.cpp 2007-12-04 17:22:34 UTC (rev 2248) @@ -188,9 +188,9 @@ std::string local_file_name; //use the specified filepath unless it is unavailable if (filepath != NULL) - local_file_name = amis::util::FilePathTools::getAsLocalFilePath(filepath->get_url()); + local_file_name = amis::util::FilePathTools::getAsLocalFilePath(filepath->get_file()); else - local_file_name = amis::util::FilePathTools::getAsLocalFilePath(pFile->mFilePath.get_url()); + local_file_name = amis::util::FilePathTools::getAsLocalFilePath(pFile->mFilePath.get_file()); mpRecentBooks = pFile; Modified: branches/amis3/AmisGuiMFC2/src/gui/AmisGuiMFC2.cpp =================================================================== --- branches/amis3/AmisGuiMFC2/src/gui/AmisGuiMFC2.cpp 2007-12-04 13:45:00 UTC (rev 2247) +++ branches/amis3/AmisGuiMFC2/src/gui/AmisGuiMFC2.cpp 2007-12-04 17:22:34 UTC (rev 2248) @@ -335,10 +335,18 @@ if (b_a_book_was_open) { + AudioSequencePlayer::Instance()->Stop(); + AudioSequencePlayer::playPromptFromStringId("generalBookError"); + AfxMessageBox(message2); openLastReadBook(); } - else AfxMessageBox(message1); + else + { + AudioSequencePlayer::Instance()->Stop(); + AudioSequencePlayer::playPromptFromStringId("generalBookError"); + AfxMessageBox(message1); + } } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |