Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[1722] trunk/OpenMPT/mptrack
|
From: <sag...@us...> - 2013-04-03 22:12:46
|
Revision: 1722
http://sourceforge.net/p/modplug/code/1722
Author: saga-games
Date: 2013-04-03 22:12:35 +0000 (Wed, 03 Apr 2013)
Log Message:
-----------
[Fix] Pre-Amp slider in soundcard options was upside down.
[Mod] Updated credits
Modified Paths:
--------------
trunk/OpenMPT/mptrack/Mpdlgs.cpp
trunk/OpenMPT/mptrack/Mptrack.cpp
Modified: trunk/OpenMPT/mptrack/Mpdlgs.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mpdlgs.cpp 2013-04-03 22:12:01 UTC (rev 1721)
+++ trunk/OpenMPT/mptrack/Mpdlgs.cpp 2013-04-03 22:12:35 UTC (rev 1722)
@@ -121,7 +121,7 @@
CMainFrame *pMainFrm = CMainFrame::GetMainFrame();
BOOL bAsio = FALSE;
CHAR s[128];
-
+
CPropertyPage::OnInitDialog();
if (m_dwSoundSetup & SOUNDSETUP_SOFTPANNING) CheckDlgButton(IDC_CHECK2, MF_CHECKED);
if (m_dwSoundSetup & SOUNDSETUP_ENABLEMMX) CheckDlgButton(IDC_CHECK3, MF_CHECKED);
@@ -282,7 +282,7 @@
{
if(m_PreAmpNoteShowed == true)
{
- int n = 40 - m_SliderPreAmp.GetPos();
+ int n = m_SliderPreAmp.GetPos();
if ((n >= 0) && (n <= 40)) // approximately +/- 10dB
{
CMainFrame *pMainFrm = CMainFrame::GetMainFrame();
@@ -306,7 +306,7 @@
CSoundFile::m_nStereoSeparation = 32 << m_SliderStereoSep.GetPos();
wsprintf(s, "%d%%", (CSoundFile::m_nStereoSeparation * 100) / 128);
SetDlgItemText(IDC_TEXT1, s);
-
+
}
@@ -315,7 +315,7 @@
{
int n = (TrackerSettings::Instance().m_nPreAmp - 64) / 8;
if ((n < 0) || (n > 40)) n = 16;
- m_SliderPreAmp.SetPos(40 - n);
+ m_SliderPreAmp.SetPos(n);
}
@@ -538,7 +538,7 @@
//---------------------------------
{
DWORD dwQuality;
-
+
CPropertyPage::OnInitDialog();
dwQuality = TrackerSettings::Instance().m_dwQuality;
// Resampling type
@@ -712,12 +712,12 @@
m_CEditWFIRCutoff.EnableWindow(TRUE);
wsprintf(s, "%d", static_cast<int>((TrackerSettings::Instance().m_MixerSettings.gdWFIRCutoff*100)));
break;
- default:
+ default:
m_CbnWFIRType.AddString("None");
m_CEditWFIRCutoff.EnableWindow(FALSE);
m_CbnWFIRType.EnableWindow(FALSE);
}
-
+
m_CEditWFIRCutoff.SetWindowText(s);
OnSettingsChanged();
}
@@ -732,7 +732,7 @@
m_CEditWFIRCutoff.SetWindowText("97");
m_CEditRampUp.SetWindowText("16");
m_CEditRampDown.SetWindowText("42");
-
+
}
extern void SndMixInitializeTables(const MixerSettings & mixersettings);
@@ -1102,7 +1102,7 @@
//-----------------------------
{
CMainFrame::m_nLastOptionsPage = OPTIONS_PAGE_EQ;
- SetDlgItemText(IDC_EQ_WARNING,
+ SetDlgItemText(IDC_EQ_WARNING,
"Note: This EQ, when enabled from Player tab, is applied to "
"any and all of the modules "
"that you load in OpenMPT; its settings are stored globally, "
@@ -1142,8 +1142,8 @@
DDX_Control(pDX, IDC_COMBO2, m_ATBehaviour);
//}}AFX_DATA_MAP
}
-
+
BOOL CMidiSetupDlg::OnInitDialog()
//--------------------------------
{
@@ -1225,7 +1225,7 @@
if (IsDlgButtonChecked(IDC_MIDIVOL_TO_NOTEVOL)) m_dwMidiSetup |= MIDISETUP_MIDIVOL_TO_NOTEVOL;
if (IsDlgButtonChecked(IDC_MIDIPLAYCONTROL)) m_dwMidiSetup |= MIDISETUP_RESPONDTOPLAYCONTROLMSGS;
if (IsDlgButtonChecked(IDC_MIDIPLAYPATTERNONMIDIIN)) m_dwMidiSetup |= MIDISETUP_PLAYPATTERNONMIDIIN;
-
+
if ((combo = (CComboBox *)GetDlgItem(IDC_COMBO1)) != NULL)
{
int n = combo->GetCurSel();
@@ -1248,4 +1248,3 @@
CMainFrame::m_nLastOptionsPage = OPTIONS_PAGE_MIDI;
return CPropertyPage::OnSetActive();
}
-
Modified: trunk/OpenMPT/mptrack/Mptrack.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mptrack.cpp 2013-04-03 22:12:01 UTC (rev 1721)
+++ trunk/OpenMPT/mptrack/Mptrack.cpp 2013-04-03 22:12:35 UTC (rev 1722)
@@ -57,7 +57,7 @@
public:
CModDocTemplate(UINT nIDResource, CRuntimeClass* pDocClass, CRuntimeClass* pFrameClass, CRuntimeClass* pViewClass):
CMultiDocTemplate(nIDResource, pDocClass, pFrameClass, pViewClass) {}
-
+
#if (_MSC_VER < MSVC_VER_2010)
virtual CDocument* OpenDocumentFile(LPCTSTR path, BOOL makeVisible = TRUE);
#else
@@ -88,7 +88,7 @@
}
#if (_MSC_VER < MSVC_VER_2010)
- CDocument *pDoc = CMultiDocTemplate::OpenDocumentFile(path, makeVisible);
+ CDocument *pDoc = CMultiDocTemplate::OpenDocumentFile(path, makeVisible);
#else
CDocument *pDoc = CMultiDocTemplate::OpenDocumentFile(path, addToMru, makeVisible);
#endif
@@ -108,7 +108,7 @@
Reporting::Error(str);
}
else //Case: Valid path but opening fails.
- {
+ {
const int nOdc = theApp.GetOpenDocumentCount();
CString str;
str.Format(GetStrI18N(_TEXT("Opening \"%s\" failed. This can happen if "
@@ -298,9 +298,9 @@
public:
CMPTCommandLineInfo()
- {
- m_bNoAcm = m_bNoDls = m_bNoMp3 = m_bSafeMode = m_bWavEx =
- m_bNoPlugins = m_bDebug = m_bNoSettingsOnNewVersion = m_bPortable = false;
+ {
+ m_bNoAcm = m_bNoDls = m_bNoMp3 = m_bSafeMode = m_bWavEx =
+ m_bNoPlugins = m_bDebug = m_bNoSettingsOnNewVersion = m_bPortable = false;
}
virtual void ParseParam(LPCTSTR lpszParam, BOOL bFlag, BOOL bLast);
};
@@ -334,7 +334,7 @@
//-------------------------------------------------------------------
{
TCHAR szFileName[_MAX_PATH], s[_MAX_PATH], szUltraSndPath[_MAX_PATH];
-
+
if ((!lpszConfigFile) || (!lpszConfigFile[0])) return FALSE;
if (!glpMidiLibrary)
{
@@ -427,7 +427,7 @@
//-----------------------------------------------------
{
TCHAR szFileName[_MAX_PATH], s[128];
-
+
if ((!glpMidiLibrary) || (!lpszConfigFile) || (!lpszConfigFile[0])) return FALSE;
for(size_t iMidi = 0; iMidi < 256; iMidi++) if (glpMidiLibrary->MidiMap[iMidi])
{
@@ -548,10 +548,10 @@
DWORD nBanks = 0;
for(size_t i = 0; i < gpDLSBanks.size(); i++)
{
-
+
if(!gpDLSBanks[i] || !gpDLSBanks[i]->GetFileName() || !gpDLSBanks[i]->GetFileName()[0])
continue;
-
+
_tcsncpy(szPath, gpDLSBanks[i]->GetFileName(), CountOf(szPath) - 1);
if(theApp.IsPortableMode())
{
@@ -621,7 +621,7 @@
ON_COMMAND(ID_FILE_NEWIT, OnFileNewIT)
// -> CODE#0023
// -> DESC="IT project files (.itp)"
- ON_COMMAND(ID_NEW_ITPROJECT,OnFileNewITProject)
+ ON_COMMAND(ID_NEW_ITPROJECT,OnFileNewITProject)
// -! NEW_FEATURE#0023
ON_COMMAND(ID_NEW_MPT, OnFileNewMPT)
ON_COMMAND(ID_FILE_OPEN, OnFileOpen)
@@ -772,7 +772,7 @@
{
strcpy(m_szConfigDirectory, m_szExePath);
}
-
+
// Create tunings dir
CString sTuningPath;
sTuningPath.Format(TEXT("%stunings\\"), m_szConfigDirectory);
@@ -798,9 +798,9 @@
WIN32_FIND_DATA FindFileData;
HANDLE hFind;
hFind = FindFirstFile(sSearchPattern, &FindFileData);
- if(hFind != INVALID_HANDLE_VALUE)
+ if(hFind != INVALID_HANDLE_VALUE)
{
- do
+ do
{
MoveConfigFile(FindFileData.cFileName, "tunings\\");
} while(FindNextFile(hFind, &FindFileData) != 0);
@@ -875,7 +875,7 @@
{
free((void *)m_pszProfileName);
}
- m_pszProfileName = _tcsdup(m_szConfigFileName);
+ m_pszProfileName = _tcsdup(m_szConfigFileName);
int mruListLength = GetPrivateProfileInt("Misc", "MRUListLength", 10, m_pszProfileName);
Limit(mruListLength, 0, 15);
@@ -1252,7 +1252,7 @@
protected:
afx_msg void OnPaint();
afx_msg BOOL OnEraseBkgnd(CDC *) { return TRUE; }
- afx_msg void OnLButtonDblClk(UINT, CPoint) { m_dwStartTime = timeGetTime(); }
+ afx_msg void OnLButtonDblClk(UINT, CPoint) { m_dwStartTime = timeGetTime(); }
DECLARE_MESSAGE_MAP()
};
@@ -1431,7 +1431,7 @@
#define PI 3.14159265358979323f
BOOL CPaletteBitmap::Animate()
//----------------------------
-{
+{
//included random hacking by rewbs to get funny animation.
LPBYTE dest, src;
DWORD t = (timeGetTime() - m_dwStartTime) / 10;
@@ -1447,7 +1447,7 @@
dir = ((t/256) % 2 != 0); //change dir every 256 t
t = t%256;
if (!dir) t = (256-t);
-
+
sizex = m_nRotoWidth;
sizey = m_nRotoHeight;
m_dwFrameTime = t;
@@ -1459,8 +1459,8 @@
spdy = 0;
spdx =(Cosinus(Phi)+Sinus(Phi<<2))*(Dist<<9)/sizex;
spdy =(Sinus(Phi)+Cosinus(Phi>>2))*(Dist<<9)/sizey;
- srcx = 0x800000 - ((spdx * sizex) >> 1) + (spdy * sizey);
- srcy = 0x800000 - ((spdy * sizex) >> 1) + (spdx * sizey);
+ srcx = 0x800000 - ((spdx * sizex) >> 1) + (spdy * sizey);
+ srcy = 0x800000 - ((spdy * sizex) >> 1) + (spdx * sizey);
for (UINT y=sizey; y; y--)
{
UINT oldx = srcx, oldy = srcy;
@@ -1538,11 +1538,10 @@
BOOL CAboutDlg::OnInitDialog()
//----------------------------
{
- CHAR s[256];
+ const char * const s = "Build Date: " __DATE__ " " __TIME__;
CDialog::OnInitDialog();
m_bmp.SubclassDlgItem(IDC_BITMAP1, this);
m_bmp.LoadBitmap(MAKEINTRESOURCE(IDB_MPTRACK));
- wsprintf(s, "Build Date: %s", gszBuildDate);
SetDlgItemText(IDC_EDIT2, s);
SetDlgItemText(IDC_EDIT3, CString("OpenMPT ") + MptVersion::str
#if (MPT_VERSION_NUMERIC & 0xFF) != 0
@@ -1557,14 +1556,15 @@
"http://openmpt.org/download");
static const char* const pArrCredit =
- {
+ {
"OpenMPT / ModPlug Tracker|"
"Copyright \xA9 2004-2013 Contributors|"
"Copyright \xA9 1997-2003 Olivier Lapicque|"
"|"
"Contributors:|"
"Johannes Schultz (2008-2013)|"
- "Ahti Lepp\xE4nen (2005-2011)|"
+ "Ahti Lepp\xE4nen (2005-2011, 2013)|"
+ "Joern Heusipp (2012-2013)|"
"Robin Fernandes (2004-2007)|"
"Sergiy Pylypenko (2007)|"
"Eric Chavanon (2004-2005)|"
@@ -1591,6 +1591,8 @@
"https://github.com/iamgreaser/it2everything/|"
"Jean-loup Gailly and Mark Adler for zlib|"
"http://zlib.net/|"
+ "PortAudio|"
+ "http://www.portaudio.com/|"
"Josh Coalson for libFLAC|"
"http://flac.sourceforge.net/|"
"The mpg123 project for libmpg123|"
@@ -1677,7 +1679,7 @@
{
CRect rect;
int cx, cy, newcx, newcy;
-
+
CDialog::OnInitDialog();
m_Bmp.SubclassDlgItem(IDC_SPLASH, this);
m_Bmp.LoadBitmap(MAKEINTRESOURCE(IDB_SPLASHNOFOLDFIN));
@@ -1893,7 +1895,7 @@
////////////////////////////////////////////////////////////////////////////////
// CFastBitmap 8-bit output / 4-bit input
-// useful for lots of small blits with color mapping
+// useful for lots of small blits with color mapping
// combined in one big blit
void CFastBitmap::Init(LPMODPLUGDIB lpTextDib)
@@ -1989,7 +1991,7 @@
BYTE *pdest;
UINT x1, x2;
int srcwidth, srcinc;
-
+
m_n4BitPalette[0] = (BYTE)m_nTextColor;
m_n4BitPalette[15] = (BYTE)m_nBkColor;
if (x < 0)
@@ -2117,6 +2119,7 @@
}
CloseHandle(hmf);
}
+ // Fallback
if (dwLen > CTrackApp::gMemStatus.dwTotalPhys) return NULL;
if ((lpStream = (LPBYTE)GlobalAllocPtr(GHND, dwLen)) == NULL) return NULL;
m_File.Read(lpStream, dwLen);
@@ -2379,12 +2382,12 @@
// Do it!
CMainFrame::GetInputHandler()->Bypass(true);
- if(dlg.DoModal() != IDOK)
+ bool doCancel = dlg.DoModal() != IDOK;
+ CMainFrame::GetInputHandler()->Bypass(false);
+ if(doCancel)
{
- CMainFrame::GetInputHandler()->Bypass(false);
return result;
}
- CMainFrame::GetInputHandler()->Bypass(false);
// Retrieve variables
if(filterIndex != nullptr)
@@ -2497,4 +2500,4 @@
{
if (m_pRecentFileList && nItem >= 0 && nItem < m_pRecentFileList->GetSize())
m_pRecentFileList->Remove(nItem);
-}
+}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
