Rename all Controller-family classes to new style
Adjust capitialization on all Controller-related classes to new standards and update all calling code
This commit is contained in:
@@ -36,7 +36,7 @@
|
||||
#include "effect_chain.h"
|
||||
#include "Cpu.h"
|
||||
#include "automation_pattern.h"
|
||||
#include "controller_connection.h"
|
||||
#include "ControllerConnection.h"
|
||||
|
||||
#include "embed.cpp"
|
||||
|
||||
@@ -125,7 +125,7 @@ void ladspaEffect::changeSampleRate()
|
||||
automationPattern::resolveAllIDs();
|
||||
|
||||
// make sure, connections are ok
|
||||
controllerConnection::finalizeConnections();
|
||||
ControllerConnection::finalizeConnections();
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -23,9 +23,9 @@
|
||||
*/
|
||||
|
||||
|
||||
#include "controller.h"
|
||||
#include "Controller.h"
|
||||
#include "song.h"
|
||||
#include "peak_controller.h"
|
||||
#include "PeakController.h"
|
||||
#include "peak_controller_effect.h"
|
||||
|
||||
#include "embed.cpp"
|
||||
@@ -60,13 +60,13 @@ peakControllerEffect::peakControllerEffect(
|
||||
model * _parent,
|
||||
const descriptor::subPluginFeatures::key * _key ) :
|
||||
effect( &peakcontrollereffect_plugin_descriptor, _parent, _key ),
|
||||
m_effectId( ++peakController::s_lastEffectId ),
|
||||
m_effectId( ++PeakController::s_lastEffectId ),
|
||||
m_peakControls( this ),
|
||||
m_autoController( NULL )
|
||||
{
|
||||
m_autoController = new peakController( engine::getSong(), this );
|
||||
m_autoController = new PeakController( engine::getSong(), this );
|
||||
engine::getSong()->addController( m_autoController );
|
||||
peakController::s_effects.append( this );
|
||||
PeakController::s_effects.append( this );
|
||||
}
|
||||
|
||||
|
||||
@@ -74,10 +74,10 @@ peakControllerEffect::peakControllerEffect(
|
||||
|
||||
peakControllerEffect::~peakControllerEffect()
|
||||
{
|
||||
int idx = peakController::s_effects.indexOf( this );
|
||||
int idx = PeakController::s_effects.indexOf( this );
|
||||
if( idx >= 0 )
|
||||
{
|
||||
peakController::s_effects.remove( idx );
|
||||
PeakController::s_effects.remove( idx );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -62,7 +62,7 @@ private:
|
||||
|
||||
float m_lastSample;
|
||||
|
||||
controller * m_autoController;
|
||||
Controller * m_autoController;
|
||||
} ;
|
||||
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
#include <QtXml/QDomElement>
|
||||
|
||||
#include "peak_controller.h"
|
||||
#include "PeakController.h"
|
||||
#include "peak_controller_effect_controls.h"
|
||||
#include "peak_controller_effect.h"
|
||||
|
||||
@@ -50,9 +50,9 @@ void peakControllerEffectControls::loadSettings( const QDomElement & _this )
|
||||
m_muteModel.setValue( _this.attribute( "mute" ).toFloat() );
|
||||
|
||||
int effectId = _this.attribute( "effectId" ).toInt();
|
||||
if( effectId > peakController::s_lastEffectId )
|
||||
if( effectId > PeakController::s_lastEffectId )
|
||||
{
|
||||
peakController::s_lastEffectId = effectId;
|
||||
PeakController::s_lastEffectId = effectId;
|
||||
}
|
||||
m_effect->m_effectId = effectId;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user