reset button in mixer

HertzDevil · Jun 6, 2016 · 915e39e · 915e39e
1 parent b46dada
commit 915e39e
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 18 deletions.
diff --git a/0CC-FamiTracker.rc b/0CC-FamiTracker.rc
@@ -1443,22 +1443,22 @@ EXSTYLE WS_EX_CONTEXTHELP
 CAPTION "Mixer"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
-    CONTROL         "",IDC_SLIDER_APU1,"msctls_trackbar32",TBS_AUTOTICKS | TBS_VERT | TBS_BOTH | WS_TABSTOP,7,30,26,114
-    CTEXT           "APU1",IDC_STATIC,7,22,26,8
-    CONTROL         "",IDC_SLIDER_APU2,"msctls_trackbar32",TBS_AUTOTICKS | TBS_VERT | TBS_BOTH | WS_TABSTOP,41,30,26,114
-    CTEXT           "APU2",IDC_STATIC,41,22,26,8
-    CONTROL         "",IDC_SLIDER_VRC6,"msctls_trackbar32",TBS_AUTOTICKS | TBS_VERT | TBS_BOTH | WS_TABSTOP,75,30,26,114
-    CTEXT           "VRC6",IDC_STATIC,75,22,26,8
-    CONTROL         "",IDC_SLIDER_VRC7,"msctls_trackbar32",TBS_AUTOTICKS | TBS_VERT | TBS_BOTH | WS_TABSTOP,109,30,26,114
-    CTEXT           "VRC7",IDC_STATIC,109,22,26,8
-    CONTROL         "",IDC_SLIDER_MMC5,"msctls_trackbar32",TBS_AUTOTICKS | TBS_VERT | TBS_BOTH | WS_TABSTOP,143,30,26,114
-    CTEXT           "MMC5",IDC_STATIC,143,22,26,8
-    CONTROL         "",IDC_SLIDER_FDS,"msctls_trackbar32",TBS_AUTOTICKS | TBS_VERT | TBS_BOTH | WS_TABSTOP,177,30,26,114
-    CTEXT           "FDS",IDC_STATIC,177,22,26,8
-    CONTROL         "",IDC_SLIDER_N163,"msctls_trackbar32",TBS_AUTOTICKS | TBS_VERT | TBS_BOTH | WS_TABSTOP,211,30,26,114
-    CTEXT           "N163",IDC_STATIC,211,22,26,8
-    CONTROL         "",IDC_SLIDER_S5B,"msctls_trackbar32",TBS_AUTOTICKS | TBS_VERT | TBS_BOTH | WS_TABSTOP,245,30,26,114
-    CTEXT           "S5B",IDC_STATIC,245,22,26,8
+    CONTROL         "",IDC_SLIDER_APU1,"msctls_trackbar32",TBS_AUTOTICKS | TBS_VERT | TBS_BOTH | WS_TABSTOP,7,34,26,110
+    CTEXT           "APU1",IDC_STATIC,7,26,26,8
+    CONTROL         "",IDC_SLIDER_APU2,"msctls_trackbar32",TBS_AUTOTICKS | TBS_VERT | TBS_BOTH | WS_TABSTOP,41,34,26,110
+    CTEXT           "APU2",IDC_STATIC,41,26,26,8
+    CONTROL         "",IDC_SLIDER_VRC6,"msctls_trackbar32",TBS_AUTOTICKS | TBS_VERT | TBS_BOTH | WS_TABSTOP,75,34,26,110
+    CTEXT           "VRC6",IDC_STATIC,75,26,26,8
+    CONTROL         "",IDC_SLIDER_VRC7,"msctls_trackbar32",TBS_AUTOTICKS | TBS_VERT | TBS_BOTH | WS_TABSTOP,109,34,26,110
+    CTEXT           "VRC7",IDC_STATIC,109,26,26,8
+    CONTROL         "",IDC_SLIDER_MMC5,"msctls_trackbar32",TBS_AUTOTICKS | TBS_VERT | TBS_BOTH | WS_TABSTOP,143,34,26,110
+    CTEXT           "MMC5",IDC_STATIC,143,26,26,8
+    CONTROL         "",IDC_SLIDER_FDS,"msctls_trackbar32",TBS_AUTOTICKS | TBS_VERT | TBS_BOTH | WS_TABSTOP,177,34,26,110
+    CTEXT           "FDS",IDC_STATIC,177,26,26,8
+    CONTROL         "",IDC_SLIDER_N163,"msctls_trackbar32",TBS_AUTOTICKS | TBS_VERT | TBS_BOTH | WS_TABSTOP,211,34,26,110
+    CTEXT           "N163",IDC_STATIC,211,26,26,8
+    CONTROL         "",IDC_SLIDER_S5B,"msctls_trackbar32",TBS_AUTOTICKS | TBS_VERT | TBS_BOTH | WS_TABSTOP,245,34,26,110
+    CTEXT           "S5B",IDC_STATIC,245,26,26,8
     CTEXT           "0.0dB",IDC_LEVEL_APU1,7,149,30,8
     CTEXT           "0.0dB",IDC_LEVEL_APU2,40,149,30,8
     CTEXT           "0.0dB",IDC_LEVEL_VRC6,73,149,30,8
@@ -1468,6 +1468,7 @@ BEGIN
     CTEXT           "0.0dB",IDC_LEVEL_N163,209,149,30,8
     CTEXT           "0.0dB",IDC_LEVEL_S5B,243,149,30,8
     LTEXT           "Hardware mixing levels",IDC_STATIC,7,7,74,8
+    PUSHBUTTON      "Reset",IDC_BUTTON_MIXER_RESET,223,7,50,14
 END
 
 IDD_INSTRUMENT_N163_WAVE DIALOGEX 0, 0, 372, 172
@@ -2165,6 +2166,11 @@ BEGIN
     0
 END
 
+IDD_CONFIG_MIXER AFX_DIALOG_LAYOUT
+BEGIN
+    0
+END
+
 
 /////////////////////////////////////////////////////////////////////////////
 //

diff --git a/Source/ConfigMixer.cpp b/Source/ConfigMixer.cpp
@@ -54,6 +54,7 @@ void CConfigMixer::DoDataExchange(CDataExchange* pDX)
 
 BEGIN_MESSAGE_MAP(CConfigMixer, CPropertyPage)
 	ON_WM_VSCROLL()
+	ON_BN_CLICKED(IDC_BUTTON_MIXER_RESET, &CConfigMixer::OnBnClickedButtonMixerReset)
 END_MESSAGE_MAP()
 
 
@@ -143,3 +144,18 @@ void CConfigMixer::UpdateLevel(int nID, int Level)
 	if (str.Compare(str2) != 0)
 		SetDlgItemText(nID, str);
 }
+
+void CConfigMixer::OnBnClickedButtonMixerReset()		// // // 050B
+{
+	m_iLevelAPU1 = 0;
+	m_iLevelAPU2 = 0;
+	m_iLevelVRC6 = 0;
+	m_iLevelVRC7 = 0;
+	m_iLevelMMC5 = 0;
+	m_iLevelFDS = 0;
+	m_iLevelN163 = 0;
+	m_iLevelS5B = 0;
+
+	UpdateData(FALSE);
+	SetModified();
+}
diff --git a/Source/ConfigMixer.h b/Source/ConfigMixer.h
@@ -60,4 +60,5 @@ class CConfigMixer : public CPropertyPage
 	virtual BOOL OnInitDialog();
 	virtual BOOL OnApply();
 	afx_msg void OnVScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar);
+	afx_msg void OnBnClickedButtonMixerReset();		// // // 050B
 };
diff --git a/resource.h b/resource.h
@@ -607,6 +607,7 @@
 #define IDC_COMBO_SPLIT_TRSP            1452
 #define IDC_CHECK_SPLIT_ENABLE          1453
 #define IDC_COMBO_SPLIT_CHAN            1454
+#define IDC_BUTTON_MIXER_RESET          1454
 #define ID_TRACKER_PLAY                 32771
 #define ID_TRACKER_PLAYPATTERN          32775
 #define ID_TRACKER_STOP                 32776
@@ -764,9 +765,9 @@
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        351
+#define _APS_NEXT_RESOURCE_VALUE        352
 #define _APS_NEXT_COMMAND_VALUE         33196
-#define _APS_NEXT_CONTROL_VALUE         1454
+#define _APS_NEXT_CONTROL_VALUE         1455
 #define _APS_NEXT_SYMED_VALUE           179
 #endif
 #endif