do not inline code for fetching value from controller and thus reduce header dependencies

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1802 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Tobias Doerffel
2008-10-25 15:16:09 +00:00
parent f070492fd6
commit 6fc2eba70b
19 changed files with 58 additions and 10 deletions

View File

@@ -30,7 +30,6 @@
#include "journalling_object.h"
#include "mv_base.h"
#include "controller_connection.h"
// simple way to map a property of a view to a model
@@ -60,6 +59,9 @@
class controllerConnection;
class EXPORT automatableModel : public model, public journallingObject
{
Q_OBJECT
@@ -119,20 +121,14 @@ public:
{
if( unlikely( m_controllerConnection != NULL ) )
{
const T v = minValue<T>() +
castValue<T>( m_range *
m_controllerConnection->currentValue(
_frameOffset ) );
if( typeInfo<float>::isEqual( m_step, 1 ) )
{
return castValue<T>( roundf( (float) v ) );
}
return v;
return castValue<T>( controllerValue( _frameOffset ) );
}
return castValue<T>( m_value );
}
float controllerValue( int _frameOffset ) const;
template<class T>
inline T initValue( void ) const