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

[<man...@us...>]

Revision: 4295
          http://sourceforge.net/p/modplug/code/4295
Author:   manxorist
Date:     2014-09-16 07:52:30 +0000 (Tue, 16 Sep 2014)
Log Message:
-----------
[Fix] Soundcard settings: Disable channel mapping label if channel mapping is not supported by the selected device.

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/Mpdlgs.cpp
    trunk/OpenMPT/mptrack/mptrack.rc
    trunk/OpenMPT/mptrack/resource.h

Modified: trunk/OpenMPT/mptrack/Mpdlgs.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mpdlgs.cpp	2014-09-16 07:18:21 UTC (rev 4294)
+++ trunk/OpenMPT/mptrack/Mpdlgs.cpp	2014-09-16 07:52:30 UTC (rev 4295)
@@ -491,6 +491,7 @@
 //--------------------------------------------
 {
 	int usedChannels = m_CbnChannels.GetItemData(m_CbnChannels.GetCurSel());
+	GetDlgItem(IDC_STATIC_CHANNELMAPPING)->EnableWindow(m_CurrentDeviceCaps.CanChannelMapping ? TRUE : FALSE);
 	for(int mch = 0; mch < NUM_CHANNELCOMBOBOXES; mch++)	// Host channels
 	{
 		CStatic *statictext = &m_StaticChannelMapping[mch];

Modified: trunk/OpenMPT/mptrack/mptrack.rc
===================================================================
--- trunk/OpenMPT/mptrack/mptrack.rc	2014-09-16 07:18:21 UTC (rev 4294)
+++ trunk/OpenMPT/mptrack/mptrack.rc	2014-09-16 07:52:30 UTC (rev 4295)
@@ -1343,7 +1343,7 @@
     CONTROL         "Use device &exclusively",IDC_CHECK4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,108,54,90,12
     CONTROL         "&Boost thread priority",IDC_CHECK5,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,108,72,90,12
     CONTROL         "&Hardware timing",IDC_CHECK9,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,204,72,72,12
-    LTEXT           "Channel &Mapping:",IDC_STATIC,12,108,60,12,SS_CENTERIMAGE
+    LTEXT           "Channel &Mapping:",IDC_STATIC_CHANNELMAPPING,12,108,60,12,SS_CENTERIMAGE
     CTEXT           "Front Left",IDC_STATIC_CHANNEL_FRONTLEFT,78,108,48,12,SS_CENTERIMAGE,WS_EX_STATICEDGE
     COMBOBOX        IDC_COMBO_CHANNEL_FRONTLEFT,132,108,144,72,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     CTEXT           "Front Right",IDC_STATIC_CHANNEL_FRONTRIGHT,78,126,48,12,SS_CENTERIMAGE,WS_EX_STATICEDGE

Modified: trunk/OpenMPT/mptrack/resource.h
===================================================================
--- trunk/OpenMPT/mptrack/resource.h	2014-09-16 07:18:21 UTC (rev 4294)
+++ trunk/OpenMPT/mptrack/resource.h	2014-09-16 07:52:30 UTC (rev 4295)
@@ -963,6 +963,7 @@
 #define IDC_COMBO_CHANNEL_REARLEFT      2477
 #define IDC_COMBO_CHANNEL_REARRIGHT     2478
 #define IDC_SCANTEXT                    2479
+#define IDC_STATIC_CHANNELMAPPING       2480
 #define ID_FILE_NEWMOD                  32771
 #define ID_FILE_NEWXM                   32772
 #define ID_FILE_NEWS3M                  32773
@@ -1246,7 +1247,7 @@
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        537
 #define _APS_NEXT_COMMAND_VALUE         44644
-#define _APS_NEXT_CONTROL_VALUE         2480
+#define _APS_NEXT_CONTROL_VALUE         2481
 #define _APS_NEXT_SYMED_VALUE           901
 #endif
 #endif

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