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

[<sag...@us...>]

Revision: 321
          http://modplug.svn.sourceforge.net/modplug/?rev=321&view=rev
Author:   saga-games
Date:     2009-08-13 22:23:15 +0000 (Thu, 13 Aug 2009)

Log Message:
-----------
[Fix] IT Compatibility: Multisample instruments change with no entry in the instrument column (fixes spx-shuttledeparture.it) (test me)
[Imp] Modtype Dialog: Added suffixes IT and S3M to some mod flags for more clarity
[Imp] Instrument / Sample list: Double click will switch to instrument / sample 

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/mptrack.rc
    trunk/OpenMPT/mptrack/view_com.cpp
    trunk/OpenMPT/mptrack/view_com.h
    trunk/OpenMPT/soundlib/Snd_fx.cpp

Modified: trunk/OpenMPT/mptrack/mptrack.rc
===================================================================
--- trunk/OpenMPT/mptrack/mptrack.rc	2009-08-12 21:17:36 UTC (rev 320)
+++ trunk/OpenMPT/mptrack/mptrack.rc	2009-08-13 22:23:15 UTC (rev 321)
@@ -559,10 +559,10 @@
     CONTROL         "Embed instrument parameters in ITP",IDC_CHECK6,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,36,126,8
     GROUPBOX        "Playback",IDC_FRAME_MODFLAGS,6,60,246,54
     CONTROL         "Linear Frequency Slides",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,72,91,10
-    CONTROL         "Fast Volume Slides",IDC_CHECK2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,84,75,10
+    CONTROL         "Fast Volume Slides (S3M)",IDC_CHECK2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,84,96,10
     CONTROL         "Extended filter range",IDC_CHECK5,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,96,81,10
-    CONTROL         "IT Old Effects",IDC_CHECK3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,120,72,76,10
-    CONTROL         "IT Compatible Gxx",IDC_CHECK4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,120,84,76,10
+    CONTROL         "Old Effects (IT)",IDC_CHECK3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,120,72,66,10
+    CONTROL         "Compatible Gxx (IT)",IDC_CHECK4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,120,84,84,10
     GROUPBOX        "Extended Playback Options (OpenMPT only)",IDC_FRAME_MPTEXT,6,120,246,84
     RTEXT           "Mix Levels:",IDC_TEXT_MIXMODE,18,134,81,8
     COMBOBOX        IDC_COMBO_MIXLEVELS,108,132,84,51,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP

Modified: trunk/OpenMPT/mptrack/view_com.cpp
===================================================================
--- trunk/OpenMPT/mptrack/view_com.cpp	2009-08-12 21:17:36 UTC (rev 320)
+++ trunk/OpenMPT/mptrack/view_com.cpp	2009-08-13 22:23:15 UTC (rev 321)
@@ -84,7 +84,8 @@
 	ON_COMMAND(IDC_LIST_SAMPLES,		OnShowSamples)
 	ON_COMMAND(IDC_LIST_INSTRUMENTS,	OnShowInstruments)
 	ON_COMMAND(IDC_LIST_PATTERNS,		OnShowPatterns)
-	ON_NOTIFY(LVN_ENDLABELEDIT,	IDC_LIST_DETAILS, OnEndLabelEdit)
+	ON_NOTIFY(LVN_ENDLABELEDIT,	IDC_LIST_DETAILS,	OnEndLabelEdit)
+	ON_NOTIFY(NM_DBLCLK, IDC_LIST_DETAILS,	OnDblClickListItem)
 	//}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
@@ -565,8 +566,31 @@
 	}
 }
 
+void CViewComments::OnDblClickListItem(NMHDR *, LRESULT *)
+//--------------------------------------------------------
+{
+	// Double click -> switch to instrument or sample tab
+	int nItem = m_ItemList.GetSelectionMark();
+	if(nItem == -1) return;
+	CModDoc *pModDoc = GetDocument();
+	if(!pModDoc) return;
+	nItem++;
 
+	switch(m_nListId)
+	{
+	case IDC_LIST_SAMPLES:
+		pModDoc->ViewSample(nItem);
+		break;
+	case IDC_LIST_INSTRUMENTS:
+		pModDoc->ViewInstrument(nItem);
+		break;
+	case IDC_LIST_PATTERNS:
+		pModDoc->ViewPattern(nItem, 0);
+		break;
+	}
+}
 
+
 LRESULT CViewComments::OnModViewMsg(WPARAM wParam, LPARAM lParam)
 //-----------------------------------------------------------------
 {

Modified: trunk/OpenMPT/mptrack/view_com.h
===================================================================
--- trunk/OpenMPT/mptrack/view_com.h	2009-08-12 21:17:36 UTC (rev 320)
+++ trunk/OpenMPT/mptrack/view_com.h	2009-08-13 22:23:15 UTC (rev 321)
@@ -43,6 +43,7 @@
 	afx_msg void OnShowInstruments();
 	afx_msg void OnShowPatterns();
 	afx_msg VOID OnEndLabelEdit(LPNMHDR pnmhdr, LRESULT *pLResult);
+	afx_msg void OnDblClickListItem(NMHDR *, LRESULT *);
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
 };

Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Snd_fx.cpp	2009-08-12 21:17:36 UTC (rev 320)
+++ trunk/OpenMPT/soundlib/Snd_fx.cpp	2009-08-13 22:23:15 UTC (rev 321)
@@ -674,6 +674,8 @@
 			pChn->nFineTune = pins->nFineTune;
 		}
 	}
+	// IT Compatibility: Update multisample instruments frequency even if instrument is not specified
+	if(!bPorta && pins && IsCompatibleMode(TRK_IMPULSETRACKER)) pChn->nC5Speed = pins->nC5Speed;
 
 	if (m_nType & (MOD_TYPE_XM|MOD_TYPE_MT2|MOD_TYPE_MED)) note += pChn->nTranspose;
 	note = CLAMP(note, 1, 132);


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