[OMPT-svn-commit] SF.net SVN: modplug:[234] trunk/OpenMPT/mptrack

[<rel...@us...>]

Revision: 234
          http://modplug.svn.sourceforge.net/modplug/?rev=234&view=rev
Author:   relabsoluness
Date:     2008-10-25 19:06:55 +0000 (Sat, 25 Oct 2008)

Log Message:
-----------
+ Sample amplify now accepts negative values(inverts sample phase) (request 2219)
. Fixed a typo in Setup->Colors

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/Ctrl_smp.cpp
    trunk/OpenMPT/mptrack/View_pat.cpp
    trunk/OpenMPT/mptrack/dlg_misc.cpp
    trunk/OpenMPT/mptrack/dlg_misc.h
    trunk/OpenMPT/mptrack/mptrack.rc

Modified: trunk/OpenMPT/mptrack/Ctrl_smp.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_smp.cpp	2008-10-24 18:33:16 UTC (rev 233)
+++ trunk/OpenMPT/mptrack/Ctrl_smp.cpp	2008-10-25 19:06:55 UTC (rev 234)
@@ -1078,7 +1078,7 @@
 void CCtrlSamples::OnAmplify()
 //----------------------------
 {
-	static UINT snOldAmp = 100;
+	static int16 snOldAmp = 100;
 	SAMPLEVIEWSTATE viewstate;
 	DWORD dwStart, dwEnd;
 	MODINSTRUMENT *pins;

Modified: trunk/OpenMPT/mptrack/View_pat.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_pat.cpp	2008-10-24 18:33:16 UTC (rev 233)
+++ trunk/OpenMPT/mptrack/View_pat.cpp	2008-10-25 19:06:55 UTC (rev 234)
@@ -2595,7 +2595,7 @@
 //-----------------------------------
 {
 	static UINT snOldAmp = 100;
-	CAmpDlg dlg(this, snOldAmp);
+	CAmpDlg dlg(this, snOldAmp, 0);
 	CModDoc *pModDoc = GetDocument();
 	BYTE chvol[MAX_BASECHANNELS];
 
@@ -2604,7 +2604,7 @@
 		CSoundFile *pSndFile = pModDoc->GetSoundFile();
 		BeginWaitCursor();
 		PrepareUndo(m_dwBeginSel, m_dwEndSel);
-		snOldAmp = dlg.m_nFactor;
+		snOldAmp = static_cast<UINT>(dlg.m_nFactor);
 		memset(chvol, 64, sizeof(chvol));
 		if (pSndFile->Patterns[m_nPattern])
 		{

Modified: trunk/OpenMPT/mptrack/dlg_misc.cpp
===================================================================
--- trunk/OpenMPT/mptrack/dlg_misc.cpp	2008-10-24 18:33:16 UTC (rev 233)
+++ trunk/OpenMPT/mptrack/dlg_misc.cpp	2008-10-25 19:06:55 UTC (rev 234)
@@ -11,7 +11,7 @@
 #include "midi.h"
 #include "version.h"
 
-#pragma warning(disable:4244)
+#pragma warning(disable:4244) //"conversion from 'type1' to 'type2', possible loss of data"
 
 
 
@@ -1504,6 +1504,13 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Samples
 
+CAmpDlg::CAmpDlg(CWnd *parent, int16 nFactor, int16 nFactorMin, int16 nFactorMax) 
+//-------------------------------------------------------------------------------
+	: CDialog(IDD_SAMPLE_AMPLIFY, parent), m_nFactor(nFactor),
+	  m_nFactorMin(nFactorMin), m_nFactorMax(nFactorMax),
+	  m_bFadeIn(FALSE), m_bFadeOut(FALSE)
+{}
+
 BOOL CAmpDlg::OnInitDialog()
 //--------------------------
 {
@@ -1511,8 +1518,8 @@
 	CSpinButtonCtrl *spin = (CSpinButtonCtrl *)GetDlgItem(IDC_SPIN1);
 	if (spin)
 	{
-		spin->SetRange(10, 800);
-		spin->SetPos(m_nFactor);
+		spin->SetRange32(m_nFactorMin, m_nFactorMax);
+		spin->SetPos32(m_nFactor);
 	}
 	SetDlgItemInt(IDC_EDIT1, m_nFactor);
 	return TRUE;
@@ -1522,9 +1529,16 @@
 void CAmpDlg::OnOK()
 //------------------
 {
-	m_nFactor = GetDlgItemInt(IDC_EDIT1);
-	m_bFadeIn = IsDlgButtonChecked(IDC_CHECK1);
-	m_bFadeOut = IsDlgButtonChecked(IDC_CHECK2);
+	const int nVal = static_cast<int>(GetDlgItemInt(IDC_EDIT1));
+	if(nVal < m_nFactorMin || nVal > m_nFactorMax)
+	{
+		CString str; str.Format(GetStrI18N(__TEXT("Value should be within [%d, %d]")), m_nFactorMin, m_nFactorMax);
+		AfxMessageBox(str, MB_ICONINFORMATION);
+		return;
+	}
+	m_nFactor = static_cast<int16>(nVal);
+	m_bFadeIn = (IsDlgButtonChecked(IDC_CHECK1) != 0);
+	m_bFadeOut = (IsDlgButtonChecked(IDC_CHECK2) != 0);
 	CDialog::OnOK();
 }
 

Modified: trunk/OpenMPT/mptrack/dlg_misc.h
===================================================================
--- trunk/OpenMPT/mptrack/dlg_misc.h	2008-10-24 18:33:16 UTC (rev 233)
+++ trunk/OpenMPT/mptrack/dlg_misc.h	2008-10-25 19:06:55 UTC (rev 234)
@@ -316,11 +316,11 @@
 //===========================
 {
 public:
-	UINT m_nFactor;
-	BOOL m_bFadeIn, m_bFadeOut;
+	int16 m_nFactor, m_nFactorMin, m_nFactorMax;
+	bool m_bFadeIn, m_bFadeOut;
 
 public:
-	CAmpDlg(CWnd *parent, UINT nFactor=100):CDialog(IDD_SAMPLE_AMPLIFY, parent) { m_nFactor = nFactor; m_bFadeIn = m_bFadeOut = FALSE; }
+	CAmpDlg(CWnd *parent, int16 nFactor=100, int16 nFactorMin = int16_min, int16 nFactorMax = int16_max);
 	virtual BOOL OnInitDialog();
 	virtual void OnOK();
 };

Modified: trunk/OpenMPT/mptrack/mptrack.rc
===================================================================
--- trunk/OpenMPT/mptrack/mptrack.rc	2008-10-24 18:33:16 UTC (rev 233)
+++ trunk/OpenMPT/mptrack/mptrack.rc	2008-10-25 19:06:55 UTC (rev 234)
@@ -454,7 +454,7 @@
     LTEXT           "rows",IDC_STATIC,124,88,16,8
     CONTROL         "",IDC_BUTTON4,"Button",BS_OWNERDRAW | BS_FLAT,54,113,
                     114,43
-    CONTROL         "Set highlights to songs' time sigatures",IDC_CHECK5,
+    CONTROL         "Set highlights to songs' time signatures",IDC_CHECK5,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,63,136,10
 END
 
@@ -1310,7 +1310,7 @@
 FONT 8, "MS Sans Serif", 0, 0, 0x0
 BEGIN
     LTEXT           "Amplify by",IDC_STATIC,13,19,37,8
-    EDITTEXT        IDC_EDIT1,54,16,40,14,ES_AUTOHSCROLL | ES_NUMBER
+    EDITTEXT        IDC_EDIT1,54,16,40,14,ES_AUTOHSCROLL
     CONTROL         "Spin1",IDC_SPIN1,"msctls_updown32",UDS_SETBUDDYINT | 
                     UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | 
                     UDS_NOTHOUSANDS,89,17,11,14


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.