hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Rename basicFilters/basic_filters.h

Browse Source
This commit is contained in:
Lukas W
2014-11-26 10:59:35 +01:00
parent 6d4a6ed9cd
commit d57b51142d
8 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/basic_filters.h → include/BasicFilters.h
View File

@@ -1,5 +1,5 @@
/*
* basic_filters.h - simple but powerful filter-class with most used filters
* BasicFilters.h - simple but powerful filter-class with most used filters
*
* original file by ???
* modified and enhanced by Tobias Doerffel
@@ -49,7 +49,7 @@
//#include <cstdlib>
template<ch_cnt_t CHANNELS/* = DEFAULT_CHANNELS*/>
class basicFilters
class BasicFilters
{
MM_OPERATORS
public:
@@ -106,14 +106,14 @@ public:
: Moog;
if( m_subFilter == NULL )
{
m_subFilter = new basicFilters<CHANNELS>(
m_subFilter = new BasicFilters<CHANNELS>(
static_cast<sample_rate_t>(
m_sampleRate ) );
}
m_subFilter->m_type = m_type;
}
inline basicFilters( const sample_rate_t _sample_rate ) :
inline BasicFilters( const sample_rate_t _sample_rate ) :
m_doubleFilter( false ),
m_sampleRate( (float) _sample_rate ),
m_sampleRatio( 1.0f / m_sampleRate ),
@@ -123,7 +123,7 @@ public:
clearHistory();
}
inline ~basicFilters()
inline ~BasicFilters()
{
delete m_subFilter;
}
@@ -756,7 +756,7 @@ private:
float m_sampleRate;
float m_sampleRatio;
basicFilters<CHANNELS> * m_subFilter;
BasicFilters<CHANNELS> * m_subFilter;
} ;

4
include/NotePlayHandle.h
View File

@@ -37,7 +37,7 @@
class InstrumentTrack;
class NotePlayHandle;
template<ch_cnt_t=DEFAULT_CHANNELS> class basicFilters;
template<ch_cnt_t=DEFAULT_CHANNELS> class BasicFilters;
typedef QList<NotePlayHandle *> NotePlayHandleList;
typedef QList<const NotePlayHandle *> ConstNotePlayHandleList;
@@ -47,7 +47,7 @@ class EXPORT NotePlayHandle : public PlayHandle, public Note
MM_OPERATORS
public:
void * m_pluginData;
basicFilters<> * m_filter;
BasicFilters<> * m_filter;
// specifies origin of NotePlayHandle
enum Origins

6
plugins/DualFilter/DualFilter.cpp
View File

@@ -26,7 +26,7 @@
#include "DualFilter.h"
#include "embed.cpp"
#include "basic_filters.h"
#include "BasicFilters.h"
extern "C"
@@ -53,8 +53,8 @@ DualFilterEffect::DualFilterEffect( Model* parent, const Descriptor::SubPluginFe
Effect( &dualfilter_plugin_descriptor, parent, key ),
m_dfControls( this )
{
m_filter1 = new basicFilters<2>( Engine::mixer()->processingSampleRate() );
m_filter2 = new basicFilters<2>( Engine::mixer()->processingSampleRate() );
m_filter1 = new BasicFilters<2>( Engine::mixer()->processingSampleRate() );
m_filter2 = new BasicFilters<2>( Engine::mixer()->processingSampleRate() );
// ensure filters get updated
m_filter1changed = true;

6
plugins/DualFilter/DualFilter.h
View File

@@ -29,7 +29,7 @@
#include "Effect.h"
#include "DualFilterControls.h"
#include "basic_filters.h"
#include "BasicFilters.h"
class DualFilterEffect : public Effect
{
@@ -47,8 +47,8 @@ public:
private:
DualFilterControls m_dfControls;
basicFilters<2> * m_filter1;
basicFilters<2> * m_filter2;
BasicFilters<2> * m_filter1;
BasicFilters<2> * m_filter2;
bool m_filter1changed;
bool m_filter2changed;

10
plugins/DualFilter/DualFilterControls.cpp
View File

@@ -30,7 +30,7 @@
#include "DualFilter.h"
#include "Engine.h"
#include "Song.h"
#include "basic_filters.h"
#include "BasicFilters.h"
#include "embed.h"
DualFilterControls::DualFilterControls( DualFilterEffect* effect ) :
@@ -40,7 +40,7 @@ DualFilterControls::DualFilterControls( DualFilterEffect* effect ) :
m_enabled1Model( true, this, tr( "Filter 1 enabled" ) ),
m_filter1Model( this, tr( "Filter 1 type" ) ),
m_cut1Model( 7000.0f, 1.0f, 14000.0f, 1.0f, this, tr( "Cutoff 1 frequency" ) ),
m_res1Model( 0.5, basicFilters<0>::minQ(), 10.0, 0.01, this, tr( "Q/Resonance 1" ) ),
m_res1Model( 0.5, BasicFilters<0>::minQ(), 10.0, 0.01, this, tr( "Q/Resonance 1" ) ),
m_gain1Model( 100.0f, 0.0f, 200.0f, 0.1f, this, tr( "Gain 1" ) ),
m_mixModel( 0.0f, -1.0f, 1.0f, 0.01f, this, tr( "Mix" ) ),
@@ -48,7 +48,7 @@ DualFilterControls::DualFilterControls( DualFilterEffect* effect ) :
m_enabled2Model( true, this, tr( "Filter 2 enabled" ) ),
m_filter2Model( this, tr( "Filter 2 type" ) ),
m_cut2Model( 7000.0f, 1.0f, 14000.0f, 1.0f, this, tr( "Cutoff 2 frequency" ) ),
m_res2Model( 0.5, basicFilters<0>::minQ(), 10.0, 0.01, this, tr( "Q/Resonance 2" ) ),
m_res2Model( 0.5, BasicFilters<0>::minQ(), 10.0, 0.01, this, tr( "Q/Resonance 2" ) ),
m_gain2Model( 100.0f, 0.0f, 200.0f, 0.1f, this, tr( "Gain 2" ) )
{
m_filter1Model.addItem( tr( "LowPass" ), new PixmapLoader( "filter_lp" ) );
@@ -108,8 +108,8 @@ void DualFilterControls::updateFilters()
delete m_effect->m_filter1;
delete m_effect->m_filter2;
m_effect->m_filter1 = new basicFilters<2>( Engine::mixer()->processingSampleRate() );
m_effect->m_filter2 = new basicFilters<2>( Engine::mixer()->processingSampleRate() );
m_effect->m_filter1 = new BasicFilters<2>( Engine::mixer()->processingSampleRate() );
m_effect->m_filter2 = new BasicFilters<2>( Engine::mixer()->processingSampleRate() );
// flag filters as needing recalculation

20
plugins/flp_import/FlpImport.cpp
View File

@@ -32,7 +32,7 @@
#include "FlpImport.h"
#include "NotePlayHandle.h"
#include "AutomationPattern.h"
#include "basic_filters.h"
#include "BasicFilters.h"
#include "BBTrack.h"
#include "BBTrackContainer.h"
#include "ComboBox.h"
@@ -462,7 +462,7 @@ struct FL_Channel : public FL_Plugin
sampleUseLoopPoints( false ),
instrumentPlugin( NULL ),
envelopes(),
filterType( basicFilters<>::LowPass ),
filterType( BasicFilters<>::LowPass ),
filterCut( 10000 ),
filterRes( 0.1 ),
filterEnabled( false ),
@@ -595,14 +595,14 @@ bool FlpImport::tryImport( TrackContainer* tc )
{
const int mappedFilter[] =
{
basicFilters<>::LowPass,// fast LP
basicFilters<>::LowPass,
basicFilters<>::BandPass_CSG,
basicFilters<>::HiPass,
basicFilters<>::Notch,
basicFilters<>::NumFilters+basicFilters<>::LowPass,
basicFilters<>::LowPass,
basicFilters<>::NumFilters+basicFilters<>::LowPass
BasicFilters<>::LowPass,// fast LP
BasicFilters<>::LowPass,
BasicFilters<>::BandPass_CSG,
BasicFilters<>::HiPass,
BasicFilters<>::Notch,
BasicFilters<>::NumFilters+BasicFilters<>::LowPass,
BasicFilters<>::LowPass,
BasicFilters<>::NumFilters+BasicFilters<>::LowPass
} ;
const InstrumentFunctionArpeggio::ArpDirections mappedArpDir[] =

6
src/core/InstrumentSoundShaping.cpp
View File

@@ -25,7 +25,7 @@
#include <QDomElement>
#include "InstrumentSoundShaping.h"
#include "basic_filters.h"
#include "BasicFilters.h"
#include "embed.h"
#include "Engine.h"
#include "EnvelopeAndLfoParameters.h"
@@ -63,7 +63,7 @@ InstrumentSoundShaping::InstrumentSoundShaping(
m_filterEnabledModel( false, this ),
m_filterModel( this, tr( "Filter type" ) ),
m_filterCutModel( 14000.0, 1.0, 14000.0, 1.0, this, tr( "Cutoff frequency" ) ),
m_filterResModel( 0.5, basicFilters<>::minQ(), 10.0, 0.01, this, tr( "Q/Resonance" ) )
m_filterResModel( 0.5, BasicFilters<>::minQ(), 10.0, 0.01, this, tr( "Q/Resonance" ) )
{
for( int i = 0; i < NumTargets; ++i )
{
@@ -161,7 +161,7 @@ void InstrumentSoundShaping::processAudioBuffer( sampleFrame* buffer,
if( n->m_filter == NULL )
{
n->m_filter = new basicFilters<>( Engine::mixer()->processingSampleRate() );
n->m_filter = new BasicFilters<>( Engine::mixer()->processingSampleRate() );
}
n->m_filter->setFilterType( m_filterModel.value() );

2
src/core/NotePlayHandle.cpp
View File

@@ -24,7 +24,7 @@
*/
#include "NotePlayHandle.h"
#include "basic_filters.h"
#include "BasicFilters.h"
#include "ConfigManager.h"
#include "DetuningHelper.h"
#include "InstrumentSoundShaping.h"