Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[1017] trunk/OpenMPT
|
From: <sag...@us...> - 2011-09-04 15:19:47
|
Revision: 1017
http://modplug.svn.sourceforge.net/modplug/?rev=1017&view=rev
Author: saga-games
Date: 2011-09-04 15:19:40 +0000 (Sun, 04 Sep 2011)
Log Message:
-----------
[Fix] Internal: Fixed VS2008 project file (tx jmkz)
[Ref] Got rid of WinApi flags in public Reporting members alltogether
Modified Paths:
--------------
trunk/OpenMPT/common/Reporting.cpp
trunk/OpenMPT/common/Reporting.h
trunk/OpenMPT/mptrack/CleanupSong.cpp
trunk/OpenMPT/mptrack/CommandSet.cpp
trunk/OpenMPT/mptrack/EffectVis.cpp
trunk/OpenMPT/mptrack/KeyConfigDlg.cpp
trunk/OpenMPT/mptrack/Modedit.cpp
trunk/OpenMPT/mptrack/Moptions.cpp
trunk/OpenMPT/mptrack/Mptrack.cpp
trunk/OpenMPT/mptrack/PSRatioCalc.cpp
trunk/OpenMPT/mptrack/dlg_misc.cpp
trunk/OpenMPT/mptrack/mptrack_08.vcproj
Modified: trunk/OpenMPT/common/Reporting.cpp
===================================================================
--- trunk/OpenMPT/common/Reporting.cpp 2011-09-04 00:09:56 UTC (rev 1016)
+++ trunk/OpenMPT/common/Reporting.cpp 2011-09-04 15:19:40 UTC (rev 1017)
@@ -34,17 +34,17 @@
}
-void Reporting::Notification(const char *text, UINT flags, const CWnd *parent)
-//----------------------------------------------------------------------------
+void Reporting::Notification(const char *text, const CWnd *parent)
+//----------------------------------------------------------------
{
- Notification(text, MAINFRAME_TITLE, flags, parent);
+ Notification(text, MAINFRAME_TITLE, parent);
}
-void Reporting::Notification(const char *text, const char *caption, UINT flags, const CWnd *parent)
-//-------------------------------------------------------------------------------------------------
+void Reporting::Notification(const char *text, const char *caption, const CWnd *parent)
+//-------------------------------------------------------------------------------------
{
- ShowNotification(text, caption, flags, parent);
+ ShowNotification(text, caption, MB_OK, parent);
}
@@ -65,7 +65,7 @@
void Reporting::Warning(const char *text, const CWnd *parent)
//-----------------------------------------------------------
{
- Warning(text, MAINFRAME_TITLE " - Error", parent);
+ Warning(text, MAINFRAME_TITLE " - Warning", parent);
}
Modified: trunk/OpenMPT/common/Reporting.h
===================================================================
--- trunk/OpenMPT/common/Reporting.h 2011-09-04 00:09:56 UTC (rev 1016)
+++ trunk/OpenMPT/common/Reporting.h 2011-09-04 15:19:40 UTC (rev 1017)
@@ -34,8 +34,8 @@
static UINT CustomNotification(const char *text, const char *caption, UINT flags, const CWnd *parent) { return ShowNotification(text, caption, flags, parent); };
// Show a simple notification
- static void Notification(const char *text, UINT flags = MB_OK, const CWnd *parent = nullptr);
- static void Notification(const char *text, const char *caption, UINT flags = MB_OK, const CWnd *parent = nullptr);
+ static void Notification(const char *text, const CWnd *parent = nullptr);
+ static void Notification(const char *text, const char *caption, const CWnd *parent = nullptr);
// Show a simple information
static void Information(const char *text, const CWnd *parent = nullptr);
Modified: trunk/OpenMPT/mptrack/CleanupSong.cpp
===================================================================
--- trunk/OpenMPT/mptrack/CleanupSong.cpp 2011-09-04 00:09:56 UTC (rev 1016)
+++ trunk/OpenMPT/mptrack/CleanupSong.cpp 2011-09-04 15:19:40 UTC (rev 1017)
@@ -700,17 +700,10 @@
CSoundFile *pSndFile = m_pModDoc->GetSoundFile();
if(pSndFile == nullptr) return false;
- vector<bool> usedmap;
- INSTRUMENTINDEX swapmap[MAX_INSTRUMENTS];
- INSTRUMENTINDEX swapdest[MAX_INSTRUMENTS];
- UINT nRemoved = 0;
- INSTRUMENTINDEX nSwap, nIndex;
- bool bReorg = false;
-
if (!pSndFile->GetNumInstruments()) return false;
deleteInstrumentSamples removeSamples = doNoDeleteAssociatedSamples;
- if ( !((pSndFile->GetType() == MOD_TYPE_IT) && (pSndFile->m_dwSongFlags & SONG_ITPROJECT))) //never remove an instrument's samples in ITP.
+ if (!((pSndFile->GetType() == MOD_TYPE_IT) && (pSndFile->m_dwSongFlags & SONG_ITPROJECT))) // Never remove an instrument's samples in ITP.
{
if(Reporting::Confirm("Remove samples associated with an instrument if they are unused?", "Removing unused instruments") == cnfYes)
{
@@ -722,7 +715,12 @@
}
BeginWaitCursor();
- usedmap.resize(pSndFile->GetNumInstruments() + 1, false);
+ vector<bool> usedmap(pSndFile->GetNumInstruments() + 1, false);
+ vector<INSTRUMENTINDEX> swapmap(pSndFile->GetNumInstruments() + 1, 0);
+ vector<INSTRUMENTINDEX> swapdest(pSndFile->GetNumInstruments() + 1, 0);
+ INSTRUMENTINDEX nRemoved = 0;
+ INSTRUMENTINDEX nSwap, nIndex;
+ bool bReorg = false;
for(INSTRUMENTINDEX i = pSndFile->GetNumInstruments(); i >= 1; i--)
{
@@ -751,7 +749,7 @@
CriticalSection cs;
nSwap = 0;
nIndex = 1;
- for (INSTRUMENTINDEX nIns = 1; nIns <= pSndFile->m_nInstruments; nIns++)
+ for (INSTRUMENTINDEX nIns = 1; nIns <= pSndFile->GetNumInstruments(); nIns++)
{
if (usedmap[nIns])
{
Modified: trunk/OpenMPT/mptrack/CommandSet.cpp
===================================================================
--- trunk/OpenMPT/mptrack/CommandSet.cpp 2011-09-04 00:09:56 UTC (rev 1016)
+++ trunk/OpenMPT/mptrack/CommandSet.cpp 2011-09-04 15:19:40 UTC (rev 1017)
@@ -1585,7 +1585,7 @@
CString err;
err.Format("The following problems have been encountered while trying to load the key binding file %s:\n", szFilename);
err += errText;
- Reporting::Notification(err, MB_ICONEXCLAMATION | MB_OK);
+ Reporting::Warning(err);
}
if(fileVersion < KEYMAP_VERSION) UpgradeKeymap(pTempCS, fileVersion);
@@ -1603,7 +1603,7 @@
{
CString strMsg;
AfxFormatString1(strMsg, IDS_CANT_OPEN_KEYBINDING_FILE, fileName);
- Reporting::Notification(strMsg, MB_ICONEXCLAMATION | MB_OK);
+ Reporting::Warning(strMsg);
return false;
}
else
Modified: trunk/OpenMPT/mptrack/EffectVis.cpp
===================================================================
--- trunk/OpenMPT/mptrack/EffectVis.cpp 2011-09-04 00:09:56 UTC (rev 1016)
+++ trunk/OpenMPT/mptrack/EffectVis.cpp 2011-09-04 15:19:40 UTC (rev 1017)
@@ -767,9 +767,7 @@
void CEffectVis::OnEditUndo()
//---------------------------
{
- CHAR s[64];
- strcpy(s, "Undo Through!");
- Reporting::Notification(s, MB_OK | MB_ICONEXCLAMATION);
+ Reporting::Notification("Undo Through!");
}
Modified: trunk/OpenMPT/mptrack/KeyConfigDlg.cpp
===================================================================
--- trunk/OpenMPT/mptrack/KeyConfigDlg.cpp 2011-09-04 00:09:56 UTC (rev 1016)
+++ trunk/OpenMPT/mptrack/KeyConfigDlg.cpp 2011-09-04 15:19:40 UTC (rev 1017)
@@ -552,7 +552,7 @@
if (m_nCurHotKey<0 || m_nCurKeyChoice<0 || m_nCurKeyChoice>=plocalCmdSet->GetKeyListSize(cmd))
{
CString error = "No key currently set for this slot.";
- Reporting::Notification(error, "Invalid key data", MB_ICONEXCLAMATION|MB_OK);
+ Reporting::Warning(error, "Invalid key data");
return;
}
@@ -573,7 +573,7 @@
if (cmd<0)
{
CString error = "Invalid slot.";
- Reporting::Notification(error, "Invalid key data", MB_ICONEXCLAMATION|MB_OK);
+ Reporting::Warning(error, "Invalid key data");
return;
}
@@ -589,13 +589,13 @@
if (!kc.code)
{
CString error = "You need to say to which key you'd like to map this command.";
- Reporting::Notification(error, "Invalid key data", MB_ICONEXCLAMATION|MB_OK);
+ Reporting::Warning(error, "Invalid key data");
return;
}
if (!kc.event)
{
/* CString error = "You need to select at least one key event type (up, down or hold).";
- Reporting::Notification(error, "Invalid key data", MB_ICONEXCLAMATION|MB_OK);
+ Reporting::Warning(error, "Invalid key data");
return;
*/
kc.event = kKeyEventDown;
Modified: trunk/OpenMPT/mptrack/Modedit.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Modedit.cpp 2011-09-04 00:09:56 UTC (rev 1016)
+++ trunk/OpenMPT/mptrack/Modedit.cpp 2011-09-04 15:19:40 UTC (rev 1017)
@@ -43,7 +43,7 @@
{
CString error;
error.Format("Error: Max number of channels for this file type is %d", maxChans);
- Reporting::Notification(error, MB_OK | MB_ICONEXCLAMATION);
+ Reporting::Warning(error);
return false;
}
Modified: trunk/OpenMPT/mptrack/Moptions.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Moptions.cpp 2011-09-04 00:09:56 UTC (rev 1016)
+++ trunk/OpenMPT/mptrack/Moptions.cpp 2011-09-04 15:19:40 UTC (rev 1017)
@@ -108,7 +108,7 @@
if ((temp_nRowSpacing2 > temp_nRowSpacing))
{
- Reporting::Notification("Error: Primary highlight must be greater than or equal secondary highlight.", MB_OK | MB_ICONEXCLAMATION);
+ Reporting::Warning("Error: Primary highlight must be greater than or equal secondary highlight.");
::SetFocus(::GetDlgItem(m_hWnd, IDC_PRIMARYHILITE));
return 0;
}
Modified: trunk/OpenMPT/mptrack/Mptrack.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mptrack.cpp 2011-09-04 00:09:56 UTC (rev 1016)
+++ trunk/OpenMPT/mptrack/Mptrack.cpp 2011-09-04 15:19:40 UTC (rev 1017)
@@ -1860,7 +1860,7 @@
void ErrorBox(UINT nStringID, CWnd *parent)
//-----------------------------------------
{
- MsgBox(nStringID, parent, "Error!", MB_OK | MB_ICONSTOP);
+ MsgBox(nStringID, parent, "Error!", MB_OK | MB_ICONERROR);
}
Modified: trunk/OpenMPT/mptrack/PSRatioCalc.cpp
===================================================================
--- trunk/OpenMPT/mptrack/PSRatioCalc.cpp 2011-09-04 00:09:56 UTC (rev 1016)
+++ trunk/OpenMPT/mptrack/PSRatioCalc.cpp 2011-09-04 15:19:40 UTC (rev 1017)
@@ -162,8 +162,7 @@
{
if (m_dRatio<50.0 || m_dRatio>200.0)
{
- Reporting::Notification("Error: ratio must be between 50% and 200%.",
- "Error", MB_ICONERROR | MB_OK);
+ Reporting::Error("Error: ratio must be between 50% and 200%.");
return;
}
OnOK();
Modified: trunk/OpenMPT/mptrack/dlg_misc.cpp
===================================================================
--- trunk/OpenMPT/mptrack/dlg_misc.cpp 2011-09-04 00:09:56 UTC (rev 1016)
+++ trunk/OpenMPT/mptrack/dlg_misc.cpp 2011-09-04 15:19:40 UTC (rev 1017)
@@ -339,7 +339,7 @@
int temp_nRPM = GetDlgItemInt(IDC_ROWSPERMEASURE);
if ((temp_nRPB > temp_nRPM))
{
- Reporting::Notification("Error: Rows per measure must be greater than or equal rows per beat.", MB_OK|MB_ICONEXCLAMATION);
+ Reporting::Warning("Error: Rows per measure must be greater than or equal rows per beat.");
GetDlgItem(IDC_ROWSPERMEASURE)->SetFocus();
return false;
}
@@ -353,7 +353,7 @@
{
CString error;
error.Format("Error: Max number of channels for this type is %d", maxChans);
- Reporting::Notification(error, MB_OK|MB_ICONEXCLAMATION);
+ Reporting::Warning(error);
return FALSE;
}
Modified: trunk/OpenMPT/mptrack/mptrack_08.vcproj
===================================================================
--- trunk/OpenMPT/mptrack/mptrack_08.vcproj 2011-09-04 00:09:56 UTC (rev 1016)
+++ trunk/OpenMPT/mptrack/mptrack_08.vcproj 2011-09-04 15:19:40 UTC (rev 1017)
@@ -493,7 +493,7 @@
>
</File>
<File
- RelativePath=".\common\Reporting.cpp"
+ RelativePath="..\common\Reporting.cpp"
>
</File>
<File
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
