Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[465] trunk/OpenMPT
|
From: <rel...@us...> - 2010-01-14 20:46:42
|
Revision: 465
http://modplug.svn.sourceforge.net/modplug/?rev=465&view=rev
Author: relabsoluness
Date: 2010-01-14 20:46:32 +0000 (Thu, 14 Jan 2010)
Log Message:
-----------
[Fix] Sample tab: Fix to possible crash if trying to use time stretching without SoundTouch DLL available.
[Fix] Internal: mptrack_08.vcproj wasn't updated in rev. 462.
[Imp] Keymaps: Updated default keybindings.
[Mod] Version: Changed version to 1.18.
[Mod] PackageTemplate: Update to history.txt.
[Mod] Misc: Removed unused DLL from version control, added version resource to SoundTouch DLL.
Modified Paths:
--------------
trunk/OpenMPT/mptrack/Ctrl_smp.cpp
trunk/OpenMPT/mptrack/Mptrack.cpp
trunk/OpenMPT/mptrack/Mptrack.h
trunk/OpenMPT/mptrack/mptrack.vcproj
trunk/OpenMPT/mptrack/mptrack_08.vcproj
trunk/OpenMPT/mptrack/res/defaultKeybindings.mkb
trunk/OpenMPT/mptrack/version.h
trunk/OpenMPT/packageTemplate/History.txt
trunk/OpenMPT/soundtouch/soundtouch.vcproj
trunk/OpenMPT/soundtouch/soundtouch_08.vcproj
Added Paths:
-----------
trunk/OpenMPT/soundtouch/SoundTouchDLL.rc
Removed Paths:
-------------
trunk/OpenMPT/mptrack/bin/OpenMPT_SoundTouch.dll
Modified: trunk/OpenMPT/mptrack/Ctrl_smp.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_smp.cpp 2010-01-10 21:54:41 UTC (rev 464)
+++ trunk/OpenMPT/mptrack/Ctrl_smp.cpp 2010-01-14 20:46:32 UTC (rev 465)
@@ -16,6 +16,7 @@
#include "smbPitchShift.cpp"
#pragma warning(default:4244) //"conversion from 'type1' to 'type2', possible loss of data"
#include "modsmp_ctrl.h"
+#include <Shlwapi.h>
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -1799,7 +1800,11 @@
if (handleSt == NULL)
{
- handleSt = soundtouch_createInstance();
+ // Check whether the DLL file exists.
+ CString sPath;
+ sPath.Format(TEXT("%s%s"), CTrackApp::GetAppDirPath(), TEXT("OpenMPT_SoundTouch_i16.dll"));
+ if (sPath.GetLength() <= _MAX_PATH && PathFileExists(sPath) == TRUE)
+ handleSt = soundtouch_createInstance();
}
if (handleSt == NULL)
{
Modified: trunk/OpenMPT/mptrack/Mptrack.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mptrack.cpp 2010-01-10 21:54:41 UTC (rev 464)
+++ trunk/OpenMPT/mptrack/Mptrack.cpp 2010-01-14 20:46:32 UTC (rev 465)
@@ -252,6 +252,8 @@
}
+TCHAR CTrackApp::m_szExePath[_MAX_PATH] = TEXT("");
+
/////////////////////////////////////////////////////////////////////////////
// MPTRACK Command Line options
Modified: trunk/OpenMPT/mptrack/Mptrack.h
===================================================================
--- trunk/OpenMPT/mptrack/Mptrack.h 2010-01-10 21:54:41 UTC (rev 464)
+++ trunk/OpenMPT/mptrack/Mptrack.h 2010-01-14 20:46:32 UTC (rev 465)
@@ -153,7 +153,7 @@
HANDLE m_hAlternateResourceHandle;
// Default macro configuration
MODMIDICFG m_MidiCfg;
- TCHAR m_szExePath[_MAX_PATH];
+ static TCHAR m_szExePath[_MAX_PATH];
TCHAR m_szConfigDirectory[_MAX_PATH];
TCHAR m_szConfigFileName[_MAX_PATH];
TCHAR m_szPluginCacheFileName[_MAX_PATH];
@@ -175,6 +175,7 @@
static VOID SetAsProject(BOOL n) { m_nProject = n; }
// -! NEW_FEATURE#0023
+ static LPCTSTR GetAppDirPath() {return m_szExePath;} // Returns '\'-ended executable directory path.
static UINT GetDefaultDocType() { return m_nDefaultDocType; }
static VOID SetDefaultDocType(UINT n) { m_nDefaultDocType = n; }
static LPMIDILIBSTRUCT GetMidiLibrary() { return glpMidiLibrary; }
Deleted: trunk/OpenMPT/mptrack/bin/OpenMPT_SoundTouch.dll
===================================================================
(Binary files differ)
Modified: trunk/OpenMPT/mptrack/mptrack.vcproj
===================================================================
--- trunk/OpenMPT/mptrack/mptrack.vcproj 2010-01-10 21:54:41 UTC (rev 464)
+++ trunk/OpenMPT/mptrack/mptrack.vcproj 2010-01-14 20:46:32 UTC (rev 465)
@@ -54,7 +54,7 @@
LinkIncremental="2"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=""
- DelayLoadDLLs="OpenMPT_soundtouch_i16.dll"
+ DelayLoadDLLs="OpenMPT_SoundTouch_i16.dll"
GenerateDebugInformation="TRUE"
AssemblyDebug="1"
ProgramDatabaseFile=".\Debug/mptrack.pdb"
@@ -132,7 +132,7 @@
LinkIncremental="1"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=""
- DelayLoadDLLs="OpenMPT_soundtouch_i16.dll"
+ DelayLoadDLLs="OpenMPT_SoundTouch_i16.dll"
GenerateDebugInformation="TRUE"
GenerateMapFile="FALSE"
MapFileName=".\Release/mptrack.map"
Modified: trunk/OpenMPT/mptrack/mptrack_08.vcproj
===================================================================
--- trunk/OpenMPT/mptrack/mptrack_08.vcproj 2010-01-10 21:54:41 UTC (rev 464)
+++ trunk/OpenMPT/mptrack/mptrack_08.vcproj 2010-01-14 20:46:32 UTC (rev 465)
@@ -89,7 +89,7 @@
LinkIncremental="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=""
- DelayLoadDLLs="OpenMPT_soundtouch.dll"
+ DelayLoadDLLs="OpenMPT_SoundTouch_i16.dll"
GenerateDebugInformation="true"
AssemblyDebug="1"
ProgramDatabaseFile=".\Debug/mptrack.pdb"
@@ -195,7 +195,7 @@
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=""
- DelayLoadDLLs="OpenMPT_soundtouch.dll"
+ DelayLoadDLLs="OpenMPT_SoundTouch_i16.dll"
GenerateDebugInformation="true"
GenerateMapFile="false"
MapFileName=".\Release/mptrack.map"
Modified: trunk/OpenMPT/mptrack/res/defaultKeybindings.mkb
===================================================================
--- trunk/OpenMPT/mptrack/res/defaultKeybindings.mkb 2010-01-10 21:54:41 UTC (rev 464)
+++ trunk/OpenMPT/mptrack/res/defaultKeybindings.mkb 2010-01-14 20:46:32 UTC (rev 465)
@@ -8,6 +8,7 @@
0:1347:2:78:1 //File/New: Ctrl+N (KeyDown)
0:1346:2:79:1 //File/Open: Ctrl+O (KeyDown)
0:1349:2:83:1 //File/Save: Ctrl+S (KeyDown)
+0:1350:3:83:1 //File/Save As: Shift+Ctrl+S (KeyDown)
0:1030:0:116:1 //Play song/Pause song: F5 (KeyDown)
0:1031:0:119:1 //Pause song: F8 (KeyDown)
0:1375:0:27:1 //Stop Song: ESC (KeyDown)
@@ -21,6 +22,9 @@
0:1361:2:45:1 //Copy: Ctrl+INSERT (KeyDown)
0:1362:2:86:1 //Paste: Ctrl+V (KeyDown)
0:1362:1:45:1 //Paste: Shift+INSERT (KeyDown)
+0:1363:1:86:1 //Mix Paste: Shift+V (KeyDown)
+0:1793:3:86:1 //Paste Flood: Shift+Ctrl+V (KeyDown)
+0:1820:6:86:1 //Push Forward Paste: Ctrl+Alt+V (KeyDown)
0:1364:2:53:1 //SelectAll: Ctrl+5 (KeyDown)
0:1365:2:70:1 //Find: Ctrl+F (KeyDown)
0:1366:0:114:1 //Find Next: F3 (KeyDown)
@@ -31,6 +35,7 @@
0:1025:1:120:1 //View Comments: Shift+F9 (KeyDown)
0:1368:2:113:1 //Toggle Tree View: Ctrl+F2 (KeyDown)
0:1369:2:112:1 //View Options: Ctrl+F1 (KeyDown)
+0:1781:2:114:1 //View MIDI mapping: Ctrl+F3 (KeyDown)
0:1370:0:112:1 //Help (to do): F1 (KeyDown)
0:1032:2:111:5 //Previous instrument: Ctrl+NUM DIVIDE (KeyDown|KeyHold)
0:1032:2:38:5 //Previous instrument: Ctrl+UP (KeyDown|KeyHold)
@@ -76,8 +81,12 @@
2:1685:2:9:1 //Switch to order list: Ctrl+TAB (KeyDown)
2:1662:6:80:1 //Toggle channel's plugin editor: Ctrl+Alt+P (KeyDown)
2:1062:0:93:1 //Show note properties: Application (KeyDown)
+2:1819:2:69:1 //Split Keyboard Settings dialog: Ctrl+E (KeyDown)
+2:1776:6:32:1 //Toggle loop pattern: Ctrl+Alt+SPACE (KeyDown)
+2:1780:2:84:1 //Show playback time at current row: Ctrl+T (KeyDown)
2:1005:0:121:5 //Mute current channel: F10 (KeyDown|KeyHold)
2:1006:2:121:5 //Solo current channel: Ctrl+F10 (KeyDown|KeyHold)
+2:1786:2:82:1 //Reset channel: Ctrl+R (KeyDown)
2:1007:2:81:5 //Transpose +1: Ctrl+Q (KeyDown|KeyHold)
2:1008:2:65:5 //Transpose -1: Ctrl+A (KeyDown|KeyHold)
2:1009:3:81:5 //Transpose +12: Shift+Ctrl+Q (KeyDown|KeyHold)
@@ -159,6 +168,8 @@
3:1316:1:16:1 //Chord Modifier: Shift (KeyDown)
3:1200:0:192:1 //Note cut: ' (KeyDown)
3:1201:0:187:1 //Note off: = (KeyDown)
+3:1788:1:226:1 //Parameter control(MPTm only): Shift+< (KeyDown)
+3:1789:0:226:1 //Parameter control(smooth)(MPTm only): < (KeyDown)
//----( Pattern Context [bottom] - Ins Col (4) )------------
4:1202:0:96:1 //Set instrument digit 0: NUM 0 (KeyDown)
@@ -219,7 +230,6 @@
//----( Pattern Context [bottom] - FX Col (6) )------------
6:1294:0:220:1 //FX midi macro slide: \ (KeyDown)
-6:1295:1:186:1 //FX pseudo-velocity (experimental): Shift+; (KeyDown)
//----( Pattern Context [bottom] - Param Col (7) )------------
7:1247:0:48:1 //FX Param digit 0: 0 (KeyDown)
@@ -252,13 +262,32 @@
//----( Sample Context [bottom] (8) )------------
8:1380:2:84:1 //Trim sample around loop points: Ctrl+T (KeyDown)
8:1383:0:8:1 //Silence sample selection: BACKSPACE (KeyDown)
+8:1384:1:78:1 //Normalise Sample: Shift+N (KeyDown)
8:1385:3:65:1 //Amplify Sample: Shift+Ctrl+A (KeyDown)
8:1381:3:82:1 //Reverse sample: Shift+Ctrl+R (KeyDown)
8:1382:0:46:1 //Delete sample selection: DELETE (KeyDown)
8:1386:0:107:1 //Zoom Out: NUM PLUS (KeyDown)
8:1387:0:109:1 //Zoom In: NUM SUB (KeyDown)
+8:1784:2:73:1 //Invert sample phase: Ctrl+I (KeyDown)
+8:1785:2:85:1 //Signed/Unsigned conversion: Ctrl+U (KeyDown)
+8:1790:2:68:1 //Remove DC Offset: Ctrl+D (KeyDown)
//----( Instrument Context [bottom] (9) )------------
+9:1825:1:9:5 //Select previous envelope point: Shift+TAB (KeyDown|KeyHold)
+9:1826:0:9:5 //Select next envelope point: TAB (KeyDown|KeyHold)
+9:1821:0:37:5 //Move envelope point left: LEFT (KeyDown|KeyHold)
+9:1822:0:39:5 //Move envelope point right: RIGHT (KeyDown|KeyHold)
+9:1823:0:38:5 //Move envelope point up: UP (KeyDown|KeyHold)
+9:1834:0:33:5 //Move envelope point up (big step): PG UP (KeyDown|KeyHold)
+9:1824:0:40:5 //Move envelope point down: DOWN (KeyDown|KeyHold)
+9:1835:0:34:5 //Move envelope point down (big step): PG DN (KeyDown|KeyHold)
+9:1827:0:45:5 //Insert envelope point: INSERT (KeyDown|KeyHold)
+9:1828:0:46:5 //Remove envelope point: DELETE (KeyDown|KeyHold)
+9:1829:0:36:1 //Set loop start: HOME (KeyDown)
+9:1830:0:35:1 //Set loop end: END (KeyDown)
+9:1831:2:36:1 //Set sustain loop start: Ctrl+HOME (KeyDown)
+9:1832:2:35:1 //Set sustain loop end: Ctrl+END (KeyDown)
+9:1833:2:82:1 //Toggle release node: Ctrl+R (KeyDown)
//----( Comments Context [bottom] (10) )------------
@@ -267,6 +296,11 @@
//----( Unknown Context (12) )------------
//----( Plugin GUI Context (13) )------------
+13:1763:2:109:5 //Previous plugin preset: Ctrl+NUM SUB (KeyDown|KeyHold)
+13:1764:2:107:5 //Next plugin preset: Ctrl+NUM PLUS (KeyDown|KeyHold)
+13:1782:0:109:5 //Plugin preset backward jump: NUM SUB (KeyDown|KeyHold)
+13:1783:0:107:5 //Plugin preset forward jump: NUM PLUS (KeyDown|KeyHold)
+13:1765:2:82:5 //Randomize plugin parameters: Ctrl+R (KeyDown|KeyHold)
//----( General Context [top] (14) )------------
Modified: trunk/OpenMPT/mptrack/version.h
===================================================================
--- trunk/OpenMPT/mptrack/version.h 2010-01-10 21:54:41 UTC (rev 464)
+++ trunk/OpenMPT/mptrack/version.h 2010-01-14 20:46:32 UTC (rev 465)
@@ -13,9 +13,9 @@
//Version definitions. The only thing that needs to be changed when changing version number.
#define VER_MAJORMAJOR 1
-#define VER_MAJOR 17
-#define VER_MINOR 03
-#define VER_MINORMINOR 03
+#define VER_MAJOR 18
+#define VER_MINOR 00
+#define VER_MINORMINOR 00
//Creates version number from version parts that appears in version string.
//For example MAKE_VERSION_NUMERIC(1,17,02,28) gives version number of
Modified: trunk/OpenMPT/packageTemplate/History.txt
===================================================================
--- trunk/OpenMPT/packageTemplate/History.txt 2010-01-10 21:54:41 UTC (rev 464)
+++ trunk/OpenMPT/packageTemplate/History.txt 2010-01-14 20:46:32 UTC (rev 465)
@@ -76,6 +76,7 @@
/ <Jojo> Removed time stretcher's / pitch shifter's preview function as it's unnecessary now.
. <Jojo> When going down close to 0 Hz in the sample editor, the sample freq wrapped around to the maximum value.
. <Jojo> Insert Silence: Loop points were not updated when adding silence at the beginning of the sample
+ . <re> Actions such as time stretching and undo could trigger sample play.
Instrument tab
. <Jojo> When playing an instrument and disabling its envelopes at the same time, the toggled envelopes are stopped (prevents filter envelope from turning into a pitch envelope).
Added: trunk/OpenMPT/soundtouch/SoundTouchDLL.rc
===================================================================
--- trunk/OpenMPT/soundtouch/SoundTouchDLL.rc (rev 0)
+++ trunk/OpenMPT/soundtouch/SoundTouchDLL.rc 2010-01-14 20:46:32 UTC (rev 465)
@@ -0,0 +1,114 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE
+BEGIN
+ "resource.h\0"
+END
+
+2 TEXTINCLUDE
+BEGIN
+ "#include ""afxres.h""\r\n"
+ "\0"
+END
+
+3 TEXTINCLUDE
+BEGIN
+ "\r\n"
+ "\0"
+END
+
+#endif // APSTUDIO_INVOKED
+
+#endif // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+/////////////////////////////////////////////////////////////////////////////
+// Finnish resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FIN)
+#ifdef _WIN32
+LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 1,5,0,0
+ PRODUCTVERSION 1,5,0,0
+ FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "000004b0"
+ BEGIN
+ VALUE "Comments", "This is a slightly customized build of SoundTouch DLL for OpenMPT using INTEGER_SAMPLES."
+ VALUE "FileDescription", "SoundTouch Dynamic Link Library"
+ VALUE "FileVersion", "1, 5, 0, 0"
+ VALUE "InternalName", "SoundTouch"
+ VALUE "LegalCopyright", "Copyright (C) Olli Parviainen 1999-2009"
+ VALUE "OriginalFilename", "OpenMPT_SoundTouch_i16.dll"
+ VALUE "ProductName", " SoundTouch Dynamic Link Library"
+ VALUE "ProductVersion", "1, 5, 0, 0"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x0, 1200
+ END
+END
+
+#endif // Finnish resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif // not APSTUDIO_INVOKED
+
Modified: trunk/OpenMPT/soundtouch/soundtouch.vcproj
===================================================================
--- trunk/OpenMPT/soundtouch/soundtouch.vcproj 2010-01-10 21:54:41 UTC (rev 464)
+++ trunk/OpenMPT/soundtouch/soundtouch.vcproj 2010-01-14 20:46:32 UTC (rev 465)
@@ -207,6 +207,9 @@
Name="Resource Files"
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ <File
+ RelativePath=".\SoundTouchDLL.rc">
+ </File>
</Filter>
</Files>
<Globals>
Modified: trunk/OpenMPT/soundtouch/soundtouch_08.vcproj
===================================================================
--- trunk/OpenMPT/soundtouch/soundtouch_08.vcproj 2010-01-10 21:54:41 UTC (rev 464)
+++ trunk/OpenMPT/soundtouch/soundtouch_08.vcproj 2010-01-14 20:46:32 UTC (rev 465)
@@ -298,6 +298,10 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
+ <File
+ RelativePath=".\SoundTouchDLL.rc"
+ >
+ </File>
</Filter>
</Files>
<Globals>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
