Revision: 5404
http://sourceforge.net/p/modplug/code/5404
Author: saga-games
Date: 2015-07-11 18:48:55 +0000 (Sat, 11 Jul 2015)
Log Message:
-----------
[Fix] Duplicate control sneaked into resource file in last commit.
[Mod] Note preview stop: Only apply not channels which have a sample or instrument running.
Modified Paths:
--------------
trunk/OpenMPT/mptrack/Moddoc.cpp
trunk/OpenMPT/mptrack/mptrack.rc
Modified: trunk/OpenMPT/mptrack/Moddoc.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Moddoc.cpp 2015-07-11 16:49:28 UTC (rev 5403)
+++ trunk/OpenMPT/mptrack/Moddoc.cpp 2015-07-11 18:48:55 UTC (rev 5404)
@@ -1163,7 +1163,7 @@
for(CHANNELINDEX c = m_SndFile.GetNumChannels(); c < MAX_CHANNELS; c++)
{
ModChannel &chn = m_SndFile.m_PlayState.Chn[c];
- if(chn.nMasterChn == 0)
+ if(chn.nMasterChn == 0 && (chn.pModSample || chn.pModInstrument))
{
m_SndFile.NoteChange(&chn, note);
}
Modified: trunk/OpenMPT/mptrack/mptrack.rc
===================================================================
--- trunk/OpenMPT/mptrack/mptrack.rc 2015-07-11 16:49:28 UTC (rev 5403)
+++ trunk/OpenMPT/mptrack/mptrack.rc 2015-07-11 18:48:55 UTC (rev 5404)
@@ -1722,6 +1722,7 @@
CAPTION "Mixer"
FONT 8, "MS Shell Dlg", 400, 0, 0x0
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,96,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "Window:",IDC_STATIC,156,18,30,12,SS_CENTERIMAGE
@@ -1729,27 +1730,25 @@
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
- EDITTEXT IDC_RAMPING_IN,12,72,36,12,ES_AUTOHSCROLL | ES_NUMBER
+ GROUPBOX "Volume Ramping",IDC_STATIC,6,60,276,48
+ EDITTEXT IDC_RAMPING_IN,12,72,24,12,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER
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
EDITTEXT IDC_EDIT_VOLRAMP_SAMPLES_UP,78,72,90,12,ES_AUTOHSCROLL | ES_READONLY
+ EDITTEXT IDC_RAMPING_OUT,12,90,24,12,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER
LTEXT "\xB5s down",IDC_STATIC,42,92,28,11,SS_CENTERIMAGE
- EDITTEXT IDC_RAMPING_OUT,12,90,24,12,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER
EDITTEXT IDC_EDIT_VOLRAMP_SAMPLES_DOWN,78,90,90,12,ES_AUTOHSCROLL | ES_READONLY
+ GROUPBOX "Polyphony",IDC_STATIC,6,114,276,30
LTEXT "Maximum Mixed Channels:",IDC_STATIC,12,126,84,12,SS_CENTERIMAGE
COMBOBOX IDC_COMBO_POLYPHONY,102,126,66,88,CBS_DROPDOWNLIST | WS_TABSTOP
+ GROUPBOX "Behaviour",IDC_STATIC,6,150,276,30
LTEXT "Stereo Separation:",IDC_STATIC,12,162,62,8
CONTROL "",IDC_SLIDER_STEREOSEP,"msctls_trackbar32",TBS_AUTOTICKS | TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,78,162,54,12
LTEXT "100%",IDC_TEXT_STEREOSEP,132,162,36,8
+ GROUPBOX "Pre-1.17RC3 mixing levels",IDC_STATIC,6,186,276,72
CONTROL "Soft Panning",IDC_CHECK_SOFTPAN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,204,66,12
LTEXT "Sample Pre-Amp:",IDC_STATIC,102,204,60,12,SS_CENTERIMAGE
CONTROL "",IDC_SLIDER_PREAMP,"msctls_trackbar32",TBS_AUTOTICKS | TBS_BOTH | TBS_TOOLTIPS | WS_TABSTOP,168,198,96,24
LTEXT "Warning: Only samples are affected by these settings! Modifying them will change the balance between samples and plugins in songs with mix levels set to 1.17RC2 or earlier in the Song Properties! ",IDC_STATIC,12,222,252,30
- GROUPBOX "Resampling",IDC_STATIC,6,6,276,48
- GROUPBOX "Volume Ramping",IDC_STATIC,6,60,276,48
- GROUPBOX "Polyphony",IDC_STATIC,6,114,276,30
- GROUPBOX "Behaviour",IDC_STATIC,6,150,276,30
- GROUPBOX "Pre-1.17RC3 mixing levels",IDC_STATIC,6,186,276,72
END
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
