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

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

Revision: 3811
          http://sourceforge.net/p/modplug/code/3811
Author:   saga-games
Date:     2014-03-03 15:41:56 +0000 (Mon, 03 Mar 2014)
Log Message:
-----------
[Fix] Sample options: Spin button for FLAC compression didn't work. While fixing it, convert it to a slider.

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/Moptions.cpp
    trunk/OpenMPT/mptrack/mptrack.rc

Modified: trunk/OpenMPT/mptrack/Moptions.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Moptions.cpp	2014-03-03 15:06:46 UTC (rev 3810)
+++ trunk/OpenMPT/mptrack/Moptions.cpp	2014-03-03 15:41:56 UTC (rev 3811)
@@ -730,13 +730,10 @@
 	m_cbnDefaultSampleFormat.SetItemData(m_cbnDefaultSampleFormat.AddString("RAW"), dfRAW);
 	m_cbnDefaultSampleFormat.SetCurSel(TrackerSettings::Instance().m_defaultSampleFormat);
 
-	SetDlgItemInt(IDC_FLAC_COMPRESSION, TrackerSettings::Instance().m_FLACCompressionLevel);
-	CSpinButtonCtrl *spin = (CSpinButtonCtrl *)GetDlgItem(IDC_SPIN1);
-	if(spin)
-	{
-		spin->SetRange(0, 8);
-		spin->SetPos(TrackerSettings::Instance().m_FLACCompressionLevel);
-	}
+	CSliderCtrl *slider = static_cast<CSliderCtrl *>(GetDlgItem(IDC_SLIDER1));
+	slider->SetRange(0, 8);
+	slider->SetTicFreq(1);
+	slider->SetPos(TrackerSettings::Instance().m_FLACCompressionLevel);
 
 	CheckRadioButton(IDC_RADIO1, IDC_RADIO3, IDC_RADIO1 + TrackerSettings::Instance().sampleEditorKeyBehaviour);
 
@@ -762,7 +759,7 @@
 	TrackerSettings::Instance().m_nFinetuneStep = GetDlgItemInt(IDC_EDIT_FINETUNE);
 	TrackerSettings::Instance().m_SampleUndoBufferSize = SampleUndoBufferSize(GetDlgItemInt(IDC_EDIT_UNDOSIZE));
 	TrackerSettings::Instance().m_defaultSampleFormat = static_cast<SampleEditorDefaultFormat>(m_cbnDefaultSampleFormat.GetItemData(m_cbnDefaultSampleFormat.GetCurSel()));
-	TrackerSettings::Instance().m_FLACCompressionLevel = GetDlgItemInt(IDC_FLAC_COMPRESSION);
+	TrackerSettings::Instance().m_FLACCompressionLevel = static_cast<CSliderCtrl *>(GetDlgItem(IDC_SLIDER1))->GetPos();
 	TrackerSettings::Instance().sampleEditorKeyBehaviour = static_cast<SampleEditorKeyBehaviour>(GetCheckedRadioButton(IDC_RADIO1, IDC_RADIO3) -IDC_RADIO1);
 	TrackerSettings::Instance().compressITI = IsDlgButtonChecked(IDC_COMPRESS_ITI) != MF_UNCHECKED;
 	TrackerSettings::Instance().DefaultPlugVolumeHandling = static_cast<PLUGVOLUMEHANDLING>(m_cbnDefaultVolumeHandling.GetItemData(m_cbnDefaultVolumeHandling.GetCurSel()));

Modified: trunk/OpenMPT/mptrack/mptrack.rc
===================================================================
--- trunk/OpenMPT/mptrack/mptrack.rc	2014-03-03 15:06:46 UTC (rev 3810)
+++ trunk/OpenMPT/mptrack/mptrack.rc	2014-03-03 15:41:56 UTC (rev 3811)
@@ -140,8 +140,9 @@
     LTEXT           "Default Sample Format:",IDC_STATIC,12,56,102,8
     COMBOBOX        IDC_DEFAULT_FORMAT,114,54,42,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT           "FLAC Compression Level:",IDC_STATIC,12,74,90,8
-    EDITTEXT        IDC_FLAC_COMPRESSION,114,72,42,12,ES_AUTOHSCROLL | ES_NUMBER
-    CONTROL         "",IDC_SPIN1,"msctls_updown32",UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,150,72,11,11
+    LTEXT           "Faster Encoding",IDC_STATIC,114,74,52,8
+    CONTROL         "",IDC_SLIDER1,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOOLTIPS | WS_TABSTOP,168,72,48,12
+    LTEXT           "Smaller Files",IDC_STATIC,222,74,40,8
     LTEXT           "Note Cuts:",IDC_STATIC,12,90,252,12
     CONTROL         "On New Note",IDC_RADIO1,"Button",BS_AUTORADIOBUTTON,18,102,246,12
     CONTROL         "On Key Release",IDC_RADIO2,"Button",BS_AUTORADIOBUTTON,18,114,246,12

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