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

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

Revision: 4141
          http://sourceforge.net/p/modplug/code/4141
Author:   saga-games
Date:     2014-06-19 18:54:57 +0000 (Thu, 19 Jun 2014)
Log Message:
-----------
[Mod] Experimental change: To make "maintain sample sync on seek" also work when playback was previously stopped, move some channel reset code again.
[Mod] When resuming paused (not stopped) playback, previously playing samples are continued.
[Mod] OpenMPT: Version is now 1.23.04.02

Modified Paths:
--------------
    trunk/OpenMPT/common/versionNumber.h
    trunk/OpenMPT/mptrack/MainFrm.cpp

Modified: trunk/OpenMPT/common/versionNumber.h
===================================================================
--- trunk/OpenMPT/common/versionNumber.h	2014-06-19 16:24:09 UTC (rev 4140)
+++ trunk/OpenMPT/common/versionNumber.h	2014-06-19 18:54:57 UTC (rev 4141)
@@ -19,7 +19,7 @@
 #define VER_MAJORMAJOR          1
 #define VER_MAJOR               23
 #define VER_MINOR               04
-#define VER_MINORMINOR          01
+#define VER_MINORMINOR          02
 
 //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/MainFrm.cpp
===================================================================
--- trunk/OpenMPT/mptrack/MainFrm.cpp	2014-06-19 16:24:09 UTC (rev 4140)
+++ trunk/OpenMPT/mptrack/MainFrm.cpp	2014-06-19 18:54:57 UTC (rev 4141)
@@ -1343,7 +1343,7 @@
 	const bool bPaused = m_pSndFile->IsPaused();
 	const bool bPatLoop = m_pSndFile->m_SongFlags[SONG_PATTERNLOOP];
 
-	m_pSndFile->ResetChannels();
+	m_pSndFile->m_SongFlags.reset(SONG_FADINGSONG | SONG_ENDREACHED);
 
 	if(!bPatLoop && bPaused) sndFile.m_SongFlags.set(SONG_PAUSED);
 	sndFile.SetRepeatCount((TrackerSettings::Instance().gbLoopSong) ? -1 : 0);
@@ -1395,6 +1395,7 @@
 	GenerateStopNotification();
 
 	m_pSndFile->SetCurrentPos(0);
+	m_pSndFile->ResetChannels();
 	UnsetPlaybackSoundFile();
 
 	StopPlayback();

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