From: <man...@us...> - 2014-10-06 16:42:36
|
Revision: 4398 http://sourceforge.net/p/modplug/code/4398 Author: manxorist Date: 2014-10-06 16:42:26 +0000 (Mon, 06 Oct 2014) Log Message: ----------- [Ref] Invert NO_FILEREADER_STD_ISTREAM to MPT_FILEREADER_STD_ISTREAM for better code readability. Modified Paths: -------------- trunk/OpenMPT/mptrack/Moddoc.cpp Modified: trunk/OpenMPT/mptrack/Moddoc.cpp =================================================================== --- trunk/OpenMPT/mptrack/Moddoc.cpp 2014-10-06 16:40:16 UTC (rev 4397) +++ trunk/OpenMPT/mptrack/Moddoc.cpp 2014-10-06 16:42:26 UTC (rev 4398) @@ -29,10 +29,10 @@ #include "modsmp_ctrl.h" #include "CleanupSong.h" #include "../common/StringFixer.h" -#ifdef NO_FILEREADER_STD_ISTREAM +#if defined(MPT_FILEREADER_STD_ISTREAM) +#include "../common/mptFstream.h" +#else #include "MemoryMappedFile.h" -#else -#include "../common/mptFstream.h" #endif #include "soundlib/FileReader.h" #include <shlwapi.h> @@ -219,7 +219,7 @@ if(filename.empty()) return OnNewDocument(); BeginWaitCursor(); - #ifndef NO_FILEREADER_STD_ISTREAM + #if defined(MPT_FILEREADER_STD_ISTREAM) mpt::ifstream f(filename, std::ios_base::binary); m_SndFile.Create(FileReader(&f), CSoundFile::loadCompleteModule, this); #else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |