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:
@@ -35,6 +35,7 @@
|
||||
|
||||
#include "endian_handling.h"
|
||||
#include "config_mgr.h"
|
||||
#include "engine.h"
|
||||
#include "lcd_spinbox.h"
|
||||
#include "gui_templates.h"
|
||||
#include "templates.h"
|
||||
|
||||
@@ -39,6 +39,7 @@
|
||||
|
||||
|
||||
#include "debug.h"
|
||||
#include "engine.h"
|
||||
#include "templates.h"
|
||||
#include "gui_templates.h"
|
||||
#include "config_mgr.h"
|
||||
|
||||
@@ -36,6 +36,7 @@
|
||||
|
||||
#include "endian_handling.h"
|
||||
#include "lcd_spinbox.h"
|
||||
#include "engine.h"
|
||||
#include "gui_templates.h"
|
||||
#include "templates.h"
|
||||
|
||||
|
||||
@@ -417,6 +417,20 @@ void automatableModel::setControllerConnection( controllerConnection * _c )
|
||||
|
||||
|
||||
|
||||
float automatableModel::controllerValue( int _frameOffset ) const
|
||||
{
|
||||
const float v = m_minValue +
|
||||
( m_range * m_controllerConnection->currentValue(
|
||||
_frameOffset ) );
|
||||
if( typeInfo<float>::isEqual( m_step, 1 ) )
|
||||
{
|
||||
return qRound( v );
|
||||
}
|
||||
return v;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
void automatableModel::unlinkControllerConnection( void )
|
||||
{
|
||||
|
||||
@@ -34,6 +34,7 @@
|
||||
#include "engine.h"
|
||||
#include "mixer.h"
|
||||
#include "controller.h"
|
||||
#include "controller_connection.h"
|
||||
#include "controller_dialog.h"
|
||||
#include "lfo_controller.h"
|
||||
#include "midi_controller.h"
|
||||
|
||||
@@ -32,6 +32,7 @@
|
||||
|
||||
#include "debug.h"
|
||||
#include "engine.h"
|
||||
#include "mixer.h"
|
||||
#include "mmp.h"
|
||||
#include "oscillator.h"
|
||||
|
||||
|
||||
@@ -50,6 +50,7 @@
|
||||
#include "automation_pattern.h"
|
||||
#include "caption_menu.h"
|
||||
#include "embed.h"
|
||||
#include "engine.h"
|
||||
#include "gui_templates.h"
|
||||
#include "instrument_track.h"
|
||||
#include "knob.h"
|
||||
|
||||
@@ -36,6 +36,7 @@
|
||||
#include "fx_mixer_view.h"
|
||||
#include "fader.h"
|
||||
#include "effect_rack_view.h"
|
||||
#include "engine.h"
|
||||
#include "embed.h"
|
||||
#include "main_window.h"
|
||||
#include "lcd_spinbox.h"
|
||||
|
||||
@@ -32,6 +32,7 @@
|
||||
#include <QtGui/QMouseEvent>
|
||||
|
||||
#include "caption_menu.h"
|
||||
#include "engine.h"
|
||||
#include "embed.h"
|
||||
#include "main_window.h"
|
||||
|
||||
|
||||
@@ -33,6 +33,7 @@
|
||||
|
||||
#include "caption_menu.h"
|
||||
#include "embed.h"
|
||||
#include "engine.h"
|
||||
#include "main_window.h"
|
||||
|
||||
|
||||
|
||||
@@ -37,6 +37,7 @@
|
||||
|
||||
#include "automation_pattern.h"
|
||||
#include "caption_menu.h"
|
||||
#include "engine.h"
|
||||
#include "embed.h"
|
||||
#include "gui_templates.h"
|
||||
#include "main_window.h"
|
||||
|
||||
@@ -39,6 +39,7 @@
|
||||
#include "gui_templates.h"
|
||||
#include "knob.h"
|
||||
#include "led_checkbox.h"
|
||||
#include "mixer.h"
|
||||
#include "mmp.h"
|
||||
#include "oscillator.h"
|
||||
#include "pixmap_button.h"
|
||||
|
||||
@@ -51,6 +51,7 @@
|
||||
|
||||
#include "fader.h"
|
||||
#include "embed.h"
|
||||
#include "engine.h"
|
||||
#include "caption_menu.h"
|
||||
#include "main_window.h"
|
||||
|
||||
|
||||
@@ -29,11 +29,13 @@
|
||||
|
||||
#include "instrument_midi_io_view.h"
|
||||
#include "midi_port_menu.h"
|
||||
#include "engine.h"
|
||||
#include "embed.h"
|
||||
#include "group_box.h"
|
||||
#include "gui_templates.h"
|
||||
#include "lcd_spinbox.h"
|
||||
#include "midi_client.h"
|
||||
#include "mixer.h"
|
||||
#include "tooltip.h"
|
||||
|
||||
|
||||
|
||||
@@ -43,6 +43,7 @@
|
||||
|
||||
#include "caption_menu.h"
|
||||
#include "config_mgr.h"
|
||||
#include "controller_connection.h"
|
||||
#include "embed.h"
|
||||
#include "engine.h"
|
||||
#include "gui_templates.h"
|
||||
|
||||
@@ -36,6 +36,7 @@
|
||||
|
||||
#include "lcd_spinbox.h"
|
||||
#include "caption_menu.h"
|
||||
#include "engine.h"
|
||||
#include "embed.h"
|
||||
#include "gui_templates.h"
|
||||
#include "templates.h"
|
||||
|
||||
@@ -29,6 +29,7 @@
|
||||
|
||||
#include "automation_track.h"
|
||||
#include "automation_pattern.h"
|
||||
#include "engine.h"
|
||||
#include "embed.h"
|
||||
#include "project_journal.h"
|
||||
#include "string_pair_drag.h"
|
||||
|
||||
Reference in New Issue
Block a user