Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[1933] trunk/OpenMPT
|
From: <sag...@us...> - 2013-04-22 20:22:09
|
Revision: 1933
http://sourceforge.net/p/modplug/code/1933
Author: saga-games
Date: 2013-04-22 20:21:59 +0000 (Mon, 22 Apr 2013)
Log Message:
-----------
[Ref] Small changes here and there.
Modified Paths:
--------------
trunk/OpenMPT/mptrack/MIDIMapping.cpp
trunk/OpenMPT/mptrack/MIDIMapping.h
trunk/OpenMPT/mptrack/MIDIMappingDialog.cpp
trunk/OpenMPT/mptrack/dlg_misc.cpp
trunk/OpenMPT/mptrack/dlg_misc.h
trunk/OpenMPT/mptrack/mptrack.rc
trunk/OpenMPT/mptrack/mptrack_10.vcxproj
trunk/OpenMPT/mptrack/mptrack_10.vcxproj.filters
trunk/OpenMPT/mptrack/resource.h
trunk/OpenMPT/soundlib/ModSequence.cpp
Modified: trunk/OpenMPT/mptrack/MIDIMapping.cpp
===================================================================
--- trunk/OpenMPT/mptrack/MIDIMapping.cpp 2013-04-22 20:20:55 UTC (rev 1932)
+++ trunk/OpenMPT/mptrack/MIDIMapping.cpp 2013-04-22 20:21:59 UTC (rev 1933)
@@ -14,7 +14,7 @@
#include "Mainfrm.h"
-mpt::String CMIDIMappingDirective::ToString() const
+const char *CMIDIMappingDirective::ToString() const
//-------------------------------------------------
{
mpt::String str;
@@ -23,7 +23,7 @@
if(m_CaptureMIDI) flags[1] = '1';
if(m_AllowPatternEdit) flags[2] = '1';
str.Format("%s:%d:%x:%d:%d:%d", flags, (int)GetChannel(), (int)GetEvent(), (int)GetController(), (int)m_PluginIndex, m_Parameter);
- return str;
+ return str.c_str();
}
Modified: trunk/OpenMPT/mptrack/MIDIMapping.h
===================================================================
--- trunk/OpenMPT/mptrack/MIDIMapping.h 2013-04-22 20:20:55 UTC (rev 1932)
+++ trunk/OpenMPT/mptrack/MIDIMapping.h 2013-04-22 20:21:59 UTC (rev 1933)
@@ -14,9 +14,7 @@
#include <algorithm>
using std::vector;
-namespace mpt { class String; }
-
//=========================
class CMIDIMappingDirective
//=========================
@@ -59,7 +57,7 @@
bool operator==(const CMIDIMappingDirective& d) const {return memcmp(this, &d, sizeof(CMIDIMappingDirective)) == 0;}
- mpt::String ToString() const;
+ const char *ToString() const;
BYTE GetChnEvent() const {return m_ChnEvent;}
Modified: trunk/OpenMPT/mptrack/MIDIMappingDialog.cpp
===================================================================
--- trunk/OpenMPT/mptrack/MIDIMappingDialog.cpp 2013-04-22 20:20:55 UTC (rev 1932)
+++ trunk/OpenMPT/mptrack/MIDIMappingDialog.cpp 2013-04-22 20:21:59 UTC (rev 1933)
@@ -151,8 +151,8 @@
m_ChannelCBox.SetCurSel(activeSetting.GetChannel());
if(m_Setting.GetEvent() == MIDIEvents::evControllerChange)
- m_EventCBox.SetCurSel(0);
- else
+ m_EventCBox.SetCurSel(0);
+ else
m_EventCBox.SetCurSel(-1);
Modified: trunk/OpenMPT/mptrack/dlg_misc.cpp
===================================================================
--- trunk/OpenMPT/mptrack/dlg_misc.cpp 2013-04-22 20:20:55 UTC (rev 1932)
+++ trunk/OpenMPT/mptrack/dlg_misc.cpp 2013-04-22 20:21:59 UTC (rev 1933)
@@ -459,32 +459,11 @@
//////////////////////////////////////////////////////////////////////////////
// CShowLogDlg
-BEGIN_MESSAGE_MAP(CShowLogDlg, CDialog)
- //{{AFX_MSG_MAP(CShowLogDlg)
- //}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-
-
-void CShowLogDlg::DoDataExchange(CDataExchange* pDX)
-//--------------------------------------------------
-{
- CDialog::DoDataExchange(pDX);
- //{{AFX_DATA_MAP(CShowLogDlg)
- DDX_Control(pDX, IDC_EDIT_LOG, m_EditLog);
- //}}AFX_DATA_MAP
-}
-
-
BOOL CShowLogDlg::OnInitDialog()
//------------------------------
{
CDialog::OnInitDialog();
if (m_lpszTitle) SetWindowText(m_lpszTitle);
- m_EditLog.SetSel(0, -1);
- m_EditLog.ReplaceSel(m_lpszLog);
- m_EditLog.SetFocus();
- m_EditLog.SetSel(0, 0);
return FALSE;
}
Modified: trunk/OpenMPT/mptrack/dlg_misc.h
===================================================================
--- trunk/OpenMPT/mptrack/dlg_misc.h 2013-04-22 20:20:55 UTC (rev 1932)
+++ trunk/OpenMPT/mptrack/dlg_misc.h 2013-04-22 20:21:59 UTC (rev 1933)
@@ -59,18 +59,13 @@
{
public:
LPCSTR m_lpszLog, m_lpszTitle;
- CEdit m_EditLog;
public:
- CShowLogDlg(CWnd *parent=NULL):CDialog(IDD_SHOWLOG, parent) { m_lpszLog = NULL; m_lpszTitle = NULL; }
+ CShowLogDlg(CWnd *parent = nullptr):CDialog(IDD_SHOWLOG, parent) { m_lpszLog = NULL; m_lpszTitle = NULL; }
UINT ShowLog(LPCSTR pszLog, LPCSTR lpszTitle=NULL);
protected:
- //{{AFX_VIRTUAL(CShowLogDlg)
- virtual void DoDataExchange(CDataExchange* pDX);
virtual BOOL OnInitDialog();
- //}}AFX_VIRTUAL
- DECLARE_MESSAGE_MAP()
};
Modified: trunk/OpenMPT/mptrack/mptrack.rc
===================================================================
--- trunk/OpenMPT/mptrack/mptrack.rc 2013-04-22 20:20:55 UTC (rev 1932)
+++ trunk/OpenMPT/mptrack/mptrack.rc 2013-04-22 20:21:59 UTC (rev 1933)
@@ -24,16 +24,6 @@
// Dialog
//
-IDD_MODLOADING_WARNINGS DIALOGEX 0, 0, 316, 178
-STYLE DS_SYSMODAL | DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "module.it - Warnings"
-FONT 8, "MS Shell Dlg", 400, 0, 0x1
-BEGIN
- DEFPUSHBUTTON "OK",IDOK,258,156,50,14
- EDITTEXT IDC_EDIT_MODLOADING_WARNINGS,6,18,300,132,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY
- LTEXT "The following problems have been encountered when loading this module:",IDC_STATIC,6,6,237,8
-END
-
IDD_CLEANUP_SONG DIALOGEX 0, 0, 394, 154
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Cleanup"
@@ -277,14 +267,6 @@
#ifdef APSTUDIO_INVOKED
GUIDELINES DESIGNINFO
BEGIN
- IDD_MODLOADING_WARNINGS, DIALOG
- BEGIN
- LEFTMARGIN, 7
- RIGHTMARGIN, 309
- TOPMARGIN, 7
- BOTTOMMARGIN, 171
- END
-
IDD_CLEANUP_SONG, DIALOG
BEGIN
LEFTMARGIN, 7
@@ -923,14 +905,12 @@
GROUPBOX "OpenMPT Version Info",IDC_FRAME_MPTVERSION,6,263,246,48
END
-IDD_SHOWLOG DIALOG 0, 0, 300, 106
-STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Information"
-FONT 8, "MS Shell Dlg"
+IDD_SHOWLOG DIALOGEX 0, 0, 300, 149
+STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
- DEFPUSHBUTTON "OK",IDOK,246,7,50,14
- PUSHBUTTON "Cancel",IDCANCEL,246,24,50,14
- EDITTEXT IDC_EDIT_LOG,6,7,234,96,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL
+ DEFPUSHBUTTON "OK",IDOK,246,132,50,14
+ EDITTEXT IDC_EDIT_LOG,6,7,288,119,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL
END
IDD_REMOVECHANNELS DIALOGEX 0, 0, 171, 221
@@ -1520,15 +1500,6 @@
LTEXT "",IDC_RENDERZONE,4,3,414,84,NOT WS_VISIBLE
END
-IDD_SOUNDBANK_INFO1 DIALOGEX 0, 0, 271, 167
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Sound Bank Information"
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
- DEFPUSHBUTTON "Close",IDOK,109,149,50,14
- EDITTEXT IDC_EDIT1,7,7,257,138,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE
-END
-
IDD_PITCHSHIFT DIALOGEX 0, 0, 181, 124
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Time-Stretch Ratio Calculator"
@@ -1717,7 +1688,7 @@
LEFTMARGIN, 7
RIGHTMARGIN, 293
TOPMARGIN, 7
- BOTTOMMARGIN, 99
+ BOTTOMMARGIN, 142
END
IDD_REMOVECHANNELS, DIALOG
@@ -1855,14 +1826,6 @@
BOTTOMMARGIN, 104
END
- IDD_SOUNDBANK_INFO1, DIALOG
- BEGIN
- LEFTMARGIN, 7
- RIGHTMARGIN, 264
- TOPMARGIN, 7
- BOTTOMMARGIN, 163
- END
-
IDD_PITCHSHIFT, DIALOG
BEGIN
END
Modified: trunk/OpenMPT/mptrack/mptrack_10.vcxproj
===================================================================
--- trunk/OpenMPT/mptrack/mptrack_10.vcxproj 2013-04-22 20:20:55 UTC (rev 1932)
+++ trunk/OpenMPT/mptrack/mptrack_10.vcxproj 2013-04-22 20:21:59 UTC (rev 1933)
@@ -497,6 +497,7 @@
<ClInclude Include="PatternClipboard.h" />
<ClInclude Include="PatternCursor.h" />
<ClInclude Include="Reporting.h" />
+ <ClInclude Include="resource.h" />
<ClInclude Include="SelectPluginDialog.h" />
<ClInclude Include="ChannelManagerDlg.h" />
<ClInclude Include="CloseMainDialog.h" />
Modified: trunk/OpenMPT/mptrack/mptrack_10.vcxproj.filters
===================================================================
--- trunk/OpenMPT/mptrack/mptrack_10.vcxproj.filters 2013-04-22 20:20:55 UTC (rev 1932)
+++ trunk/OpenMPT/mptrack/mptrack_10.vcxproj.filters 2013-04-22 20:21:59 UTC (rev 1933)
@@ -810,6 +810,9 @@
<ClInclude Include="..\common\svn_version_default\svn_version.h">
<Filter>Header Files\common</Filter>
</ClInclude>
+ <ClInclude Include="resource.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="res\bitmap1.bmp">
Modified: trunk/OpenMPT/mptrack/resource.h
===================================================================
--- trunk/OpenMPT/mptrack/resource.h 2013-04-22 20:20:55 UTC (rev 1932)
+++ trunk/OpenMPT/mptrack/resource.h 2013-04-22 20:21:59 UTC (rev 1933)
@@ -118,7 +118,6 @@
#define IDB_VISPCNODE 437
#define IDD_DEFAULTPLUGINEDITOR 438
#define IDD_CHANNELMANAGER 440
-#define IDD_SOUNDBANK_INFO1 441
#define IDD_PITCHSHIFT 442
#define IDD_OPTIONS_AUTOSAVE 443
#define IDD_EDIT_GOTO 444
@@ -133,7 +132,6 @@
#define IDD_MIDIPARAMCONTROL 515
#define IDD_MSGBOX_HIDABLE 516
#define IDD_ADDSILENCE 517
-#define IDD_MODLOADING_WARNINGS 518
#define IDR_DEFAULT_KEYBINDINGS 519
#define IDR_BUILTIN_TUNINGS 520
#define IDD_CLEANUP_SONG 521
@@ -882,7 +880,6 @@
#define IDC_RADIO_ADDSILENCE_END 2381
#define IDC_SPIN_ADDSILENCE 2382
#define IDC_RADIO_RESIZETO 2384
-#define IDC_EDIT_MODLOADING_WARNINGS 2385
#define IDC_CHECK_PATRECORD 2386
#define IDC_LOAD_COLORSCHEME 2387
#define IDC_SAVE_COLORSCHEME 2388
Modified: trunk/OpenMPT/soundlib/ModSequence.cpp
===================================================================
--- trunk/OpenMPT/soundlib/ModSequence.cpp 2013-04-22 20:20:55 UTC (rev 1932)
+++ trunk/OpenMPT/soundlib/ModSequence.cpp 2013-04-22 20:21:59 UTC (rev 1933)
@@ -793,7 +793,7 @@
void WriteModSequenceOld(std::ostream& oStrm, const ModSequenceSet& seq)
-//-------------------------------------------------------------------------
+//----------------------------------------------------------------------
{
const uint16 size = seq.GetLength();
srlztn::Binarywrite<uint16>(oStrm, size);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
