Merge lp:dspatch/2.70 into lp:dspatch

[Marcus Tomlinson]

=== modified file '.bzrignore'
--- .bzrignore	2014-01-19 08:28:22 +0000
+++ .bzrignore	2014-12-21 12:19:18 +0000
@@ -1,2 +1,4 @@
-*.user
+./CMakeLists.txt.user
 ./doc/html
+./doc/doxygen_sqlite3.db
+./build

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-08-17 10:44:10 +0000
+++ CMakeLists.txt	2014-12-21 12:19:18 +0000
@@ -1,11 +1,6 @@
 cmake_minimum_required(VERSION 2.8)
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -pthread")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Wcast-align -Wcast-qual -Wctor-dtor-privacy")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wdisabled-optimization -Wformat=2 -Wlogical-op -Wmissing-declarations")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wmissing-include-dirs -Woverloaded-virtual -Wredundant-decls -Winit-self")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wsign-promo -Wstrict-null-sentinel -Wstrict-overflow=5 -Wreorder -Wno-vla")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wswitch-default -Wno-unused -Wnon-virtual-dtor -Wshadow -Wnoexcept -Wabi")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -pthread -pedantic -Wall -Wextra -Wnon-virtual-dtor")
 
 project(DSPatch)
 
@@ -25,11 +20,12 @@
     ${in_hdrs}
 )
 
-# Link pthread on Unix
+# Link pthread and dl on Unix
 if(UNIX)
     target_link_libraries(
         ${PROJECT_NAME}
         pthread
+        dl
     )
 endif(UNIX)
 

=== renamed file 'build' => 'build.sh'
--- build	2014-02-02 16:21:18 +0000
+++ build.sh	2014-12-21 12:19:18 +0000
@@ -1,6 +1,6 @@
 #!/bin/bash
-src_dir=$(dirname ${BASH_SOURCE[0]})
-build_dir=${src_dir}-build
+src_dir=$(dirname $(readlink -f "$0"))
+build_dir=${src_dir}/build
 
 if [ -f "/usr/bin/ninja" ] ; then
   GENERATOR="Ninja"

=== modified file 'doc/Doxyfile'
--- doc/Doxyfile	2014-08-17 10:44:10 +0000
+++ doc/Doxyfile	2014-12-21 12:19:18 +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.62
+PROJECT_NUMBER         = v.2.70
 
 # 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-06-08 09:18:18 +0000
+++ example/CMakeLists.txt	2014-12-21 12:19:18 +0000
@@ -1,5 +1,7 @@
 project(DSPatchExample)
 
+add_subdirectory(oscillator-plugin)
+
 file(GLOB srcs *.cpp rtaudio/*.cpp)
 file(GLOB hdrs *.h rtaudio/*.h)
 
@@ -9,7 +11,7 @@
     ${CMAKE_CURRENT_SOURCE_DIR}/rtaudio
 )
 
-# Add definition of example audio file
+# Add definition for example audio file
 add_definitions(-DEXAMPLE_WAV_FILE="${CMAKE_CURRENT_SOURCE_DIR}/Sample.wav")
 
 add_executable(
@@ -25,8 +27,9 @@
 
 # Definition for RtAudio Windows, using direct sound
 if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+    add_definitions(-DEXAMPLE_PLUGIN_FILE="${CMAKE_CURRENT_BINARY_DIR}/oscillator-plugin/$<CONFIGURATION>/DspOscillator.dll")
     add_definitions(-D__WINDOWS_WASAPI__)
-    
+
     add_custom_command(
         TARGET ${PROJECT_NAME} POST_BUILD
         COMMAND ${CMAKE_COMMAND} -E copy_if_different
@@ -37,16 +40,23 @@
 
 # Definition for RtAudio Linux, using ALSA
 if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+    add_definitions(-DEXAMPLE_PLUGIN_FILE="${CMAKE_CURRENT_BINARY_DIR}/oscillator-plugin/libDspOscillator.so")
     add_definitions(-D__LINUX_ALSA__)
 
+    find_library(ASOUND asound)
+    if(NOT ASOUND)
+        message(FATAL_ERROR "ALSA not found (Ensure that libasound2-dev is installed)")
+    endif()
+
     target_link_libraries(
         ${PROJECT_NAME}
-        asound
+        ${ASOUND}
     )
 endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 
 # Definition for RtAudio Mac OSX, using Core Audio
 if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+    add_definitions(-DEXAMPLE_PLUGIN_FILE="${CMAKE_CURRENT_BINARY_DIR}/oscillator-plugin/$<CONFIGURATION>/libDspOscillator.dylib")
     add_definitions(-D__MACOSX_CORE__)
 
     target_link_libraries(

=== removed file 'example/DspOscillator.cpp'
--- example/DspOscillator.cpp	2014-08-17 08:07:56 +0000
+++ example/DspOscillator.cpp	1970-01-01 00:00:00 +0000
@@ -1,223 +0,0 @@
-/************************************************************************
-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 <DspOscillator.h>
-
-#include <math.h>
-
-//=================================================================================================
-
-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 )
-: _lastPos( 0 ),
-  _lookupLength( 0 )
-{
-  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();
-}
-
-//-------------------------------------------------------------------------------------------------
-
-DspOscillator::~DspOscillator() {}
-
-//=================================================================================================
-
-void DspOscillator::SetBufferSize( int bufferSize )
-{
-  SetParameter_( pBufferSize, DspParameter( DspParameter::Int, bufferSize ) );
-
-  _processMutex.Lock();
-  _BuildLookup();
-  _processMutex.Unlock();
-}
-
-//-------------------------------------------------------------------------------------------------
-
-void DspOscillator::SetSampleRate( int sampleRate )
-{
-  SetParameter_( pSampleRate, DspParameter( DspParameter::Int, sampleRate ) );
-
-  _processMutex.Lock();
-  _BuildLookup();
-  _processMutex.Unlock();
-}
-
-//-------------------------------------------------------------------------------------------------
-
-void DspOscillator::SetAmpl( float ampl )
-{
-  SetParameter_( pAmplitude, DspParameter( DspParameter::Float, ampl ) );
-
-  _processMutex.Lock();
-  _BuildLookup();
-  _processMutex.Unlock();
-}
-
-//-------------------------------------------------------------------------------------------------
-
-void DspOscillator::SetFreq( float 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 )
-{
-  // Synchronise sample rate with the "Sample Rate" input feed
-  // =========================================================
-  int sampleRate;
-  if( inputs.GetValue( "Sample Rate", sampleRate ) )
-  {
-    if( sampleRate != GetSampleRate() )
-    {
-      SetSampleRate( sampleRate );
-    }
-  }
-
-  // Synchronise buffer size with the size of incoming buffers
-  // =========================================================
-  if( inputs.GetValue( "Buffer Size", _signal ) )
-  {
-    if( GetBufferSize() != (int) _signal.size() )
-    {
-      SetBufferSize( _signal.size() );
-    }
-  }
-
-  _processMutex.Lock();
-
-  if( _signalLookup.size() != 0 )
-  {
-    for( unsigned long i = 0; i < _signal.size(); i ++ )
-    {
-      if( _lastPos >= _lookupLength )
-        _lastPos = 0;
-      _signal[i] = _signalLookup[_lastPos++];
-    }
-
-    outputs.SetValue( 0, _signal );
-  }
-
-  _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 * 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 ) * GetAmpl();
-  }
-
-  _lastPos = ( unsigned long ) ( posFrac * ( float ) _lookupLength + 0.5f );	//calculate new position (round up)
-}
-
-//=================================================================================================

=== removed file 'example/DspOscillator.h'
--- example/DspOscillator.h	2014-06-16 10:02:03 +0000
+++ example/DspOscillator.h	1970-01-01 00:00:00 +0000
@@ -1,71 +0,0 @@
-/************************************************************************
-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 DSPOSCILLATOR_H
-#define DSPOSCILLATOR_H
-
-#include <DSPatch.h>
-
-//=================================================================================================
-
-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( int bufferSize );
-  void SetSampleRate( int sampleRate );
-  void SetAmpl( float ampl );
-  void SetFreq( float 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:
-  std::vector< float > _signalLookup;
-  std::vector< float > _signal;
-
-  unsigned long _lastPos;
-  unsigned long _lookupLength;
-
-  DspMutex _processMutex;
-
-  void _BuildLookup();
-};
-
-//=================================================================================================
-
-#endif /* DSPOSCILLATOR_H */

=== modified file 'example/main.cpp'
--- example/main.cpp	2014-06-16 15:31:48 +0000
+++ example/main.cpp	2014-12-21 12:19:18 +0000
@@ -27,7 +27,6 @@
 #include <DspWaveStreamer.h>
 #include <DspGain.h>
 #include <DspAudioDevice.h>
-#include <DspOscillator.h>
 #include <DspAdder.h>
 
 #include <stdio.h>
@@ -73,7 +72,7 @@
   circuit.ConnectOutToIn( gainRight, 0, audioDevice, 1 );   // gain right into audio device right channel
 
   // set the gain of components gainLeft and gainRight (wave left and right channels)
-  gainLeft.SetGain( 0.75 );
+  gainLeft.SetParameter( DspGain::pGain, DspParameter( DspParameter::Float, 0.75f ) ); // OR: gainLeft.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
@@ -89,10 +88,16 @@
   // 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
-
-  // declare components to be added to the circuit
-  DspOscillator oscillator( 1000.0f, 0.1f );
+  // a component input pin can only receive one signal at a time so an adders are required to combine the signals
+
+  // load the oscillator plugin and create an instance of it
+  DspPluginLoader oscillPlugin( EXAMPLE_PLUGIN_FILE );
+  std::map< std::string, DspParameter > oscillParams = oscillPlugin.GetCreateParams();
+  oscillParams[ "startFreq" ] = DspParameter( DspParameter::Float, 1000.0f );
+  oscillParams[ "startAmpl" ] = DspParameter( DspParameter::Float, 0.1f );
+  DspComponent* oscillator = oscillPlugin.Create( oscillParams );
+
+  // declare the rest of the components to be added to the circuit
   DspAdder adder1;
   DspAdder adder2;
 
@@ -120,7 +125,7 @@
   // 3. Overlay both streams
   // =======================
 
-  // resume the track (via parameter)
+  // resume the track
   waveStreamer.Play();
 
   // wait for key press
@@ -129,6 +134,9 @@
   // clean up DSPatch
   DSPatch::Finalize();
 
+  // clean up the oscillator pointer
+  delete oscillator;
+
   return 0;
 }
 

=== added directory 'example/oscillator-plugin'
=== added file 'example/oscillator-plugin/CMakeLists.txt'
--- example/oscillator-plugin/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ example/oscillator-plugin/CMakeLists.txt	2014-12-21 12:19:18 +0000
@@ -0,0 +1,20 @@
+project(DspOscillator)
+
+file(GLOB srcs *.cpp)
+file(GLOB hdrs *.h)
+
+include_directories(
+    ${CMAKE_SOURCE_DIR}/include
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+add_library(
+    ${PROJECT_NAME} SHARED
+    ${srcs}
+    ${hdrs}
+)
+
+target_link_libraries(
+    ${PROJECT_NAME}
+    DSPatch
+)

=== added file 'example/oscillator-plugin/DspOscillator.cpp'
--- example/oscillator-plugin/DspOscillator.cpp	1970-01-01 00:00:00 +0000
+++ example/oscillator-plugin/DspOscillator.cpp	2014-12-21 12:19:18 +0000
@@ -0,0 +1,223 @@
+/************************************************************************
+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 <DspOscillator.h>
+
+#include <math.h>
+
+//=================================================================================================
+
+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 )
+: _lastPos( 0 ),
+  _lookupLength( 0 )
+{
+  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();
+}
+
+//-------------------------------------------------------------------------------------------------
+
+DspOscillator::~DspOscillator() {}
+
+//=================================================================================================
+
+void DspOscillator::SetBufferSize( int bufferSize )
+{
+  SetParameter_( pBufferSize, DspParameter( DspParameter::Int, bufferSize ) );
+
+  _processMutex.Lock();
+  _BuildLookup();
+  _processMutex.Unlock();
+}
+
+//-------------------------------------------------------------------------------------------------
+
+void DspOscillator::SetSampleRate( int sampleRate )
+{
+  SetParameter_( pSampleRate, DspParameter( DspParameter::Int, sampleRate ) );
+
+  _processMutex.Lock();
+  _BuildLookup();
+  _processMutex.Unlock();
+}
+
+//-------------------------------------------------------------------------------------------------
+
+void DspOscillator::SetAmpl( float ampl )
+{
+  SetParameter_( pAmplitude, DspParameter( DspParameter::Float, ampl ) );
+
+  _processMutex.Lock();
+  _BuildLookup();
+  _processMutex.Unlock();
+}
+
+//-------------------------------------------------------------------------------------------------
+
+void DspOscillator::SetFreq( float 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 )
+{
+  // Synchronise sample rate with the "Sample Rate" input feed
+  // =========================================================
+  int sampleRate;
+  if( inputs.GetValue( "Sample Rate", sampleRate ) )
+  {
+    if( sampleRate != GetSampleRate() )
+    {
+      SetSampleRate( sampleRate );
+    }
+  }
+
+  // Synchronise buffer size with the size of incoming buffers
+  // =========================================================
+  if( inputs.GetValue( "Buffer Size", _signal ) )
+  {
+    if( GetBufferSize() != ( int ) _signal.size() )
+    {
+      SetBufferSize( _signal.size() );
+    }
+  }
+
+  _processMutex.Lock();
+
+  if( _signalLookup.size() != 0 )
+  {
+    for( unsigned long i = 0; i < _signal.size(); i ++ )
+    {
+      if( _lastPos >= _lookupLength )
+        _lastPos = 0;
+      _signal[i] = _signalLookup[_lastPos++];
+    }
+
+    outputs.SetValue( 0, _signal );
+  }
+
+  _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 * 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 ) * GetAmpl();
+  }
+
+  _lastPos = ( unsigned long ) ( posFrac * ( float ) _lookupLength + 0.5f );	//calculate new position (round up)
+}
+
+//=================================================================================================

=== added file 'example/oscillator-plugin/DspOscillator.h'
--- example/oscillator-plugin/DspOscillator.h	1970-01-01 00:00:00 +0000
+++ example/oscillator-plugin/DspOscillator.h	2014-12-21 12:19:18 +0000
@@ -0,0 +1,105 @@
+/************************************************************************
+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 DSPOSCILLATOR_H
+#define DSPOSCILLATOR_H
+
+#include <DSPatch.h>
+
+//=================================================================================================
+
+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( int bufferSize );
+  void SetSampleRate( int sampleRate );
+  void SetAmpl( float ampl );
+  void SetFreq( float 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:
+  std::vector< float > _signalLookup;
+  std::vector< float > _signal;
+
+  unsigned long _lastPos;
+  unsigned long _lookupLength;
+
+  DspMutex _processMutex;
+
+  void _BuildLookup();
+};
+
+//=================================================================================================
+
+class DspOscillatorPlugin : public DspPlugin
+{
+  std::map< std::string, DspParameter > GetCreateParams() const
+  {
+    std::map< std::string, DspParameter > params;
+    params[ "startFreq" ] = DspParameter( DspParameter::Float );
+    params[ "startAmpl" ] = DspParameter( DspParameter::Float, 1.0f, std::make_pair( 0.0f, 1.0f ) );
+    return params;
+  }
+
+  DspComponent* Create( std::map< std::string, DspParameter >& params ) const
+  {
+    float const* startFreq = params[ "startFreq" ].GetFloat();
+    float const* startAmpl = params[ "startAmpl" ].GetFloat();
+
+    if( startFreq && startAmpl )
+    {
+      return new DspOscillator( *startFreq, *startAmpl );
+    }
+    else if( startFreq && !startAmpl )
+    {
+      return new DspOscillator( *startFreq );
+    }
+    else
+    {
+      return new DspOscillator();
+    }
+  }
+};
+
+EXPORT_DSPPLUGIN( DspOscillatorPlugin )
+
+//=================================================================================================
+
+#endif /* DSPOSCILLATOR_H */

=== modified file 'include/DSPatch.h'
--- include/DSPatch.h	2014-08-18 16:44:09 +0000
+++ include/DSPatch.h	2014-12-21 12:19:18 +0000
@@ -28,6 +28,7 @@
 //-------------------------------------------------------------------------------------------------
 
 #include <dspatch/DspCircuit.h>
+#include <dspatch/DspPluginLoader.h>
 
 //=================================================================================================
 /// System-wide DSPatch functionality
@@ -106,6 +107,7 @@
 
 \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>Component plugins</b> - Package components into plugins to be dynamically loaded into DSPatch host applications.
   - <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.
@@ -372,6 +374,10 @@
 
 \section changelog Changelog
 
+\subsection v270 v.2.70 (21 December 2014)
+  - Added support for DspComponent plugins (DspPlugin + DspPluginLoader).
+  - Fixed build and install scripts.
+
 \subsection v262 v.2.62 (18 August 2014)
   - Added alternative Get* methods returning const pointers.
   - Increased build warning level and fixed all issues.

=== added file 'include/dspatch/DspPlugin.h'
--- include/dspatch/DspPlugin.h	1970-01-01 00:00:00 +0000
+++ include/dspatch/DspPlugin.h	2014-12-21 12:19:18 +0000
@@ -0,0 +1,95 @@
+/************************************************************************
+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 DSPPLUGIN_H
+#define DSPPLUGIN_H
+
+//-------------------------------------------------------------------------------------------------
+
+#include <dspatch/DspComponent.h>
+
+#include <map>
+#include <string>
+
+//=================================================================================================
+/// Abstract base class for DspComponent plugins
+
+/**
+A DspComponent can be packaged into a shared library (.so / .dylib / .dll) and dynamically loaded
+from a DSPatch application at runtime. This allows DSPatch applications and components to be built
+and released independently of each other, resulting in a highly flexible developer (and end-user)
+experience. Now, in order for a DspComponent to be packaged into a plugin (shared library), the
+plugin needs to expose some details about itself to the outside world. This is achieved via the
+DspPlugin abstract base class.
+
+A DspComponent plugin project must contain 2 classes: 1. A class derived from DspComponent that
+implements the component logic, and 2. A class derived from DspPlugin that implements the component
+construction logic.
+
+Classes derived from DspPlugin must (at least) implement the pure virtual method: Create(). If the
+DspComponent does not require any construction parameters, Create() should simply return a pointer
+to a new instantiation of that DspComponent. If a DspComponent does require construction parameters
+to be instantiated, the derived class must also implement the virtual GetCreateParams() method.
+This method should return a map of parameter name-to-DspParameter pairs. The plugin host can then
+assign values to this parameter map and return them via the Create() call.
+
+Once both DspComponent and DspPlugin classes have been implemented, add the line
+"EXPORT_DSPPLUGIN( MyPlugin )" anywhere after the declaration of your DspPlugin class, where
+"MyPlugin" is the name of your DspPlugin class. Then compile the project into a shared library.
+
+The plugin is now ready to be loaded into a DSPatch host application (see DspPluginLoader).
+*/
+
+class DLLEXPORT DspPlugin
+{
+public:
+  virtual ~DspPlugin() {}
+  virtual std::map< std::string, DspParameter > GetCreateParams() const;
+  virtual DspComponent* Create( std::map< std::string, DspParameter >& params ) const = 0;
+};
+
+//=================================================================================================
+
+#define EXPORT_DSPPLUGIN( Plugin )\
+extern "C"\
+{\
+  DLLEXPORT std::map< std::string, DspParameter > GetCreateParams()\
+  {\
+    DspPlugin* plugin = new Plugin();\
+    std::map< std::string, DspParameter > params  = plugin->GetCreateParams();\
+    delete plugin;\
+    return params;\
+  }\
+  DLLEXPORT DspComponent* Create( std::map< std::string, DspParameter >& params )\
+  {\
+    DspPlugin* plugin = new Plugin();\
+    DspComponent* component = plugin->Create( params );\
+    delete plugin;\
+    return component;\
+  }\
+}
+
+//=================================================================================================
+
+#endif // DSPPLUGIN_H

=== added file 'include/dspatch/DspPluginLoader.h'
--- include/dspatch/DspPluginLoader.h	1970-01-01 00:00:00 +0000
+++ include/dspatch/DspPluginLoader.h	2014-12-21 12:19:18 +0000
@@ -0,0 +1,68 @@
+/************************************************************************
+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 DSPPLUGINLOADER_H
+#define DSPPLUGINLOADER_H
+
+//-------------------------------------------------------------------------------------------------
+
+#include <dspatch/DspPlugin.h>
+
+//=================================================================================================
+/// Plugin loader for DspPlugin host applications
+
+/**
+A DspComponent packaged into a shared library (.so / .dylib / .dll) and exported via the DspPlugin
+class can be dynamically loaded from a DSPatch application at runtime using a DspPluginLoader. A
+DspPluginLoader represents exactly one DspPlugin in a host application.
+
+A DspPluginLoader should be constructed with the absolute path of the plugin (shared library) to be
+loaded. Once instantiated you should check that the plugin was successfully loaded by calling
+IsLoaded(). Thereafter, the contained DspComponent can be instantiated via the GetCreateParams()
+and Create() methods accordingly (For more detail on the structure of a plugin, see DspPlugin).
+*/
+
+class DLLEXPORT DspPluginLoader : public DspPlugin
+{
+public:
+  DspPluginLoader( std::string const& pluginPath );
+  ~DspPluginLoader();
+
+  bool IsLoaded() const;
+
+  std::map< std::string, DspParameter > GetCreateParams() const;
+  DspComponent* Create( std::map< std::string, DspParameter >& params ) const;
+
+private:
+  typedef std::map< std::string, DspParameter >( *GetCreateParams_t )();
+  typedef DspComponent*( *Create_t )( std::map< std::string, DspParameter >& );
+
+  void* _handle;
+  GetCreateParams_t _getCreateParams;
+  Create_t _create;
+};
+
+//=================================================================================================
+
+#endif // DSPPLUGINLOADER_H

=== modified file 'include/dspatch/DspThreadNull.h'
--- include/dspatch/DspThreadNull.h	2014-04-07 16:39:53 +0000
+++ include/dspatch/DspThreadNull.h	2014-12-21 12:19:18 +0000
@@ -55,7 +55,7 @@
     HighPriority,
     HighestPriority,
 
-    TimeCriticalPriority,
+    TimeCriticalPriority
   };
 
   virtual void Start( Priority priority ) {}

=== modified file 'include/dspatch/DspThreadWin.h'
--- include/dspatch/DspThreadWin.h	2014-04-08 13:23:50 +0000
+++ include/dspatch/DspThreadWin.h	2014-12-21 12:19:18 +0000
@@ -55,7 +55,7 @@
     HighPriority = 1,
     HighestPriority = 2,
 
-    TimeCriticalPriority = 15,
+    TimeCriticalPriority = 15
   };
 
   virtual void Start( Priority priority = NormalPriority )

=== renamed file 'install' => 'install.sh'
--- install	2014-02-02 16:21:18 +0000
+++ install.sh	2014-12-21 12:19:18 +0000
@@ -1,6 +1,6 @@
 #!/bin/bash
-src_dir=$(dirname ${BASH_SOURCE[0]})
-build_dir=${src_dir}-build
+src_dir=$(dirname $(readlink -f "$0"))
+build_dir=${src_dir}/build
 
 if [ -f "/usr/bin/ninja" ] ; then
   BUILD_COMMAND="ninja"
@@ -8,6 +8,6 @@
   BUILD_COMMAND="make"
 fi
 
-${src_dir}/build
+${src_dir}/build.sh
 cd ${build_dir}
 sudo ${BUILD_COMMAND} install

=== modified file 'src/DspCircuit.cpp'
--- src/DspCircuit.cpp	2014-06-14 15:35:42 +0000
+++ src/DspCircuit.cpp	2014-12-21 12:19:18 +0000
@@ -111,7 +111,7 @@
 
 bool DspCircuit::AddComponent( DspComponent* component, std::string const& componentName )
 {
-  if( component != this )
+  if( component != this && component != NULL )
   {
     std::string compName = componentName;
 

=== added file 'src/DspPlugin.cpp'
--- src/DspPlugin.cpp	1970-01-01 00:00:00 +0000
+++ src/DspPlugin.cpp	2014-12-21 12:19:18 +0000
@@ -0,0 +1,34 @@
+/************************************************************************
+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/DspPlugin.h>
+
+//=================================================================================================
+
+std::map< std::string, DspParameter > DspPlugin::GetCreateParams() const
+{
+  return std::map< std::string, DspParameter >();
+}
+
+//=================================================================================================

=== added file 'src/DspPluginLoader.cpp'
--- src/DspPluginLoader.cpp	1970-01-01 00:00:00 +0000
+++ src/DspPluginLoader.cpp	2014-12-21 12:19:18 +0000
@@ -0,0 +1,113 @@
+/************************************************************************
+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/DspPluginLoader.h>
+
+#ifdef _WIN32
+  #include <windows.h>
+#else
+  #include <dlfcn.h>
+#endif
+
+//=================================================================================================
+
+DspPluginLoader::DspPluginLoader( std::string const& pluginPath )
+  : _handle( NULL )
+{
+  // open library
+  #ifdef _WIN32
+    _handle = LoadLibrary( pluginPath.c_str() );
+  #else
+    _handle = dlopen( pluginPath.c_str(), RTLD_NOW );
+  #endif
+
+  if( _handle )
+  {
+    // load symbols
+    #ifdef _WIN32
+      _getCreateParams = ( GetCreateParams_t ) GetProcAddress( ( HMODULE ) _handle, "GetCreateParams" );
+      _create = ( Create_t ) GetProcAddress( ( HMODULE ) _handle, "Create" );
+    #else
+      _getCreateParams = ( GetCreateParams_t ) dlsym( _handle, "GetCreateParams" );
+      _create = ( Create_t ) dlsym( _handle, "Create" );
+    #endif
+
+    if( !_getCreateParams || !_create )
+    {
+      #ifdef _WIN32
+        FreeLibrary( ( HMODULE ) _handle );
+      #else
+        dlclose( _handle );
+      #endif
+
+      _handle = NULL;
+    }
+  }
+}
+
+//-------------------------------------------------------------------------------------------------
+
+DspPluginLoader::~DspPluginLoader()
+{
+  // close library
+  if( _handle )
+  {
+    #ifdef _WIN32
+      FreeLibrary( ( HMODULE ) _handle );
+    #else
+      dlclose( _handle );
+    #endif
+  }
+}
+
+//=================================================================================================
+
+bool DspPluginLoader::IsLoaded() const
+{
+  return _handle ? true : false;
+}
+
+//-------------------------------------------------------------------------------------------------
+
+std::map< std::string, DspParameter > DspPluginLoader::GetCreateParams() const
+{
+  if( _handle )
+  {
+    return _getCreateParams();
+  }
+  return std::map< std::string, DspParameter >();
+}
+
+//-------------------------------------------------------------------------------------------------
+
+DspComponent* DspPluginLoader::Create( std::map< std::string, DspParameter >& params ) const
+{
+  if( _handle )
+  {
+    return _create( params );
+  }
+  return NULL;
+}
+
+//=================================================================================================