ZynAddSubFX: added pitch range support

Even though ZynAddSubFX does not support updating its pitch wheel range via MIDI events we can set it manually using provided internal functions. Closes #394.
LMMS · Mar 3, 2014 · b5183fd · b5183fd
1 parent 46ca257
commit b5183fd
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 2 deletions.
diff --git a/plugins/zynaddsubfx/LocalZynAddSubFx.cpp b/plugins/zynaddsubfx/LocalZynAddSubFx.cpp
@@ -190,6 +190,16 @@ void LocalZynAddSubFx::setLmmsWorkingDir( const std::string & _dir )
 
 
 
+void LocalZynAddSubFx::setPitchWheelBendRange( int semitones )
+{
+	for( int i = 0; i < NUM_MIDI_PARTS; ++i )
+	{
+		m_master->part[i]->ctl.setpitchwheelbendrange( semitones * 100 );
+	}
+}
+
+
+
 void LocalZynAddSubFx::processMidiEvent( const MidiEvent& event )
 {
 	// all functions are called while m_master->mutex is held

diff --git a/plugins/zynaddsubfx/LocalZynAddSubFx.h b/plugins/zynaddsubfx/LocalZynAddSubFx.h
@@ -49,6 +49,8 @@ class LocalZynAddSubFx
 	void setPresetDir( const std::string & _dir );
 	void setLmmsWorkingDir( const std::string & _dir );
 
+	void setPitchWheelBendRange( int semitones );
+
 	void processMidiEvent( const MidiEvent& event );
 
 	void processAudio( sampleFrame * _out );

diff --git a/plugins/zynaddsubfx/RemoteZynAddSubFx.cpp b/plugins/zynaddsubfx/RemoteZynAddSubFx.cpp
@@ -119,6 +119,10 @@ class RemoteZynAddSubFx : public RemotePluginClient, public LocalZynAddSubFx
 				LocalZynAddSubFx::setLmmsWorkingDir( _m.getString() );
 				break;
 
+			case IdZasfSetPitchWheelBendRange:
+				LocalZynAddSubFx::setPitchWheelBendRange( _m.getInt() );
+				break;
+
 			default:
 				return RemotePluginClient::processMessage( _m );
 		}

diff --git a/plugins/zynaddsubfx/RemoteZynAddSubFx.h b/plugins/zynaddsubfx/RemoteZynAddSubFx.h
@@ -1,7 +1,7 @@
 /*
  * RemoteZynAddSubFx.h - ZynAddSubFX-embedding plugin
  *
- * Copyright (c) 2008-2010 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2008-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  *
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
  *
@@ -30,7 +30,8 @@
 enum ZasfRemoteMessageIDs
 {
 	IdZasfPresetDirectory = IdUserBase,
-	IdZasfLmmsWorkingDirectory
+	IdZasfLmmsWorkingDirectory,
+	IdZasfSetPitchWheelBendRange
 } ;
 
 #endif
diff --git a/plugins/zynaddsubfx/ZynAddSubFx.cpp b/plugins/zynaddsubfx/ZynAddSubFx.cpp
@@ -133,6 +133,9 @@ ZynAddSubFxInstrument::ZynAddSubFxInstrument(
 
 	connect( engine::mixer(), SIGNAL( sampleRateChanged() ),
 			this, SLOT( reloadPlugin() ) );
+
+	connect( instrumentTrack()->pitchRangeModel(), SIGNAL( dataChanged() ),
+				this, SLOT( updatePitchRange() ) );
 }
 
 
@@ -378,6 +381,21 @@ void ZynAddSubFxInstrument::reloadPlugin()
 
 
 
+void ZynAddSubFxInstrument::updatePitchRange()
+{
+	m_pluginMutex.lock();
+	if( m_remotePlugin )
+	{
+		m_remotePlugin->sendMessage( RemotePlugin::message( IdZasfSetPitchWheelBendRange ).
+											addInt( instrumentTrack()->midiPitchRange() ) );
+	}
+	else
+	{
+		m_plugin->setPitchWheelBendRange( instrumentTrack()->midiPitchRange() );
+	}
+	m_pluginMutex.unlock();
+}
+
 
 #define GEN_CC_SLOT(slotname,midictl,modelname)						\
 			void ZynAddSubFxInstrument::slotname()					\

diff --git a/plugins/zynaddsubfx/ZynAddSubFx.h b/plugins/zynaddsubfx/ZynAddSubFx.h
@@ -91,6 +91,8 @@ class ZynAddSubFxInstrument : public Instrument
 private slots:
 	void reloadPlugin();
 
+	void updatePitchRange();
+
 	void updatePortamento();
 	void updateFilterFreq();
 	void updateFilterQ();