Merge lp:~marcustomlinson/dspatch/component_params into lp:dspatch

[Marcus Tomlinson]

[lp:~marcustomlinson/dspatch/component_params]

41. By Marcus Tomlinson on 2014-06-09

Allow DspParameter to be default constructed (SetParam then used to specify type, value etc.)

42. By Marcus Tomlinson on 2014-06-09

DspParameter constructible with initial values.

43. By Marcus Tomlinson on 2014-06-14

Added protected methods for IO and param count, and get/setting params, to be used from DspComponent child implementations.

44. By Marcus Tomlinson on 2014-06-15

Return pointers from DspParameter get methods to be compared with NULL.
ParameterUpdated_() replaced with ParameterUpdating_() for components to first validate the new value.

45. By Marcus Tomlinson on 2014-06-15

Allow list parameters to be set as an int parameter (to select a list index)

46. By Marcus Tomlinson on 2014-06-15

ParameterUpdating_() to simply redirect to the target class method

47. By Marcus Tomlinson on 2014-06-15

Parameter introduction to DspAudioDevice complete

48. By Marcus Tomlinson on 2014-06-15

Updated DspComponent to describe the Process_() correctly

49. By Marcus Tomlinson on 2014-06-16

Updated DspGain to use a gain parameter

50. By Marcus Tomlinson on 2014-06-16

Updated DspOscillator to use parameters

51. By Marcus Tomlinson on 2014-06-16

Store int and float ranges as pairs in DspParameter

52. By Marcus Tomlinson on 2014-06-16

Updated DspWaveStreamer to use parameters

53. By Marcus Tomlinson on 2014-06-16

Updated demo main.cpp to demonstrate parameter usage

54. By Marcus Tomlinson on 2014-06-16

Updated doxygen

55. By Marcus Tomlinson on 2014-06-16

Added userData parameter to callback

56. By Marcus Tomlinson on 2014-06-16

Updated documentation

57. By Marcus Tomlinson on 2014-06-16

Renamed "Release Notes" to "Changelog"

58. By Marcus Tomlinson on 2014-06-16

Fixed build errors on Windows

59. By Marcus Tomlinson on 2014-06-16

Removed unused PI variable

[Marcus Tomlinson (marcustomlinson)]

review: Approve

=== modified file 'doc/Doxyfile'
--- doc/Doxyfile	2014-02-27 14:01:09 +0000
+++ doc/Doxyfile	2014-06-16 15:43:30 +0000
@@ -32,7 +32,7 @@
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = v.2.60
+PROJECT_NUMBER         = v.2.61
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description 
 # for a project that appears at the top of each page and should give viewer 

=== modified file 'example/CMakeLists.txt'
--- example/CMakeLists.txt	2014-04-12 15:48:46 +0000
+++ example/CMakeLists.txt	2014-06-16 15:43:30 +0000
@@ -35,7 +35,7 @@
     )
 endif(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
 
-# Definition for RtAudio Linux, using ASLA
+# Definition for RtAudio Linux, using ALSA
 if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
     add_definitions(-D__LINUX_ALSA__)
 

=== modified file 'example/DspAdder.h'
--- example/DspAdder.h	2014-01-19 09:07:19 +0000
+++ example/DspAdder.h	2014-06-16 15:43:30 +0000
@@ -1,6 +1,6 @@
 /************************************************************************
 DSPatch - Cross-Platform, Object-Oriented, Flow-Based Programming Library
-Copyright (c) 2012-2013 Marcus Tomlinson
+Copyright (c) 2012-2014 Marcus Tomlinson
 
 This file is part of DSPatch.
 
@@ -43,7 +43,7 @@
   achieved by making calls to the base class protected methods: "AddInput_()" and "AddOutput_().
   These methods must be called once per input / output required. IO signal names are optional
   (Component IO can be referenced by either string ID or index)	and can be assigned to each
-  input / output by supplying the desired string ID as a parameter to the respective AddInput_()
+  input / output by supplying the desired string ID as an argument to the respective AddInput_()
   / AddOutput_() method call.*/
 
   DspAdder()
@@ -61,7 +61,7 @@
 protected:
   //! Virtual process method inherited from DspComponent
   /*! The Process_() method is called from the DSPatch engine when a new set of component input
-  signals are ready for processing. The Process() method has 2 parameters: the input bus and the
+  signals are ready for processing. The Process() method has 2 arguments: the input bus and the
   output bus. This method's purpose is to pull its required inputs out of the input bus, process
   these inputs, and populate the output bus with the results (see DspSignalBus). */
 

=== modified file 'example/DspAudioDevice.cpp'
--- example/DspAudioDevice.cpp	2014-04-12 23:16:46 +0000
+++ example/DspAudioDevice.cpp	2014-06-16 15:43:30 +0000
@@ -1,6 +1,6 @@
 /************************************************************************
 DSPatch - Cross-Platform, Object-Oriented, Flow-Based Programming Library
-Copyright (c) 2012-2013 Marcus Tomlinson
+Copyright (c) 2012-2014 Marcus Tomlinson
 
 This file is part of DSPatch.
 
@@ -32,6 +32,13 @@
 
 //=================================================================================================
 
+std::string const DspAudioDevice::pDeviceList = "deviceList";
+std::string const DspAudioDevice::pIsStreaming = "isStreaming";
+std::string const DspAudioDevice::pBufferSize = "bufferSize";
+std::string const DspAudioDevice::pSampleRate = "sampleRate";
+
+//=================================================================================================
+
 struct RtAudioMembers
 {
   std::vector< RtAudio::DeviceInfo > deviceList;
@@ -45,18 +52,8 @@
 
 DspAudioDevice::DspAudioDevice()
 : _rtAudio( new RtAudioMembers() ),
-
-  _bufferSize( 256 ),
-  _sampleRate( 44100 ),
-
-  _deviceCount( 0 ),
-
   _gotWaitReady( false ),
-  _gotSyncReady( true ),
-
-  _streamStop( false ),
-
-  _currentDevice( 0 )
+  _gotSyncReady( true )
 {
   _outputChannels.resize( 20 );
   for( unsigned short i = 0; i < 20; i++ )
@@ -72,18 +69,22 @@
     AddOutput_();
   }
 
-  _deviceCount = _rtAudio->audioStream.getDeviceCount();
-  _rtAudio->deviceList.resize( _deviceCount );
+  std::vector< std::string > deviceNameList;
 
-  for( short i = 0; i < _deviceCount; i++ )
+  for( unsigned int i = 0; i < _rtAudio->audioStream.getDeviceCount(); i++ )
   {
-    _rtAudio->deviceList[i] = _rtAudio->audioStream.getDeviceInfo( i );
+    _rtAudio->deviceList.push_back( _rtAudio->audioStream.getDeviceInfo( i ) );
+    deviceNameList.push_back( _rtAudio->audioStream.getDeviceInfo( i ).name );
   }
 
+  AddParameter_( pDeviceList, DspParameter( DspParameter::List, deviceNameList ) );
+  AddParameter_( pIsStreaming, DspParameter( DspParameter::Bool, false ) );
+  AddParameter_( pBufferSize, DspParameter( DspParameter::Int, 256 ) );
+  AddParameter_( pSampleRate, DspParameter( DspParameter::Int, 44100 ) );
+
   SetDevice( _rtAudio->audioStream.getDefaultOutputDevice() );
-
-  SetBufferSize( _bufferSize );
-  SetSampleRate( _sampleRate );
+  SetBufferSize( GetBufferSize() );
+  SetSampleRate( GetSampleRate() );
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -99,12 +100,12 @@
 
 bool DspAudioDevice::SetDevice( short deviceIndex )
 {
-  if( deviceIndex >= 0 && deviceIndex < ( _deviceCount ) )
+  if( deviceIndex >= 0 && deviceIndex < GetDeviceCount() )
   {
-    _currentDevice = deviceIndex;
-
     _StopStream();
 
+    SetParameter_( pDeviceList, DspParameter( DspParameter::Int, deviceIndex ) );
+
     _rtAudio->inputParams.nChannels = _rtAudio->deviceList[deviceIndex].inputChannels;
     _rtAudio->inputParams.deviceId = deviceIndex;
 
@@ -121,9 +122,9 @@
 
 //-------------------------------------------------------------------------------------------------
 
-std::string DspAudioDevice::GetDeviceName( short deviceIndex )
+std::string DspAudioDevice::GetDeviceName( short deviceIndex ) const
 {
-  if( deviceIndex >= 0 && deviceIndex < ( _deviceCount ) )
+  if( deviceIndex >= 0 && deviceIndex < GetDeviceCount() )
   {
     return _rtAudio->deviceList[deviceIndex].name;
   }
@@ -133,50 +134,42 @@
 
 //-------------------------------------------------------------------------------------------------
 
-unsigned short DspAudioDevice::GetDeviceInputCount( short deviceIndex )
+unsigned short DspAudioDevice::GetDeviceInputCount( short deviceIndex ) const
 {
   return _rtAudio->deviceList[deviceIndex].inputChannels;
 }
 
 //-------------------------------------------------------------------------------------------------
 
-unsigned short DspAudioDevice::GetDeviceOutputCount( short deviceIndex )
+unsigned short DspAudioDevice::GetDeviceOutputCount( short deviceIndex ) const
 {
   return _rtAudio->deviceList[deviceIndex].outputChannels;
 }
 
 //-------------------------------------------------------------------------------------------------
 
-unsigned short DspAudioDevice::GetCurrentDevice()
-{
-  return _currentDevice;
-}
-
-//-------------------------------------------------------------------------------------------------
-
-unsigned short DspAudioDevice::GetDeviceCount()
-{
-  return _deviceCount;
-}
-
-//-------------------------------------------------------------------------------------------------
-
-bool DspAudioDevice::IsStreaming()
-{
-  return !_streamStop;
-}
-
-//-------------------------------------------------------------------------------------------------
-
-void DspAudioDevice::SetBufferSize( unsigned long bufferSize )
+unsigned short DspAudioDevice::GetCurrentDevice() const
+{
+  return *GetParameter_( pDeviceList )->GetInt();
+}
+
+//-------------------------------------------------------------------------------------------------
+
+unsigned short DspAudioDevice::GetDeviceCount() const
+{
+  return GetParameter_( pDeviceList )->GetList()->size();
+}
+
+//-------------------------------------------------------------------------------------------------
+
+void DspAudioDevice::SetBufferSize( int bufferSize )
 {
   _StopStream();
 
-  _bufferSize = bufferSize;
-
+  SetParameter_( pBufferSize, DspParameter( DspParameter::Int, bufferSize ) );
   for( unsigned short i = 0; i < _inputChannels.size(); i++ )
   {
-    _inputChannels[i].resize( _bufferSize );
+    _inputChannels[i].resize( bufferSize );
   }
 
   _StartStream();
@@ -184,20 +177,32 @@
 
 //-------------------------------------------------------------------------------------------------
 
-void DspAudioDevice::SetSampleRate( unsigned long sampleRate )
+void DspAudioDevice::SetSampleRate( int sampleRate )
 {
   _StopStream();
-
-  _sampleRate = sampleRate;
-
+  SetParameter_( pSampleRate, DspParameter( DspParameter::Int, sampleRate ) );
   _StartStream();
 }
 
 //-------------------------------------------------------------------------------------------------
 
-unsigned long DspAudioDevice::GetSampleRate()
-{
-  return _sampleRate;
+bool DspAudioDevice::IsStreaming() const
+{
+  return *GetParameter_( pIsStreaming )->GetBool();
+}
+
+//-------------------------------------------------------------------------------------------------
+
+int DspAudioDevice::GetBufferSize() const
+{
+  return *GetParameter_( pBufferSize )->GetInt();
+}
+
+//-------------------------------------------------------------------------------------------------
+
+int DspAudioDevice::GetSampleRate() const
+{
+  return *GetParameter_( pSampleRate )->GetInt();
 }
 
 //=================================================================================================
@@ -227,7 +232,7 @@
   // =========================================================
   if( inputs.GetValue( 0, _outputChannels[0] ) )
   {
-    if( _bufferSize != _outputChannels[0].size() &&
+    if( GetBufferSize() != _outputChannels[0].size() &&
         _outputChannels[0].size() != 0 )
     {
       SetBufferSize( _outputChannels[0].size() );
@@ -259,8 +264,37 @@
   _buffersMutex.Unlock();
 }
 
+//-------------------------------------------------------------------------------------------------
+
+bool DspAudioDevice::ParameterUpdating_( std::string const& name, DspParameter const& param )
+{
+  if( name == pDeviceList )
+  {
+    return SetDevice( *param.GetInt() );
+  }
+  else if( name == pBufferSize )
+  {
+    SetBufferSize( *param.GetInt() );
+    return true;
+  }
+  else if( name == pSampleRate )
+  {
+    SetSampleRate( *param.GetInt() );
+    return true;
+  }
+
+  return false;
+}
+
 //=================================================================================================
 
+void DspAudioDevice::_SetIsStreaming( bool isStreaming )
+{
+  SetParameter_( pIsStreaming, DspParameter( DspParameter::Bool, isStreaming ) );
+}
+
+//-------------------------------------------------------------------------------------------------
+
 void DspAudioDevice::_WaitForBuffer()
 {
   _buffersMutex.Lock();
@@ -284,7 +318,7 @@
 
 void DspAudioDevice::_StopStream()
 {
-  _streamStop = true;
+  _SetIsStreaming( false );
 
   _buffersMutex.Lock();
   _gotWaitReady = true; // set release flag
@@ -321,15 +355,15 @@
   _rtAudio->audioStream.openStream( outputParams,
                                     inputParams,
                                     RTAUDIO_FLOAT32,
-                                    _sampleRate,
-                                    ( unsigned int* ) &_bufferSize,
+                                    GetSampleRate(),
+                                    ( unsigned int* ) GetParameter_( pBufferSize )->GetInt(),
                                     &_StaticCallback,
                                     this,
                                     &options );
 
   _rtAudio->audioStream.startStream();
 
-  _streamStop = false;
+  _SetIsStreaming( true );
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -341,7 +375,7 @@
                                      unsigned int status,
                                      void* userData )
 {
-  return ( ( DspAudioDevice* ) userData )->_DynamicCallback( inputBuffer, outputBuffer );
+  return ( reinterpret_cast<DspAudioDevice*>( userData ) )->_DynamicCallback( inputBuffer, outputBuffer );
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -350,7 +384,7 @@
 {
   _WaitForBuffer();
 
-  if( !_streamStop )
+  if( IsStreaming() )
   {
     float* floatOutput = ( float* ) outputBuffer;
     float* floatInput = ( float* ) inputBuffer;
@@ -359,7 +393,7 @@
     {
       for( unsigned long i = 0; i < _outputChannels.size(); i++ )
       {
-        if( _rtAudio->deviceList[_currentDevice].outputChannels >= ( i + 1 ) )
+        if( _rtAudio->deviceList[GetCurrentDevice()].outputChannels >= ( i + 1 ) )
         {
           for( unsigned long j = 0; j < _outputChannels[i].size(); j++ )
           {
@@ -373,7 +407,7 @@
     {
       for( unsigned long i = 0; i < _inputChannels.size(); i++ )
       {
-        if( _rtAudio->deviceList[_currentDevice].inputChannels >= ( i + 1 ) )
+        if( _rtAudio->deviceList[GetCurrentDevice()].inputChannels >= ( i + 1 ) )
         {
           for( unsigned long j = 0; j < _inputChannels[i].size(); j++ )
           {

=== modified file 'example/DspAudioDevice.h'
--- example/DspAudioDevice.h	2014-04-12 23:16:46 +0000
+++ example/DspAudioDevice.h	2014-06-16 15:43:30 +0000
@@ -1,6 +1,6 @@
 /************************************************************************
 DSPatch - Cross-Platform, Object-Oriented, Flow-Based Programming Library
-Copyright (c) 2012-2013 Marcus Tomlinson
+Copyright (c) 2012-2014 Marcus Tomlinson
 
 This file is part of DSPatch.
 
@@ -34,25 +34,32 @@
 class DspAudioDevice : public DspComponent
 {
 public:
+  static std::string const pDeviceList; // List
+  static std::string const pIsStreaming; // Bool
+  static std::string const pBufferSize; // Int
+  static std::string const pSampleRate; // Int
+
   DspAudioDevice();
   ~DspAudioDevice();
 
   bool SetDevice( short deviceIndex );
 
-  std::string GetDeviceName( short deviceIndex );
-  unsigned short GetDeviceInputCount( short deviceIndex );
-  unsigned short GetDeviceOutputCount( short deviceIndex );
-  unsigned short GetCurrentDevice();
-  unsigned short GetDeviceCount();
-
-  bool IsStreaming();
-
-  void SetBufferSize( unsigned long bufferSize );
-  void SetSampleRate( unsigned long sampleRate );
-  unsigned long GetSampleRate();
+  std::string GetDeviceName( short deviceIndex ) const;
+  unsigned short GetDeviceInputCount( short deviceIndex ) const;
+  unsigned short GetDeviceOutputCount( short deviceIndex ) const;
+  unsigned short GetCurrentDevice() const;
+  unsigned short GetDeviceCount() const;
+
+  void SetBufferSize( int bufferSize );
+  void SetSampleRate( int sampleRate );
+
+  bool IsStreaming() const;
+  int GetBufferSize() const;
+  int GetSampleRate() const;
 
 protected:
   virtual void Process_( DspSignalBus& inputs, DspSignalBus& outputs );
+  virtual bool ParameterUpdating_( std::string const& name, DspParameter const& param );
 
 private:
   std::vector< std::vector< float > > _outputChannels;
@@ -60,11 +67,6 @@
 
   RtAudioMembers* _rtAudio;
 
-  unsigned long _bufferSize;
-  unsigned long _sampleRate;
-
-  unsigned short _deviceCount;
-
   DspMutex _buffersMutex;
   DspMutex _syncMutex;
   DspWaitCondition _waitCondt;
@@ -72,9 +74,7 @@
   bool _gotWaitReady;
   bool _gotSyncReady;
 
-  bool _streamStop;
-
-  unsigned short _currentDevice;
+  void _SetIsStreaming( bool isStreaming );
 
   void _WaitForBuffer();
   void _SyncBuffer();

=== modified file 'example/DspGain.h'
--- example/DspGain.h	2014-01-19 09:07:19 +0000
+++ example/DspGain.h	2014-06-16 15:43:30 +0000
@@ -1,6 +1,6 @@
 /************************************************************************
 DSPatch - Cross-Platform, Object-Oriented, Flow-Based Programming Library
-Copyright (c) 2012-2013 Marcus Tomlinson
+Copyright (c) 2012-2014 Marcus Tomlinson
 
 This file is part of DSPatch.
 
@@ -32,29 +32,25 @@
 class DspGain : public DspComponent
 {
 public:
+  static std::string const pGain; // Float
+
   DspGain()
-  : _gain( 1.0 )
   {
     AddInput_();
     AddOutput_();
+
+    AddParameter_( pGain, DspParameter( DspParameter::Float, 1, std::make_pair( 0, 2 ) ) );
   }
   ~DspGain() {}
 
   void SetGain( float gain )
   {
-    if( gain < 0.0 )
-    {
-      _gain = 0;
-    }
-    else
-    {
-      _gain = gain;
-    }
+    SetParameter_( pGain, DspParameter( DspParameter::Float, gain ) );
   }
 
   float GetGain() const
   {
-    return _gain;
+    return *GetParameter_( pGain )->GetFloat();
   }
 
 protected:
@@ -67,17 +63,28 @@
 
     for( unsigned long i = 0; i < _stream.size(); i++ )
     {
-      _stream[i] *= _gain;
+      _stream[i] *= GetGain();
     }
 
     outputs.SetValue( 0, _stream );
   }
 
+  virtual bool ParameterUpdating_( std::string const& name, DspParameter const& param )
+  {
+    if( name == pGain )
+    {
+      SetGain( *param.GetFloat() );
+      return true;
+    }
+    return false;
+  }
+
 private:
   std::vector< float > _stream;
-  float _gain;
 };
 
+std::string const DspGain::pGain = "gain";
+
 //=================================================================================================
 
 #endif // DSPGAIN_H

=== modified file 'example/DspOscillator.cpp'
--- example/DspOscillator.cpp	2014-04-12 23:16:46 +0000
+++ example/DspOscillator.cpp	2014-06-16 15:43:30 +0000
@@ -1,6 +1,6 @@
 /************************************************************************
 DSPatch - Cross-Platform, Object-Oriented, Flow-Based Programming Library
-Copyright (c) 2012-2013 Marcus Tomlinson
+Copyright (c) 2012-2014 Marcus Tomlinson
 
 This file is part of DSPatch.
 
@@ -26,25 +26,32 @@
 
 #include <math.h>
 
-static const float PI = 3.1415926535897932384626433832795f;
+//=================================================================================================
+
 static const float TWOPI = 6.283185307179586476925286766559f;
 
+std::string const DspOscillator::pBufferSize = "bufferSize";
+std::string const DspOscillator::pSampleRate = "sampleRate";
+std::string const DspOscillator::pAmplitude = "amplitude";
+std::string const DspOscillator::pFrequency = "frequency";
+
 //=================================================================================================
 
 DspOscillator::DspOscillator( float startFreq, float startAmpl )
-: _freq( startFreq ),
-  _ampl( startAmpl ),
-  _lastPos( 0 ),
-  _lookupLength( 0 ),
-  _bufferSize( 256 ),
-  _sampleRate( 44100 )
+: _lastPos( 0 ),
+  _lookupLength( 0 )
 {
-  _BuildLookup();
-
   AddInput_( "Sample Rate" );
   AddInput_( "Buffer Size" );
 
   AddOutput_();
+
+  AddParameter_( pBufferSize, DspParameter( DspParameter::Int, 256 ) );
+  AddParameter_( pSampleRate, DspParameter( DspParameter::Int, 44100 ) );
+  AddParameter_( pAmplitude, DspParameter( DspParameter::Float, startAmpl ) );
+  AddParameter_( pFrequency, DspParameter( DspParameter::Float, startFreq ) );
+
+  _BuildLookup();
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -53,9 +60,9 @@
 
 //=================================================================================================
 
-void DspOscillator::SetBufferSize( unsigned long bufferSize )
+void DspOscillator::SetBufferSize( int bufferSize )
 {
-  _bufferSize = bufferSize;
+  SetParameter_( pBufferSize, DspParameter( DspParameter::Int, bufferSize ) );
 
   _processMutex.Lock();
   _BuildLookup();
@@ -64,9 +71,9 @@
 
 //-------------------------------------------------------------------------------------------------
 
-void DspOscillator::SetSampleRate( unsigned long sampleRate )
+void DspOscillator::SetSampleRate( int sampleRate )
 {
-  _sampleRate = sampleRate;
+  SetParameter_( pSampleRate, DspParameter( DspParameter::Int, sampleRate ) );
 
   _processMutex.Lock();
   _BuildLookup();
@@ -77,7 +84,7 @@
 
 void DspOscillator::SetAmpl( float ampl )
 {
-  _ampl = ampl;
+  SetParameter_( pAmplitude, DspParameter( DspParameter::Float, ampl ) );
 
   _processMutex.Lock();
   _BuildLookup();
@@ -88,13 +95,41 @@
 
 void DspOscillator::SetFreq( float freq )
 {
-  _freq = freq;
+  SetParameter_( pFrequency, DspParameter( DspParameter::Float, freq ) );
 
   _processMutex.Lock();
   _BuildLookup();
   _processMutex.Unlock();
 }
 
+//-------------------------------------------------------------------------------------------------
+
+int DspOscillator::GetBufferSize() const
+{
+  return *GetParameter_( pBufferSize )->GetInt();
+}
+
+//-------------------------------------------------------------------------------------------------
+
+int DspOscillator::GetSampleRate() const
+{
+  return *GetParameter_( pSampleRate )->GetInt();
+}
+
+//-------------------------------------------------------------------------------------------------
+
+float DspOscillator::GetAmpl() const
+{
+  return *GetParameter_( pAmplitude )->GetFloat();
+}
+
+//-------------------------------------------------------------------------------------------------
+
+float DspOscillator::GetFreq() const
+{
+  return *GetParameter_( pFrequency )->GetFloat();
+}
+
 //=================================================================================================
 
 void DspOscillator::Process_( DspSignalBus& inputs, DspSignalBus& outputs )
@@ -104,10 +139,9 @@
   unsigned long sampleRate;
   if( inputs.GetValue( "Sample Rate", sampleRate ) )
   {
-    if( sampleRate != _sampleRate )
+    if( sampleRate != GetSampleRate() )
     {
-      _sampleRate = sampleRate;
-      _BuildLookup();
+      SetSampleRate( sampleRate );
     }
   }
 
@@ -115,10 +149,9 @@
   // =========================================================
   if( inputs.GetValue( "Buffer Size", _signal ) )
   {
-    if( _bufferSize != _signal.size() )
+    if( GetBufferSize() != _signal.size() )
     {
-      _bufferSize = _signal.size();
-      _BuildLookup();
+      SetBufferSize( _signal.size() );
     }
   }
 
@@ -139,21 +172,49 @@
   _processMutex.Unlock();
 }
 
+//-------------------------------------------------------------------------------------------------
+
+bool DspOscillator::ParameterUpdating_( std::string const& name, DspParameter const& param )
+{
+  if( name == pBufferSize )
+  {
+    SetBufferSize( *param.GetInt() );
+    return true;
+  }
+  else if( name == pSampleRate )
+  {
+    SetSampleRate( *param.GetInt() );
+    return true;
+  }
+  else if( name == pAmplitude )
+  {
+    SetAmpl( *param.GetFloat() );
+    return true;
+  }
+  else if( name == pFrequency )
+  {
+    SetFreq( *param.GetFloat() );
+    return true;
+  }
+
+  return false;
+}
+
 //=================================================================================================
 
 void DspOscillator::_BuildLookup()
 {
   float posFrac = ( float ) _lastPos / ( float ) _lookupLength;
-  float angleInc = TWOPI * _freq / _sampleRate;
-
-  _lookupLength = ( unsigned long ) ( ( float ) _sampleRate / _freq );
-
-  _signal.resize( _bufferSize );
+  float angleInc = TWOPI * GetFreq() / GetSampleRate();
+
+  _lookupLength = ( unsigned long ) ( ( float ) GetSampleRate() / GetFreq() );
+
+  _signal.resize( GetBufferSize() );
   _signalLookup.resize( _lookupLength );
 
   for( unsigned long i = 0; i < _lookupLength; i++ )
   {
-    _signalLookup[i] = sin( angleInc * i ) * _ampl;
+    _signalLookup[i] = sin( angleInc * i ) * GetAmpl();
   }
 
   _lastPos = ( unsigned long ) ( posFrac * ( float ) _lookupLength + 0.5f );	//calculate new position (round up)

=== modified file 'example/DspOscillator.h'
--- example/DspOscillator.h	2014-01-19 09:07:19 +0000
+++ example/DspOscillator.h	2014-06-16 15:43:30 +0000
@@ -1,6 +1,6 @@
 /************************************************************************
 DSPatch - Cross-Platform, Object-Oriented, Flow-Based Programming Library
-Copyright (c) 2012-2013 Marcus Tomlinson
+Copyright (c) 2012-2014 Marcus Tomlinson
 
 This file is part of DSPatch.
 
@@ -32,49 +32,34 @@
 class DspOscillator : public DspComponent
 {
 public:
+  static std::string const pBufferSize; // Int
+  static std::string const pSampleRate; // Int
+  static std::string const pAmplitude; // Float
+  static std::string const pFrequency; // Float
+
   DspOscillator( float startFreq = 1000.0, float startAmpl = 1.0 );
   ~DspOscillator();
 
-  void SetBufferSize( unsigned long bufferSize );
-  void SetSampleRate( unsigned long sampleRate );
-
+  void SetBufferSize( int bufferSize );
+  void SetSampleRate( int sampleRate );
   void SetAmpl( float ampl );
   void SetFreq( float freq );
 
-  unsigned long GetBufferSize() const
-  {
-    return _bufferSize;
-  }
-
-  unsigned long GetSampleRate() const
-  {
-    return _sampleRate;
-  }
-
-  float GetAmpl() const
-  {
-    return _ampl;
-  }
-
-  float GetFreq() const
-  {
-    return _freq;
-  }
+  int GetBufferSize() const;
+  int GetSampleRate() const;
+  float GetAmpl() const;
+  float GetFreq() const;
 
 protected:
   virtual void Process_( DspSignalBus& inputs, DspSignalBus& outputs );
+  virtual bool ParameterUpdating_( std::string const& name, DspParameter const& param );
 
 private:
-  float _freq;
-  float _ampl;
-
   std::vector< float > _signalLookup;
   std::vector< float > _signal;
 
   unsigned long _lastPos;
   unsigned long _lookupLength;
-  unsigned long _bufferSize;
-  unsigned long _sampleRate;
 
   DspMutex _processMutex;
 

=== modified file 'example/DspWaveStreamer.cpp'
--- example/DspWaveStreamer.cpp	2014-04-12 23:16:46 +0000
+++ example/DspWaveStreamer.cpp	2014-06-16 15:43:30 +0000
@@ -1,6 +1,6 @@
 /************************************************************************
 DSPatch - Cross-Platform, Object-Oriented, Flow-Based Programming Library
-Copyright (c) 2012-2013 Marcus Tomlinson
+Copyright (c) 2012-2014 Marcus Tomlinson
 
 This file is part of DSPatch.
 
@@ -30,19 +30,34 @@
 
 //=================================================================================================
 
+std::string const DspWaveStreamer::pFilePath = "filePath";
+std::string const DspWaveStreamer::pPlay = "play";
+std::string const DspWaveStreamer::pPause = "pause";
+std::string const DspWaveStreamer::pStop = "stop";
+std::string const DspWaveStreamer::pIsPlaying = "isPlaying";
+
+//=================================================================================================
+
 DspWaveStreamer::DspWaveStreamer()
 : _waveData( 0 ),
-  _isPlaying( false ),
   _bufferSize( 256 ),
   _sampleIndex( 0 ),
   _shortToFloatCoeff( 1.0f / 32767.0f )
 {
+  _waveFormat.Clear();
+
   _leftChannel.resize( _bufferSize );
   _rightChannel.resize( _bufferSize );
 
   AddOutput_();
   AddOutput_();
   AddOutput_( "Sample Rate" );
+
+  AddParameter_( pFilePath, DspParameter( DspParameter::FilePath, "" ) );
+  AddParameter_( pPlay, DspParameter( DspParameter::Trigger ) );
+  AddParameter_( pPause, DspParameter( DspParameter::Trigger ) );
+  AddParameter_( pStop, DspParameter( DspParameter::Trigger ) );
+  AddParameter_( pIsPlaying, DspParameter( DspParameter::Bool, false ) );
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -51,9 +66,9 @@
 
 //=================================================================================================
 
-bool DspWaveStreamer::LoadFile( const char* filePath )
+bool DspWaveStreamer::LoadFile( char const* filePath )
 {
-  bool wasPlaying = _isPlaying;
+  bool wasPlaying = IsPlaying();
   Stop();
 
   if( filePath == NULL )
@@ -64,8 +79,8 @@
     return false;
 
   unsigned long dwFileSize = 0, dwChunkSize = 0;
-  char* dwChunkId = new char[5];
-  char* dwExtra = new char[5];
+  char dwChunkId[5];
+  char dwExtra[5];
 
   dwChunkId[4] = 0;
   dwExtra[4] = 0;
@@ -163,6 +178,7 @@
     Play();
   }
 
+  SetParameter_( pFilePath, DspParameter( DspParameter::FilePath, filePath ) );
   return true;
 }
 
@@ -170,14 +186,14 @@
 
 void DspWaveStreamer::Play()
 {
-  _isPlaying = true;
+  SetParameter_( pIsPlaying, DspParameter( DspParameter::Bool, true ) );
 }
 
 //-------------------------------------------------------------------------------------------------
 
 void DspWaveStreamer::Pause()
 {
-  _isPlaying = false;
+  SetParameter_( pIsPlaying, DspParameter( DspParameter::Bool, false ) );
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -187,23 +203,23 @@
   _busyMutex.Lock();
 
   _sampleIndex = 0;
-  _isPlaying = false;
+  SetParameter_( pIsPlaying, DspParameter( DspParameter::Bool, false ) );
 
   _busyMutex.Unlock();
 }
 
 //-------------------------------------------------------------------------------------------------
 
-bool DspWaveStreamer::IsPlaying()
+bool DspWaveStreamer::IsPlaying() const
 {
-  return _isPlaying;
+  return *GetParameter_( pIsPlaying )->GetBool();
 }
 
 //=================================================================================================
 
 void DspWaveStreamer::Process_( DspSignalBus& inputs, DspSignalBus& outputs )
 {
-  if( _isPlaying && _waveData.size() > 0 )
+  if( IsPlaying() && _waveData.size() > 0 )
   {
     _busyMutex.Lock();
 
@@ -235,4 +251,31 @@
   }
 }
 
+//-------------------------------------------------------------------------------------------------
+
+bool DspWaveStreamer::ParameterUpdating_( std::string const& name, DspParameter const& param )
+{
+  if( name == pFilePath )
+  {
+    return LoadFile( param.GetString()->c_str() );
+  }
+  else if( name == pPlay )
+  {
+    Play();
+    return true;
+  }
+  else if( name == pPause )
+  {
+    Pause();
+    return true;
+  }
+  else if( name == pStop )
+  {
+    Stop();
+    return true;
+  }
+
+  return false;
+}
+
 //=================================================================================================

=== modified file 'example/DspWaveStreamer.h'
--- example/DspWaveStreamer.h	2014-01-19 09:07:19 +0000
+++ example/DspWaveStreamer.h	2014-06-16 15:43:30 +0000
@@ -1,6 +1,6 @@
 /************************************************************************
 DSPatch - Cross-Platform, Object-Oriented, Flow-Based Programming Library
-Copyright (c) 2012-2013 Marcus Tomlinson
+Copyright (c) 2012-2014 Marcus Tomlinson
 
 This file is part of DSPatch.
 
@@ -32,18 +32,25 @@
 class DspWaveStreamer : public DspComponent
 {
 public:
+  static std::string const pFilePath; // FilePath
+  static std::string const pPlay; // Trigger
+  static std::string const pPause; // Trigger
+  static std::string const pStop; // Trigger
+  static std::string const pIsPlaying; // Bool
+
   DspWaveStreamer();
   ~DspWaveStreamer();
 
-  bool LoadFile( const char* filePath );
+  bool LoadFile( char const* filePath );
   void Play();
   void Pause();
   void Stop();
 
-  bool IsPlaying();
+  bool IsPlaying() const;
 
 protected:
   virtual void Process_( DspSignalBus& inputs, DspSignalBus& outputs );
+  virtual bool ParameterUpdating_( std::string const& name, DspParameter const& param );
 
 private:
   struct WaveFormat
@@ -70,7 +77,6 @@
 
   WaveFormat _waveFormat;
   std::vector< short > _waveData;
-  bool _isPlaying;
   unsigned long _bufferSize;
   unsigned long _sampleIndex;
   float _shortToFloatCoeff;

=== modified file 'example/main.cpp'
--- example/main.cpp	2014-01-19 09:07:19 +0000
+++ example/main.cpp	2014-06-16 15:43:30 +0000
@@ -1,6 +1,6 @@
 /************************************************************************
 DSPatch - Cross-Platform, Object-Oriented, Flow-Based Programming Library
-Copyright (c) 2012-2013 Marcus Tomlinson
+Copyright (c) 2012-2014 Marcus Tomlinson
 
 This file is part of DSPatch.
 
@@ -38,10 +38,10 @@
 
 int main()
 {
-  // 1. Stream Wave
+  // 1. Stream wave
   // ==============
 
-  // create a circuit 
+  // create a circuit
   DspCircuit circuit;
 
   // declare components to be added to the circuit
@@ -53,7 +53,7 @@
   // set circuit thread count to 2
   circuit.SetThreadCount( 2 );
 
-  //// start separate thread to tick the circuit continuously ("auto-tick")
+  // start separate thread to tick the circuit continuously ("auto-tick")
   circuit.StartAutoTick();
 
   // add new components to the circuit (these methods return pointers to the new components)
@@ -63,7 +63,7 @@
   circuit.AddComponent( gainRight );
 
   // DspWaveStreamer has an output signal named "Sample Rate" that streams the current wave's sample rate
-  // DspAudioDevice's "Sample Rate" input receives a sample rate value and updates the audio stream accordingly 
+  // DspAudioDevice's "Sample Rate" input receives a sample rate value and updates the audio stream accordingly
   circuit.ConnectOutToIn( waveStreamer, "Sample Rate", audioDevice, "Sample Rate" ); // sample rate sync
 
   // connect component output signals to respective component input signals
@@ -74,17 +74,20 @@
 
   // set the gain of components gainLeft and gainRight (wave left and right channels)
   gainLeft.SetGain( 0.75 );
-  gainRight.SetGain( 0.75 );
+  gainRight.SetParameter( DspGain::pGain, DspParameter( DspParameter::Float, 0.75f ) ); // OR: gainRight.SetGain( 0.75 );
 
   // load a wave into the wave streamer and start playing the track
-  waveStreamer.LoadFile(EXAMPLE_WAV_FILE);
-  waveStreamer.Play();
+  waveStreamer.SetParameter( DspWaveStreamer::pFilePath, DspParameter( DspParameter::FilePath, EXAMPLE_WAV_FILE ) );
+  waveStreamer.SetParameter( DspWaveStreamer::pPlay, DspParameter( DspParameter::Trigger ) );
 
   // wait for key press
   getchar();
 
-  // 2. Overlay oscillator
-  // =====================
+  // 2. Stream oscillator
+  // ====================
+
+  // pause the track
+  waveStreamer.Pause();
 
   // A component input pin can only receive one signal at a time so an adders are required to combine the signals
 
@@ -114,6 +117,15 @@
   // wait for key press
   getchar();
 
+  // 3. Overlay both streams
+  // =======================
+
+  // resume the track (via parameter)
+  waveStreamer.Play();
+
+  // wait for key press
+  getchar();
+
   // clean up DSPatch
   DSPatch::Finalize();
 

=== modified file 'include/DSPatch.h'
--- include/DSPatch.h	2014-01-25 09:05:16 +0000
+++ include/DSPatch.h	2014-06-16 15:43:30 +0000
@@ -1,6 +1,6 @@
 /************************************************************************
 DSPatch - Cross-Platform, Object-Oriented, Flow-Based Programming Library
-Copyright (c) 2012-2013 Marcus Tomlinson
+Copyright (c) 2012-2014 Marcus Tomlinson
 
 This file is part of DSPatch.
 
@@ -49,17 +49,17 @@
 
 class DLLEXPORT DSPatch
 {
-  friend class DspComponent;
-
 public:
   static void SetGlobalThreadCount( unsigned short threadCount );
   static void Finalize();
 
 private:
-  static bool _IsThisGlobalCircuit( DspComponent* thisComponent );
+  friend class DspComponent;
+
+  static bool _IsThisGlobalCircuit( DspComponent const* thisComponent );
 
   static bool _AddGlobalComponent( DspComponent* component );
-  static void _RemoveGlobalComponent( DspComponent* component );
+  static void _RemoveGlobalComponent( DspComponent const* component );
 
   static unsigned short _GetGlobalComponentCount();
 
@@ -81,113 +81,114 @@
 \mainpage Welcome!
 
 \section intro_sec Introduction
-	DSPatch, pronounced "dispatch", is a powerful C++ flow-based programming library that allows
-	you to create and route (or "patch") high performance data processing circuits. DSPatch is not
-	limited to any particular type of circuit or signal, its generic object-oriented API allows you
-	to create almost any system imaginable, from simple logic circuits to high performance audio
-	process chains and electronics simulation. DSPatch's simple framework makes development quick
-	and easy, allowing you to hit the ground running on every project.
-	
-	DSPatch is designed around the concept of a "circuit" containing "components", interconnected
-	via "wires" that transfer "signals" to and from input and output "buses". For more detail on
-	how DSPatch works, check out the <a href="spec_page.html"><b>DSPatch Design Specification</b></a>.
-	
-	The two most important classes to consider are DspComponent and DspCircuit.  In order to route
-	data to and from DspComponents they can either be added to an DspCircuit, where they can be
-	wired together (recommended), or they can be wired directly via public DspComponent methods.
-	The DSPatch engine takes care of data transfer between interconnected components, when data is
-	ready for a component to process, a callback: "Process_()" is executed in that component. For a
-	component to form part of the DSPatch framework, designers simply have to derive their
-	component from the DspComponent base class, configure the component's IO buses, and implement
-	the virtual Process_() callback method.
+  DSPatch, pronounced "dispatch", is a powerful C++ flow-based programming library that allows
+  you to create and route (or "patch") high performance data processing circuits. DSPatch is not
+  limited to any particular type of circuit or signal, its generic object-oriented API allows you
+  to create almost any system imaginable, from simple logic circuits to high performance audio
+  process chains and electronics simulation. DSPatch's simple framework makes development quick
+  and easy, allowing you to hit the ground running on every project.
+
+  DSPatch is designed around the concept of a "circuit" containing "components", interconnected
+  via "wires" that transfer "signals" to and from input and output "buses". For more detail on
+  how DSPatch works, check out the <a href="spec_page.html"><b>DSPatch Design Specification</b></a>.
+
+  The two most important classes to consider are DspComponent and DspCircuit. In order to route
+  data to and from DspComponents they can either be added to an DspCircuit, where they can be
+  wired together (recommended), or they can be wired directly via public DspComponent methods.
+
+  The DSPatch engine takes care of data transfer between interconnected components, when data is
+  ready for a component to process, a callback: "Process_()" is executed in that component. For a
+  component to form part of the DSPatch framework, designers simply have to derive their
+  component from the DspComponent base class, configure the component's IO buses, and implement
+  the virtual Process_() callback method.
   
 \n
 
 \section features_sec Features
-	- <b>Automatic branch synchronization</b> - The result of data diverging across parallel branches is guaranteed to arrive synchronized at a converging point.
-	- <b>Dynamic thread count adjustment</b> - Specify at run-time, the number of threads in which you require a circuit to process.
-	- <b>Easy-to-use object-oriented API</b> - DSPatch is modeled around real-world circuit entities and concepts, making code more readable and easy to understand.
-	- <b>Feedback loops</b> - Create true closed-circuit systems by feeding resultant signals back into previous component inputs.
-	- <b>High performance parallel processing</b> - Circuits use advanced multi-threaded scheduling to maximize data flow efficiency.
-	- <b>Integrated circuits</b> - Build circuits within circuits to encapsulate complex component networks into single circuit components.
-	- <b>Non-threaded platform support</b> - Develop for (or port to) platforms without multi-threading support and process complex circuit systems in a single thread.
-	- <b>Run-time circuit wiring</b> - Connect and disconnect wires on the fly whilst maintaining steady data flow through the system.
-	- <b>Run-time adaptive signal types</b> - Component inputs can accept values of run-time varying types allowing you to create more flexible, multi-purpose component processes.
+  - <b>Automatic branch synchronization</b> - The result of data diverging across parallel branches is guaranteed to arrive synchronized at a converging point.
+  - <b>Dynamic thread count adjustment</b> - Specify at run-time, the number of threads in which you require a circuit to process.
+  - <b>Easy-to-use object-oriented API</b> - DSPatch is modeled around real-world circuit entities and concepts, making code more readable and easy to understand.
+  - <b>Feedback loops</b> - Create true closed-circuit systems by feeding resultant signals back into previous component inputs.
+  - <b>High performance parallel processing</b> - Circuits use advanced multi-threaded scheduling to maximize data flow efficiency.
+  - <b>Integrated circuits</b> - Build circuits within circuits to encapsulate complex component networks into single circuit components.
+  - <b>Non-threaded platform support</b> - Develop for (or port to) platforms without multi-threading support and process complex circuit systems in a single thread.
+  - <b>Run-time circuit wiring</b> - Connect and disconnect wires on the fly whilst maintaining steady data flow through the system.
+  - <b>Run-time adaptive signal types</b> - Component inputs can accept values of run-time varying types allowing you to create more flexible, multi-purpose component processes.
 
 \n
 
 \section install_sec Getting Started
 
 \subsection step1 Step 1: Download DSPatch
-	The DSPatch library can be downloaded from the
-	<a href="https://sourceforge.net/projects/dspatch/"><b>SourceForge project page</b></a>. 
-	Download the project archive and extract the contents anywhere you like.
+  The DSPatch library can be downloaded from the
+  <a href="https://sourceforge.net/projects/dspatch/"><b>SourceForge project page</b></a>.
+  Download the project archive and extract the contents anywhere you like.
 
 \subsection step2 Step 2: Read the Tutorials
-	The "Tutorials" section below covers 2 vital aspects to developing with DSPatch:
-	1. Creating a DspComponent - This tutorial is a start to finish demonstration of how to
-	create a DSPatch component.
-	2. Building a DspCircuit - In this tutorial you will learn how to use the DSPatch framework
-	to interconnect and process DspComponent networks using the DspCircuit interface.
+  The "Tutorials" section below covers 2 vital aspects to developing with DSPatch:
+  1. Creating a DspComponent - This tutorial is a start to finish demonstration of how to
+  create a DSPatch component.
+  2. Building a DspCircuit - In this tutorial you will learn how to use the DSPatch framework
+  to interconnect and process DspComponent networks using the DspCircuit interface.
 
 \subsection step3 Step 3: Check out the example project
-	In the "example" folder (in the DSPatch root directory) you will find a DSPatch demo project,
-	written to assist developers in understanding the DSPatch API as well as to demonstrate how it
-	could be used to build audio process chains. This project uses the open-source library RtAudio
-	in order to stream sound to your computer's audio device -Linux users will need to install
-	"libasound2-dev" (ALSA) before attempting to build.
-	
+  In the "example" folder (in the DSPatch root directory) you will find a DSPatch demo project,
+  written to assist developers in understanding the DSPatch API as well as to demonstrate how it
+  could be used to build audio process chains. This project uses the open-source library RtAudio
+  in order to stream sound to your computer's audio device -Linux users will need to install
+  "libasound2-dev" (ALSA) before attempting to build.
+
 \subsection step4 Step 4: Make your own DspComponents
-	A fast way to create your own DspComponent could be to copy an existing component to another
-	destination, rename it, and edit the contents to satisfy your component's required behavior.
-	In the "example" folder (from Step 3) you will find 2 source files: "DspAdder.h" and
-	"DspAdder.cpp". These files make up a very simple DspComponent that receives 2 floating-point
-	buffers into it's 2 inputs, adds each buffer element of the 1st buffer to the corresponding
-	element of the 2nd buffer, then passes the resultant buffer to the output. Alternatively, you
-	could just copy / reference the source code from the "Creating a DspComponent" tutorial
-	(found under the "tutorial" folder in the root directory).
+  A fast way to create your own DspComponent could be to copy an existing component to another
+  destination, rename it, and edit the contents to satisfy your component's required behavior.
+  In the "example" folder (from Step 3) you will find 2 source files: "DspAdder.h" and
+  "DspAdder.cpp". These files make up a very simple DspComponent that receives 2 floating-point
+  buffers into it's 2 inputs, adds each buffer element of the 1st buffer to the corresponding
+  element of the 2nd buffer, then passes the resultant buffer to the output. Alternatively, you
+  could just copy / reference the source code from the "Creating a DspComponent" tutorial
+  (found under the "tutorial" folder in the root directory).
 
 \subsection step5 Step 5: Roll your own DSPatch projects
-	As DSPatch is not reliant on any non-standard 3rd party sources, getting a DSPatch project to
-	compile and run is relatively painless. All you need to do from your project is #include
-	"DSPatch.h" from the "include" folder (in the DSPatch root directory), and link to the
-	DSPatch library (either by including all DSPatch source or by linking to a compiled library
-	file). To speed things up you may want to copy, rename, and edit the example project from
-	step 3 to get up and running faster.
+  As DSPatch is not reliant on any non-standard 3rd party sources, getting a DSPatch project to
+  compile and run is relatively painless. All you need to do from your project is include
+  "DSPatch.h" from the "include" folder (in the DSPatch root directory), and link to the
+  DSPatch library (either by including all DSPatch source or by linking to a compiled library
+  file). To speed things up you may want to copy, rename, and edit the example project from
+  step 3 to get up and running faster.
 
 \subsection step6 Step 6: Refer to the documentation
-	Between the example project, the DspAdder component template, and the documentation found
-	here, you should have enough resources to get started with DSPatch straight away. If you have
-	any questions or wish to report a bug, feel free to email me at [e-mail].
+  Between the example project, the DspAdder component template, and the documentation found
+  here, you should have enough resources to get started with DSPatch straight away. If you have
+  any questions or wish to report a bug, feel free to email me at [e-mail].
 
 \n
 
 \section tutorial_sec Tutorials
 
 \subsection create_component 1. Creating a DspComponent
-	In order to create a new DspComponent, we must derive our component class from the
-	DspComponent base class, configure component IO, and implement the inherited virtual
-	"Process_()" method.
-	
-	Lets take a look at how we would go about creating a boolean logic "AND" component. This
-	component will accept 2 boolean input values and output the result of: input 1 && input 2.
-	
-	We begin by deriving our new "DspAnd" component from DspComponent:
-
-	\code
+  In order to create a new DspComponent, we must derive our component class from the
+  DspComponent base class, configure component IO, and implement the inherited virtual
+  "Process_()" method.
+
+  Lets take a look at how we would go about creating a boolean logic "AND" component. This
+  component will accept 2 boolean input values and output the result of: input 1 && input 2.
+
+  We begin by deriving our new "DspAnd" component from DspComponent:
+
+  \code
 // 1. Derive component class from DspComponent
 // ===========================================
 class DspAnd : public DspComponent
 {
-	\endcode
-
-	The next step is to configure our component's input and output buses. This is achieved by
-	calling the base protected methods AddInput_() and AddOutput_() respectively from our
-	component's constructor. Each method must be called once per input / output required. In our
-	component's case, we require 2 inputs and 1 output, therefore our constructor code will look
-	like this:
-
-	\code
+  \endcode
+
+  The next step is to configure our component's input and output buses. This is achieved by
+  calling the base protected methods AddInput_() and AddOutput_() respectively from our
+  component's constructor. Each method must be called once per input / output required. In our
+  component's case, we require 2 inputs and 1 output, therefore our constructor code will look
+  like this:
+
+  \code
 public:
   // 2. Configure component IO buses
   // ===============================
@@ -200,20 +201,20 @@
     // add 1 output
     AddOutput_( "output" );
   }
-	\endcode
-	
-	The string values passed into the AddInput_() and AddOutput_() method calls are signal names
-	/ IDs. As component IO can be referenced by either string ID or index, IO signal names are
-	optional. If we do not require a signal to have a string ID associated with it, we can simply
-	leave the parenthesis empty.
-
-	Lastly, our component must implement the DspComponent virtual Process_() method. This is
-	where our component does it's work. The Process_() method provides us with 2 parameters: the
-	input bus and the output bus. It is our duty as the component designer to pull the inputs we
-	require out of the input bus, process them accordingly, and populate the output bus with the
-	results. Our component's process method will look something like this:
-
-	\code
+  \endcode
+
+  The string values passed into the AddInput_() and AddOutput_() method calls are signal names
+  / IDs. As component IO can be referenced by either string ID or index, IO signal names are
+  optional. If we do not require a signal to have a string ID associated with it, we can simply
+  leave the parenthesis empty.
+
+  Lastly, our component must implement the DspComponent virtual Process_() method. This is
+  where our component does it's work. The Process_() method provides us with 2 arguments: the
+  input bus and the output bus. It is our duty as the component designer to pull the inputs we
+  require out of the input bus, process them accordingly, and populate the output bus with the
+  results. Our component's process method will look something like this:
+
+  \code
 protected:
   // 3. Implement virtual Process_() method
   // ======================================
@@ -232,35 +233,35 @@
     }
   }
 };
-	\endcode
+  \endcode
 
-	And that's it! Our component is now ready to form part of the DSPatch framework. Next we'll
-	look at how we can add our component to a DspCircuit and route it to and from other
-	DspComponents.
+  And that's it! Our component is now ready to form part of the DSPatch framework. Next we'll
+  look at how we can add our component to a DspCircuit and route it to and from other
+  DspComponents.
 
 \n
 
 \subsection use_component 2. Building a DspCircuit
-	In order for us to get any real use out of our DspComponents, we need them to interact with
-	each other. This is where the DspCircuit class comes in. A DspCircuit is a workspace for
-	adding and routing DspComponents. In this section we will have a look at how to create a
-	simple DSPatch application that generates random boolean pairs, performs a logic AND on each
-	pair, then prints the result to screen.
-
-	First we must include the DSPatch header and any other headers that contain DspComponents we
-	wish to use in our application:
-
-	\code
+  In order for us to get any real use out of our DspComponents, we need them to interact with
+  each other. This is where the DspCircuit class comes in. A DspCircuit is a workspace for
+  adding and routing DspComponents. In this section we will have a look at how to create a
+  simple DSPatch application that generates random boolean pairs, performs a logic AND on each
+  pair, then prints the result to screen.
+
+  First we must include the DSPatch header and any other headers that contain DspComponents we
+  wish to use in our application:
+
+  \code
 #include <DSPatch.h>
 #include <components.h>
-	\endcode
-
-	Next, we must instantiate our DspCircuit object and all DspComponent objects needed for our
-	circuit. Lets say we had 2 other components included with "DspAnd" (from the first tutorial):
-	"DspRandBool" (generates a random boolean value then outputs the result) and "DspPrintBool"
-	(receives a boolean value and outputs it to the console):
-
-	\code
+  \endcode
+
+  Next, we must instantiate our DspCircuit object and all DspComponent objects needed for our
+  circuit. Lets say we had 2 other components included with "DspAnd" (from the first tutorial):
+  "DspRandBool" (generates a random boolean value then outputs the result) and "DspPrintBool"
+  (receives a boolean value and outputs it to the console):
+
+  \code
 void main()
 {
   // 1. Create a DspCircuit where we can route our components
@@ -273,29 +274,29 @@
   DspRandBool randBoolGen2;
   DspAnd logicAnd;
   DspPrintBool boolPrinter;
-	\endcode
-
-	Now that we have a circuit and some components, lets add all of our components to the circuit:
-
-	\code
+  \endcode
+
+  Now that we have a circuit and some components, lets add all of our components to the circuit:
+
+  \code
   // 3. Add component instances to circuit
   // =====================================
   circuit.AddComponent( randBoolGen1, "Bool Generator 1" );
   circuit.AddComponent( randBoolGen2, "Bool Generator 2" );
   circuit.AddComponent( logicAnd, "Logic AND" );
   circuit.AddComponent( boolPrinter, "Bool Printer" );
-	\endcode
-
-	The string values passed into the AddComponent() method calls are component names / IDs.
-	Although we still have the option of referencing a component via it's pointer in a circuit,
-	component string IDs can allow circuit objects to be entirely self-contained. This could give
-	us the ability to pass circuits around by reference, allowing the receiver access to all
-	circuit components via their string IDs, without having to manage both component and circuit
-	references everywhere.
-
-	We are now ready to begin wiring the circuit:
-
-	\code
+  \endcode
+
+  The string values passed into the AddComponent() method calls are component names / IDs.
+  Although we still have the option of referencing a component via it's pointer in a circuit,
+  component string IDs can allow circuit objects to be entirely self-contained. This could give
+  us the ability to pass circuits around by reference, allowing the receiver access to all
+  circuit components via their string IDs, without having to manage both component and circuit
+  references everywhere.
+
+  We are now ready to begin wiring the circuit:
+
+  \code
   // 4. Wire up the components inside the circuit
   // ============================================
 
@@ -310,28 +311,28 @@
   circuit.ConnectOutToIn( logicAnd, 0, boolPrinter, 0 );
   //OR circuit.ConnectOutToIn( "Logic AND", 0, "Bool Printer", 0 );
   //OR circuit.ConnectOutToIn( "Logic AND", "output", "Bool Printer", 0 );
-	\endcode
+  \endcode
 
-	The code above results in the following wiring configuration:
-	\code
+  The code above results in the following wiring configuration:
+  \code
                                  ___________
   ["Bool Generator 1"] 0 ---> 0 |           |
                                 |"Logic AND"| 0 ---> 0 ["Bool Printer"]
   ["Bool Generator 2"] 0 ---> 1 |___________|
-	\endcode
-
-	*N.B. Each component input can only accept one wire at a time. When another wire is connected
-	to an input that already has a connected wire, that wire is replaced with the new one. One
-	output, on the other hand, can be distributed to multiple inputs.
-
-	Lastly, in order for our circuit to do any work it must be ticked over. This is performed by
-	repeatedly calling the circuit's Tick() and Reset() methods. These methods can be called
-	manually in a loop from the main application thread, or alternatively, by calling
-	StartAutoTick(), a seperate thread will spawn, automatically calling Tick() and Reset()
-	continuously. A circuit's thread count can be adjusted at runtime, allowing us to increase /
-	decrease the number of threads use by the circuit as required during execution:
-
-	\code
+  \endcode
+
+  *N.B. Each component input can only accept one wire at a time. When another wire is connected
+  to an input that already has a connected wire, that wire is replaced with the new one. One
+  output, on the other hand, can be distributed to multiple inputs.
+
+  Lastly, in order for our circuit to do any work it must be ticked over. This is performed by
+  repeatedly calling the circuit's Tick() and Reset() methods. These methods can be called
+  manually in a loop from the main application thread, or alternatively, by calling
+  StartAutoTick(), a seperate thread will spawn, automatically calling Tick() and Reset()
+  continuously. A circuit's thread count can be adjusted at runtime, allowing us to increase /
+  decrease the number of threads use by the circuit as required during execution:
+
+  \code
   // 5. Tick the circuit
   // ===================
 
@@ -353,23 +354,29 @@
 
   // Press any key to quit
   getchar();
-		\endcode
-
-		Lastly, the DSPatch::Finalize() method must be called on application exit in order for DSPatch
-		to perform its own internal memory cleanup.
-
-		\code
+  \endcode
+
+  Lastly, the DSPatch::Finalize() method must be called on application exit in order for DSPatch
+  to perform its own internal memory cleanup.
+
+  \code
   // 6. Clean up
   // ===========
   DSPatch::Finalize();
 }
-	\endcode
+  \endcode
 
-	(All the source code from these tutorials can be found under the "tutorial" folder in the DSPatch root directory).
+  (All the source code from these tutorials can be found under the "tutorial" folder in the DSPatch root directory).
 
 \n
 
-\section release_notes Release Notes
+\section changelog Changelog
+
+\subsection v261 v.2.61 (16 June 2014)
+  - Introduced component parameters (DspParameter).
+  - Added DspComponent user callback mechanism.
+  - Improved const-correctness and code style.
+  - Added ability to remove single IO pins.
 
 \subsection v260 v.2.60 (19 January 2014)
   - Replaced project files with more flexible CMakeLists.
@@ -486,10 +493,10 @@
 next set of inputs from its input wires and populating the component's input
 bus. To insure that these inputs are up-to-date, the dependent component
 first calls all of its input components' Tick() methods -hence recursively
-called in all components going backward through the circuit.  The acquired
+called in all components going backward through the circuit. The acquired
 input bus is then passed into a virtual method: Process() -it is the
 responsibility of the (derived) component creator to implement this virtual
-function. The Process() method has 2 input parameters: the input bus and the
+function. The Process() method has 2 input arguments: the input bus and the
 output bus. This method's purpose is to pull its required inputs out of the
 input bus, process these inputs, and populate the output bus with the results.
 These resultant outputs in the output bus are then acquired by dependent

=== modified file 'include/dspatch/DspCircuit.h'
--- include/dspatch/DspCircuit.h	2014-01-25 09:05:16 +0000
+++ include/dspatch/DspCircuit.h	2014-06-16 15:43:30 +0000
@@ -1,6 +1,6 @@
 /************************************************************************
 DSPatch - Cross-Platform, Object-Oriented, Flow-Based Programming Library
-Copyright (c) 2012-2013 Marcus Tomlinson
+Copyright (c) 2012-2014 Marcus Tomlinson
 
 This file is part of DSPatch.
 
@@ -70,51 +70,54 @@
   void SetThreadCount( unsigned short threadCount );
   unsigned short GetThreadCount() const;
 
-  bool AddComponent( DspComponent* component, std::string componentName = "" );
-  bool AddComponent( DspComponent& component, std::string componentName = "" );
+  bool AddComponent( DspComponent* component, std::string const& componentName = "" );
+  bool AddComponent( DspComponent& component, std::string const& componentName = "" );
 
-  void RemoveComponent( DspComponent* component );
-  void RemoveComponent( DspComponent& component );
-  void RemoveComponent( std::string componentName );
+  void RemoveComponent( DspComponent const* component );
+  void RemoveComponent( DspComponent const& component );
+  void RemoveComponent( std::string const& componentName );
 
   void RemoveAllComponents();
 
   template< class ComponentType >
-  ComponentType* GetComponent( std::string componentName );
+  ComponentType* GetComponent( std::string const& componentName );
 
   unsigned short GetComponentCount() const;
 
   // component output to component input
-  template< class FromComponentType, class FromOutputType, class ToComponentType, class ToInputType >
-  bool ConnectOutToIn( FromComponentType& fromComponent, FromOutputType fromOutput, ToComponentType& toComponent, ToInputType toInput );
+  template< class FromComponentType, class FromOutputId, class ToComponentType, class ToInputId >
+  bool ConnectOutToIn( FromComponentType& fromComponent, FromOutputId const& fromOutput, ToComponentType& toComponent, ToInputId const& toInput );
 
   // circuit input to component input
-  template< class FromInputType, class ToComponentType, class ToInputType >
-  bool ConnectInToIn( FromInputType fromInput, ToComponentType& toComponent, ToInputType toInput );
+  template< class FromInputId, class ToComponentType, class ToInputId >
+  bool ConnectInToIn( FromInputId const& fromInput, ToComponentType& toComponent, ToInputId const& toInput );
 
   // component output to circuit output
-  template< class FromComponentType, class FromOutputType, class ToOutputType >
-  bool ConnectOutToOut( FromComponentType& fromComponent, FromOutputType fromOutput, ToOutputType toOutput );
+  template< class FromComponentType, class FromOutputId, class ToOutputId >
+  bool ConnectOutToOut( FromComponentType& fromComponent, FromOutputId const& fromOutput, ToOutputId const& toOutput );
 
   // component output to component input
-  template< class FromComponentType, class FromOutputType, class ToComponentType, class ToInputType >
-  void DisconnectOutToIn( FromComponentType& fromComponent, FromOutputType fromOutput, ToComponentType& toComponent, ToInputType toInput );
+  template< class FromComponentType, class FromOutputId, class ToComponentType, class ToInputId >
+  void DisconnectOutToIn( FromComponentType const& fromComponent, FromOutputId const& fromOutput, ToComponentType const& toComponent, ToInputId const& toInput );
 
   // circuit input to component input
-  template< class FromInputType, class ToComponentType, class ToInputType >
-  bool DisconnectInToIn( FromInputType fromInput, ToComponentType& toComponent, ToInputType toInput );
+  template< class FromInputId, class ToComponentType, class ToInputId >
+  bool DisconnectInToIn( FromInputId const& fromInput, ToComponentType const& toComponent, ToInputId const& toInput );
 
   // component output to circuit output
-  template< class FromComponentType, class FromOutputType, class ToOutputType >
-  bool DisconnectOutToOut( FromComponentType& fromComponent, FromOutputType fromOutput, ToOutputType toOutput );
-
-  void DisconnectComponent( std::string component );
-
-  bool AddInput( std::string inputName = "" );
-  bool AddOutput( std::string outputName = "" );
-
-  void RemoveInputs();
-  void RemoveOutputs();
+  template< class FromComponentType, class FromOutputId, class ToOutputId >
+  bool DisconnectOutToOut( FromComponentType const& fromComponent, FromOutputId const& fromOutput, ToOutputId const& toOutput );
+
+  void DisconnectComponent( std::string const& component );
+
+  bool AddInput( std::string const& inputName = "" );
+  bool AddOutput( std::string const& outputName = "" );
+
+  void RemoveInput();
+  void RemoveOutput();
+
+  void RemoveAllInputs();
+  void RemoveAllOutputs();
 
 protected:
   virtual void Process_( DspSignalBus& inputs, DspSignalBus& outputs );
@@ -128,9 +131,9 @@
   DspWireBus _inToInWires;
   DspWireBus _outToOutWires;
 
-  bool _FindComponent( DspComponent* component, unsigned short& returnIndex ) const;
-  bool _FindComponent( DspComponent& component, unsigned short& returnIndex ) const;
-  bool _FindComponent( std::string componentName, unsigned short& returnIndex ) const;
+  bool _FindComponent( DspComponent const* component, unsigned short& returnIndex ) const;
+  bool _FindComponent( DspComponent const& component, unsigned short& returnIndex ) const;
+  bool _FindComponent( std::string const& componentName, unsigned short& returnIndex ) const;
   bool _FindComponent( unsigned short componentIndex, unsigned short& returnIndex ) const;
 
   void _DisconnectComponent( unsigned short componentIndex );
@@ -140,7 +143,7 @@
 //=================================================================================================
 
 template< class ComponentType >
-ComponentType* DspCircuit::GetComponent( std::string componentName )
+ComponentType* DspCircuit::GetComponent( std::string const& componentName )
 {
   unsigned short componentIndex;
 
@@ -156,8 +159,8 @@
 
 //-------------------------------------------------------------------------------------------------
 
-template< class FromComponentType, class FromOutputType, class ToComponentType, class ToInputType >
-bool DspCircuit::ConnectOutToIn( FromComponentType& fromComponent, FromOutputType fromOutput, ToComponentType& toComponent, ToInputType toInput )
+template< class FromComponentType, class FromOutputId, class ToComponentType, class ToInputId >
+bool DspCircuit::ConnectOutToIn( FromComponentType& fromComponent, FromOutputId const& fromOutput, ToComponentType& toComponent, ToInputId const& toInput )
 {
   unsigned short fromComponentIndex;
   unsigned short toComponentIndex;
@@ -180,8 +183,8 @@
 
 //-------------------------------------------------------------------------------------------------
 
-template< class FromInputType, class ToComponentType, class ToInputType >
-bool DspCircuit::ConnectInToIn( FromInputType fromInput, ToComponentType& toComponent, ToInputType toInput )
+template< class FromInputId, class ToComponentType, class ToInputId >
+bool DspCircuit::ConnectInToIn( FromInputId const& fromInput, ToComponentType& toComponent, ToInputId const& toInput )
 {
   unsigned short fromInputIndex;
   unsigned short toComponentIndex;
@@ -206,8 +209,8 @@
 
 //-------------------------------------------------------------------------------------------------
 
-template< class FromComponentType, class FromOutputType, class ToOutputType >
-bool DspCircuit::ConnectOutToOut( FromComponentType& fromComponent, FromOutputType fromOutput, ToOutputType toOutput )
+template< class FromComponentType, class FromOutputId, class ToOutputId >
+bool DspCircuit::ConnectOutToOut( FromComponentType& fromComponent, FromOutputId const& fromOutput, ToOutputId const& toOutput )
 {
   unsigned short fromComponentIndex;
   unsigned short fromOutputIndex;
@@ -232,8 +235,8 @@
 
 //-------------------------------------------------------------------------------------------------
 
-template< class FromComponentType, class FromOutputType, class ToComponentType, class ToInputType >
-void DspCircuit::DisconnectOutToIn( FromComponentType& fromComponent, FromOutputType fromOutput, ToComponentType& toComponent, ToInputType toInput )
+template< class FromComponentType, class FromOutputId, class ToComponentType, class ToInputId >
+void DspCircuit::DisconnectOutToIn( FromComponentType const& fromComponent, FromOutputId const& fromOutput, ToComponentType const& toComponent, ToInputId const& toInput )
 {
   unsigned short fromComponentIndex;
   unsigned short toComponentIndex;
@@ -254,8 +257,8 @@
 
 //-------------------------------------------------------------------------------------------------
 
-template< class FromInputType, class ToComponentType, class ToInputType >
-bool DspCircuit::DisconnectInToIn( FromInputType fromInput, ToComponentType& toComponent, ToInputType toInput )
+template< class FromInputId, class ToComponentType, class ToInputId >
+bool DspCircuit::DisconnectInToIn( FromInputId const& fromInput, ToComponentType const& toComponent, ToInputId const& toInput )
 {
   unsigned short fromInputIndex;
   unsigned short toComponentIndex;
@@ -280,8 +283,8 @@
 
 //-------------------------------------------------------------------------------------------------
 
-template< class FromComponentType, class FromOutputType, class ToOutputType >
-bool DspCircuit::DisconnectOutToOut( FromComponentType& fromComponent, FromOutputType fromOutput, ToOutputType toOutput )
+template< class FromComponentType, class FromOutputId, class ToOutputId >
+bool DspCircuit::DisconnectOutToOut( FromComponentType const& fromComponent, FromOutputId const& fromOutput, ToOutputId const& toOutput )
 {
   unsigned short fromComponentIndex;
   unsigned short fromOutputIndex;

=== modified file 'include/dspatch/DspCircuitThread.h'
--- include/dspatch/DspCircuitThread.h	2014-01-25 09:05:16 +0000
+++ include/dspatch/DspCircuitThread.h	2014-06-16 15:43:30 +0000
@@ -1,6 +1,6 @@
 /************************************************************************
 DSPatch - Cross-Platform, Object-Oriented, Flow-Based Programming Library
-Copyright (c) 2012-2013 Marcus Tomlinson
+Copyright (c) 2012-2014 Marcus Tomlinson
 
 This file is part of DSPatch.
 

=== modified file 'include/dspatch/DspComponent.h'
--- include/dspatch/DspComponent.h	2014-01-25 09:05:16 +0000
+++ include/dspatch/DspComponent.h	2014-06-16 15:43:30 +0000
@@ -1,6 +1,6 @@
 /************************************************************************
 DSPatch - Cross-Platform, Object-Oriented, Flow-Based Programming Library
-Copyright (c) 2012-2013 Marcus Tomlinson
+Copyright (c) 2012-2014 Marcus Tomlinson
 
 This file is part of DSPatch.
 
@@ -30,6 +30,9 @@
 #include <dspatch/DspSignalBus.h>
 #include <dspatch/DspWireBus.h>
 #include <dspatch/DspComponentThread.h>
+#include <dspatch/DspParameter.h>
+
+#include <map>
 
 class DspCircuit;
 
@@ -37,13 +40,27 @@
 /// Abstract base class for all DSPatch components
 
 /**
-Classes derived from DspComponent can be added to an DspCircuit and routed to and from other
-DspComponents. On construction, derived classes must configure the component's IO buses by calling
-AddInput_() and AddOutput_() respectively. Derived classes must also implement the virtual method:
-Process_(). The Process_() method is a callback from the DSPatch engine that occurs when a new set
-of input signals is ready for processing. The Process_() method has 2 parameters: the input bus and
-the output bus. This method's purpose is to pull its required inputs out of the input bus, process
-these inputs, and populate the output bus with the results (see DspSignalBus).
+Classes derived from DspComponent can be added to a DspCircuit and routed to and from other
+DspComponents.
+
+On construction, derived classes must configure the component's IO buses by calling AddInput_() and
+AddOutput_() respectively, as well as populate the component's parameter map via AddParameter_()
+(see DspParameter).
+
+Derived classes must also implement the virtual method: Process_(). The Process_() method is a
+callback from the DSPatch engine that occurs when a new set of input signals is ready for
+processing. The Process_() method has 2 arguments: the input bus, and the output bus. This
+method's purpose is to pull its required inputs out of the input bus, process these inputs, and
+populate the output bus with the results (see DspSignalBus).
+
+Derived classes that expose parameters will also need to implement the virtual ParameterUpdating_()
+method. The ParameterUpdating_() method is a callback from the DSPatch engine that occurs when an
+update to a component parameter has been requested via the public SetParameter() method.
+ParameterUpdating_() has 2 arguments: the parameter name, and the new parameter value to be set.
+This method's purpose is to: 1. validate that the new value is legal, 2. make the necessary
+internal changes associated with that parameter change, and 3. update the target parameter itself
+by calling the protected SetParameter_() method. If the new parameter value is legal and the update
+was successful, ParameterUpdating_() should return true, otherwise, it should return false.
 
 In order for a component to do any work it must be ticked over. This is performed by repeatedly
 calling the Tick() and Reset() methods. The Tick() method is responsible for acquiring the next set
@@ -54,41 +71,56 @@
 method. The Reset() method then informs the component that the last circuit traversal has completed
 and hence can execute the next Tick() request. A component's Tick() and Reset() methods can be
 called in a loop from the main application thread, or alternatively, by calling StartAutoTick(), a
-seperate thread will spawn, automatically calling Tick() and Reset() methods continuously (This is
+separate thread will spawn, automatically calling Tick() and Reset() methods continuously (This is
 most commonly used to tick over an instance of DspCircuit).
 */
 
 class DLLEXPORT DspComponent
 {
-  friend class DspCircuit;
-  friend class DspCircuitThread;
-
 public:
+  enum CallbackType
+  {
+    InputAdded, InputRemoved,
+    OutputAdded, OutputRemoved,
+    ParameterAdded, ParameterRemoved, ParameterUpdated
+  };
+  typedef void( *Callback_t )( DspComponent const* component, CallbackType const& callbackType, int index, void* userData );
+
   DspComponent();
   virtual ~DspComponent();
 
-  void SetComponentName( std::string componentName );
+  void SetCallback( Callback_t const& callback, void* userData = NULL );
+
+  void SetComponentName( std::string const& componentName );
   std::string GetComponentName() const;
 
-  template< class FromOutputType, class ToInputType >
-  bool ConnectInput( DspComponent* fromComponent, FromOutputType fromOutput, ToInputType toInput );
-
-  template< class FromOutputType, class ToInputType >
-  bool ConnectInput( DspComponent& fromComponent, FromOutputType fromOutput, ToInputType toInput );
-
-  template< class FromOutputType, class ToInputType >
-  void DisconnectInput( DspComponent* fromComponent, FromOutputType fromOutput, ToInputType toInput );
-
-  template< class FromOutputType, class ToInputType >
-  void DisconnectInput( DspComponent& fromComponent, FromOutputType fromOutput, ToInputType toInput );
+  template< class FromOutputId, class ToInputId >
+  bool ConnectInput( DspComponent* fromComponent, FromOutputId const& fromOutput, ToInputId const& toInput );
+
+  template< class FromOutputId, class ToInputId >
+  bool ConnectInput( DspComponent& fromComponent, FromOutputId const& fromOutput, ToInputId const& toInput );
+
+  template< class FromOutputId, class ToInputId >
+  void DisconnectInput( DspComponent const* fromComponent, FromOutputId const& fromOutput, ToInputId const& toInput );
+
+  template< class FromOutputId, class ToInputId >
+  void DisconnectInput( DspComponent const& fromComponent, FromOutputId const& fromOutput, ToInputId const& toInput );
 
   void DisconnectInput( unsigned short inputIndex );
-  void DisconnectInput( std::string inputName );
-  void DisconnectInput( DspComponent* inputComponent );
-  void DisconnectInputs();
-
-  unsigned short GetInputCount() const;
-  unsigned short GetOutputCount() const;
+  void DisconnectInput( std::string const& inputName );
+  void DisconnectInput( DspComponent const* inputComponent );
+  void DisconnectAllInputs();
+
+  unsigned short GetInputCount();
+  unsigned short GetOutputCount();
+  unsigned short GetParameterCount();
+
+  std::string GetInputName( unsigned short index );
+  std::string GetOutputName( unsigned short index );
+  std::string GetParameterName( unsigned short index );
+
+  bool GetParameter( std::string const& paramName, DspParameter& param );
+  bool SetParameter( std::string const& paramName, DspParameter const& param );
 
   void Tick();
   void Reset();
@@ -99,21 +131,35 @@
   virtual void ResumeAutoTick();
 
 protected:
-  virtual void Process_( DspSignalBus& inputs, DspSignalBus& outputs ) {};
-
-  bool AddInput_( std::string inputName = "" );
-  bool AddOutput_( std::string outputName = "" );
-
-  void RemoveInputs_();
-  void RemoveOutputs_();
+  virtual void Process_( DspSignalBus& inputs, DspSignalBus& outputs ) {}
+  virtual bool ParameterUpdating_( std::string const& name, DspParameter const& param ) { return false; }
+
+  bool AddInput_( std::string const& inputName = "" );
+  bool AddOutput_( std::string const& outputName = "" );
+  bool AddParameter_( std::string const& paramName, DspParameter const& param );
+
+  bool RemoveInput_();
+  bool RemoveOutput_();
+  bool RemoveParameter_();
+
+  void RemoveAllInputs_();
+  void RemoveAllOutputs_();
+  void RemoveAllParameters_();
+
+  unsigned short GetInputCount_();
+  unsigned short GetOutputCount_();
+  unsigned short GetParameterCount_();
+
+  DspParameter const* GetParameter_( std::string const& paramName ) const;
+  bool SetParameter_( std::string const& paramName, DspParameter const& param );
 
 private:
   void _SetParentCircuit( DspCircuit* parentCircuit );
   DspCircuit* _GetParentCircuit();
 
-  bool _FindInput( std::string signalName, unsigned short& returnIndex ) const;
+  bool _FindInput( std::string const& signalName, unsigned short& returnIndex ) const;
   bool _FindInput( unsigned short signalIndex, unsigned short& returnIndex ) const;
-  bool _FindOutput( std::string signalName, unsigned short& returnIndex ) const;
+  bool _FindOutput( std::string const& signalName, unsigned short& returnIndex ) const;
   bool _FindOutput( unsigned short signalIndex, unsigned short& returnIndex ) const;
 
   void _SetBufferCount( unsigned short bufferCount );
@@ -122,8 +168,8 @@
   void _ThreadTick( unsigned short threadNo );
   void _ThreadReset( unsigned short threadNo );
 
-  bool _SetInputSignal( unsigned short inputIndex, const DspSignal* newSignal );
-  bool _SetInputSignal( unsigned short inputIndex, unsigned short threadIndex, const DspSignal* newSignal );
+  bool _SetInputSignal( unsigned short inputIndex, DspSignal const* newSignal );
+  bool _SetInputSignal( unsigned short inputIndex, unsigned short threadIndex, DspSignal const* newSignal );
   DspSignal* _GetOutputSignal( unsigned short outputIndex );
   DspSignal* _GetOutputSignal( unsigned short outputIndex, unsigned short threadIndex );
 
@@ -131,6 +177,9 @@
   void _ReleaseThread( unsigned short threadNo );
 
 private:
+  friend class DspCircuit;
+  friend class DspCircuitThread;
+
   DspCircuit* _parentCircuit;
 
   unsigned short _bufferCount;
@@ -141,6 +190,8 @@
   std::vector< DspSignalBus > _inputBuses;
   std::vector< DspSignalBus > _outputBuses;
 
+  std::map< std::string, DspParameter > _parameters;
+
   std::string _componentName;
   bool _isAutoTickRunning;
   bool _isAutoTickPaused;
@@ -155,12 +206,15 @@
   std::vector< bool > _gotReleases; // bool pointers not used here as only 1 thread writes to this vector at a time
   std::vector< DspMutex > _releaseMutexes;
   std::vector< DspWaitCondition > _releaseCondts;
+
+  Callback_t _callback;
+  void* _userData;
 };
 
 //=================================================================================================
 
-template< class FromOutputType, class ToInputType >
-bool DspComponent::ConnectInput( DspComponent* fromComponent, FromOutputType fromOutput, ToInputType toInput )
+template< class FromOutputId, class ToInputId >
+bool DspComponent::ConnectInput( DspComponent* fromComponent, FromOutputId const& fromOutput, ToInputId const& toInput )
 {
   unsigned short fromOutputIndex;
   unsigned short toInputIndex;
@@ -180,16 +234,16 @@
 
 //-------------------------------------------------------------------------------------------------
 
-template< class FromOutputType, class ToInputType >
-bool DspComponent::ConnectInput( DspComponent& fromComponent, FromOutputType fromOutput, ToInputType toInput )
+template< class FromOutputId, class ToInputId >
+bool DspComponent::ConnectInput( DspComponent& fromComponent, FromOutputId const& fromOutput, ToInputId const& toInput )
 {
   return ConnectInput( &fromComponent, fromOutput, toInput );
 }
 
 //-------------------------------------------------------------------------------------------------
 
-template< class FromOutputType, class ToInputType >
-void DspComponent::DisconnectInput( DspComponent* fromComponent, FromOutputType fromOutput, ToInputType toInput )
+template< class FromOutputId, class ToInputId >
+void DspComponent::DisconnectInput( DspComponent const* fromComponent, FromOutputId const& fromOutput, ToInputId const& toInput )
 {
   unsigned short fromOutputIndex;
   unsigned short toInputIndex;
@@ -207,8 +261,8 @@
 
 //-------------------------------------------------------------------------------------------------
 
-template< class FromOutputType, class ToInputType >
-void DspComponent::DisconnectInput( DspComponent& fromComponent, FromOutputType fromOutput, ToInputType toInput )
+template< class FromOutputId, class ToInputId >
+void DspComponent::DisconnectInput( DspComponent const& fromComponent, FromOutputId const& fromOutput, ToInputId const& toInput )
 {
   DisconnectInput( &fromComponent, fromOutput, toInput );
 }

=== modified file 'include/dspatch/DspComponentThread.h'
--- include/dspatch/DspComponentThread.h	2014-01-25 09:05:16 +0000
+++ include/dspatch/DspComponentThread.h	2014-06-16 15:43:30 +0000
@@ -1,6 +1,6 @@
 /************************************************************************
 DSPatch - Cross-Platform, Object-Oriented, Flow-Based Programming Library
-Copyright (c) 2012-2013 Marcus Tomlinson
+Copyright (c) 2012-2014 Marcus Tomlinson
 
 This file is part of DSPatch.
 

=== added file 'include/dspatch/DspParameter.h'
--- include/dspatch/DspParameter.h	1970-01-01 00:00:00 +0000
+++ include/dspatch/DspParameter.h	2014-06-16 15:43:30 +0000
@@ -0,0 +1,111 @@
+/************************************************************************
+DSPatch - Cross-Platform, Object-Oriented, Flow-Based Programming Library
+Copyright (c) 2012-2014 Marcus Tomlinson
+
+This file is part of DSPatch.
+
+GNU Lesser General Public License Usage
+This file may be used under the terms of the GNU Lesser General Public
+License version 3.0 as published by the Free Software Foundation and
+appearing in the file LGPLv3.txt included in the packaging of this
+file. Please review the following information to ensure the GNU Lesser
+General Public License version 3.0 requirements will be met:
+http://www.gnu.org/copyleft/lgpl.html.
+
+Other Usage
+Alternatively, this file may be used in accordance with the terms and
+conditions contained in a signed written agreement between you and
+Marcus Tomlinson.
+
+DSPatch is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+************************************************************************/
+
+#ifndef DSPPARAMETER_H
+#define DSPPARAMETER_H
+
+//-------------------------------------------------------------------------------------------------
+
+#include <dspatch/DspThread.h>
+#include <string>
+#include <vector>
+
+//=================================================================================================
+/// Value container used to hold non-transient component IO
+
+/**
+DspParameters are similar to DspSignals in that they provide a generic means of inputting and
+outputting data to and from DspComponents. However, unlike signals, parameters are non-transient
+inputs and outputs (such as enable / disable, bias, offset, etc.) that allow for a component's
+behaviour to be manipulated via direct set / get methods. The parameter type (ParamType) must be
+specified on construction of a DspParameter. Any type mismatches on subsequent set / get calls will
+immediatly return false.
+
+NOTE: Abstracting component parameters behind the generic DspParameter container allows a
+component to be entirely controllable via the DspComponent base class.
+*/
+
+class DLLEXPORT DspParameter
+{
+public:
+  enum ParamType
+  {
+    Null,
+    Bool,
+    Int,
+    Float,
+    String,
+    FilePath, // this is essentially just a string, but helps when determining an appropriate user input method
+    List, // this type acts as a vector (available items), an int (index selected), and a string (item selected)
+    Trigger // this type has no value, SetParam(triggerParam) simply represents a trigger. E.g. a button press
+  };
+
+  DspParameter();
+  DspParameter( ParamType const& type );
+  DspParameter( ParamType const& type, int const& initValue, std::pair<int, int> const& valueRange = std::make_pair( -1, -1 ) );
+  DspParameter( ParamType const& type, float const& initValue, std::pair<float, float> const& valueRange = std::make_pair( -1.0f, -1.0f ) );
+  DspParameter( ParamType const& type, std::string const& initValue );
+  DspParameter( ParamType const& type, std::vector< std::string > const& initValue );
+
+  ParamType Type() const;
+  bool IsSet() const;
+
+  bool const* GetBool() const;
+  int const* GetInt() const;
+  std::pair<int, int> const* GetIntRange() const;
+  float const* GetFloat() const;
+  std::pair<float, float> const* GetFloatRange() const;
+  std::string const* GetString() const;
+  std::vector< std::string > const* GetList() const;
+
+  bool SetBool( bool const& value );
+  bool SetInt( int const& value );
+  bool SetIntRange( std::pair<int, int> const& intRange );
+  bool SetFloat( float const& value );
+  bool SetFloatRange( std::pair<float, float> const& floatRange );
+  bool SetString( std::string const& value );
+  bool SetList( std::vector< std::string > const& value );
+
+  bool SetParam( DspParameter const& param );
+
+private:
+  ParamType _type;
+  bool _isSet;
+  bool _isRangeSet;
+
+  bool _boolValue;
+
+  std::pair<int, int> _intRange;
+  int _intValue;
+
+  std::pair<float, float> _floatRange;
+  float _floatValue;
+
+  std::string _stringValue;
+  std::vector< std::string > _listValue;
+};
+
+//=================================================================================================
+
+#endif // DSPPARAMETER_H

=== modified file 'include/dspatch/DspRunType.h'
--- include/dspatch/DspRunType.h	2014-01-25 09:05:16 +0000
+++ include/dspatch/DspRunType.h	2014-06-16 15:43:30 +0000
@@ -1,6 +1,6 @@
 /************************************************************************
 DSPatch - Cross-Platform, Object-Oriented, Flow-Based Programming Library
-Copyright (c) 2012-2013 Marcus Tomlinson
+Copyright (c) 2012-2014 Marcus Tomlinson
 
 This file is part of DSPatch.
 
@@ -49,12 +49,12 @@
   : _valueHolder( NULL ) {}
 
   template< typename ValueType >
-  DspRunType( const ValueType& value )
+  DspRunType( ValueType const& value )
   {
     _valueHolder = new _DspRtValue< ValueType >( value );
   }
 
-  DspRunType( const DspRunType& other )
+  DspRunType( DspRunType const& other )
   {
     if( other._valueHolder != NULL )
     {
@@ -78,7 +78,7 @@
     return *this;
   }
 
-  void CopyFrom( const DspRunType& rhs )
+  void CopyFrom( DspRunType const& rhs )
   {
     if( _valueHolder != NULL && rhs._valueHolder != NULL &&
         _valueHolder->GetType() == rhs._valueHolder->GetType() )
@@ -92,7 +92,7 @@
   }
 
   template< typename ValueType >
-  DspRunType& operator=( const ValueType& rhs )
+  DspRunType& operator=( ValueType const& rhs )
   {
     if( typeid( rhs ) == GetType() )
     {
@@ -117,7 +117,7 @@
     return !_valueHolder;
   }
 
-  const std::type_info& GetType() const
+  std::type_info const& GetType() const
   {
     if( _valueHolder != NULL )
     {
@@ -143,7 +143,7 @@
   }
 
   template< typename ValueType >
-  static inline const ValueType* RunTypeCast( const DspRunType* operand )
+  static inline ValueType const* RunTypeCast( DspRunType const* operand )
   {
     return RunTypeCast< ValueType >( const_cast< DspRunType* >( operand ) );
   }
@@ -155,7 +155,7 @@
     virtual ~_DspRtValueHolder() {}
 
   public:
-    virtual const std::type_info& GetType() const = 0;
+    virtual std::type_info const& GetType() const = 0;
     virtual _DspRtValueHolder* GetCopy() const = 0;
     virtual void SetValue( _DspRtValueHolder* valueHolder ) = 0;
   };
@@ -164,11 +164,11 @@
   class _DspRtValue : public _DspRtValueHolder
   {
   public:
-    _DspRtValue( const ValueType& value )
+    _DspRtValue( ValueType const& value )
     : value( value ) {}
 
   public:
-    virtual const std::type_info& GetType() const
+    virtual std::type_info const& GetType() const
     {
       return typeid( ValueType );
     }
@@ -187,7 +187,7 @@
     ValueType value;
 
   private:
-    _DspRtValue& operator=( const _DspRtValue& ); // disable copy-assignment
+    _DspRtValue& operator=( _DspRtValue const& ); // disable copy-assignment
   };
 
 private:

=== modified file 'include/dspatch/DspSignal.h'
--- include/dspatch/DspSignal.h	2014-01-25 09:05:16 +0000
+++ include/dspatch/DspSignal.h	2014-06-16 15:43:30 +0000
@@ -1,6 +1,6 @@
 /************************************************************************
 DSPatch - Cross-Platform, Object-Oriented, Flow-Based Programming Library
-Copyright (c) 2012-2013 Marcus Tomlinson
+Copyright (c) 2012-2014 Marcus Tomlinson
 
 This file is part of DSPatch.
 
@@ -54,16 +54,16 @@
   virtual ~DspSignal();
 
   template< class ValueType >
-  bool SetValue( const ValueType& newValue );
+  bool SetValue( ValueType const& newValue );
 
   template< class ValueType >
   bool GetValue( ValueType& returnValue ) const;
 
-  bool SetSignal( const DspSignal* newSignal );
+  bool SetSignal( DspSignal const* newSignal );
 
   void ClearValue();
 
-  const std::type_info& GetSignalType() const;
+  std::type_info const& GetSignalType() const;
 
   std::string GetSignalName() const;
 
@@ -76,7 +76,7 @@
 //=================================================================================================
 
 template< class ValueType >
-bool DspSignal::SetValue( const ValueType& newValue )
+bool DspSignal::SetValue( ValueType const& newValue )
 {
   _signalValue = newValue;
   _valueAvailable = true;
@@ -90,7 +90,7 @@
 {
   if( _valueAvailable )
   {
-    const ValueType* returnValuePtr = DspRunType::RunTypeCast< ValueType >( &_signalValue );
+    ValueType const* returnValuePtr = DspRunType::RunTypeCast< ValueType >( &_signalValue );
     if( returnValuePtr != NULL )
     {
       returnValue = *returnValuePtr;

=== modified file 'include/dspatch/DspSignalBus.h'
--- include/dspatch/DspSignalBus.h	2014-01-25 09:05:16 +0000
+++ include/dspatch/DspSignalBus.h	2014-06-16 15:43:30 +0000
@@ -1,6 +1,6 @@
 /************************************************************************
 DSPatch - Cross-Platform, Object-Oriented, Flow-Based Programming Library
-Copyright (c) 2012-2013 Marcus Tomlinson
+Copyright (c) 2012-2014 Marcus Tomlinson
 
 This file is part of DSPatch.
 
@@ -37,8 +37,7 @@
 receives signals into it's "inputs" DspSignalBus and provides signals to it's "outputs"
 DspSignalBus. Although DspSignals can be acquired from a DspSignalBus, the DspSignalBus class
 provides public getters and setters for manipulating it's internal DspSignal values directly,
-abstracting the need to retrieve and interface with the contained DspSignal objects. Likewise,
-signals can be added and removed from a DspSignalBus via public methods.
+abstracting the need to retrieve and interface with the contained DspSignals themself.
 */
 
 class DLLEXPORT DspSignalBus
@@ -46,46 +45,50 @@
 public:
   virtual ~DspSignalBus();
 
-  bool AddSignal( std::string signalName = "" );
-
-  bool SetSignal( unsigned short signalIndex, const DspSignal* newSignal );
-  bool SetSignal( std::string signalName, const DspSignal* newSignal );
+  bool SetSignal( unsigned short signalIndex, DspSignal const* newSignal );
+  bool SetSignal( std::string const& signalName, DspSignal const* newSignal );
 
   DspSignal* GetSignal( unsigned short signalIndex );
-  DspSignal* GetSignal( std::string signalName );
+  DspSignal* GetSignal( std::string const& signalName );
 
-  bool FindSignal( std::string signalName, unsigned short& returnIndex ) const;
+  bool FindSignal( std::string const& signalName, unsigned short& returnIndex ) const;
   bool FindSignal( unsigned short signalIndex, unsigned short& returnIndex ) const;
 
   unsigned short GetSignalCount() const;
 
-  void RemoveAllSignals();
-
-  template< class ValueType >
-  bool SetValue( unsigned short signalIndex, const ValueType& newValue );
-
-  template< class ValueType >
-  bool SetValue( std::string signalName, const ValueType& newValue );
+  template< class ValueType >
+  bool SetValue( unsigned short signalIndex, ValueType const& newValue );
+
+  template< class ValueType >
+  bool SetValue( std::string const& signalName, ValueType const& newValue );
 
   template< class ValueType >
   bool GetValue( unsigned short signalIndex, ValueType& returnValue ) const;
 
   template< class ValueType >
-  bool GetValue( std::string signalName, ValueType& returnValue ) const;
+  bool GetValue( std::string const& signalName, ValueType& returnValue ) const;
 
   void ClearValue( unsigned short signalIndex );
-  void ClearValue( std::string signalName );
+  void ClearValue( std::string const& signalName );
 
   void ClearAllValues();
 
 private:
+  friend class DspComponent;
+
+  bool _AddSignal( std::string const& signalName = "" );
+
+  bool _RemoveSignal();
+  void _RemoveAllSignals();
+
+private:
   std::vector< DspSignal > _signals;
 };
 
 //=================================================================================================
 
 template< class ValueType >
-bool DspSignalBus::SetValue( unsigned short signalIndex, const ValueType& newValue )
+bool DspSignalBus::SetValue( unsigned short signalIndex, ValueType const& newValue )
 {
   if( signalIndex < _signals.size() )
   {
@@ -100,7 +103,7 @@
 //-------------------------------------------------------------------------------------------------
 
 template< class ValueType >
-bool DspSignalBus::SetValue( std::string signalName, const ValueType& newValue )
+bool DspSignalBus::SetValue( std::string const& signalName, ValueType const& newValue )
 {
   unsigned short signalIndex;
 
@@ -132,7 +135,7 @@
 //-------------------------------------------------------------------------------------------------
 
 template< class ValueType >
-bool DspSignalBus::GetValue( std::string signalName, ValueType& returnValue ) const
+bool DspSignalBus::GetValue( std::string const& signalName, ValueType& returnValue ) const
 {
   unsigned short signalIndex;
 

=== modified file 'include/dspatch/DspThread.h'
--- include/dspatch/DspThread.h	2014-01-25 09:05:16 +0000
+++ include/dspatch/DspThread.h	2014-06-16 15:43:30 +0000
@@ -1,6 +1,6 @@
 /************************************************************************
 DSPatch - Cross-Platform, Object-Oriented, Flow-Based Programming Library
-Copyright (c) 2012-2013 Marcus Tomlinson
+Copyright (c) 2012-2014 Marcus Tomlinson
 
 This file is part of DSPatch.
 

=== modified file 'include/dspatch/DspThreadNull.h'
--- include/dspatch/DspThreadNull.h	2014-01-25 09:05:16 +0000
+++ include/dspatch/DspThreadNull.h	2014-06-16 15:43:30 +0000
@@ -1,6 +1,6 @@
 /************************************************************************
 DSPatch - Cross-Platform, Object-Oriented, Flow-Based Programming Library
-Copyright (c) 2012-2013 Marcus Tomlinson
+Copyright (c) 2012-2014 Marcus Tomlinson
 
 This file is part of DSPatch.
 

=== modified file 'include/dspatch/DspThreadUnix.h'
--- include/dspatch/DspThreadUnix.h	2014-01-25 09:05:16 +0000
+++ include/dspatch/DspThreadUnix.h	2014-06-16 15:43:30 +0000
@@ -1,6 +1,6 @@
 /************************************************************************
 DSPatch - Cross-Platform, Object-Oriented, Flow-Based Programming Library
-Copyright (c) 2012-2013 Marcus Tomlinson
+Copyright (c) 2012-2014 Marcus Tomlinson
 
 This file is part of DSPatch.
 
@@ -114,8 +114,6 @@
 
 class DspMutex
 {
-  friend class DspWaitCondition;
-
 public:
   DspMutex()
   {
@@ -138,6 +136,8 @@
   }
 
 private:
+  friend class DspWaitCondition;
+
   pthread_mutex_t _mutex;
 };
 

=== modified file 'include/dspatch/DspThreadWin.h'
--- include/dspatch/DspThreadWin.h	2014-01-25 09:05:16 +0000
+++ include/dspatch/DspThreadWin.h	2014-06-16 15:43:30 +0000
@@ -1,6 +1,6 @@
 /************************************************************************
 DSPatch - Cross-Platform, Object-Oriented, Flow-Based Programming Library
-Copyright (c) 2012-2013 Marcus Tomlinson
+Copyright (c) 2012-2014 Marcus Tomlinson
 
 This file is part of DSPatch.
 
@@ -37,7 +37,7 @@
   DspThread()
   : _threadHandle( NULL ) {}
 
-  DspThread( const DspThread& )
+  DspThread( DspThread const& )
   : _threadHandle( NULL ) {}
 
   virtual ~DspThread()
@@ -105,7 +105,7 @@
     InitializeCriticalSection( &_cs );
   }
 
-  DspMutex( const DspMutex& )
+  DspMutex( DspMutex const& )
   {
     InitializeCriticalSection( &_cs );
   }
@@ -139,7 +139,7 @@
     _hEvent = CreateEvent( NULL, TRUE, FALSE, NULL );
   }
 
-  DspWaitCondition( const DspWaitCondition& )
+  DspWaitCondition( DspWaitCondition const& )
   {
     _hEvent = CreateEvent( NULL, TRUE, FALSE, NULL );
   }

=== modified file 'include/dspatch/DspWire.h'
--- include/dspatch/DspWire.h	2014-01-25 09:05:16 +0000
+++ include/dspatch/DspWire.h	2014-06-16 15:43:30 +0000
@@ -1,6 +1,6 @@
 /************************************************************************
 DSPatch - Cross-Platform, Object-Oriented, Flow-Based Programming Library
-Copyright (c) 2012-2013 Marcus Tomlinson
+Copyright (c) 2012-2014 Marcus Tomlinson
 
 This file is part of DSPatch.
 

=== modified file 'include/dspatch/DspWireBus.h'
--- include/dspatch/DspWireBus.h	2014-01-25 09:05:16 +0000
+++ include/dspatch/DspWireBus.h	2014-06-16 15:43:30 +0000
@@ -1,6 +1,6 @@
 /************************************************************************
 DSPatch - Cross-Platform, Object-Oriented, Flow-Based Programming Library
-Copyright (c) 2012-2013 Marcus Tomlinson
+Copyright (c) 2012-2014 Marcus Tomlinson
 
 This file is part of DSPatch.
 
@@ -53,7 +53,7 @@
   bool AddWire( DspComponent* linkedComponent, unsigned short fromSignalIndex, unsigned short toSignalIndex );
 
   bool RemoveWire( unsigned short wireIndex );
-  bool RemoveWire( DspComponent* linkedComponent, unsigned short fromSignalIndex, unsigned short toSignalIndex );
+  bool RemoveWire( DspComponent const* linkedComponent, unsigned short fromSignalIndex, unsigned short toSignalIndex );
 
   void RemoveAllWires();
 

=== modified file 'src/DSPatch.cpp'
--- src/DSPatch.cpp	2014-01-19 09:07:19 +0000
+++ src/DSPatch.cpp	2014-06-16 15:43:30 +0000
@@ -1,6 +1,6 @@
 /************************************************************************
 DSPatch - Cross-Platform, Object-Oriented, Flow-Based Programming Library
-Copyright (c) 2012-2013 Marcus Tomlinson
+Copyright (c) 2012-2014 Marcus Tomlinson
 
 This file is part of DSPatch.
 
@@ -48,7 +48,7 @@
 
 //=================================================================================================
 
-bool DSPatch::_IsThisGlobalCircuit( DspComponent* thisComponent )
+bool DSPatch::_IsThisGlobalCircuit( DspComponent const* thisComponent )
 {
   if( _globalCircuit != NULL )
   {
@@ -72,7 +72,7 @@
 
 //-------------------------------------------------------------------------------------------------
 
-void DSPatch::_RemoveGlobalComponent( DspComponent* component )
+void DSPatch::_RemoveGlobalComponent( DspComponent const* component )
 {
   if( _globalCircuit != NULL )
   {

=== modified file 'src/DspCircuit.cpp'
--- src/DspCircuit.cpp	2014-01-25 09:05:16 +0000
+++ src/DspCircuit.cpp	2014-06-16 15:43:30 +0000
@@ -1,6 +1,6 @@
 /************************************************************************
 DSPatch - Cross-Platform, Object-Oriented, Flow-Based Programming Library
-Copyright (c) 2012-2013 Marcus Tomlinson
+Copyright (c) 2012-2014 Marcus Tomlinson
 
 This file is part of DSPatch.
 
@@ -109,14 +109,16 @@
 
 //-------------------------------------------------------------------------------------------------
 
-bool DspCircuit::AddComponent( DspComponent* component, std::string componentName )
+bool DspCircuit::AddComponent( DspComponent* component, std::string const& componentName )
 {
   if( component != this )
   {
+    std::string compName = componentName;
+
     // if the component has a name already
-    if( component->GetComponentName() != "" && componentName == "" )
+    if( component->GetComponentName() != "" && compName == "" )
     {
-      componentName = component->GetComponentName();
+      compName = component->GetComponentName();
     }
 
     unsigned short componentIndex;
@@ -129,7 +131,7 @@
     {
       return false; // if the component is already in the array
     }
-    if( _FindComponent( componentName, componentIndex ) )
+    if( _FindComponent( compName, componentIndex ) )
     {
       return false; // if the component name is already in the array
     }
@@ -137,7 +139,7 @@
     // components within the circuit need to have as many buffers as there are threads in the circuit
     component->_SetParentCircuit( this );
     component->_SetBufferCount( _circuitThreads.size() );
-    component->SetComponentName( componentName );
+    component->SetComponentName( compName );
 
     PauseAutoTick();
     _components.push_back( component );
@@ -151,14 +153,14 @@
 
 //-------------------------------------------------------------------------------------------------
 
-bool DspCircuit::AddComponent( DspComponent& component, std::string componentName )
+bool DspCircuit::AddComponent( DspComponent& component, std::string const& componentName )
 {
   return AddComponent( &component, componentName );
 }
 
 //-------------------------------------------------------------------------------------------------
 
-void DspCircuit::RemoveComponent( DspComponent* component )
+void DspCircuit::RemoveComponent( DspComponent const* component )
 {
   unsigned short componentIndex;
 
@@ -172,14 +174,14 @@
 
 //-------------------------------------------------------------------------------------------------
 
-void DspCircuit::RemoveComponent( DspComponent& component )
+void DspCircuit::RemoveComponent( DspComponent const& component )
 {
   RemoveComponent( &component );
 }
 
 //-------------------------------------------------------------------------------------------------
 
-void DspCircuit::RemoveComponent( std::string componentName )
+void DspCircuit::RemoveComponent( std::string const& componentName )
 {
   unsigned short componentIndex;
 
@@ -212,7 +214,7 @@
 
 //-------------------------------------------------------------------------------------------------
 
-void DspCircuit::DisconnectComponent( std::string component )
+void DspCircuit::DisconnectComponent( std::string const& component )
 {
   unsigned short componentIndex;
 
@@ -228,38 +230,58 @@
 
 //-------------------------------------------------------------------------------------------------
 
-bool DspCircuit::AddInput( std::string inputName )
+bool DspCircuit::AddInput( std::string const& inputName )
 {
   PauseAutoTick();
   bool result = AddInput_( inputName );
   ResumeAutoTick();
-
   return result;
 }
 
 //-------------------------------------------------------------------------------------------------
 
-bool DspCircuit::AddOutput( std::string outputName )
+bool DspCircuit::AddOutput( std::string const& outputName )
 {
   PauseAutoTick();
   bool result = AddOutput_( outputName );
   ResumeAutoTick();
-
   return result;
 }
 
 //-------------------------------------------------------------------------------------------------
 
-void DspCircuit::RemoveInputs()
-{
-  RemoveInputs_();
-}
-
-//-------------------------------------------------------------------------------------------------
-
-void DspCircuit::RemoveOutputs()
-{
-  RemoveOutputs_();
+void DspCircuit::RemoveInput()
+{
+  PauseAutoTick();
+  RemoveInput_();
+  ResumeAutoTick();
+}
+
+//-------------------------------------------------------------------------------------------------
+
+void DspCircuit::RemoveOutput()
+{
+  PauseAutoTick();
+  RemoveOutput_();
+  ResumeAutoTick();
+}
+
+//-------------------------------------------------------------------------------------------------
+
+void DspCircuit::RemoveAllInputs()
+{
+  PauseAutoTick();
+  RemoveAllInputs_();
+  ResumeAutoTick();
+}
+
+//-------------------------------------------------------------------------------------------------
+
+void DspCircuit::RemoveAllOutputs()
+{
+  PauseAutoTick();
+  RemoveAllOutputs_();
+  ResumeAutoTick();
 }
 
 //=================================================================================================
@@ -334,7 +356,7 @@
 
 //=================================================================================================
 
-bool DspCircuit::_FindComponent( DspComponent* component, unsigned short& returnIndex ) const
+bool DspCircuit::_FindComponent( DspComponent const* component, unsigned short& returnIndex ) const
 {
   for( unsigned short i = 0; i < _components.size(); i++ )
   {
@@ -350,14 +372,14 @@
 
 //-------------------------------------------------------------------------------------------------
 
-bool DspCircuit::_FindComponent( DspComponent& component, unsigned short& returnIndex ) const
+bool DspCircuit::_FindComponent( DspComponent const& component, unsigned short& returnIndex ) const
 {
   return _FindComponent( &component, returnIndex );
 }
 
 //-------------------------------------------------------------------------------------------------
 
-bool DspCircuit::_FindComponent( std::string componentName, unsigned short& returnIndex ) const
+bool DspCircuit::_FindComponent( std::string const& componentName, unsigned short& returnIndex ) const
 {
   for( unsigned short i = 0; i < _components.size(); i++ )
   {
@@ -389,7 +411,7 @@
 void DspCircuit::_DisconnectComponent( unsigned short componentIndex )
 {
   // remove component from _inputComponents and _inputWires
-  _components[ componentIndex ]->DisconnectInputs();
+  _components[ componentIndex ]->DisconnectAllInputs();
 
   // remove component from _inToInWires
   DspWire* wire;
@@ -427,12 +449,7 @@
   // setting a component's parent to NULL (above) calls _RemoveComponent (hence the following code will run)
   else if( _components.size() != 0 )
   {
-    for( unsigned short i = componentIndex; i < _components.size() - 1; i++ )
-    {
-      _components[i] = _components[i + 1]; // shift all lower elements up
-    }
-
-    _components.pop_back(); // remove end item
+    _components.erase( _components.begin() + componentIndex );
   }
 }
 

=== modified file 'src/DspCircuitThread.cpp'
--- src/DspCircuitThread.cpp	2014-01-25 09:05:16 +0000
+++ src/DspCircuitThread.cpp	2014-06-16 15:43:30 +0000
@@ -1,6 +1,6 @@
 /************************************************************************
 DSPatch - Cross-Platform, Object-Oriented, Flow-Based Programming Library
-Copyright (c) 2012-2013 Marcus Tomlinson
+Copyright (c) 2012-2014 Marcus Tomlinson
 
 This file is part of DSPatch.
 
@@ -44,7 +44,7 @@
 
 //=================================================================================================
 
-void DspCircuitThread::Initialise(  std::vector< DspComponent* >* components, unsigned short threadNo )
+void DspCircuitThread::Initialise( std::vector< DspComponent* >* components, unsigned short threadNo )
 {
   _components = components;
   _threadNo = threadNo;

=== modified file 'src/DspComponent.cpp'
--- src/DspComponent.cpp	2014-01-25 09:05:16 +0000
+++ src/DspComponent.cpp	2014-06-16 15:43:30 +0000
@@ -1,6 +1,6 @@
 /************************************************************************
 DSPatch - Cross-Platform, Object-Oriented, Flow-Based Programming Library
-Copyright (c) 2012-2013 Marcus Tomlinson
+Copyright (c) 2012-2014 Marcus Tomlinson
 
 This file is part of DSPatch.
 
@@ -37,7 +37,9 @@
   _componentName( "" ),
   _isAutoTickRunning( false ),
   _isAutoTickPaused( false ),
-  _hasTicked( false )
+  _hasTicked( false ),
+  _callback( NULL ),
+  _userData( NULL )
 {
   _componentThread.Initialise( this );
 }
@@ -53,12 +55,22 @@
 
   StopAutoTick();
   _SetBufferCount( 0 );
-  DisconnectInputs();
+  DisconnectAllInputs();
 }
 
 //=================================================================================================
 
-void DspComponent::SetComponentName( std::string componentName )
+void DspComponent::SetCallback( Callback_t const& callback, void* userData )
+{
+  PauseAutoTick();
+  _callback = callback;
+  _userData = userData;
+  ResumeAutoTick();
+}
+
+//-------------------------------------------------------------------------------------------------
+
+void DspComponent::SetComponentName( std::string const& componentName )
 {
   _componentName = componentName;
 }
@@ -92,19 +104,23 @@
 
 //-------------------------------------------------------------------------------------------------
 
-void DspComponent::DisconnectInput( std::string inputName )
+void DspComponent::DisconnectInput( std::string const& inputName )
 {
   unsigned short inputIndex;
 
+  PauseAutoTick();
+
   if( _FindInput( inputName, inputIndex ) )
   {
     DisconnectInput( inputIndex );
   }
+
+  ResumeAutoTick();
 }
 
 //-------------------------------------------------------------------------------------------------
 
-void DspComponent::DisconnectInput( DspComponent* inputComponent )
+void DspComponent::DisconnectInput( DspComponent const* inputComponent )
 {
   PauseAutoTick();
 
@@ -123,7 +139,7 @@
 
 //-------------------------------------------------------------------------------------------------
 
-void DspComponent::DisconnectInputs()
+void DspComponent::DisconnectAllInputs()
 {
   PauseAutoTick();
   _inputWires.RemoveAllWires();
@@ -132,16 +148,115 @@
 
 //-------------------------------------------------------------------------------------------------
 
-unsigned short DspComponent::GetInputCount() const
-{
-  return _inputBus.GetSignalCount();
-}
-
-//-------------------------------------------------------------------------------------------------
-
-unsigned short DspComponent::GetOutputCount() const
-{
-  return _outputBus.GetSignalCount();
+unsigned short DspComponent::GetInputCount()
+{
+  PauseAutoTick();
+  unsigned short inputCount = GetInputCount_();
+  ResumeAutoTick();
+  return inputCount;
+}
+
+//-------------------------------------------------------------------------------------------------
+
+unsigned short DspComponent::GetOutputCount()
+{
+  PauseAutoTick();
+  unsigned short outputCount = GetOutputCount_();
+  ResumeAutoTick();
+  return outputCount;
+}
+
+//-------------------------------------------------------------------------------------------------
+
+unsigned short DspComponent::GetParameterCount()
+{
+  PauseAutoTick();
+  unsigned short parameterCount = GetParameterCount_();
+  ResumeAutoTick();
+  return parameterCount;
+}
+
+//-------------------------------------------------------------------------------------------------
+
+std::string DspComponent::GetInputName( unsigned short index )
+{
+  std::string inputName;
+
+  PauseAutoTick();
+
+  if( index < _inputBus.GetSignalCount() )
+  {
+    inputName = _inputBus.GetSignal( index )->GetSignalName();
+  }
+  inputName = "";
+
+  ResumeAutoTick();
+  return inputName;
+}
+
+//-------------------------------------------------------------------------------------------------
+
+std::string DspComponent::GetOutputName( unsigned short index )
+{
+  std::string outputName;
+
+  PauseAutoTick();
+
+  if( index < _outputBus.GetSignalCount() )
+  {
+    outputName = _outputBus.GetSignal( index )->GetSignalName();
+  }
+  outputName = "";
+
+  ResumeAutoTick();
+  return outputName;
+}
+
+//-------------------------------------------------------------------------------------------------
+
+std::string DspComponent::GetParameterName( unsigned short index )
+{
+  std::string parameterName;
+
+  PauseAutoTick();
+
+  if( index < _parameters.size() )
+  {
+    std::map< std::string, DspParameter >::const_iterator it = _parameters.begin();
+    std::advance( it, index );
+    parameterName = it->first;
+  }
+  parameterName = "";
+
+  ResumeAutoTick();
+  return parameterName;
+}
+
+//-------------------------------------------------------------------------------------------------
+
+bool DspComponent::GetParameter( std::string const& paramName, DspParameter& param )
+{
+  bool result = false;
+  PauseAutoTick();
+
+  DspParameter const* paramPtr = GetParameter_( paramName );
+  if( paramPtr )
+  {
+    result = param.SetParam( *paramPtr );
+  }
+
+  ResumeAutoTick();
+  return result;
+}
+
+//-------------------------------------------------------------------------------------------------
+
+bool DspComponent::SetParameter( std::string const& paramName, DspParameter const& param )
+{
+  PauseAutoTick();
+  bool result = ParameterUpdating_( paramName, param );
+  ResumeAutoTick();
+  return result;
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -285,62 +400,197 @@
   }
 }
 
-//-------------------------------------------------------------------------------------------------
-
-DspSignal* DspComponent::_GetOutputSignal( unsigned short outputIndex )
-{
-  return _outputBus.GetSignal( outputIndex );
-}
-
-//-------------------------------------------------------------------------------------------------
-
-DspSignal* DspComponent::_GetOutputSignal( unsigned short outputIndex, unsigned short threadIndex )
-{
-  return _outputBuses[threadIndex].GetSignal( outputIndex );
-}
-
 //=================================================================================================
 
-bool DspComponent::AddInput_( std::string inputName )
-{
-  for( unsigned short i = 0; i < _inputBuses.size(); i++ )
-  {
-    _inputBuses[i].AddSignal( inputName );
-  }
-  return _inputBus.AddSignal( inputName );
-}
-
-//-------------------------------------------------------------------------------------------------
-
-bool DspComponent::AddOutput_( std::string outputName )
-{
-  for( unsigned short i = 0; i < _outputBuses.size(); i++ )
-  {
-    _outputBuses[i].AddSignal( outputName );
-  }
-  return _outputBus.AddSignal( outputName );
-}
-
-//-------------------------------------------------------------------------------------------------
-
-void DspComponent::RemoveInputs_()
-{
-  for( unsigned short i = 0; i < _inputBuses.size(); i++ )
-  {
-    _inputBuses[i].RemoveAllSignals();
-  }
-  return _inputBus.RemoveAllSignals();
-}
-
-//-------------------------------------------------------------------------------------------------
-
-void DspComponent::RemoveOutputs_()
-{
-  for( unsigned short i = 0; i < _outputBuses.size(); i++ )
-  {
-    _outputBuses[i].RemoveAllSignals();
-  }
-  return _outputBus.RemoveAllSignals();
+bool DspComponent::AddInput_( std::string const& inputName )
+{
+  for( unsigned short i = 0; i < _inputBuses.size(); i++ )
+  {
+    _inputBuses[i]._AddSignal( inputName );
+  }
+  if( _inputBus._AddSignal( inputName ) )
+  {
+    if( _callback )
+    {
+      _callback( this, InputAdded, _inputBus.GetSignalCount() - 1, _userData );
+    }
+    return true;
+  }
+  return false;
+}
+
+//-------------------------------------------------------------------------------------------------
+
+bool DspComponent::AddOutput_( std::string const& outputName )
+{
+  for( unsigned short i = 0; i < _outputBuses.size(); i++ )
+  {
+    _outputBuses[i]._AddSignal( outputName );
+  }
+  if( _outputBus._AddSignal( outputName ) )
+  {
+    if( _callback )
+    {
+      _callback( this, OutputAdded, _outputBus.GetSignalCount() - 1, _userData );
+    }
+    return true;
+  }
+  return false;
+}
+
+//-------------------------------------------------------------------------------------------------
+
+bool DspComponent::AddParameter_( std::string const& paramName, DspParameter const& param )
+{
+  if( _parameters.find( paramName ) == _parameters.end() )
+  {
+    _parameters.insert( std::make_pair( paramName, param ) );
+    if( _callback )
+    {
+      _callback( this, ParameterAdded, _parameters.size() - 1, _userData );
+    }
+    return true;
+  }
+  return false;
+}
+
+//-------------------------------------------------------------------------------------------------
+
+bool DspComponent::RemoveInput_()
+{
+  if( _inputBus._RemoveSignal() )
+  {
+    if( _callback )
+    {
+      _callback( this, InputRemoved, _inputBus.GetSignalCount(), _userData );
+    }
+    return true;
+  }
+  return false;
+}
+
+//-------------------------------------------------------------------------------------------------
+
+bool DspComponent::RemoveOutput_()
+{
+  if( _outputBus._RemoveSignal() )
+  {
+    if( _callback )
+    {
+      _callback( this, OutputRemoved, _outputBus.GetSignalCount(), _userData );
+    }
+    return true;
+  }
+  return false;
+}
+
+//-------------------------------------------------------------------------------------------------
+
+bool DspComponent::RemoveParameter_()
+{
+  if( !_parameters.empty() )
+  {
+    _parameters.erase( _parameters.rbegin()->first );
+    if( _callback )
+    {
+      _callback( this, ParameterRemoved, _parameters.size(), _userData );
+    }
+    return true;
+  }
+  return false;
+}
+
+//-------------------------------------------------------------------------------------------------
+
+void DspComponent::RemoveAllInputs_()
+{
+  for( unsigned short i = 0; i < _inputBuses.size(); i++ )
+  {
+    _inputBuses[i]._RemoveAllSignals();
+  }
+  _inputBus._RemoveAllSignals();
+  if( _callback )
+  {
+    _callback( this, InputRemoved, -1, _userData );
+  }
+}
+
+//-------------------------------------------------------------------------------------------------
+
+void DspComponent::RemoveAllOutputs_()
+{
+  for( unsigned short i = 0; i < _outputBuses.size(); i++ )
+  {
+    _outputBuses[i]._RemoveAllSignals();
+  }
+  _outputBus._RemoveAllSignals();
+  if( _callback )
+  {
+    _callback( this, OutputRemoved, -1, _userData );
+  }
+}
+
+//-------------------------------------------------------------------------------------------------
+
+void DspComponent::RemoveAllParameters_()
+{
+  _parameters.clear();
+  if( _callback )
+  {
+    _callback( this, ParameterRemoved, -1, _userData );
+  }
+}
+
+//-------------------------------------------------------------------------------------------------
+
+unsigned short DspComponent::GetInputCount_()
+{
+  return _inputBus.GetSignalCount();
+}
+
+//-------------------------------------------------------------------------------------------------
+
+unsigned short DspComponent::GetOutputCount_()
+{
+  return _outputBus.GetSignalCount();
+}
+
+//-------------------------------------------------------------------------------------------------
+
+unsigned short DspComponent::GetParameterCount_()
+{
+  return _parameters.size();
+}
+
+//-------------------------------------------------------------------------------------------------
+
+DspParameter const* DspComponent::GetParameter_( std::string const& paramName ) const
+{
+  std::map< std::string, DspParameter >::const_iterator it = _parameters.find( paramName );
+  if( it != _parameters.end() )
+  {
+    return &it->second;
+  }
+  return NULL;
+}
+
+//-------------------------------------------------------------------------------------------------
+
+bool DspComponent::SetParameter_( std::string const& paramName, DspParameter const& param )
+{
+  std::map< std::string, DspParameter >::iterator it = _parameters.find( paramName );
+  if( it != _parameters.end() )
+  {
+    if( it->second.SetParam( param ) )
+    {
+      if( _callback )
+      {
+        _callback( this, ParameterUpdated, std::distance( _parameters.begin(), _parameters.find( paramName ) ), _userData );
+      }
+      return true;
+    }
+  }
+  return false;
 }
 
 //=================================================================================================
@@ -373,7 +623,7 @@
 
 //-------------------------------------------------------------------------------------------------
 
-bool DspComponent::_FindInput( std::string signalName, unsigned short& returnIndex ) const
+bool DspComponent::_FindInput( std::string const& signalName, unsigned short& returnIndex ) const
 {
   return _inputBus.FindSignal( signalName, returnIndex );
 }
@@ -393,7 +643,7 @@
 
 //-------------------------------------------------------------------------------------------------
 
-bool DspComponent::_FindOutput( std::string signalName, unsigned short& returnIndex ) const
+bool DspComponent::_FindOutput( std::string const& signalName, unsigned short& returnIndex ) const
 {
   return _outputBus.FindSignal( signalName, returnIndex );
 }
@@ -446,12 +696,12 @@
 
     for( unsigned short j = 0; j < _inputBus.GetSignalCount(); j++ )
     {
-      _inputBuses[i].AddSignal( _inputBus.GetSignal( j )->GetSignalName() );
+      _inputBuses[i]._AddSignal( _inputBus.GetSignal( j )->GetSignalName() );
     }
 
     for( unsigned short j = 0; j < _outputBus.GetSignalCount(); j++ )
     {
-      _outputBuses[i].AddSignal( _outputBus.GetSignal( j )->GetSignalName() );
+      _outputBuses[i]._AddSignal( _outputBus.GetSignal( j )->GetSignalName() );
     }
   }
 
@@ -517,20 +767,34 @@
 
 //-------------------------------------------------------------------------------------------------
 
-bool DspComponent::_SetInputSignal( unsigned short inputIndex, const DspSignal* newSignal )
+bool DspComponent::_SetInputSignal( unsigned short inputIndex, DspSignal const* newSignal )
 {
   return _inputBus.SetSignal( inputIndex, newSignal );
 }
 
 //-------------------------------------------------------------------------------------------------
 
-bool DspComponent::_SetInputSignal( unsigned short inputIndex, unsigned short threadIndex, const DspSignal* newSignal )
+bool DspComponent::_SetInputSignal( unsigned short inputIndex, unsigned short threadIndex, DspSignal const* newSignal )
 {
   return _inputBuses[threadIndex].SetSignal( inputIndex, newSignal );
 }
 
 //-------------------------------------------------------------------------------------------------
 
+DspSignal* DspComponent::_GetOutputSignal( unsigned short outputIndex )
+{
+  return _outputBus.GetSignal( outputIndex );
+}
+
+//-------------------------------------------------------------------------------------------------
+
+DspSignal* DspComponent::_GetOutputSignal( unsigned short outputIndex, unsigned short threadIndex )
+{
+  return _outputBuses[threadIndex].GetSignal( outputIndex );
+}
+
+//-------------------------------------------------------------------------------------------------
+
 void DspComponent::_WaitForRelease( unsigned short threadNo )
 {
   _releaseMutexes[threadNo].Lock();

=== modified file 'src/DspComponentThread.cpp'
--- src/DspComponentThread.cpp	2014-01-25 09:05:16 +0000
+++ src/DspComponentThread.cpp	2014-06-16 15:43:30 +0000
@@ -1,6 +1,6 @@
 /************************************************************************
 DSPatch - Cross-Platform, Object-Oriented, Flow-Based Programming Library
-Copyright (c) 2012-2013 Marcus Tomlinson
+Copyright (c) 2012-2014 Marcus Tomlinson
 
 This file is part of DSPatch.
 

=== added file 'src/DspParameter.cpp'
--- src/DspParameter.cpp	1970-01-01 00:00:00 +0000
+++ src/DspParameter.cpp	2014-06-16 15:43:30 +0000
@@ -0,0 +1,462 @@
+/************************************************************************
+DSPatch - Cross-Platform, Object-Oriented, Flow-Based Programming Library
+Copyright (c) 2012-2014 Marcus Tomlinson
+
+This file is part of DSPatch.
+
+GNU Lesser General Public License Usage
+This file may be used under the terms of the GNU Lesser General Public
+License version 3.0 as published by the Free Software Foundation and
+appearing in the file LGPLv3.txt included in the packaging of this
+file. Please review the following information to ensure the GNU Lesser
+General Public License version 3.0 requirements will be met:
+http://www.gnu.org/copyleft/lgpl.html.
+
+Other Usage
+Alternatively, this file may be used in accordance with the terms and
+conditions contained in a signed written agreement between you and
+Marcus Tomlinson.
+
+DSPatch is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+************************************************************************/
+
+#include <dspatch/DspParameter.h>
+
+//=================================================================================================
+
+DspParameter::DspParameter()
+  : _type( Null ),
+    _isSet( false ),
+    _isRangeSet( false ) {}
+
+//-------------------------------------------------------------------------------------------------
+
+DspParameter::DspParameter( ParamType const& type )
+  : _type( type ),
+    _isSet( false ),
+    _isRangeSet( false ) {}
+
+//-------------------------------------------------------------------------------------------------
+
+DspParameter::DspParameter( ParamType const& type, int const& initValue, std::pair<int, int> const& valueRange )
+: _type( type ),
+  _isSet( false ),
+  _isRangeSet( false )
+{
+  if( type == Bool )
+  {
+    if( !SetBool( initValue != 0 ) )
+    {
+      _type = Null;
+    }
+  }
+  else if( type == Float )
+  {
+    if( !SetFloatRange( std::make_pair( ( float ) valueRange.first, ( float ) valueRange.second ) ) || !SetFloat( ( float ) initValue ) )
+    {
+      _type = Null;
+    }
+  }
+  else
+  {
+    if( !SetIntRange( valueRange ) || !SetInt( initValue ) )
+    {
+      _type = Null;
+    }
+  }
+}
+
+//-------------------------------------------------------------------------------------------------
+
+DspParameter::DspParameter( ParamType const& type, float const& initValue, std::pair<float, float> const& valueRange )
+  : _type( type ),
+    _isSet( false ),
+    _isRangeSet( false )
+{
+  if( !SetFloatRange( valueRange ) || !SetFloat( initValue ) )
+  {
+    _type = Null;
+  }
+}
+
+//-------------------------------------------------------------------------------------------------
+
+DspParameter::DspParameter( ParamType const& type, std::string const& initValue )
+  : _type( type ),
+    _isSet( false ),
+    _isRangeSet( false )
+{
+  if( !SetString( initValue ) )
+  {
+    _type = Null;
+  }
+}
+
+//-------------------------------------------------------------------------------------------------
+
+DspParameter::DspParameter( ParamType const& type, std::vector< std::string > const& initValue )
+  : _type( type ),
+    _isSet( false ),
+    _isRangeSet( false )
+{
+  if( !SetList( initValue ) )
+  {
+    _type = Null;
+  }
+}
+
+//=================================================================================================
+
+DspParameter::ParamType DspParameter::Type() const
+{
+  return _type;
+}
+
+//-------------------------------------------------------------------------------------------------
+
+bool DspParameter::IsSet() const
+{
+  return _isSet;
+}
+
+//-------------------------------------------------------------------------------------------------
+
+bool const* DspParameter::GetBool() const
+{
+  if( !_isSet )
+  {
+    return NULL;
+  }
+
+  if( _type == Bool )
+  {
+    return &_boolValue;
+  }
+
+  return NULL;
+}
+
+//-------------------------------------------------------------------------------------------------
+
+int const* DspParameter::GetInt() const
+{
+  if( !_isSet )
+  {
+    return NULL;
+  }
+
+  if( _type == Int || _type == List )
+  {
+    return &_intValue;
+  }
+
+  return NULL;
+}
+
+//-------------------------------------------------------------------------------------------------
+
+std::pair<int, int> const* DspParameter::GetIntRange() const
+{
+  if( !_isRangeSet )
+  {
+    return NULL;
+  }
+
+  if( _type == Int || _type == List )
+  {
+    return &_intRange;
+  }
+
+  return NULL;
+}
+
+//-------------------------------------------------------------------------------------------------
+
+float const* DspParameter::GetFloat() const
+{
+  if( !_isSet )
+  {
+    return NULL;
+  }
+
+  if( _type == Float )
+  {
+    return &_floatValue;
+  }
+
+  return NULL;
+}
+
+//-------------------------------------------------------------------------------------------------
+
+std::pair<float, float> const* DspParameter::GetFloatRange() const
+{
+  if( !_isRangeSet )
+  {
+    return NULL;
+  }
+
+  if( _type == Float )
+  {
+    return &_floatRange;
+  }
+
+  return NULL;
+}
+
+//-------------------------------------------------------------------------------------------------
+
+std::string const* DspParameter::GetString() const
+{
+  if( !_isSet )
+  {
+    return NULL;
+  }
+
+  if( _type == String || _type == FilePath )
+  {
+    return &_stringValue;
+  }
+  else if( _type == List )
+  {
+    return &_listValue[_intValue];
+  }
+
+  return NULL;
+}
+
+//-------------------------------------------------------------------------------------------------
+
+std::vector< std::string > const* DspParameter::GetList() const
+{
+  if( !_isSet )
+  {
+    return NULL;
+  }
+
+  if( _type == List )
+  {
+    return &_listValue;
+  }
+
+  return NULL;
+}
+
+//-------------------------------------------------------------------------------------------------
+
+bool DspParameter::SetBool( bool const& value )
+{
+  if( _type == Bool )
+  {
+    _boolValue = value;
+    _isSet = true;
+    return true;
+  }
+
+  return false;
+}
+
+//-------------------------------------------------------------------------------------------------
+
+bool DspParameter::SetInt( int const& value )
+{
+  if( _type == Int || _type == List )
+  {
+    if( _isRangeSet )
+    {
+      _intValue = value < _intRange.first ? _intRange.first : value;
+      _intValue = value > _intRange.second ? _intRange.second : value;
+    }
+    else
+    {
+      _intValue = value;
+    }
+    _isSet = true;
+    return true;
+  }
+
+  return false;
+}
+
+//-------------------------------------------------------------------------------------------------
+
+bool DspParameter::SetIntRange( std::pair<int, int> const& intRange )
+{
+  if( _type == Int )
+  {
+    _intRange = intRange;
+
+    if( intRange.first == intRange.second && intRange.first == -1 )
+    {
+      _isRangeSet = false;
+    }
+    else
+    {
+      _intValue = _intValue < intRange.first ? intRange.first : _intValue;
+      _intValue = _intValue > intRange.second ?  intRange.second : _intValue;
+      _isRangeSet = true;
+    }
+    return true;
+  }
+
+  return false;
+}
+
+//-------------------------------------------------------------------------------------------------
+
+bool DspParameter::SetFloat( float const& value )
+{
+  if( _type == Float )
+  {
+    if( _isRangeSet )
+    {
+      _floatValue = value < _floatRange.first ? _floatRange.first : value;
+      _floatValue = value > _floatRange.second ? _floatRange.second : value;
+    }
+    else
+    {
+      _floatValue = value;
+    }
+    _isSet = true;
+    return true;
+  }
+
+  return false;
+}
+
+//-------------------------------------------------------------------------------------------------
+
+bool DspParameter::SetFloatRange( std::pair<float, float> const& floatRange )
+{
+  if( _type == Float )
+  {
+    _floatRange = floatRange;
+
+    if( floatRange.first == floatRange.second && floatRange.first == -1 )
+    {
+      _isRangeSet = false;
+    }
+    else
+    {
+      _floatValue = _floatValue < floatRange.first ? floatRange.first : _floatValue;
+      _floatValue = _floatValue > floatRange.second ?  floatRange.second : _floatValue;
+      _isRangeSet = true;
+    }
+    return true;
+  }
+
+  return false;
+}
+
+//-------------------------------------------------------------------------------------------------
+
+bool DspParameter::SetString( std::string const& value )
+{
+  if( _type == String || _type == FilePath )
+  {
+    _stringValue = value;
+    _isSet = true;
+    return true;
+  }
+  else if( _type == List )
+  {
+    for( unsigned short i = 0; i < _listValue.size(); ++i )
+    {
+      if( _listValue[i] == value )
+      {
+        _intValue = i;
+        _isSet = true;
+        return true;
+      }
+    }
+  }
+
+  return false;
+}
+
+//-------------------------------------------------------------------------------------------------
+
+bool DspParameter::SetList( std::vector< std::string > const& value )
+{
+  if( _type == List )
+  {
+    _listValue = value;
+
+    _intRange.first = 0;
+    _intRange.second = value.size() - 1;
+    _isRangeSet = true;
+
+    _intValue = 0;
+    _isSet = true;
+    return true;
+  }
+
+  return false;
+}
+
+//-------------------------------------------------------------------------------------------------
+
+bool DspParameter::SetParam( DspParameter const& param )
+{
+  if( _type == Null )
+  {
+    _type = param.Type();
+  }
+
+  if( param.Type() == Bool )
+  {
+    if( param.GetBool() )
+    {
+      return SetBool( *param.GetBool() );
+    }
+  }
+  else if( param.Type() == Int )
+  {
+    if( param.GetIntRange() && param.GetInt() )
+    {
+      return SetIntRange( *param.GetIntRange() ) && SetInt( *param.GetInt() );
+    }
+    else if( param.GetInt() )
+    {
+      return SetInt( *param.GetInt() );
+    }
+  }
+  else if( param.Type() == Float )
+  {
+    if( param.GetFloatRange() && param.GetFloat() )
+    {
+      return SetFloatRange( *param.GetFloatRange() ) && SetFloat( *param.GetFloat() );
+    }
+    if( param.GetFloat() )
+    {
+      return SetFloat( *param.GetFloat() );
+    }
+  }
+  else if( param.Type() == String || param.Type() == FilePath )
+  {
+    if( param.GetString() )
+    {
+      return SetString( *param.GetString() );
+    }
+  }
+  else if( param.Type() == Trigger )
+  {
+    if( _type == Trigger )
+    {
+      return true;
+    }
+  }
+  else if( param.Type() == List )
+  {
+    if( param.GetList() )
+    {
+      return SetList( *param.GetList() );
+    }
+  }
+
+  return false;
+}
+
+//=================================================================================================

=== modified file 'src/DspSignal.cpp'
--- src/DspSignal.cpp	2014-01-25 09:05:16 +0000
+++ src/DspSignal.cpp	2014-06-16 15:43:30 +0000
@@ -1,6 +1,6 @@
 /************************************************************************
 DSPatch - Cross-Platform, Object-Oriented, Flow-Based Programming Library
-Copyright (c) 2012-2013 Marcus Tomlinson
+Copyright (c) 2012-2014 Marcus Tomlinson
 
 This file is part of DSPatch.
 
@@ -32,11 +32,11 @@
 
 //-------------------------------------------------------------------------------------------------
 
-DspSignal::~DspSignal() {};
+DspSignal::~DspSignal() {}
 
 //=================================================================================================
 
-bool DspSignal::SetSignal( const DspSignal* newSignal )
+bool DspSignal::SetSignal( DspSignal const* newSignal )
 {
   if( newSignal != NULL )
   {

=== modified file 'src/DspSignalBus.cpp'
--- src/DspSignalBus.cpp	2014-01-25 09:05:16 +0000
+++ src/DspSignalBus.cpp	2014-06-16 15:43:30 +0000
@@ -1,6 +1,6 @@
 /************************************************************************
 DSPatch - Cross-Platform, Object-Oriented, Flow-Based Programming Library
-Copyright (c) 2012-2013 Marcus Tomlinson
+Copyright (c) 2012-2014 Marcus Tomlinson
 
 This file is part of DSPatch.
 
@@ -26,29 +26,11 @@
 
 //=================================================================================================
 
-DspSignalBus::~DspSignalBus() {};
+DspSignalBus::~DspSignalBus() {}
 
 //=================================================================================================
 
-bool DspSignalBus::AddSignal( std::string signalName )
-{
-  if( signalName != "" )
-  {
-    unsigned short signalIndex;
-    if( FindSignal( signalName, signalIndex ) ) // if the name already exists
-    {
-      return false;
-    }
-  }
-
-  _signals.push_back( DspSignal( signalName ) );
-
-  return true;
-}
-
-//-------------------------------------------------------------------------------------------------
-
-bool DspSignalBus::SetSignal( unsigned short signalIndex, const DspSignal* newSignal )
+bool DspSignalBus::SetSignal( unsigned short signalIndex, DspSignal const* newSignal )
 {
   if( signalIndex < _signals.size() && newSignal != NULL )
   {
@@ -62,7 +44,7 @@
 
 //-------------------------------------------------------------------------------------------------
 
-bool DspSignalBus::SetSignal( std::string signalName, const DspSignal* newSignal )
+bool DspSignalBus::SetSignal( std::string const& signalName, DspSignal const* newSignal )
 {
   unsigned short signalIndex;
 
@@ -92,7 +74,7 @@
 
 //-------------------------------------------------------------------------------------------------
 
-DspSignal* DspSignalBus::GetSignal( std::string signalName )
+DspSignal* DspSignalBus::GetSignal( std::string const& signalName )
 {
   unsigned short signalIndex;
 
@@ -108,11 +90,16 @@
 
 //-------------------------------------------------------------------------------------------------
 
-bool DspSignalBus::FindSignal( std::string signalName, unsigned short& returnIndex ) const
+bool DspSignalBus::FindSignal( std::string const& signalName, unsigned short& returnIndex ) const
 {
+  if( signalName == "" )
+  {
+    return false;
+  }
+
   for( unsigned short i = 0; i < _signals.size(); i++ )
   {
-    if( signalName != "" && _signals[i].GetSignalName() == signalName )
+    if( _signals[i].GetSignalName() == signalName )
     {
       returnIndex = i;
       return true;
@@ -144,13 +131,6 @@
 
 //-------------------------------------------------------------------------------------------------
 
-void DspSignalBus::RemoveAllSignals()
-{
-  _signals.clear();
-}
-
-//-------------------------------------------------------------------------------------------------
-
 void DspSignalBus::ClearValue( unsigned short signalIndex )
 {
   if( signalIndex < _signals.size() )
@@ -161,7 +141,7 @@
 
 //-------------------------------------------------------------------------------------------------
 
-void DspSignalBus::ClearValue( std::string signalName )
+void DspSignalBus::ClearValue( std::string const& signalName )
 {
   unsigned short signalIndex;
 
@@ -182,3 +162,40 @@
 }
 
 //=================================================================================================
+
+bool DspSignalBus::_AddSignal( std::string const& signalName )
+{
+  if( signalName != "" )
+  {
+    unsigned short signalIndex;
+    if( FindSignal( signalName, signalIndex ) ) // if the name already exists
+    {
+      return false;
+    }
+  }
+
+  _signals.push_back( DspSignal( signalName ) );
+
+  return true;
+}
+
+//-------------------------------------------------------------------------------------------------
+
+bool DspSignalBus::_RemoveSignal()
+{
+  if( _signals.size() > 0 )
+  {
+    _signals.pop_back();
+    return true;
+  }
+  return false;
+}
+
+//-------------------------------------------------------------------------------------------------
+
+void DspSignalBus::_RemoveAllSignals()
+{
+  _signals.clear();
+}
+
+//=================================================================================================

=== modified file 'src/DspWireBus.cpp'
--- src/DspWireBus.cpp	2014-01-25 09:05:16 +0000
+++ src/DspWireBus.cpp	2014-06-16 15:43:30 +0000
@@ -1,6 +1,6 @@
 /************************************************************************
 DSPatch - Cross-Platform, Object-Oriented, Flow-Based Programming Library
-Copyright (c) 2012-2013 Marcus Tomlinson
+Copyright (c) 2012-2014 Marcus Tomlinson
 
 This file is part of DSPatch.
 
@@ -76,7 +76,7 @@
 
 //-------------------------------------------------------------------------------------------------
 
-bool DspWireBus::RemoveWire( DspComponent* linkedComponent, unsigned short fromSignalIndex, unsigned short toSignalIndex )
+bool DspWireBus::RemoveWire( DspComponent const* linkedComponent, unsigned short fromSignalIndex, unsigned short toSignalIndex )
 {
   for( unsigned short i = 0; i < _wires.size(); i++ )
   {
@@ -101,11 +101,7 @@
     return false;
   }
 
-  for( unsigned short j = wireIndex; j < ( _wires.size() - 1 ); j++ )
-  {
-    _wires[j] = _wires[j + 1]; // shift all other elements up
-  }
-  _wires.pop_back(); // remove end item
+  _wires.erase( _wires.begin() + wireIndex );
 
   return true;
 }