[xclap] On-going CLAP plugin host implementation (round stepped param…

…eter values for text/display)
rncbc · Jun 23, 2022 · 354bc3f · 354bc3f
1 parent 3e7548f
commit 354bc3f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/src/qtractorClapPlugin.cpp b/src/qtractorClapPlugin.cpp
@@ -52,6 +52,8 @@
 
 #include "qtractorMainForm.h"
 
+#include <cmath>
+
 
 // FIXME: Whether we're in the main or audio-thread...
 //
@@ -3335,7 +3337,8 @@ QString qtractorClapPlugin::Param::display (void) const
 		= static_cast<qtractorClapPlugin *> (plugin());
 	if (pPlugin && m_pImpl) {
 		const clap_id id = m_pImpl->param_info().id;
-		const double value = pPlugin->impl()->getParameter(id);
+		double value = pPlugin->impl()->getParameter(id);
+		if (isInteger()) value = ::round(value);
 		sText = pPlugin->impl()->getParameterText(id, value);
 	}
 

diff --git a/src/qtractorPluginForm.cpp b/src/qtractorPluginForm.cpp
@@ -173,9 +173,13 @@ void qtractorPluginForm::setPlugin ( qtractorPlugin *pPlugin )
 		m_pPlugin->activateObserver());
 
 	qtractorPluginType *pType = m_pPlugin->type();
-	const bool bVstPlugin = (pType->typeHint() == qtractorPluginType::Vst);
-	const int MaxRowsPerPage    = (bVstPlugin ? 12 : 8);
-	const int MaxColumnsPerPage = (bVstPlugin ?  2 : 3);
+	const qtractorPluginType::Hint typeHint = pType->typeHint();
+	const bool bTwoColumnPage
+		= (typeHint == qtractorPluginType::Vst
+		|| typeHint == qtractorPluginType::Vst3
+		|| typeHint == qtractorPluginType::Clap);
+	const int MaxRowsPerPage    = (bTwoColumnPage ? 12 : 8);
+	const int MaxColumnsPerPage = (bTwoColumnPage ?  2 : 3);
 	const int MaxItemsPerPage   = MaxRowsPerPage * MaxColumnsPerPage;
 
 	const qtractorPlugin::Params& params = m_pPlugin->params();
@@ -289,7 +293,7 @@ void qtractorPluginForm::setPlugin ( qtractorPlugin *pPlugin )
 		toggleEditor(m_pPlugin->isEditorVisible());
 
 	// Show insert tool options...
-	const bool bInsertPlugin = (pType->typeHint() == qtractorPluginType::Insert);
+	const bool bInsertPlugin = (typeHint == qtractorPluginType::Insert);
 	if (bInsertPlugin) {
 		if (pType->index() > 0) {
 			m_ui.SendsToolButton->setIcon(QIcon(":/images/itemAudioPortOut.png"));
@@ -303,7 +307,7 @@ void qtractorPluginForm::setPlugin ( qtractorPlugin *pPlugin )
 	m_ui.ReturnsToolButton->setVisible(bInsertPlugin);
 
 	// Show aux-send tool options...
-	const bool bAuxSendPlugin = (pType->typeHint() == qtractorPluginType::AuxSend);
+	const bool bAuxSendPlugin = (typeHint == qtractorPluginType::AuxSend);
 	m_ui.AuxSendBusNameComboBox->setVisible(bAuxSendPlugin);
 	m_ui.AuxSendBusNameLabel->setVisible(bAuxSendPlugin);
 	m_ui.AuxSendBusNameToolButton->setVisible(bAuxSendPlugin);
@@ -318,7 +322,7 @@ void qtractorPluginForm::setPlugin ( qtractorPlugin *pPlugin )
 	// About page...
 	m_ui.NameTextLabel->setText(pType->name());
 	m_ui.TypeHintTextLabel->setText(
-		qtractorPluginType::textFromHint(pType->typeHint()));
+		qtractorPluginType::textFromHint(typeHint));
 	QString sAboutText = pType->aboutText();
 	sAboutText += '\n';
 	sAboutText += '\n';