diff --git a/include/Engine.h b/include/Engine.h index 7bbd437f3..d0a708638 100644 --- a/include/Engine.h +++ b/include/Engine.h @@ -46,7 +46,7 @@ class PianoRoll; class projectNotes; class Song; class SongEditor; -class ladspa2LMMS; +class Ladspa2LMMS; class ControllerRackView; @@ -133,7 +133,7 @@ public: return s_automationEditor; } - static ladspa2LMMS * getLADSPAManager() + static Ladspa2LMMS * getLADSPAManager() { return s_ladspaManager; } @@ -192,7 +192,7 @@ private: static bbEditor * s_bbEditor; static PianoRoll* s_pianoRoll; static projectNotes * s_projectNotes; - static ladspa2LMMS * s_ladspaManager; + static Ladspa2LMMS * s_ladspaManager; static QMap s_pluginFileHandling; diff --git a/include/ladspa_2_lmms.h b/include/Ladspa2LMMS.h similarity index 88% rename from include/ladspa_2_lmms.h rename to include/Ladspa2LMMS.h index e5b4a281b..be7e608d9 100644 --- a/include/ladspa_2_lmms.h +++ b/include/Ladspa2LMMS.h @@ -1,5 +1,5 @@ /* - * ladspa_2_lmms.h - class that identifies and instantiates LADSPA effects + * Ladspa2LMMS.h - class that identifies and instantiates LADSPA effects * for use with LMMS * * Copyright (c) 2005-2008 Danny McRae @@ -23,14 +23,14 @@ * */ -#ifndef _LADSPA_2_LMMS_H -#define _LADSPA_2_LMMS_H +#ifndef LADSPA_2_LMMS_H +#define LADSPA_2_LMMS_H #include "ladspa_manager.h" -class EXPORT ladspa2LMMS : public ladspaManager +class EXPORT Ladspa2LMMS : public ladspaManager { public: @@ -62,8 +62,8 @@ public: QString getShortName( const ladspa_key_t & _key ); private: - ladspa2LMMS(); - virtual ~ladspa2LMMS(); + Ladspa2LMMS(); + virtual ~Ladspa2LMMS(); l_sortable_plugin_t m_instruments; l_sortable_plugin_t m_validEffects; diff --git a/plugins/LadspaEffect/LadspaEffect.cpp b/plugins/LadspaEffect/LadspaEffect.cpp index 83c75ba3d..9dc3774bc 100644 --- a/plugins/LadspaEffect/LadspaEffect.cpp +++ b/plugins/LadspaEffect/LadspaEffect.cpp @@ -30,7 +30,7 @@ #include "DataFile.h" #include "AudioDevice.h" #include "ConfigManager.h" -#include "ladspa_2_lmms.h" +#include "Ladspa2LMMS.h" #include "LadspaControl.h" #include "LadspaSubPluginFeatures.h" #include "Mixer.h" @@ -71,7 +71,7 @@ LadspaEffect::LadspaEffect( Model * _parent, m_maxSampleRate( 0 ), m_key( LadspaSubPluginFeatures::subPluginKeyToLadspaKey( _key ) ) { - ladspa2LMMS * manager = Engine::getLADSPAManager(); + Ladspa2LMMS * manager = Engine::getLADSPAManager(); if( manager->getDescription( m_key ) == NULL ) { if( !Engine::suppressMessages() ) @@ -291,7 +291,7 @@ void LadspaEffect::pluginInstantiation() { m_maxSampleRate = maxSamplerate( displayName() ); - ladspa2LMMS * manager = Engine::getLADSPAManager(); + Ladspa2LMMS * manager = Engine::getLADSPAManager(); // Calculate how many processing units are needed. const ch_cnt_t lmms_chnls = Engine::mixer()->audioDev()->channels(); @@ -548,7 +548,7 @@ void LadspaEffect::pluginDestruction() for( ch_cnt_t proc = 0; proc < processorCount(); proc++ ) { - ladspa2LMMS * manager = Engine::getLADSPAManager(); + Ladspa2LMMS * manager = Engine::getLADSPAManager(); manager->deactivate( m_key, m_handles[proc] ); manager->cleanup( m_key, m_handles[proc] ); for( int port = 0; port < m_portCount; port++ ) diff --git a/plugins/LadspaEffect/LadspaSubPluginFeatures.cpp b/plugins/LadspaEffect/LadspaSubPluginFeatures.cpp index 7847b6309..f2c977f2c 100644 --- a/plugins/LadspaEffect/LadspaSubPluginFeatures.cpp +++ b/plugins/LadspaEffect/LadspaSubPluginFeatures.cpp @@ -31,7 +31,7 @@ #include "LadspaSubPluginFeatures.h" #include "AudioDevice.h" #include "Engine.h" -#include "ladspa_2_lmms.h" +#include "Ladspa2LMMS.h" #include "LadspaBase.h" #include "Mixer.h" @@ -48,7 +48,7 @@ void LadspaSubPluginFeatures::fillDescriptionWidget( QWidget * _parent, const Key * _key ) const { const ladspa_key_t & lkey = subPluginKeyToLadspaKey( _key ); - ladspa2LMMS * lm = Engine::getLADSPAManager(); + Ladspa2LMMS * lm = Engine::getLADSPAManager(); QLabel * label = new QLabel( _parent ); label->setText( QWidget::tr( "Name: " ) + lm->getName( lkey ) ); @@ -119,7 +119,7 @@ void LadspaSubPluginFeatures::fillDescriptionWidget( QWidget * _parent, void LadspaSubPluginFeatures::listSubPluginKeys( const Plugin::Descriptor * _desc, KeyList & _kl ) const { - ladspa2LMMS * lm = Engine::getLADSPAManager(); + Ladspa2LMMS * lm = Engine::getLADSPAManager(); l_sortable_plugin_t plugins; switch( m_type ) diff --git a/plugins/ladspa_browser/ladspa_description.cpp b/plugins/ladspa_browser/ladspa_description.cpp index 88cb07ac0..76efcb182 100644 --- a/plugins/ladspa_browser/ladspa_description.cpp +++ b/plugins/ladspa_browser/ladspa_description.cpp @@ -32,7 +32,7 @@ #include "AudioDevice.h" #include "Engine.h" -#include "ladspa_2_lmms.h" +#include "Ladspa2LMMS.h" #include "Mixer.h" @@ -41,7 +41,7 @@ ladspaDescription::ladspaDescription( QWidget * _parent, ladspaPluginType _type ) : QWidget( _parent ) { - ladspa2LMMS * manager = Engine::getLADSPAManager(); + Ladspa2LMMS * manager = Engine::getLADSPAManager(); l_sortable_plugin_t plugins; switch( _type ) @@ -128,7 +128,7 @@ void ladspaDescription::update( const ladspa_key_t & _key ) QVBoxLayout * layout = new QVBoxLayout( description ); layout->setSizeConstraint( QLayout::SetFixedSize ); - ladspa2LMMS * manager = Engine::getLADSPAManager(); + Ladspa2LMMS * manager = Engine::getLADSPAManager(); QLabel * name = new QLabel( description ); name->setText( QWidget::tr( "Name: " ) + manager->getName( _key ) ); diff --git a/plugins/ladspa_browser/ladspa_port_dialog.cpp b/plugins/ladspa_browser/ladspa_port_dialog.cpp index 49ab388e8..999efb158 100644 --- a/plugins/ladspa_browser/ladspa_port_dialog.cpp +++ b/plugins/ladspa_browser/ladspa_port_dialog.cpp @@ -30,13 +30,13 @@ #include "embed.h" #include "Engine.h" -#include "ladspa_2_lmms.h" +#include "Ladspa2LMMS.h" #include "Mixer.h" ladspaPortDialog::ladspaPortDialog( const ladspa_key_t & _key ) { - ladspa2LMMS * manager = Engine::getLADSPAManager(); + Ladspa2LMMS * manager = Engine::getLADSPAManager(); setWindowIcon( embed::getIconPixmap( "ports" ) ); setWindowTitle( tr( "Ports" ) ); diff --git a/src/core/Engine.cpp b/src/core/Engine.cpp index f2d1c3712..d36c5e486 100644 --- a/src/core/Engine.cpp +++ b/src/core/Engine.cpp @@ -32,7 +32,7 @@ #include "FxMixer.h" #include "FxMixerView.h" #include "InstrumentTrack.h" -#include "ladspa_2_lmms.h" +#include "Ladspa2LMMS.h" #include "MainWindow.h" #include "Mixer.h" #include "Pattern.h" @@ -61,7 +61,7 @@ bbEditor * Engine::s_bbEditor = NULL; PianoRoll* Engine::s_pianoRoll = NULL; projectNotes * Engine::s_projectNotes = NULL; ProjectJournal * Engine::s_projectJournal = NULL; -ladspa2LMMS * Engine::s_ladspaManager = NULL; +Ladspa2LMMS * Engine::s_ladspaManager = NULL; DummyTrackContainer * Engine::s_dummyTC = NULL; ControllerRackView * Engine::s_controllerRackView = NULL; QMap Engine::s_pluginFileHandling; @@ -84,7 +84,7 @@ void Engine::init( const bool _has_gui ) s_fxMixer = new FxMixer; s_bbTrackContainer = new BBTrackContainer; - s_ladspaManager = new ladspa2LMMS; + s_ladspaManager = new Ladspa2LMMS; s_projectJournal->setJournalling( true ); diff --git a/src/core/ladspa_2_lmms.cpp b/src/core/Ladspa2LMMS.cpp similarity index 92% rename from src/core/ladspa_2_lmms.cpp rename to src/core/Ladspa2LMMS.cpp index 014a192c8..08489beff 100644 --- a/src/core/ladspa_2_lmms.cpp +++ b/src/core/Ladspa2LMMS.cpp @@ -1,5 +1,5 @@ /* - * ladspa_2_lmms.cpp - class that identifies and instantiates LADSPA effects + * Ladspa2LMMS.cpp - class that identifies and instantiates LADSPA effects * for use with LMMS * * Copyright (c) 2005-2008 Danny McRae @@ -24,10 +24,10 @@ */ -#include "ladspa_2_lmms.h" +#include "Ladspa2LMMS.h" -ladspa2LMMS::ladspa2LMMS() +Ladspa2LMMS::Ladspa2LMMS() { l_sortable_plugin_t plugins = getSortedPlugins(); @@ -78,13 +78,13 @@ ladspa2LMMS::ladspa2LMMS() -ladspa2LMMS::~ladspa2LMMS() +Ladspa2LMMS::~Ladspa2LMMS() { } -QString ladspa2LMMS::getShortName( const ladspa_key_t & _key ) +QString Ladspa2LMMS::getShortName( const ladspa_key_t & _key ) { QString name = getName( _key );