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

[Marcus Tomlinson]

Added alternative Get* methods that return const pointers rather than expecting a reference parameter.

Unmerged revisions

=== modified file 'include/dspatch/DspComponent.h'
--- include/dspatch/DspComponent.h	2014-06-16 15:31:48 +0000
+++ include/dspatch/DspComponent.h	2014-07-26 08:04:03 +0000
@@ -120,6 +120,7 @@
   std::string GetParameterName( unsigned short index );
 
   bool GetParameter( std::string const& paramName, DspParameter& param );
+  DspParameter const* GetParameter( std::string const& paramName );
   bool SetParameter( std::string const& paramName, DspParameter const& param );
 
   void Tick();

=== modified file 'include/dspatch/DspSignal.h'
--- include/dspatch/DspSignal.h	2014-04-08 13:23:50 +0000
+++ include/dspatch/DspSignal.h	2014-07-26 08:04:03 +0000
@@ -59,6 +59,9 @@
   template< class ValueType >
   bool GetValue( ValueType& returnValue ) const;
 
+  template< class ValueType >
+  ValueType const* GetValue() const;
+
   bool SetSignal( DspSignal const* newSignal );
 
   void ClearValue();
@@ -107,6 +110,21 @@
   }
 }
 
+//-------------------------------------------------------------------------------------------------
+
+template< class ValueType >
+ValueType const* DspSignal::GetValue() const
+{
+    if( _valueAvailable )
+    {
+      return DspRunType::RunTypeCast< ValueType >( &_signalValue );
+    }
+    else
+    {
+      return NULL; // no value available
+    }
+}
+
 //=================================================================================================
 
 #endif // DSPSIGNAL_H

=== modified file 'include/dspatch/DspSignalBus.h'
--- include/dspatch/DspSignalBus.h	2014-04-08 13:23:50 +0000
+++ include/dspatch/DspSignalBus.h	2014-07-26 08:04:03 +0000
@@ -68,6 +68,12 @@
   template< class ValueType >
   bool GetValue( std::string const& signalName, ValueType& returnValue ) const;
 
+  template< class ValueType >
+  ValueType const* GetValue( unsigned short signalIndex ) const;
+
+  template< class ValueType >
+  ValueType const* GetValue( std::string const& signalName ) const;
+
   void ClearValue( unsigned short signalIndex );
   void ClearValue( std::string const& signalName );
 
@@ -149,6 +155,38 @@
   }
 }
 
+//-------------------------------------------------------------------------------------------------
+
+template< class ValueType >
+ValueType const* DspSignalBus::GetValue( unsigned short signalIndex ) const
+{
+    if( signalIndex < _signals.size() )
+    {
+      return _signals[signalIndex].GetValue< ValueType >();
+    }
+    else
+    {
+      return NULL;
+    }
+}
+
+//-------------------------------------------------------------------------------------------------
+
+template< class ValueType >
+ValueType const* DspSignalBus::GetValue( std::string const& signalName ) const
+{
+    unsigned short signalIndex;
+
+    if( FindSignal( signalName, signalIndex ) )
+    {
+      return _signals[signalIndex].GetValue< ValueType >();
+    }
+    else
+    {
+      return NULL;
+    }
+}
+
 //=================================================================================================
 
 #endif // DSPSIGNALBUS_H

=== modified file 'src/DspComponent.cpp'
--- src/DspComponent.cpp	2014-06-16 14:33:10 +0000
+++ src/DspComponent.cpp	2014-07-26 08:04:03 +0000
@@ -251,6 +251,16 @@
 
 //-------------------------------------------------------------------------------------------------
 
+DspParameter const* DspComponent::GetParameter( std::string const& paramName )
+{
+    PauseAutoTick();
+    DspParameter const* result = GetParameter_( paramName );
+    ResumeAutoTick();
+    return result;
+}
+
+//-------------------------------------------------------------------------------------------------
+
 bool DspComponent::SetParameter( std::string const& paramName, DspParameter const& param )
 {
   PauseAutoTick();