Better look for plugins embedding settings.

And 2 fixes.
LMMS · Dec 21, 2017 · 1c9ff9a · 1c9ff9a
1 parent ed669db
commit 1c9ff9a
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 30 deletions.
diff --git a/include/SetupDialog.h b/include/SetupDialog.h
@@ -127,7 +127,7 @@ private slots:
 private:
 	TabBar * m_tabBar;
 
-	// General settings stuff.
+	// General settings widgets.
 	bool m_tooltips;
 	bool m_displaydBFS;
 	bool m_displayWaveform;
@@ -140,7 +140,7 @@ private slots:
 	QString m_lang;
 	QStringList m_languages;
 
-	// Performance settings stuff.
+	// Performance settings widgets.
 	int m_saveInterval;
 	bool m_enableAutoSave;
 	bool m_enableRunningAutoSave;
@@ -150,6 +150,7 @@ private slots:
 	LedCheckBox * m_runningAutoSave;
 	bool m_smoothScroll;
 	bool m_animateAFP;
+	QLabel * m_vstEmbedLbl;
 	QComboBox* m_vstEmbedComboBox;
 	QString m_vstEmbedMethod;
 	bool m_syncVSTPlugins;
@@ -160,7 +161,7 @@ private slots:
 	typedef QMap<QString, MidiSetupWidget *> MswMap;
 	typedef QMap<QString, QString> trMap;
 
-	// Audio settings stuff.
+	// Audio settings widgets.
 	QComboBox * m_audioInterfaces;
 	AswMap m_audioIfaceSetupWidgets;
 	trMap m_audioIfaceNames;
@@ -169,12 +170,12 @@ private slots:
 	QSlider * m_bufferSizeSlider;
 	QLabel * m_bufferSizeLbl;
 
-	// MIDI settings stuff.
+	// MIDI settings widgets.
 	QComboBox * m_midiInterfaces;
 	MswMap m_midiIfaceSetupWidgets;
 	trMap m_midiIfaceNames;
 
-	// Paths settings stuff.
+	// Paths settings widgets.
 	QString m_workingDir;
 	QString m_vstDir;
 	QString m_ladspaDir;

diff --git a/src/gui/SetupDialog.cpp b/src/gui/SetupDialog.cpp
@@ -443,12 +443,17 @@ SetupDialog::SetupDialog(ConfigTabs tab_to_open) :
 	ui_fx_tw->setFixedHeight(YDelta + YDelta * labelNumber3);
 
 
-	int labelNumber4 = 0;
+	float labelNumber4 = 0;
 
 	// Plugins tab.
 	TabWidget * plugins_tw = new TabWidget(
 			tr("Plugins"), performance_w);
 
+	m_vstEmbedLbl = new QLabel(plugins_tw);
+	labelNumber4++;
+	m_vstEmbedLbl->move(XDelta, YDelta * labelNumber4);
+	m_vstEmbedLbl->setText(tr("VST plugins embedding:"));
+
 	m_vstEmbedComboBox = new QComboBox(plugins_tw);
 	labelNumber4++;
 	m_vstEmbedComboBox->move(XDelta, YDelta * labelNumber4);
@@ -471,7 +476,7 @@ SetupDialog::SetupDialog(ConfigTabs tab_to_open) :
 
 	LedCheckBox * syncVST = new LedCheckBox(
 			tr("Sync VST plugins to host playback"), plugins_tw);
-	labelNumber4++;
+	labelNumber4 = labelNumber4 + 1.6;
 	syncVST->move(XDelta, YDelta * labelNumber4);
 	syncVST->setChecked(m_syncVSTPlugins);
 	connect(syncVST, SIGNAL(toggled(bool)), this,
@@ -1070,36 +1075,35 @@ void SetupDialog::accept()
 	// from taking mouse input, rendering the application unusable.
 	QDialog::accept();
 
-	ConfigManager::inst()->setValue("mixer", "framesperaudiobuffer",
-					QString::number(m_bufferSize));
-	ConfigManager::inst()->setValue("mixer", "audiodev",
-					m_audioIfaceNames[m_audioInterfaces->currentText()]);
-	ConfigManager::inst()->setValue("mixer", "mididev",
-					m_midiIfaceNames[m_midiInterfaces->currentText()]);
 	ConfigManager::inst()->setValue("tooltips", "disabled",
 					QString::number(!m_tooltips));
 	ConfigManager::inst()->setValue("app", "displaydbfs",
 					QString::number(m_displaydBFS));
+	ConfigManager::inst()->setValue("ui", "displaywaveform",
+					QString::number(m_displayWaveform));
+	ConfigManager::inst()->setValue("ui", "printnotelabels",
+					QString::number(m_printNoteLabels));
+	ConfigManager::inst()->setValue("ui", "compacttrackbuttons",
+					QString::number(m_compactTrackButtons));
+	ConfigManager::inst()->setValue("ui", "oneinstrumenttrackwindow",
+					QString::number(m_oneInstrumentTrackWindow));
 	ConfigManager::inst()->setValue("app", "nommpz",
 					QString::number(!m_MMPZ));
 	ConfigManager::inst()->setValue("app", "disablebackup",
 					QString::number(!m_disableBackup));
 	ConfigManager::inst()->setValue("app", "openlastproject",
 					QString::number(m_openLastProject));
-	ConfigManager::inst()->setValue("mixer", "hqaudio",
-					QString::number(m_hqAudioDev));
-	ConfigManager::inst()->setValue("ui", "smoothscroll",
-					QString::number(m_smoothScroll));
-	ConfigManager::inst()->setValue("ui", "enableautosave",
-					QString::number(m_enableAutoSave));
+	ConfigManager::inst()->setValue("app", "language", m_lang);
 	ConfigManager::inst()->setValue("ui", "saveinterval",
 					QString::number(m_saveInterval));
+	ConfigManager::inst()->setValue("ui", "enableautosave",
+					QString::number(m_enableAutoSave));
 	ConfigManager::inst()->setValue("ui", "enablerunningautosave",
 					QString::number(m_enableRunningAutoSave));
-	ConfigManager::inst()->setValue("ui", "oneinstrumenttrackwindow",
-					QString::number(m_oneInstrumentTrackWindow));
-	ConfigManager::inst()->setValue("ui", "compacttrackbuttons",
-					QString::number(m_compactTrackButtons));
+	ConfigManager::inst()->setValue("ui", "smoothscroll",
+					QString::number(m_smoothScroll));
+	ConfigManager::inst()->setValue("ui", "animateafp",
+					QString::number(m_animateAFP));
 	ConfigManager::inst()->setValue( "ui", "vstembedmethod",
 #if QT_VERSION >= 0x050000
 					m_vstEmbedComboBox->currentData().toString() );
@@ -1108,15 +1112,16 @@ void SetupDialog::accept()
 #endif
 	ConfigManager::inst()->setValue("ui", "syncvstplugins",
 					QString::number(m_syncVSTPlugins));
-	ConfigManager::inst()->setValue("ui", "animateafp",
-					QString::number(m_animateAFP));
-	ConfigManager::inst()->setValue("ui", "printnotelabels",
-					QString::number(m_printNoteLabels));
-	ConfigManager::inst()->setValue("ui", "displaywaveform",
-					QString::number(m_displayWaveform));
 	ConfigManager::inst()->setValue("ui", "disableautoquit",
 					QString::number(m_disableAutoQuit));
-	ConfigManager::inst()->setValue("app", "language", m_lang);
+	ConfigManager::inst()->setValue("mixer", "audiodev",
+					m_audioIfaceNames[m_audioInterfaces->currentText()]);
+	ConfigManager::inst()->setValue("mixer", "hqaudio",
+					QString::number(m_hqAudioDev));
+	ConfigManager::inst()->setValue("mixer", "framesperaudiobuffer",
+					QString::number(m_bufferSize));
+	ConfigManager::inst()->setValue("mixer", "mididev",
+					m_midiIfaceNames[m_midiInterfaces->currentText()]);
 	ConfigManager::inst()->setWorkingDir(QDir::fromNativeSeparators(m_workingDir));
 	ConfigManager::inst()->setVSTDir(QDir::fromNativeSeparators(m_vstDir));
 	ConfigManager::inst()->setLADSPADir(QDir::fromNativeSeparators(m_ladspaDir));