Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[939] trunk/OpenMPT
|
From: <rel...@us...> - 2011-07-29 20:54:47
|
Revision: 939
http://modplug.svn.sourceforge.net/modplug/?rev=939&view=rev
Author: relabsoluness
Date: 2011-07-29 20:54:38 +0000 (Fri, 29 Jul 2011)
Log Message:
-----------
[Ref] Some clean up to get build done with less warnings.
Modified Paths:
--------------
trunk/OpenMPT/mptrack/Ctrl_gen.cpp
trunk/OpenMPT/mptrack/Mainbar.cpp
trunk/OpenMPT/mptrack/Moddoc.cpp
trunk/OpenMPT/mptrack/Moddoc.h
trunk/OpenMPT/mptrack/PatternEditorDialogs.cpp
trunk/OpenMPT/mptrack/PatternEditorDialogs.h
trunk/OpenMPT/mptrack/TuningDialog.cpp
trunk/OpenMPT/mptrack/View_pat.h
trunk/OpenMPT/mptrack/Vstplug.cpp
trunk/OpenMPT/mptrack/Vstplug.h
trunk/OpenMPT/mptrack/dlg_misc.cpp
trunk/OpenMPT/mptrack/dlg_misc.h
trunk/OpenMPT/soundlib/Load_itp.cpp
Modified: trunk/OpenMPT/mptrack/Ctrl_gen.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_gen.cpp 2011-07-29 20:49:03 UTC (rev 938)
+++ trunk/OpenMPT/mptrack/Ctrl_gen.cpp 2011-07-29 20:54:38 UTC (rev 939)
@@ -281,7 +281,7 @@
if (pSlider==&m_SliderTempo) {
int min, max;
m_SpinTempo.GetRange(min, max);
- int tempo = max - m_SliderTempo.GetPos();
+ const UINT tempo = max - m_SliderTempo.GetPos();
if ((tempo >= m_pSndFile->GetModSpecifications().tempoMin) && (tempo <= m_pSndFile->GetModSpecifications().tempoMax) && (tempo != m_pSndFile->m_nDefaultTempo)) {
m_pSndFile->m_nDefaultTempo = tempo;
m_pSndFile->m_nMusicTempo = tempo;
@@ -292,7 +292,7 @@
}
else if (pSlider==&m_SliderGlobalVol) {
- int gv = MAX_SLIDER_GLOBAL_VOL - m_SliderGlobalVol.GetPos();
+ const UINT gv = MAX_SLIDER_GLOBAL_VOL - m_SliderGlobalVol.GetPos();
if ((gv >= 0) && (gv <= MAX_SLIDER_GLOBAL_VOL) && (gv != m_pSndFile->m_nDefaultGlobalVolume)) {
m_pSndFile->m_nGlobalVolume = gv;
m_pSndFile->m_nDefaultGlobalVolume = gv;
@@ -303,7 +303,7 @@
}
else if (pSlider==&m_SliderSamplePreAmp) {
- int spa = MAX_SLIDER_SAMPLE_VOL - m_SliderSamplePreAmp.GetPos();
+ const UINT spa = MAX_SLIDER_SAMPLE_VOL - m_SliderSamplePreAmp.GetPos();
if ((spa >= 0) && (spa <= MAX_SLIDER_SAMPLE_VOL) && (spa != m_pSndFile->m_nSamplePreAmp)) {
m_pSndFile->m_nSamplePreAmp = spa;
if(m_pSndFile->GetType() != MOD_TYPE_MOD)
@@ -313,7 +313,7 @@
}
else if (pSlider==&m_SliderVSTiVol) {
- int vv = MAX_SLIDER_VSTI_VOL - m_SliderVSTiVol.GetPos();
+ const UINT vv = MAX_SLIDER_VSTI_VOL - m_SliderVSTiVol.GetPos();
if ((vv >= 0) && (vv <= MAX_SLIDER_VSTI_VOL) && (vv != m_pSndFile->m_nVSTiVolume)) {
m_pSndFile->m_nVSTiVolume = vv;
m_pSndFile->RecalculateGainForAllPlugs();
@@ -402,7 +402,7 @@
if ((m_pSndFile) && (m_pModDoc) && (m_bInitialized)) {
m_EditVSTiVol.GetWindowText(s, sizeof(s));
if (s[0]) {
- int n = atoi(s);
+ UINT n = ConvertStrTo<UINT>(s);
n = CLAMP(n, 0, 2000);
if (n != m_pSndFile->m_nVSTiVolume) {
m_bEditsLocked=true;
@@ -424,7 +424,7 @@
if ((m_pSndFile) && (m_pModDoc) && (m_bInitialized)) {
m_EditSamplePA.GetWindowText(s, sizeof(s));
if (s[0]) {
- int n = atoi(s);
+ UINT n = ConvertStrTo<UINT>(s);
n = CLAMP(n, 0, 2000);
if (n != m_pSndFile->m_nSamplePreAmp) {
m_bEditsLocked=true;
Modified: trunk/OpenMPT/mptrack/Mainbar.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mainbar.cpp 2011-07-29 20:49:03 UTC (rev 938)
+++ trunk/OpenMPT/mptrack/Mainbar.cpp 2011-07-29 20:54:38 UTC (rev 939)
@@ -506,10 +506,10 @@
{
if (n < 0)
{
- pSndFile->m_nMusicSpeed = max(nCurrentSpeed - 1, pSndFile->GetModSpecifications().speedMin);
+ pSndFile->m_nMusicSpeed = Util::Max(UINT(nCurrentSpeed - 1), pSndFile->GetModSpecifications().speedMin);
} else
{
- pSndFile->m_nMusicSpeed = min(nCurrentSpeed + 1, pSndFile->GetModSpecifications().speedMax);
+ pSndFile->m_nMusicSpeed = Util::Min(UINT(nCurrentSpeed + 1), pSndFile->GetModSpecifications().speedMax);
}
m_SpinSpeed.SetPos(0);
}
@@ -523,7 +523,7 @@
}
} else
{
- if (nCurrentRowsPerBeat < pSndFile->m_nCurrentRowsPerMeasure)
+ if (static_cast<ROWINDEX>(nCurrentRowsPerBeat) < pSndFile->m_nCurrentRowsPerMeasure)
{
SetRowsPerBeat(nCurrentRowsPerBeat + 1);
}
Modified: trunk/OpenMPT/mptrack/Moddoc.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Moddoc.cpp 2011-07-29 20:49:03 UTC (rev 938)
+++ trunk/OpenMPT/mptrack/Moddoc.cpp 2011-07-29 20:54:38 UTC (rev 939)
@@ -2173,7 +2173,7 @@
typedef struct MPTEFFECTINFO
{
- DWORD dwEffect; // CMD_XXXX
+ MODCOMMAND::COMMAND dwEffect; // CMD_XXXX
DWORD dwParamMask; // 0 = default
DWORD dwParamValue; // 0 = default
DWORD dwFlags; // FXINFO_XXXX
@@ -2288,7 +2288,7 @@
}
-bool CModDoc::GetEffectName(LPSTR pszDescription, UINT command, UINT param, bool bXX, CHANNELINDEX nChn) //rewbs.xinfo: added chan arg
+bool CModDoc::GetEffectName(LPSTR pszDescription, MODCOMMAND::COMMAND command, UINT param, bool bXX, CHANNELINDEX nChn) //rewbs.xinfo: added chan arg
//------------------------------------------------------------------------------------------------------
{
bool bSupported;
@@ -2413,13 +2413,13 @@
//Returns command and corrects parameter refParam if necessary
-UINT CModDoc::GetEffectFromIndex(UINT ndx, int &refParam)
-//-------------------------------------------------------
+MODCOMMAND::COMMAND CModDoc::GetEffectFromIndex(UINT ndx, int &refParam)
+//----------------------------------------------------------------------
{
//if (pParam) *pParam = -1;
if (ndx >= MAX_FXINFO) {
refParam = 0;
- return 0;
+ return CMD_NONE;
}
//Cap parameter to match FX if necessary.
@@ -2440,11 +2440,11 @@
}
-UINT CModDoc::GetEffectFromIndex(UINT ndx)
-//----------------------------------------
+MODCOMMAND::COMMAND CModDoc::GetEffectFromIndex(UINT ndx)
+//-------------------------------------------------------
{
if (ndx >= MAX_FXINFO) {
- return 0;
+ return CMD_NONE;
}
return gFXInfo[ndx].dwEffect;
@@ -3059,7 +3059,7 @@
typedef struct MPTVOLCMDINFO
{
- DWORD dwVolCmd; // VOLCMD_XXXX
+ MODCOMMAND::VOLCMD dwVolCmd; // VOLCMD_XXXX
DWORD dwFormats; // MOD_TYPE_XXX combo
LPCSTR pszName; // ie "Set Volume"
} MPTVOLCMDINFO;
@@ -3105,8 +3105,8 @@
}
-UINT CModDoc::GetVolCmdFromIndex(UINT ndx)
-//----------------------------------------
+MODCOMMAND::VOLCMD CModDoc::GetVolCmdFromIndex(UINT ndx)
+//------------------------------------------------------
{
return (ndx < MAX_VOLINFO) ? gVolCmdInfo[ndx].dwVolCmd : 0;
}
Modified: trunk/OpenMPT/mptrack/Moddoc.h
===================================================================
--- trunk/OpenMPT/mptrack/Moddoc.h 2011-07-29 20:49:03 UTC (rev 938)
+++ trunk/OpenMPT/mptrack/Moddoc.h 2011-07-29 20:54:38 UTC (rev 939)
@@ -237,12 +237,12 @@
void ActivateWindow();
// Effects Description
- bool GetEffectName(LPSTR pszDescription, UINT command, UINT param, bool bXX = false, CHANNELINDEX nChn = CHANNELINDEX_INVALID); // bXX: Nxx: ...
+ bool GetEffectName(LPSTR pszDescription, MODCOMMAND::COMMAND command, UINT param, bool bXX = false, CHANNELINDEX nChn = CHANNELINDEX_INVALID); // bXX: Nxx: ...
UINT GetNumEffects() const;
bool GetEffectInfo(UINT ndx, LPSTR s, bool bXX = false, DWORD *prangeMin=NULL, DWORD *prangeMax=NULL);
LONG GetIndexFromEffect(UINT command, UINT param);
- UINT GetEffectFromIndex(UINT ndx, int &refParam);
- UINT GetEffectFromIndex(UINT ndx);
+ MODCOMMAND::COMMAND GetEffectFromIndex(UINT ndx, int &refParam);
+ MODCOMMAND::COMMAND GetEffectFromIndex(UINT ndx);
UINT GetEffectMaskFromIndex(UINT ndx);
bool GetEffectNameEx(LPSTR pszName, UINT ndx, UINT param);
BOOL IsExtendedEffect(UINT ndx) const;
@@ -251,7 +251,7 @@
// Volume column effects description
UINT GetNumVolCmds() const;
LONG GetIndexFromVolCmd(UINT volcmd);
- UINT GetVolCmdFromIndex(UINT ndx);
+ MODCOMMAND::VOLCMD GetVolCmdFromIndex(UINT ndx);
BOOL GetVolCmdInfo(UINT ndx, LPSTR s, DWORD *prangeMin=NULL, DWORD *prangeMax=NULL);
// Various MIDI Macro helpers
Modified: trunk/OpenMPT/mptrack/PatternEditorDialogs.cpp
===================================================================
--- trunk/OpenMPT/mptrack/PatternEditorDialogs.cpp 2011-07-29 20:49:03 UTC (rev 938)
+++ trunk/OpenMPT/mptrack/PatternEditorDialogs.cpp 2011-07-29 20:54:38 UTC (rev 939)
@@ -13,6 +13,7 @@
#include "mptrack.h"
#include "Mainfrm.h"
#include "PatternEditorDialogs.h"
+#include "view_pat.h"
// -> CODE#0010
@@ -426,8 +427,8 @@
// Min/Max channels
if (!m_bReplace)
{
- m_nMinChannel = GetDlgItemInt(IDC_EDIT1) - 1;
- m_nMaxChannel = GetDlgItemInt(IDC_EDIT2) - 1;
+ m_nMinChannel = static_cast<CHANNELINDEX>(GetDlgItemInt(IDC_EDIT1) - 1);
+ m_nMaxChannel = static_cast<CHANNELINDEX>(GetDlgItemInt(IDC_EDIT2) - 1);
if (m_nMaxChannel < m_nMinChannel)
{
std::swap(m_nMinChannel, m_nMaxChannel);
@@ -653,13 +654,13 @@
}
-BOOL CEditCommand::ShowEditWindow(UINT nPat, DWORD dwCursor)
+BOOL CEditCommand::ShowEditWindow(PATTERNINDEX nPat, DWORD dwCursor)
//----------------------------------------------------------
{
CHAR s[64];
CSoundFile *pSndFile = m_pModDoc->GetSoundFile();
- UINT nRow = dwCursor >> 16;
- UINT nChannel = (dwCursor & 0xFFFF) >> 3;
+ const ROWINDEX nRow = CViewPattern::GetRowFromCursor(dwCursor);
+ const CHANNELINDEX nChannel = CViewPattern::GetChanFromCursor(dwCursor);
if ((nPat >= pSndFile->Patterns.Size()) || (!m_pModDoc)
|| (nRow >= pSndFile->Patterns[nPat].GetNumRows()) || (nChannel >= pSndFile->m_nChannels)
@@ -702,8 +703,8 @@
}
-void CEditCommand::UpdateNote(UINT note, UINT instr)
-//--------------------------------------------------
+void CEditCommand::UpdateNote(MODCOMMAND::NOTE note, MODCOMMAND::INSTR instr)
+//---------------------------------------------------------------------------
{
CSoundFile *pSndFile = m_pModDoc->GetSoundFile();
if ((m_nPattern >= pSndFile->Patterns.Size()) || (!m_pModDoc)
@@ -731,8 +732,8 @@
}
-void CEditCommand::UpdateVolume(UINT volcmd, UINT vol)
-//----------------------------------------------------
+void CEditCommand::UpdateVolume(MODCOMMAND::VOLCMD volcmd, MODCOMMAND::VOL vol)
+//-----------------------------------------------------------------------------
{
CSoundFile *pSndFile = m_pModDoc->GetSoundFile();
if ((m_nPattern >= pSndFile->Patterns.Size()) || (!m_pModDoc)
@@ -759,8 +760,8 @@
}
-void CEditCommand::UpdateEffect(UINT command, UINT param)
-//-------------------------------------------------------
+void CEditCommand::UpdateEffect(MODCOMMAND::COMMAND command, MODCOMMAND::PARAM param)
+//-----------------------------------------------------------------------------------
{
CSoundFile *pSndFile = m_pModDoc->GetSoundFile();
if ((m_nPattern >= pSndFile->Patterns.Size()) || (!m_pModDoc)
@@ -908,16 +909,16 @@
if ((combo = (CComboBox *)GetDlgItem(IDC_COMBO1)) != NULL)
{
int n = combo->GetCurSel();
- if (n >= 0) m_nNote = combo->GetItemData(n);
+ if (n >= 0) m_nNote = static_cast<MODCOMMAND::NOTE>(combo->GetItemData(n));
}
if ((combo = (CComboBox *)GetDlgItem(IDC_COMBO2)) != NULL)
{
int n = combo->GetCurSel();
if(n >= 0)
{
- const UINT oldInstr = m_nInstr;
+ const MODCOMMAND::INSTR oldInstr = m_nInstr;
CSoundFile* pSndFile = m_pModDoc->GetSoundFile();
- m_nInstr = combo->GetItemData(n);
+ m_nInstr = static_cast<MODCOMMAND::INSTR>(combo->GetItemData(n));
//Checking whether note names should be recreated.
if(!MODCOMMAND::IsPcNote(m_nNote) && pSndFile && pSndFile->Instruments[m_nInstr] && pSndFile->Instruments[oldInstr])
{
@@ -1020,7 +1021,7 @@
int n = combo->GetCurSel();
if (n >= 0)
{
- UINT volcmd = m_pModDoc->GetVolCmdFromIndex(combo->GetItemData(n));
+ MODCOMMAND::VOLCMD volcmd = m_pModDoc->GetVolCmdFromIndex(combo->GetItemData(n));
if (volcmd != m_nVolCmd)
{
m_nVolCmd = volcmd;
@@ -1030,7 +1031,7 @@
}
if ((slider = (CSliderCtrl *)GetDlgItem(IDC_SLIDER1)) != NULL)
{
- m_nVolume = slider->GetPos();
+ m_nVolume = static_cast<MODCOMMAND::VOL>(slider->GetPos());
}
if (m_pParent) m_pParent->UpdateVolume(m_nVolCmd, m_nVolume);
}
@@ -1151,7 +1152,7 @@
{
int param = -1, ndx = combo->GetItemData(n);
m_nCommand = (ndx >= 0) ? m_pModDoc->GetEffectFromIndex(ndx, param) : 0;
- if (param >= 0) m_nParam = param;
+ if (param >= 0) m_nParam = static_cast<MODCOMMAND::PARAM>(param);
bSet = TRUE;
}
UpdateRange(bSet);
@@ -1173,7 +1174,7 @@
UINT param = m_pModDoc->MapPosToValue(fxndx, pos);
if (param != m_nParam)
{
- m_nParam = param;
+ m_nParam = static_cast<MODCOMMAND::PARAM>(param);
UpdateValue(TRUE);
}
}
@@ -1268,7 +1269,7 @@
if ((cnote < 3) || (i == (UINT)nKey))
{
UINT k = (cnote < 3) ? cnote : 2;
- pChords[chord].notes[k] = i+1;
+ pChords[chord].notes[k] = static_cast<BYTE>(i+1);
if (cnote < 3) cnote++;
}
}
@@ -1498,11 +1499,11 @@
{
CDialog::OnOK();
- m_pOptions->splitNote = m_CbnSplitNote.GetCurSel();
+ m_pOptions->splitNote = static_cast<MODCOMMAND::NOTE>(m_CbnSplitNote.GetCurSel());
m_pOptions->octaveModifier = m_CbnOctaveModifier.GetCurSel() - SPLIT_OCTAVE_RANGE;
m_pOptions->octaveLink = (IsDlgButtonChecked(IDC_PATTERN_OCTAVELINK) == TRUE) ? true : false;
- m_pOptions->splitVolume = m_CbnSplitVolume.GetCurSel();
- m_pOptions->splitInstrument = m_CbnSplitInstrument.GetItemData(m_CbnSplitInstrument.GetCurSel());
+ m_pOptions->splitVolume = static_cast<MODCOMMAND::VOL>(m_CbnSplitVolume.GetCurSel());
+ m_pOptions->splitInstrument = static_cast<MODCOMMAND::INSTR>(m_CbnSplitInstrument.GetItemData(m_CbnSplitInstrument.GetCurSel()));
}
Modified: trunk/OpenMPT/mptrack/PatternEditorDialogs.h
===================================================================
--- trunk/OpenMPT/mptrack/PatternEditorDialogs.h 2011-07-29 20:49:03 UTC (rev 938)
+++ trunk/OpenMPT/mptrack/PatternEditorDialogs.h 2011-07-29 20:54:38 UTC (rev 939)
@@ -149,7 +149,8 @@
//==========================================
{
protected:
- UINT m_nNote, m_nInstr;
+ MODCOMMAND::NOTE m_nNote;
+ MODCOMMAND::INSTR m_nInstr;
public:
CPageEditNote(CModDoc *pModDoc, CEditCommand *parent):CPageEditCommand(pModDoc, parent, IDD_PAGEEDITNOTE) {}
@@ -170,7 +171,8 @@
//============================================
{
protected:
- UINT m_nVolCmd, m_nVolume;
+ MODCOMMAND::VOLCMD m_nVolCmd;
+ MODCOMMAND::VOL m_nVolume;
bool m_bIsParamControl;
public:
@@ -193,7 +195,9 @@
//============================================
{
protected:
- UINT m_nCommand, m_nParam, m_nPlugin;
+ MODCOMMAND::COMMAND m_nCommand;
+ MODCOMMAND::PARAM m_nParam;
+ PLUGINDEX m_nPlugin;
UINT m_nPluginParam;
bool m_bIsParamControl;
// -> CODE#0010
@@ -234,7 +238,9 @@
CPageEditEffect *m_pageEffect;
CModDoc *m_pModDoc;
HWND m_hWndView;
- UINT m_nPattern, m_nRow, m_nChannel;
+ ROWINDEX m_nRow;
+ PATTERNINDEX m_nPattern;
+ CHANNELINDEX m_nChannel;
MODCOMMAND m_Command;
bool m_bModified;
@@ -243,14 +249,14 @@
public:
BOOL SetParent(CWnd *parent, CModDoc *pModDoc);
- BOOL ShowEditWindow(UINT nPat, DWORD dwCursor);
+ BOOL ShowEditWindow(PATTERNINDEX nPat, DWORD dwCursor);
// -> CODE#0010
// -> DESC="add extended parameter mechanism to pattern effects"
void OnSelListChange();
// -! NEW_FEATURE#0010
- void UpdateNote(UINT note, UINT instr);
- void UpdateVolume(UINT volcmd, UINT vol);
- void UpdateEffect(UINT command, UINT param);
+ void UpdateNote(MODCOMMAND::NOTE note, MODCOMMAND::INSTR instr);
+ void UpdateVolume(MODCOMMAND::VOLCMD volcmd, MODCOMMAND::VOL vol);
+ void UpdateEffect(MODCOMMAND::COMMAND command, MODCOMMAND::PARAM param);
protected:
//{{AFX_VIRTUAL(CEditCommand)
Modified: trunk/OpenMPT/mptrack/TuningDialog.cpp
===================================================================
--- trunk/OpenMPT/mptrack/TuningDialog.cpp 2011-07-29 20:49:03 UTC (rev 938)
+++ trunk/OpenMPT/mptrack/TuningDialog.cpp 2011-07-29 20:54:38 UTC (rev 939)
@@ -32,7 +32,7 @@
// CTuningDialog dialog
-
+#pragma warning(disable : 4355) // "'this' : used in base member initializer list"
IMPLEMENT_DYNAMIC(CTuningDialog, CDialog)
CTuningDialog::CTuningDialog(CWnd* pParent, const TUNINGVECTOR& rVec, CTuning* pTun)
: CDialog(CTuningDialog::IDD, pParent),
@@ -44,6 +44,7 @@
m_TreeItemTuningItemMap(s_notFoundItemTree, s_notFoundItemTuning),
m_TreeCtrlTuning(this),
m_DoErrorExit(false)
+#pragma warning(default : 4355) // "'this' : used in base member initializer list"
//----------------------------------------
{
m_pActiveTuning = pTun;
Modified: trunk/OpenMPT/mptrack/View_pat.h
===================================================================
--- trunk/OpenMPT/mptrack/View_pat.h 2011-07-29 20:49:03 UTC (rev 938)
+++ trunk/OpenMPT/mptrack/View_pat.h 2011-07-29 20:54:38 UTC (rev 939)
@@ -1,6 +1,8 @@
#ifndef _VIEW_PATTERNS_H_
#define _VIEW_PATTERNS_H_
+#include "globals.h"
+
class CModDoc;
class CEditCommand;
class CEffectVis; //rewbs.fxvis
@@ -342,8 +344,13 @@
public:
afx_msg void OnInitMenu(CMenu* pMenu);
+
+ static ROWINDEX GetRowFromCursor(DWORD cursor) { return (cursor >> 16); };
+ static CHANNELINDEX GetChanFromCursor(DWORD cursor) { return static_cast<CHANNELINDEX>((cursor & 0xFFFF) >> 3); };
+ static UINT GetColTypeFromCursor(DWORD cursor) { return (cursor & 0x07); };
+ static DWORD CreateCursor(ROWINDEX row, CHANNELINDEX channel = 0, UINT column = 0) { return (row << 16) | ((channel << 3) & 0x1FFF) | (column & 0x07); };
+
private:
-
void SetSplitKeyboardSettings();
bool HandleSplit(MODCOMMAND* p, int note);
bool BuildChannelControlCtxMenu(HMENU hMenu);
@@ -372,11 +379,6 @@
CHANNELINDEX GetSelectionEndChan();
UINT ListChansWhereColSelected(PatternColumns colType, CArray<UINT,UINT> &chans);
- static ROWINDEX GetRowFromCursor(DWORD cursor) { return (cursor >> 16); };
- static CHANNELINDEX GetChanFromCursor(DWORD cursor) { return static_cast<CHANNELINDEX>((cursor & 0xFFFF) >> 3); };
- static UINT GetColTypeFromCursor(DWORD cursor) { return (cursor & 0x07); };
- static DWORD CreateCursor(ROWINDEX row, CHANNELINDEX channel = 0, UINT column = 0) { return (row << 16) | ((channel << 3) & 0x1FFF) | (column & 0x07); };
-
bool IsInterpolationPossible(ROWINDEX startRow, ROWINDEX endRow, CHANNELINDEX chan, PatternColumns colType, CSoundFile* pSndFile);
void Interpolate(PatternColumns type);
Modified: trunk/OpenMPT/mptrack/Vstplug.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Vstplug.cpp 2011-07-29 20:49:03 UTC (rev 938)
+++ trunk/OpenMPT/mptrack/Vstplug.cpp 2011-07-29 20:54:38 UTC (rev 939)
@@ -286,7 +286,7 @@
if (!hLib && dw != ERROR_MOD_NOT_FOUND) // "File not found errors" are annoying.
{
TCHAR szBuf[256];
- wsprintf(szBuf, "Warning: encountered problem when loading plugin dll. Error %d: %s", dw, GetErrorMessage(dw));
+ wsprintf(szBuf, "Warning: encountered problem when loading plugin dll. Error %d: %s", dw, (LPCTSTR)GetErrorMessage(dw));
MessageBox(NULL, szBuf, "DEBUG: Error when loading plugin dll", MB_OK);
}
#endif //_DEBUG
@@ -406,11 +406,11 @@
#endif // VST_LOG
}
- try {
+ //try {
FreeLibrary(hLib);
- } catch (...) {
- CVstPluginManager::ReportPlugException("Exception in FreeLibrary(\"%s\")!\n", pszDllPath);
- }
+ //} catch (...) {
+ // CVstPluginManager::ReportPlugException("Exception in FreeLibrary(\"%s\")!\n", pszDllPath);
+ //}
return (bOk) ? m_pVstHead : NULL;
} else
@@ -1087,7 +1087,7 @@
{
// Plugin wants to load or save a file.
std::string extensions, workingDir;
- for(size_t i = 0; i < pFileSel->nbFileTypes; i++)
+ for(VstInt32 i = 0; i < pFileSel->nbFileTypes; i++)
{
VstFileType *pType = &(pFileSel->fileTypes[i]);
extensions += pType->name;
@@ -1230,7 +1230,7 @@
// Close file selector - delete allocated strings.
if(pFileSel->command == kVstMultipleFilesLoad && pFileSel->returnMultiplePaths != nullptr)
{
- for(size_t i = 0; i < pFileSel->nbReturnPath; i++)
+ for(VstInt32 i = 0; i < pFileSel->nbReturnPath; i++)
{
if(pFileSel->returnMultiplePaths[i] != nullptr)
{
@@ -1739,7 +1739,7 @@
m_nEditorX = m_nEditorY = -1;
m_pEvList = NULL;
m_pModDoc = NULL; //rewbs.plugDocAware
- m_nPreviousMidiChan = -1; //rewbs.VSTCompliance
+ m_nPreviousMidiChan = nInvalidMidiChan; //rewbs.VSTCompliance
m_pProcessFP = NULL;
// Insert ourselves in the beginning of the list
@@ -1766,7 +1766,7 @@
m_bPlugResumed = false;
m_bModified = false;
m_dwTimeAtStartOfProcess=0;
- m_nSampleRate = -1; //rewbs.VSTCompliance: gets set on Resume()
+ m_nSampleRate = nInvalidSampleRate; //rewbs.VSTCompliance: gets set on Resume()
memset(m_MidiCh, 0, sizeof(m_MidiCh));
for (int ch=0; ch<16; ch++) {
@@ -1860,7 +1860,7 @@
}
m_nSampleRate=CSoundFile::gdwMixingFreq;
- Dispatch(effSetSampleRate, 0, 0, NULL, CSoundFile::gdwMixingFreq);
+ Dispatch(effSetSampleRate, 0, 0, NULL, static_cast<float>(CSoundFile::gdwMixingFreq));
Dispatch(effSetBlockSize, 0, MIXBUFFERSIZE, NULL, 0.0f);
if (m_pEffect->numPrograms > 0) {
Dispatch(effSetProgram, 0, 0, NULL, 0);
@@ -1911,7 +1911,7 @@
m_pProcessFP = (m_pEffect->flags & effFlagsCanReplacing) ? m_pEffect->processReplacing : m_pEffect->process;
// issue samplerate again here, cos some plugs like it before the block size, other like it right at the end.
- Dispatch(effSetSampleRate, 0, 0, NULL, CSoundFile::gdwMixingFreq);
+ Dispatch(effSetSampleRate, 0, 0, NULL, static_cast<float>(CSoundFile::gdwMixingFreq));
}
@@ -2319,7 +2319,7 @@
void CVstPlugin::Resume()
//-----------------------
{
- long sampleRate = CSoundFile::gdwMixingFreq;
+ const DWORD sampleRate = CSoundFile::gdwMixingFreq;
try {
//reset some stuf
@@ -2329,7 +2329,7 @@
Dispatch(effMainsChanged, 0, 0, NULL, 0.0f); // calls plugin's suspend
if (sampleRate != m_nSampleRate) {
m_nSampleRate=sampleRate;
- Dispatch(effSetSampleRate, 0, 0, NULL, m_nSampleRate);
+ Dispatch(effSetSampleRate, 0, 0, NULL, static_cast<float>(m_nSampleRate));
}
Dispatch(effSetBlockSize, 0, MIXBUFFERSIZE, NULL, 0);
//start off some stuff
@@ -2389,7 +2389,7 @@
if (m_bIsInstrument && m_pSndFile) {
gain /= m_pSndFile->m_pConfig->getVSTiAttenuation();
- gain *= (m_pSndFile->m_nVSTiVolume / m_pSndFile->m_pConfig->getNormalVSTiVol());
+ gain = static_cast<float>(gain * (m_pSndFile->m_nVSTiVolume / m_pSndFile->m_pConfig->getNormalVSTiVol()));
}
m_fGain = gain;
}
@@ -2399,7 +2399,7 @@
//--------------------------------------
{
param = min(param, 127);
- m_pMixStruct->fDryRatio = 1.0-(static_cast<float>(param)/127.0f);
+ m_pMixStruct->fDryRatio = static_cast<float>(1.0-(static_cast<double>(param)/127.0));
}
/*
@@ -2870,8 +2870,8 @@
// pre: 0 <= value <= 16383
- BYTE byte1 = value >> 7; // get last 7 bytes only
- BYTE byte2 = value & 0x7F; // get first 7 bytes only
+ BYTE byte1 = static_cast<BYTE>(value >> 7); // get last 7 bytes only
+ BYTE byte2 = static_cast<BYTE>(value & 0x7F); // get first 7 bytes only
short converted = byte1<<8 | byte2; // merge
return converted;
@@ -2884,9 +2884,9 @@
{
nMidiCh--; // move from 1-17 range to 0-16 range
- short increment = nParam * 0x2000/0xFF;
- short newPitchBendPos = m_nMidiPitchBendPos[nMidiCh] + increment;
- newPitchBendPos = max(MIDI_PitchBend_Min, min(MIDI_PitchBend_Max, newPitchBendPos)); // cap
+ const int16 increment = static_cast<int16>(nParam * 0x2000/0xFF);
+ int16 newPitchBendPos = m_nMidiPitchBendPos[nMidiCh] + increment;
+ Limit(newPitchBendPos, int16(MIDI_PitchBend_Min), int16(MIDI_PitchBend_Max));
MidiPitchBend(nMidiCh, newPitchBendPos);
}
@@ -4167,12 +4167,10 @@
{
int xl = (int)(pIn1[i] * _f2si);
int xr = (int)(pIn2[i] * _f2si);
- if (xl < -32768) xl = -32768;
- if (xl > 32767) xl = 32767;
- if (xr < -32768) xr = -32768;
- if (xr > 32767) xr = 32767;
- pOut[i*2] = xl;
- pOut[i*2+1] = xr;
+ Limit(xl, int16_min, int16_max);
+ Limit(xr, int16_min, int16_max);
+ pOut[i*2] = static_cast<int16>(xl);
+ pOut[i*2+1] = static_cast<int16>(xr);
}
}
Modified: trunk/OpenMPT/mptrack/Vstplug.h
===================================================================
--- trunk/OpenMPT/mptrack/Vstplug.h 2011-07-29 20:49:03 UTC (rev 938)
+++ trunk/OpenMPT/mptrack/Vstplug.h 2011-07-29 20:54:38 UTC (rev 939)
@@ -70,6 +70,7 @@
AEffect *m_pEffect;
void (*m_pProcessFP)(AEffect*, float**, float**, VstInt32); //Function pointer to AEffect processReplacing if supported, else process.
CAbstractVstEditor *m_pEditor; //rewbs.defaultPlugGUI
+ static const UINT nInvalidSampleRate = UINT_MAX;
UINT m_nSampleRate;
bool m_bIsVst2;
SNDMIXPLUGINSTATE m_MixState;
@@ -87,6 +88,7 @@
CModDoc* m_pModDoc; //rewbs.plugDocAware
CSoundFile* m_pSndFile; //rewbs.plugDocAware
// PSNDMIXPLUGIN m_pSndMixPlugin; //rewbs.plugDocAware
+ static const UINT nInvalidMidiChan = UINT_MAX;
UINT m_nPreviousMidiChan; //rewbs.VSTCompliance
bool m_bSongPlaying; //rewbs.VSTCompliance
bool m_bPlugResumed; //rewbs.VSTCompliance
Modified: trunk/OpenMPT/mptrack/dlg_misc.cpp
===================================================================
--- trunk/OpenMPT/mptrack/dlg_misc.cpp 2011-07-29 20:49:03 UTC (rev 938)
+++ trunk/OpenMPT/mptrack/dlg_misc.cpp 2011-07-29 20:54:38 UTC (rev 939)
@@ -384,7 +384,7 @@
sel = m_ChannelsBox.GetCurSel();
if (sel >= 0)
{
- m_nChannels = m_ChannelsBox.GetItemData(sel);
+ m_nChannels = static_cast<CHANNELINDEX>(m_ChannelsBox.GetItemData(sel));
//if (m_nType & MOD_TYPE_XM) m_nChannels = (m_nChannels+1) & 0xFE;
}
Modified: trunk/OpenMPT/mptrack/dlg_misc.h
===================================================================
--- trunk/OpenMPT/mptrack/dlg_misc.h 2011-07-29 20:49:03 UTC (rev 938)
+++ trunk/OpenMPT/mptrack/dlg_misc.h 2011-07-29 20:54:38 UTC (rev 939)
@@ -13,7 +13,7 @@
CComboBox m_TypeBox, m_ChannelsBox, m_TempoModeBox, m_PlugMixBox;
CButton m_CheckBox1, m_CheckBox2, m_CheckBox3, m_CheckBox4, m_CheckBox5, m_CheckBoxPT1x;
CSoundFile *m_pSndFile;
- UINT m_nChannels;
+ CHANNELINDEX m_nChannels;
MODTYPE m_nType;
DWORD m_dwSongFlags;
Modified: trunk/OpenMPT/soundlib/Load_itp.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_itp.cpp 2011-07-29 20:49:03 UTC (rev 938)
+++ trunk/OpenMPT/soundlib/Load_itp.cpp 2011-07-29 20:54:38 UTC (rev 939)
@@ -231,7 +231,7 @@
// m_nPatternNames
memcpy(&id,lpStream+dwMemPos,sizeof(DWORD));
- const PATTERNINDEX numNamedPats = id;
+ const PATTERNINDEX numNamedPats = static_cast<PATTERNINDEX>(id);
dwMemPos += sizeof(DWORD);
// pattern name string length (=MAX_PATTERNNAME)
@@ -583,7 +583,7 @@
fwrite(&id, 1, sizeof(id), f);
// order array
- Order.WriteAsByte(f, id);
+ Order.WriteAsByte(f, static_cast<uint16>(id));
// Song Patterns
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
