Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[3995] trunk/OpenMPT
|
From: <sag...@us...> - 2014-03-29 17:09:10
|
Revision: 3995
http://sourceforge.net/p/modplug/code/3995
Author: saga-games
Date: 2014-03-29 17:09:01 +0000 (Sat, 29 Mar 2014)
Log Message:
-----------
[Fix] Sample editor config: Changing undo buffer size didn't mark the page as modified.
[Mod] Adjusted the size of the rest of the option tabs, and also fixed the tab order and mnemonics on some of them.
[Mod] More small changes.
Modified Paths:
--------------
trunk/OpenMPT/common/version.cpp
trunk/OpenMPT/mptrack/AboutDialog.cpp
trunk/OpenMPT/mptrack/Moptions.cpp
trunk/OpenMPT/mptrack/Moptions.h
trunk/OpenMPT/mptrack/PNG.cpp
trunk/OpenMPT/mptrack/PNG.h
trunk/OpenMPT/mptrack/mptrack.rc
trunk/OpenMPT/soundlib/Load_wav.cpp
trunk/OpenMPT/soundlib/Tables.cpp
trunk/OpenMPT/soundlib/modsmp_ctrl.cpp
Modified: trunk/OpenMPT/common/version.cpp
===================================================================
--- trunk/OpenMPT/common/version.cpp 2014-03-29 09:02:23 UTC (rev 3994)
+++ trunk/OpenMPT/common/version.cpp 2014-03-29 17:09:01 UTC (rev 3995)
@@ -323,7 +323,7 @@
"\n"
"Additional patch submitters:\n"
"coda (http://coda.s3m.us/)\n"
- "kode54 (http://kode54.foobar2000.org/)\n"
+ "kode54 (https://kode54.net/)\n"
"xaimus (http://xaimus.com/)\n"
"\n"
"Thanks to:\n"
@@ -389,7 +389,7 @@
"The people at ModPlug forums for crucial contribution\n"
"in the form of ideas, testing and support; thanks\n"
"particularly to:\n"
- "33, Anboi, BooT-SectoR-ViruZ, Bvanoudtshoorn\n"
+ "33, 8bitbubsy, Anboi, BooT-SectoR-ViruZ, Bvanoudtshoorn\n"
"christofori, Diamond, Ganja, Georg, Goor00, jmkz,\n"
"KrazyKatz, LPChip, Nofold, Rakib, Sam Zen\n"
"Skaven, Skilletaudio, Snu, Squirrel Havoc, Waxhead\n"
Modified: trunk/OpenMPT/mptrack/AboutDialog.cpp
===================================================================
--- trunk/OpenMPT/mptrack/AboutDialog.cpp 2014-03-29 09:02:23 UTC (rev 3994)
+++ trunk/OpenMPT/mptrack/AboutDialog.cpp 2014-03-29 17:09:01 UTC (rev 3995)
@@ -1,5 +1,5 @@
#include "stdafx.h"
-#include "Mptrack.h"
+#include "resource.h"
#include "AboutDialog.h"
#include "PNG.h"
#include "../common/version.h"
Modified: trunk/OpenMPT/mptrack/Moptions.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Moptions.cpp 2014-03-29 09:02:23 UTC (rev 3994)
+++ trunk/OpenMPT/mptrack/Moptions.cpp 2014-03-29 17:09:01 UTC (rev 3995)
@@ -724,7 +724,7 @@
CPropertyPage::OnInitDialog();
SetDlgItemInt(IDC_EDIT_FINETUNE, TrackerSettings::Instance().m_nFinetuneStep);
SetDlgItemInt(IDC_EDIT_UNDOSIZE, TrackerSettings::Instance().m_SampleUndoBufferSize.Get().GetSizeInPercent());
- OnUndoSizeChanged();
+ RecalcUndoSize();
m_cbnDefaultSampleFormat.SetItemData(m_cbnDefaultSampleFormat.AddString("FLAC"), dfFLAC);
m_cbnDefaultSampleFormat.SetItemData(m_cbnDefaultSampleFormat.AddString("WAV"), dfWAV);
@@ -786,6 +786,14 @@
void COptionsSampleEditor::OnUndoSizeChanged()
//--------------------------------------------
{
+ RecalcUndoSize();
+ OnSettingsChanged();
+}
+
+
+void COptionsSampleEditor::RecalcUndoSize()
+//-----------------------------------------
+{
uint32 sizeMB = mpt::saturate_cast<uint32>(SampleUndoBufferSize(GetDlgItemInt(IDC_EDIT_UNDOSIZE)).GetSizeInBytes() >> 20);
CString text;
text.Format("%% of physical memory (%u MiB)", sizeMB);
Modified: trunk/OpenMPT/mptrack/Moptions.h
===================================================================
--- trunk/OpenMPT/mptrack/Moptions.h 2014-03-29 09:02:23 UTC (rev 3994)
+++ trunk/OpenMPT/mptrack/Moptions.h 2014-03-29 17:09:01 UTC (rev 3995)
@@ -147,6 +147,8 @@
virtual void DoDataExchange(CDataExchange* pDX);
virtual BOOL OnSetActive();
+ void RecalcUndoSize();
+
afx_msg void OnHScroll(UINT /*nSBCode*/, UINT /*nPos*/, CScrollBar* /*pScrollBar*/) { OnSettingsChanged(); }
afx_msg void OnSettingsChanged() { SetModified(TRUE); }
afx_msg void OnUndoSizeChanged();
Modified: trunk/OpenMPT/mptrack/PNG.cpp
===================================================================
--- trunk/OpenMPT/mptrack/PNG.cpp 2014-03-29 09:02:23 UTC (rev 3994)
+++ trunk/OpenMPT/mptrack/PNG.cpp 2014-03-29 17:09:01 UTC (rev 3995)
@@ -88,8 +88,9 @@
size_t numEntries = std::min<size_t>(256u, chunk.GetLength() / 3u);
for(size_t i = 0; i < numEntries; i++)
{
- uint8_t r = chunk.ReadUint8(), g = chunk.ReadUint8(), b = chunk.ReadUint8();
- palette[i] = Pixel(r, g, b, 255);
+ uint8_t p[3];
+ chunk.ReadArray(p);
+ palette[i] = Pixel(p[0], p[1], p[2], 255);
}
}
}
Modified: trunk/OpenMPT/mptrack/PNG.h
===================================================================
--- trunk/OpenMPT/mptrack/PNG.h 2014-03-29 09:02:23 UTC (rev 3994)
+++ trunk/OpenMPT/mptrack/PNG.h 2014-03-29 17:09:01 UTC (rev 3995)
@@ -23,12 +23,13 @@
struct Bitmap
{
const uint32_t width, height;
- std::vector<Pixel> pixels;
+ Pixel *pixels;
- Bitmap(uint32_t width, uint32_t height) : width(width), height(height), pixels(width * height) { }
+ Bitmap(uint32_t width, uint32_t height) : width(width), height(height), pixels(new Pixel[width * height]) { }
+ ~Bitmap() { delete[] pixels; }
- Pixel *GetPixels() { ASSERT(!pixels.empty()); return &pixels[0]; }
- const Pixel *GetPixels() const { ASSERT(!pixels.empty()); return &pixels[0]; }
+ Pixel *GetPixels() { ASSERT(width && height && pixels); return pixels; }
+ const Pixel *GetPixels() const { ASSERT(width && height && pixels); return pixels; }
uint32_t GetNumPixels() const { return width * height; }
// Create a DIB for the current device from our PNG.
Modified: trunk/OpenMPT/mptrack/mptrack.rc
===================================================================
--- trunk/OpenMPT/mptrack/mptrack.rc 2014-03-29 09:02:23 UTC (rev 3994)
+++ trunk/OpenMPT/mptrack/mptrack.rc 2014-03-29 17:09:01 UTC (rev 3995)
@@ -130,10 +130,10 @@
CAPTION "Samples"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
- GROUPBOX "Sample Editor",IDC_STATIC,6,6,270,138
+ GROUPBOX "Sample Editor",IDC_STATIC,6,6,276,138
LTEXT "Sample Undo Buffer:",IDC_STATIC,12,20,78,8
EDITTEXT IDC_EDIT_UNDOSIZE,114,18,42,12,ES_AUTOHSCROLL | ES_NUMBER
- LTEXT "%",IDC_UNDOSIZE,162,20,108,16
+ LTEXT "%",IDC_UNDOSIZE,162,20,114,16
LTEXT "Frequency Finetune Steps:",IDC_STATIC,12,38,114,8
EDITTEXT IDC_EDIT_FINETUNE,114,36,42,12,ES_AUTOHSCROLL | ES_NUMBER
LTEXT "Hz",IDC_STATIC,162,38,30,8
@@ -143,19 +143,19 @@
LTEXT "Faster Encoding",IDC_STATIC,114,74,52,8
CONTROL "",IDC_SLIDER1,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOOLTIPS | WS_TABSTOP,168,72,48,12
LTEXT "Smaller Files",IDC_STATIC,222,74,40,8
- LTEXT "Note Cuts:",IDC_STATIC,12,90,252,12
- CONTROL "On New Note",IDC_RADIO1,"Button",BS_AUTORADIOBUTTON,18,102,246,12
- CONTROL "On Key Release",IDC_RADIO2,"Button",BS_AUTORADIOBUTTON,18,114,246,12
- CONTROL "Press Again",IDC_RADIO3,"Button",BS_AUTORADIOBUTTON,18,126,246,12
- GROUPBOX "Instrument Editor",IDC_STATIC,6,150,270,48
- CONTROL "Compress ITI Files",IDC_COMPRESS_ITI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,162,258,12
+ LTEXT "Note Cuts:",IDC_STATIC,12,90,264,12
+ CONTROL "On New Note",IDC_RADIO1,"Button",BS_AUTORADIOBUTTON,18,102,258,12
+ CONTROL "On Key Release",IDC_RADIO2,"Button",BS_AUTORADIOBUTTON,18,114,258,12
+ CONTROL "Press Again",IDC_RADIO3,"Button",BS_AUTORADIOBUTTON,18,126,258,12
+ GROUPBOX "Instrument Editor",IDC_STATIC,6,150,276,48
+ CONTROL "Compress ITI Files",IDC_COMPRESS_ITI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,162,264,12
LTEXT "Default Plugin Volume Command Handling:",IDC_STATIC,12,182,150,8
COMBOBOX IDC_VOLUME_HANDLING,162,180,78,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
- GROUPBOX "Common",IDC_STATIC,6,204,270,48
+ GROUPBOX "Common",IDC_STATIC,6,204,276,48
CONTROL "Preview Samples / Instruments in File Browser",IDC_PREVIEW_SAMPLES,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,217,258,12
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,217,264,12
CONTROL "Normalize 24-/32-bit Samples on Load",IDC_NORMALIZE,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,234,258,12
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,234,264,12
END
IDD_EDITHISTORY DIALOGEX 0, 0, 316, 185
@@ -195,27 +195,27 @@
LTEXT "Samples used for fading:",IDC_STATIC,6,8,96,8
END
-IDD_OPTIONS_UPDATE DIALOGEX 0, 0, 274, 281
+IDD_OPTIONS_UPDATE DIALOGEX 0, 0, 286, 281
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Update"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
- GROUPBOX "Check for Updates",IDC_STATIC,6,6,258,66
- CONTROL "Never",IDC_RADIO1,"Button",BS_AUTORADIOBUTTON,12,18,240,8
- CONTROL "Daily",IDC_RADIO2,"Button",BS_AUTORADIOBUTTON,12,30,240,8
- CONTROL "Weekly (recommended)",IDC_RADIO3,"Button",BS_AUTORADIOBUTTON,12,42,240,8
- CONTROL "Monthly",IDC_RADIO4,"Button",BS_AUTORADIOBUTTON,12,54,240,8
- GROUPBOX "Privacy Settings",IDC_STATIC,6,78,258,54
- CONTROL "Allow us to collect basic update statistics",IDC_CHECK1,
+ GROUPBOX "Check for Updates",IDC_STATIC,6,6,276,66
+ CONTROL "&Never",IDC_RADIO1,"Button",BS_AUTORADIOBUTTON,12,18,240,8
+ CONTROL "&Daily",IDC_RADIO2,"Button",BS_AUTORADIOBUTTON,12,30,240,8
+ CONTROL "&Weekly (recommended)",IDC_RADIO3,"Button",BS_AUTORADIOBUTTON,12,42,240,8
+ CONTROL "&Monthly",IDC_RADIO4,"Button",BS_AUTORADIOBUTTON,12,54,240,8
+ GROUPBOX "Privacy Settings",IDC_STATIC,6,78,276,54
+ CONTROL "&Allow us to collect basic update statistics",IDC_CHECK1,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,90,246,12
- LTEXT "If enabled, a randomized user ID is created and transmitted with every update check. This ID can not be linked to you or your computer in any way.",IDC_STATIC,12,102,246,24
- GROUPBOX "Advanced Settings",IDC_STATIC,6,138,258,60
- LTEXT "Update server URL:",IDC_STATIC,12,150,186,8
+ LTEXT "If enabled, a randomized user ID is created and transmitted with every update check. This ID can not be linked to you or your computer in any way.",IDC_STATIC,12,102,264,24
+ GROUPBOX "Advanced Settings",IDC_STATIC,6,138,276,60
+ LTEXT "&Update server URL:",IDC_STATIC,12,150,186,8
EDITTEXT IDC_EDIT1,12,162,246,12,ES_AUTOHSCROLL
- PUSHBUTTON "Reset",IDC_BUTTON2,204,146,54,12
+ PUSHBUTTON "&Reset",IDC_BUTTON2,204,146,54,12
LTEXT "Do not change this unless you are absolutely sure of what you are doing.",IDC_STATIC,12,180,246,12
- PUSHBUTTON "Check for Updates",IDC_BUTTON1,6,204,84,18
- LTEXT "",IDC_LASTUPDATE,6,228,258,24
+ PUSHBUTTON "&Check for Updates",IDC_BUTTON1,6,204,84,18
+ LTEXT "",IDC_LASTUPDATE,6,228,276,24
END
IDD_CLOSEDOCUMENTS DIALOGEX 0, 0, 370, 197
@@ -297,7 +297,7 @@
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
LTEXT "Warning:\nChanging advanced settings might cause stability problems.\nYou should only continue if you know what you are doing.",IDC_STATIC,6,6,258,24
- LTEXT "Find:",IDC_STATIC,6,38,17,8
+ LTEXT "&Find:",IDC_STATIC,6,38,17,8
EDITTEXT IDC_EDIT1,30,36,252,12,ES_AUTOHSCROLL
LISTBOX IDC_LIST4,6,54,276,222,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
END
@@ -387,7 +387,7 @@
IDD_OPTIONS_UPDATE, DIALOG
BEGIN
LEFTMARGIN, 7
- RIGHTMARGIN, 267
+ RIGHTMARGIN, 279
TOPMARGIN, 7
BOTTOMMARGIN, 274
END
@@ -624,87 +624,87 @@
CTEXT "Writing file...",IDC_TEXT1,4,4,178,9
END
-IDD_OPTIONS_KEYBOARD DIALOGEX 0, 0, 274, 281
+IDD_OPTIONS_KEYBOARD DIALOGEX 0, 0, 286, 282
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "Keyboard"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
LTEXT "Select category:",IDC_STATIC,7,5,131,11
- COMBOBOX IDC_KEYCATEGORY,5,16,133,204,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
- LISTBOX IDC_COMMAND_LIST,5,32,133,226,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
- COMBOBOX IDC_CHOICECOMBO,150,18,72,51,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+ COMBOBOX IDC_KEYCATEGORY,5,16,139,204,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+ LISTBOX IDC_COMMAND_LIST,5,32,139,226,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
+ GROUPBOX "Key setup for this command ",IDC_STATIC,150,6,132,84
+ COMBOBOX IDC_CHOICECOMBO,156,18,78,51,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "Key:",IDC_STATIC,150,38,16,8
- EDITTEXT IDC_CUSTHOTKEY,168,36,54,13,ES_AUTOHSCROLL
- CONTROL "On Key Down",IDC_CHECKKEYDOWN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,150,54,66,8
- CONTROL "On Key Hold",IDC_CHECKKEYHOLD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,150,66,66,8
- CONTROL "On Key Up",IDC_CHECKKEYUP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,150,78,66,8
- PUSHBUTTON "Restore",IDC_RESTORE,228,36,37,13
- PUSHBUTTON "Set",IDC_SET,228,30,36,13,NOT WS_VISIBLE
- PUSHBUTTON "Delete",IDC_DELETE,228,18,37,13
- LTEXT "Repeat notes on hold?",IDC_STATIC,150,108,74,8
- PUSHBUTTON "Yes",IDC_NOTESREPEAT,228,108,18,9
- PUSHBUTTON "No",IDC_NONOTESREPEAT,246,108,18,9
- LTEXT "Chord detect interval (ms):",IDC_STATIC,150,122,88,8
- EDITTEXT IDC_CHORDDETECTWAITTIME,240,120,24,12,ES_AUTOHSCROLL | ES_NUMBER,WS_EX_RIGHT
- PUSHBUTTON "Import Keys...",IDC_LOAD,150,156,54,13
- PUSHBUTTON "Export Keys...",IDC_SAVE,210,156,54,13
- LTEXT "Error Log:",IDC_STATIC,144,198,78,8
- PUSHBUTTON "Clear Log",IDC_CLEARLOG,228,196,42,12
- EDITTEXT IDC_KEYREPORT,144,210,126,66,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL
- GROUPBOX "Key setup for this command ",IDC_STATIC,144,6,126,84
- GROUPBOX "Misc",IDC_STATIC,144,96,126,40
- GROUPBOX "Multi Config Handling",IDC_STATIC,144,144,126,48
+ EDITTEXT IDC_CUSTHOTKEY,174,36,60,13,ES_AUTOHSCROLL
+ CONTROL "On Key Down",IDC_CHECKKEYDOWN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,156,54,66,8
+ CONTROL "On Key Hold",IDC_CHECKKEYHOLD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,156,66,66,8
+ CONTROL "On Key Up",IDC_CHECKKEYUP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,156,78,66,8
+ PUSHBUTTON "Restore",IDC_RESTORE,240,36,37,13
+ PUSHBUTTON "Set",IDC_SET,240,30,36,13,NOT WS_VISIBLE
+ PUSHBUTTON "Delete",IDC_DELETE,240,18,37,13
+ GROUPBOX "Misc",IDC_STATIC,150,96,132,40
+ LTEXT "Repeat notes on hold?",IDC_STATIC,156,108,74,8
+ PUSHBUTTON "Yes",IDC_NOTESREPEAT,240,108,18,9
+ PUSHBUTTON "No",IDC_NONOTESREPEAT,258,108,18,9
+ LTEXT "Chord detect interval (ms):",IDC_STATIC,156,122,88,8
+ EDITTEXT IDC_CHORDDETECTWAITTIME,246,120,30,12,ES_AUTOHSCROLL | ES_NUMBER,WS_EX_RIGHT
+ GROUPBOX "Multi Config Handling",IDC_STATIC,150,144,132,48
+ PUSHBUTTON "Import Keys...",IDC_LOAD,156,156,54,13
+ PUSHBUTTON "Export Keys...",IDC_SAVE,222,156,54,13
+ PUSHBUTTON "Restore default configuration",IDC_RESTORE_KEYMAP,156,174,120,12
+ LTEXT "Error Log:",IDC_STATIC,150,198,78,8
+ PUSHBUTTON "Clear Log",IDC_CLEARLOG,239,196,42,12
+ EDITTEXT IDC_KEYREPORT,150,210,132,66,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL
PUSHBUTTON "it",IDC_EFFECTLETTERSIT,103,223,12,9,NOT WS_VISIBLE
PUSHBUTTON "xm",IDC_EFFECTLETTERSXM,119,223,12,9,NOT WS_VISIBLE
LTEXT "Effect letters like:",IDC_STATIC,11,225,73,11,NOT WS_VISIBLE
- PUSHBUTTON "Restore default configuration",IDC_RESTORE_KEYMAP,150,174,114,12
EDITTEXT IDC_FIND,30,264,54,12,ES_AUTOHSCROLL
LTEXT "Find:",IDC_STATIC,6,266,24,8
- EDITTEXT IDC_FINDHOTKEY,108,264,30,12,ES_AUTOHSCROLL
+ EDITTEXT IDC_FINDHOTKEY,108,264,36,12,ES_AUTOHSCROLL
LTEXT "Key:",IDC_STATIC,90,266,18,8
END
-IDD_OPTIONS_COLORS DIALOGEX 0, 0, 272, 281
+IDD_OPTIONS_COLORS DIALOGEX 0, 0, 286, 282
STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "Colours"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
- COMBOBOX IDC_COMBO1,84,114,114,109,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
- CONTROL "Use small font",IDC_CHECK3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,18,114,10
- CONTROL "Enable effect highlighting",IDC_CHECK2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,36,114,10
- CONTROL "Primary highlight",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,54,84,10
+ GROUPBOX "",IDC_STATIC,6,6,276,217
+ CONTROL "Use small &font",IDC_CHECK3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,18,114,10
+ CONTROL "&Enable effect highlighting",IDC_CHECK2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,36,114,10
+ CONTROL "&Primary highlight",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,54,84,10
EDITTEXT IDC_PRIMARYHILITE,102,54,24,12,ES_AUTOHSCROLL | ES_NUMBER
LTEXT "Rows per measure (default)",IDC_STATIC,132,56,126,8
- CONTROL "Secondary highlight",IDC_CHECK4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,72,80,10
+ CONTROL "&Secondary highlight",IDC_CHECK4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,72,80,10
EDITTEXT IDC_SECONDARYHILITE,102,72,24,12,ES_AUTOHSCROLL | ES_NUMBER
LTEXT "Rows per beat (default)",IDC_STATIC,132,74,126,8
LTEXT "Note: Songs' time signatures will override the default highlight values",IDC_STATIC,18,90,240,24
+ LTEXT "Select &colour for:",IDC_STATIC,18,116,63,8
+ COMBOBOX IDC_COMBO1,84,114,114,109,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
CONTROL "",IDC_BUTTON4,"Button",BS_OWNERDRAW | BS_FLAT,76,132,114,43
LTEXT "Background:",IDC_TEXT1,36,185,60,8
- CONTROL "Colour",IDC_BUTTON1,"Button",BS_OWNERDRAW,36,196,51,15
+ CONTROL "C&olour",IDC_BUTTON1,"Button",BS_OWNERDRAW,36,196,51,15
LTEXT "Foreground:",IDC_TEXT2,109,185,62,8
- CONTROL "Colour",IDC_BUTTON2,"Button",BS_OWNERDRAW,109,196,51,15
+ CONTROL "Colo&ur",IDC_BUTTON2,"Button",BS_OWNERDRAW,109,196,51,15
LTEXT "Highlight:",IDC_TEXT3,180,188,61,8
- CONTROL "Colour",IDC_BUTTON3,"Button",BS_OWNERDRAW,179,196,51,15
- PUSHBUTTON "Load...",IDC_LOAD_COLORSCHEME,18,252,42,15
- PUSHBUTTON "Save...",IDC_SAVE_COLORSCHEME,66,252,42,15
- PUSHBUTTON "MPT",IDC_BUTTON5,126,252,30,15
- PUSHBUTTON "Green",IDC_BUTTON7,162,252,30,15
- PUSHBUTTON "Blue",IDC_BUTTON6,198,252,30,15
- PUSHBUTTON "Buzz",IDC_BUTTON8,234,252,30,15
- GROUPBOX "",IDC_STATIC,5,5,260,217
- LTEXT "Select colour for:",IDC_STATIC,18,116,63,8
- GROUPBOX "Colour Presets",IDC_STATIC,6,234,264,42
+ CONTROL "Colou&r",IDC_BUTTON3,"Button",BS_OWNERDRAW,179,196,51,15
+ GROUPBOX "Colour Presets",IDC_STATIC,6,234,276,42
+ PUSHBUTTON "&Load...",IDC_LOAD_COLORSCHEME,18,252,42,15
+ PUSHBUTTON "S&ave...",IDC_SAVE_COLORSCHEME,66,252,42,15
+ PUSHBUTTON "&MPT",IDC_BUTTON5,132,252,30,15
+ PUSHBUTTON "&Green",IDC_BUTTON7,168,252,30,15
+ PUSHBUTTON "&Blue",IDC_BUTTON6,204,252,30,15
+ PUSHBUTTON "Bu&zz",IDC_BUTTON8,240,252,30,15
END
-IDD_OPTIONS_MIDI DIALOGEX 0, 0, 272, 269
+IDD_OPTIONS_MIDI DIALOGEX 0, 0, 286, 269
STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "MIDI"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
- GROUPBOX "MIDI Recording",IDC_STATIC,6,6,258,108
+ GROUPBOX "MIDI Recording",IDC_STATIC,6,6,276,108
LTEXT "MIDI Input Device:",IDC_STATIC,18,18,67,8
- COMBOBOX IDC_COMBO1,18,30,240,74,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+ COMBOBOX IDC_COMBO1,18,30,252,74,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
CONTROL "Apply Octave Transpose to incoming MIDI Notes",IDC_CHECK4,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,48,237,12
CONTROL "Record Note Off",IDC_CHECK2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,60,237,12
@@ -714,7 +714,7 @@
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,84,237,12
CONTROL "Pass MIDI to active instrument plugin",IDC_MIDI_TO_PLUGIN,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,96,237,12
- GROUPBOX "MIDI Recording - Volume and Controllers",IDC_STATIC,6,120,258,90
+ GROUPBOX "MIDI Recording - Volume and Controllers",IDC_STATIC,6,120,276,90
CONTROL "Record MIDI Note Velocity, amplify by",IDC_CHECK1,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,138,144,10
EDITTEXT IDC_EDIT3,162,137,42,12,ES_AUTOHSCROLL | ES_NUMBER
@@ -725,10 +725,10 @@
CONTROL "Record MIDI Controller changes as MIDI Macro changes in pattern",IDC_MIDI_MACRO_CONTROL,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,162,237,12
LTEXT "Ignore CCs (e.g. 1,123,127)",IDC_STATIC,30,176,108,8
- EDITTEXT IDC_EDIT4,138,174,120,12,ES_AUTOHSCROLL
+ EDITTEXT IDC_EDIT4,138,174,132,12,ES_AUTOHSCROLL
LTEXT "Record Aftertouch Messages",IDC_STATIC,30,192,108,12,SS_CENTERIMAGE
- COMBOBOX IDC_COMBO2,138,192,120,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
- GROUPBOX "MIDI File Import",IDC_STATIC,6,216,260,36
+ COMBOBOX IDC_COMBO2,138,192,132,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+ GROUPBOX "MIDI File Import",IDC_STATIC,6,216,276,36
LTEXT "Speed:",IDC_STATIC,18,234,24,8
EDITTEXT IDC_EDIT1,48,232,39,12,ES_AUTOHSCROLL | ES_NUMBER
CONTROL "Spin1",IDC_SPIN1,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_NOTHOUSANDS,78,234,11,14
@@ -1147,7 +1147,7 @@
CTEXT "Mix Mode",IDC_STATIC,245,241,37,13,SS_CENTERIMAGE,WS_EX_STATICEDGE
COMBOBOX IDC_COMBO9,285,241,62,99,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "Gain: x 1.0",IDC_STATIC2,353,241,37,14,SS_CENTERIMAGE
- CONTROL "",IDC_SPIN10,"msctls_updown32",UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_TABSTOP,392,242,9,11
+ CONTROL "",IDC_SPIN10,"msctls_updown32",WS_TABSTOP,392,242,9,11
CONTROL "Bypass",IDC_CHECK10,"Button",BS_AUTOCHECKBOX | BS_FLAT | WS_TABSTOP,199,256,40,10
CTEXT "Output to",IDC_STATIC,245,261,37,13,SS_CENTERIMAGE,WS_EX_STATICEDGE
COMBOBOX IDC_COMBO7,285,261,117,68,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
@@ -1351,11 +1351,11 @@
CTEXT "Rear Right",IDC_STATIC_CHANNEL_REARRIGHT,78,162,48,12,SS_CENTERIMAGE,WS_EX_STATICEDGE
COMBOBOX IDC_COMBO_CHANNEL_REARRIGHT,132,162,144,72,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
GROUPBOX "General",IDC_STATIC,6,186,276,30
+ LTEXT "&When playback is stoppped:",IDC_STATIC,12,198,90,12,SS_CENTERIMAGE
COMBOBOX IDC_COMBO11,108,198,60,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
CONTROL "&Open device at startup",IDC_CHECK7,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,186,198,90,12
GROUPBOX "Stat&istics",IDC_STATIC,6,222,276,55
EDITTEXT IDC_EDIT_STATISTICS,12,233,264,38,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | NOT WS_TABSTOP
- LTEXT "&When playback is stoppped:",IDC_STATIC,12,198,90,12,SS_CENTERIMAGE
END
IDD_MIDIMACRO DIALOGEX 0, 0, 358, 354
@@ -1544,28 +1544,28 @@
GROUPBOX "Length in Rows at C4",IDC_STATIC,6,55,171,45
END
-IDD_OPTIONS_AUTOSAVE DIALOGEX 0, 0, 272, 279
+IDD_OPTIONS_AUTOSAVE DIALOGEX 0, 0, 286, 279
STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "Auto Save"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
+ GROUPBOX "Auto Save",IDC_STATIC,4,3,278,157
CONTROL "&Enable Auto Save",IDC_AUTOSAVE_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,15,237,10
+ LTEXT "&Save every:",IDC_STATIC,15,29,40,12,SS_CENTERIMAGE
EDITTEXT IDC_AUTOSAVE_INTERVAL,59,29,24,12,ES_AUTOHSCROLL | ES_NUMBER
+ LTEXT "minutes",IDC_STATIC,87,29,165,12,SS_CENTERIMAGE
+ LTEXT "&Keep up to:",IDC_STATIC,15,46,36,12,SS_CENTERIMAGE
EDITTEXT IDC_AUTOSAVE_HISTORY,59,46,24,12,ES_AUTOHSCROLL | ES_NUMBER
- EDITTEXT IDC_AUTOSAVE_PATH,60,96,164,12,ES_AUTOHSCROLL
- PUSHBUTTON "...",IDC_AUTOSAVE_BROWSE,226,97,12,11,NOT WS_TABSTOP
- LTEXT "[filename].AutoSave.[timestamp].[extension]",IDC_STATIC,60,120,164,12,SS_CENTERIMAGE,WS_EX_CLIENTEDGE
- GROUPBOX "Auto Save",IDC_STATIC,4,3,261,157
- LTEXT "Save every:",IDC_STATIC,15,29,40,12,SS_CENTERIMAGE
- LTEXT "minutes",IDC_STATIC,87,29,165,12,SS_CENTERIMAGE
- LTEXT "Filename:",IDC_STATIC,28,120,30,12,SS_CENTERIMAGE
- LTEXT "(example: mySong.AutoSave.20050327.2343.it)",IDC_STATIC,60,135,157,12,SS_CENTERIMAGE
- LTEXT "Keep up to:",IDC_STATIC,15,46,36,12,SS_CENTERIMAGE
LTEXT "backups of each file name",IDC_STATIC,87,46,165,12,SS_CENTERIMAGE
- GROUPBOX "Location:",IDC_STATIC,15,70,240,80
+ GROUPBOX "Location:",IDC_STATIC,15,70,255,80
+ CONTROL "Use song's &original directory.",IDC_AUTOSAVE_USEORIGDIR,
+ "Button",BS_AUTORADIOBUTTON,28,83,218,10
CONTROL "&Use:",IDC_AUTOSAVE_USECUSTOMDIR,"Button",BS_AUTORADIOBUTTON,28,97,31,10
- CONTROL "Use song's &original directory.",IDC_AUTOSAVE_USEORIGDIR,
- "Button",BS_AUTORADIOBUTTON,28,83,194,10
+ EDITTEXT IDC_AUTOSAVE_PATH,60,96,186,12,ES_AUTOHSCROLL
+ PUSHBUTTON "...",IDC_AUTOSAVE_BROWSE,252,96,12,11,NOT WS_TABSTOP
+ LTEXT "Filename:",IDC_STATIC,28,120,30,12,SS_CENTERIMAGE
+ LTEXT "[filename].AutoSave.[timestamp].[extension]",IDC_STATIC,60,120,186,12,SS_CENTERIMAGE,WS_EX_CLIENTEDGE
+ LTEXT "(example: mySong.AutoSave.20050327.2343.it)",IDC_STATIC,60,135,186,12,SS_CENTERIMAGE
END
IDD_EDIT_GOTO DIALOGEX 0, 0, 130, 79
@@ -1609,12 +1609,12 @@
BEGIN
GROUPBOX "Resampling",IDC_STATIC,6,6,276,48
LTEXT "Filter:",IDC_STATIC,12,18,24,12,SS_CENTERIMAGE
- COMBOBOX IDC_COMBO_FILTER,54,18,90,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
- LTEXT "Bandwidth:",IDC_STATIC,12,36,42,12,SS_CENTERIMAGE
- EDITTEXT IDC_WFIRCUTOFF,54,36,18,12,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER
- LTEXT "%",IDC_STATIC,78,36,24,12,SS_CENTERIMAGE
+ COMBOBOX IDC_COMBO_FILTER,54,18,96,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "Window:",IDC_STATIC,156,18,30,12,SS_CENTERIMAGE
COMBOBOX IDC_COMBO_FILTERWINDOW,192,18,84,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+ LTEXT "Bandwidth:",IDC_STATIC,12,36,42,12,SS_CENTERIMAGE
+ EDITTEXT IDC_WFIRCUTOFF,54,36,24,12,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER
+ LTEXT "%",IDC_STATIC,84,36,24,12,SS_CENTERIMAGE
GROUPBOX "Volume Ramping",IDC_STATIC,6,60,276,48
LTEXT "\xB5s up",IDC_STATIC,42,72,22,12,SS_CENTERIMAGE
EDITTEXT IDC_RAMPING_IN,12,72,24,12,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER
@@ -1672,20 +1672,20 @@
IDD_OPTIONS_KEYBOARD, DIALOG
BEGIN
- RIGHTMARGIN, 268
+ RIGHTMARGIN, 280
TOPMARGIN, 5
- BOTTOMMARGIN, 277
+ BOTTOMMARGIN, 278
END
IDD_OPTIONS_COLORS, DIALOG
BEGIN
- RIGHTMARGIN, 247
- BOTTOMMARGIN, 201
+ RIGHTMARGIN, 261
+ BOTTOMMARGIN, 202
END
IDD_OPTIONS_MIDI, DIALOG
BEGIN
- RIGHTMARGIN, 240
+ RIGHTMARGIN, 254
BOTTOMMARGIN, 266
END
@@ -1882,7 +1882,7 @@
IDD_OPTIONS_AUTOSAVE, DIALOG
BEGIN
- RIGHTMARGIN, 266
+ RIGHTMARGIN, 280
BOTTOMMARGIN, 276
END
Modified: trunk/OpenMPT/soundlib/Load_wav.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_wav.cpp 2014-03-29 09:02:23 UTC (rev 3994)
+++ trunk/OpenMPT/soundlib/Load_wav.cpp 2014-03-29 17:09:01 UTC (rev 3995)
@@ -171,6 +171,7 @@
CopyWavChannel<SC::ConversionChain<SC::Convert<int16, int32>, SC::DecodeInt32<0, littleEndian32> > >(sample, sampleChunk, channel, wavFile.GetNumChannels());
}
}
+ sample.PrecomputeLoops(*this, false);
}
Modified: trunk/OpenMPT/soundlib/Tables.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Tables.cpp 2014-03-29 09:02:23 UTC (rev 3994)
+++ trunk/OpenMPT/soundlib/Tables.cpp 2014-03-29 17:09:01 UTC (rev 3995)
@@ -582,6 +582,7 @@
+// Apart from a few small differences, this table seems to contain elements with a difference of 59.
const uint32 FineLinearSlideUpTable[16] =
{
65536, 65595, 65654, 65714, 65773, 65832, 65892, 65951,
@@ -589,6 +590,7 @@
};
+// Apart from a few small differences, this table seems to contain elements with a difference of 59.
const uint32 FineLinearSlideDownTable[16] =
{
65535, 65477, 65418, 65359, 65300, 65241, 65182, 65123,
@@ -737,7 +739,7 @@
};
-// Reversed sinc coefficients for 4x256 taps polyphase FIR resampling filter
+// Reversed sinc coefficients for 4x256 taps polyphase FIR resampling filter (SchismTracker's lutgen.c should generate a very similar table, but it's more precise)
const int16 CResampler::FastSincTable[256*4] =
{ // Cubic Spline
0, 16384, 0, 0, -31, 16383, 32, 0, -63, 16381, 65, 0, -93, 16378, 100, -1,
Modified: trunk/OpenMPT/soundlib/modsmp_ctrl.cpp
===================================================================
--- trunk/OpenMPT/soundlib/modsmp_ctrl.cpp 2014-03-29 09:02:23 UTC (rev 3994)
+++ trunk/OpenMPT/soundlib/modsmp_ctrl.cpp 2014-03-29 17:09:01 UTC (rev 3995)
@@ -42,7 +42,7 @@
SmpLength InsertSilence(ModSample &smp, const SmpLength nSilenceLength, const SmpLength nStartFrom, CSoundFile &sndFile)
//----------------------------------------------------------------------------------------------------------------------
{
- if(nSilenceLength == 0 || nSilenceLength >= MAX_SAMPLE_LENGTH || smp.nLength > MAX_SAMPLE_LENGTH - nSilenceLength || nStartFrom > smp.nLength)
+ if(nSilenceLength == 0 || nSilenceLength > MAX_SAMPLE_LENGTH || smp.nLength > MAX_SAMPLE_LENGTH - nSilenceLength || nStartFrom > smp.nLength)
return smp.nLength;
const bool wasEmpty = smp.nLength == 0 || smp.pSample == nullptr;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
