[OMPT-svn-commit] SF.net SVN: modplug:[3237] trunk/OpenMPT

[<sag...@us...>]

Revision: 3237
          http://sourceforge.net/p/modplug/code/3237
Author:   saga-games
Date:     2013-11-16 17:37:15 +0000 (Sat, 16 Nov 2013)
Log Message:
-----------
[Imp] Mod Export is no longer limited to 2GB files.
[Mod] OpenMPT: Version is now 1.22.07.01

Modified Paths:
--------------
    trunk/OpenMPT/common/versionNumber.h
    trunk/OpenMPT/mptrack/Mod2wave.cpp
    trunk/OpenMPT/mptrack/Moddoc.cpp
    trunk/OpenMPT/mptrack/mod2wave.h

Modified: trunk/OpenMPT/common/versionNumber.h
===================================================================
--- trunk/OpenMPT/common/versionNumber.h	2013-11-16 14:58:33 UTC (rev 3236)
+++ trunk/OpenMPT/common/versionNumber.h	2013-11-16 17:37:15 UTC (rev 3237)
@@ -16,8 +16,8 @@
 //Version definitions. The only thing that needs to be changed when changing version number.
 #define VER_MAJORMAJOR          1
 #define VER_MAJOR               22
-#define VER_MINOR               06
-#define VER_MINORMINOR          03
+#define VER_MINOR               07
+#define VER_MINORMINOR          01
 
 //Version string. For example "1.17.02.28"
 #define MPT_VERSION_STR         VER_STRINGIZE(VER_MAJORMAJOR) "." VER_STRINGIZE(VER_MAJOR) "." VER_STRINGIZE(VER_MINOR) "." VER_STRINGIZE(VER_MINORMINOR)

Modified: trunk/OpenMPT/mptrack/Mod2wave.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mod2wave.cpp	2013-11-16 14:58:33 UTC (rev 3236)
+++ trunk/OpenMPT/mptrack/Mod2wave.cpp	2013-11-16 17:37:15 UTC (rev 3237)
@@ -861,7 +861,7 @@
 	static int mixbuffer[MIXBUFFERSIZE * 4]; // channels
 
 	MSG msg;
-	CHAR s[80];
+	TCHAR s[80];
 	HWND progress = ::GetDlgItem(m_hWnd, IDC_PROGRESS1);
 	UINT ok = IDOK, pos = 0;
 	uint64 ullSamples = 0, ullMaxSamples;
@@ -938,7 +938,7 @@
 	m_SndFile.SetMixerSettings(mixersettings);
 	m_SndFile.SetResamplerSettings(TrackerSettings::Instance().GetResamplerSettings());
 	m_SndFile.InitPlayer(TRUE);
-	if ((!m_dwFileLimit) || (m_dwFileLimit > 2047*1024)) m_dwFileLimit = 2047*1024; // 2GB
+	if(!m_dwFileLimit) m_dwFileLimit = Util::MaxValueOfType(m_dwFileLimit) >> 10;
 	m_dwFileLimit <<= 10;
 
 	fileEnc->SetFormat(encSettings);
@@ -1002,7 +1002,7 @@
 	// For giving away some processing time every now and then
 	DWORD dwSleepTime = dwStartTime;
 
-	size_t bytesWritten = 0;
+	uint64 bytesWritten = 0;
 
 	CMainFrame::GetMainFrame()->PauseMod();
 	m_SndFile.m_SongFlags.reset(SONG_STEP | SONG_PATTERNLOOP);
@@ -1069,7 +1069,7 @@
 				fileEnc->WriteInterleavedConverted(lRead, buffer);
 			}
 			const std::streampos newPos = fileStream.tellp();
-			bytesWritten += static_cast<std::size_t>(newPos - oldPos);
+			bytesWritten += static_cast<uint64>(newPos - oldPos);
 
 			if(bytesWritten >= m_dwFileLimit)
 			{
@@ -1087,18 +1087,18 @@
 			DWORD l = (DWORD)(ullSamples / m_SndFile.m_MixerSettings.gdwMixingFreq);
 
 			const DWORD dwCurrentTime = timeGetTime();
-			DWORD timeRemaining = 0; // estimated remainig time
+			uint32 timeRemaining = 0; // estimated remainig time
 			if((ullSamples > 0) && (ullSamples < max))
 			{
-				timeRemaining = static_cast<DWORD>(((dwCurrentTime - dwStartTime) * (max - ullSamples) / ullSamples) / 1000);
+				timeRemaining = static_cast<uint32>(((dwCurrentTime - dwStartTime) * (max - ullSamples) / ullSamples) / 1000);
 			}
 
 			if(m_Settings.Normalize)
 			{
-				wsprintf(s, "Rendering file... (%umn%02us, %umn%02us remaining)", l / 60, l % 60, timeRemaining / 60, timeRemaining % 60);
+				_stprintf(s, _T("Rendering file... (%umn%02us, %umn%02us remaining)"), l / 60, l % 60, timeRemaining / 60, timeRemaining % 60u);
 			} else
 			{
-				wsprintf(s, "Writing file... (%uKB, %umn%02us, %umn%02us remaining)", bytesWritten >> 10, l / 60, l % 60, timeRemaining / 60, timeRemaining % 60);
+				_stprintf(s, _T("Writing file... (%lluKB, %umn%02us, %umn%02us remaining)"), bytesWritten >> 10, l / 60, l % 60u, timeRemaining / 60, timeRemaining % 60u);
 			}
 			SetDlgItemText(IDC_TEXT1, s);
 
@@ -1186,7 +1186,7 @@
 				int percent = static_cast<int>(100 * framesProcessed / framesTotal);
 				if(percent != lastPercent)
 				{
-					wsprintf(s, "Normalizing... (%d%%)", percent);
+					_stprintf(s, _T("Normalizing... (%d%%)"), percent);
 					SetDlgItemText(IDC_TEXT1, s);
 					::SendMessage(progress, PBM_SETPOS, percent, 0);
 					lastPercent = percent;

Modified: trunk/OpenMPT/mptrack/Moddoc.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Moddoc.cpp	2013-11-16 14:58:33 UTC (rev 3236)
+++ trunk/OpenMPT/mptrack/Moddoc.cpp	2013-11-16 17:37:15 UTC (rev 3237)
@@ -1793,7 +1793,7 @@
 
 		// Render song (or current channel, or current sample/instrument)
 		CDoWaveConvert dwcdlg(m_SndFile, thisName, wsdlg.m_Settings, pMainFrm);
-		dwcdlg.m_dwFileLimit = static_cast<DWORD>(wsdlg.m_dwFileLimit);
+		dwcdlg.m_dwFileLimit = wsdlg.m_dwFileLimit;
 		dwcdlg.m_bGivePlugsIdleTime = wsdlg.m_bGivePlugsIdleTime;
 		dwcdlg.m_dwSongLimit = wsdlg.m_dwSongLimit;
 

Modified: trunk/OpenMPT/mptrack/mod2wave.h
===================================================================
--- trunk/OpenMPT/mptrack/mod2wave.h	2013-11-16 14:58:33 UTC (rev 3236)
+++ trunk/OpenMPT/mptrack/mod2wave.h	2013-11-16 17:37:15 UTC (rev 3237)
@@ -68,8 +68,7 @@
 	CWaveConvertSettings m_Settings;
 	const Encoder::Traits *encTraits;
 	CSoundFile &m_SndFile;
-	uint64 m_dwFileLimit;
-	DWORD m_dwSongLimit;
+	uint64 m_dwFileLimit, m_dwSongLimit;
 	ORDERINDEX m_nNumOrders;
 
 	CComboBox m_CbnFileType, m_CbnSampleRate, m_CbnChannels, m_CbnSampleFormat;
@@ -125,7 +124,7 @@
 	const CWaveConvertSettings &m_Settings;
 	CSoundFile &m_SndFile;
 	mpt::PathString m_lpszFileName;
-	DWORD m_dwFileLimit, m_dwSongLimit;
+	uint64 m_dwFileLimit, m_dwSongLimit;
 	bool m_bAbort, m_bGivePlugsIdleTime;
 
 public:

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