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

Merge branch 'stable-1.1'

Browse Source 
Conflicts:
	include/Effect.h
	include/Plugin.h
This commit is contained in:
Vesa
2014-11-25 21:23:57 +02:00
parent ed2cd2dda5 55c59a77bd
commit 33665a2848
56 changed files with 324 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/Amplifier/AmplifierControlDialog.cpp
View File

@@ -67,3 +67,5 @@ AmplifierControlDialog::AmplifierControlDialog( AmplifierControls* controls ) :
rightKnob->setLabel( tr( "RIGHT" ) );
rightKnob->setHintText( tr( "Right gain:" ) + " ", "%" );
}
#include "moc_AmplifierControlDialog.cxx"

1
plugins/Amplifier/AmplifierControlDialog.h
View File

@@ -34,6 +34,7 @@ class AmplifierControls;
class AmplifierControlDialog : public EffectControlDialog
{
Q_OBJECT
public:
AmplifierControlDialog( AmplifierControls* controls );
virtual ~AmplifierControlDialog()

2
plugins/Amplifier/CMakeLists.txt
View File

@@ -1,3 +1,3 @@
INCLUDE(BuildPlugin)
BUILD_PLUGIN(amplifier Amplifier.cpp AmplifierControls.cpp AmplifierControlDialog.cpp MOCFILES AmplifierControls.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
BUILD_PLUGIN(amplifier Amplifier.cpp AmplifierControls.cpp AmplifierControlDialog.cpp MOCFILES AmplifierControls.h AmplifierControlDialog.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")

2
plugins/BassBooster/BassBoosterControlDialog.cpp
View File

@@ -67,4 +67,4 @@ BassBoosterControlDialog::BassBoosterControlDialog( BassBoosterControls* control
setLayout( tl );
}
#include "moc_BassBoosterControlDialog.cxx"

1
plugins/BassBooster/BassBoosterControlDialog.h
View File

@@ -33,6 +33,7 @@ class BassBoosterControls;
class BassBoosterControlDialog : public EffectControlDialog
{
Q_OBJECT
public:
BassBoosterControlDialog( BassBoosterControls* controls );
virtual ~BassBoosterControlDialog()

2
plugins/BassBooster/CMakeLists.txt
View File

@@ -1,3 +1,3 @@
INCLUDE(BuildPlugin)
BUILD_PLUGIN(bassbooster BassBooster.cpp BassBoosterControls.cpp BassBoosterControlDialog.cpp MOCFILES BassBoosterControls.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
BUILD_PLUGIN(bassbooster BassBooster.cpp BassBoosterControls.cpp BassBoosterControlDialog.cpp MOCFILES BassBoosterControls.h BassBoosterControlDialog.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")

2
plugins/DualFilter/CMakeLists.txt
View File

@@ -1,3 +1,3 @@
INCLUDE(BuildPlugin)
BUILD_PLUGIN(dualfilter DualFilter.cpp DualFilterControls.cpp DualFilterControlDialog.cpp MOCFILES DualFilterControls.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
BUILD_PLUGIN(dualfilter DualFilter.cpp DualFilterControls.cpp DualFilterControlDialog.cpp MOCFILES DualFilterControls.h DualFilterControlDialog.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")

2
plugins/DualFilter/DualFilterControlDialog.cpp
View File

@@ -84,3 +84,5 @@ DualFilterControlDialog::DualFilterControlDialog( DualFilterControls* controls )
m_filter2ComboBox->setFont( pointSize<8>( m_filter2ComboBox->font() ) );
m_filter2ComboBox->setModel( &controls->m_filter2Model );
}
#include "moc_DualFilterControlDialog.cxx"

1
plugins/DualFilter/DualFilterControlDialog.h
View File

@@ -34,6 +34,7 @@ class DualFilterControls;
class DualFilterControlDialog : public EffectControlDialog
{
Q_OBJECT
public:
DualFilterControlDialog( DualFilterControls* controls );
virtual ~DualFilterControlDialog()

2
plugins/MidiImport/CMakeLists.txt
View File

@@ -5,4 +5,4 @@ BUILD_PLUGIN(midiimport MidiImport.cpp MidiImport.h
portsmf/allegrord.cpp portsmf/allegrowr.cpp portsmf/allegrosmfrd.cpp
portsmf/mfmidi.cpp portsmf/mfmidi.h portsmf/strparse.cpp
portsmf/strparse.h portsmf/algrd_internal.h portsmf/algsmfrd_internal.h
portsmf/trace.h)
portsmf/trace.h MOCFILES MidiImport.h)

1
plugins/MidiImport/MidiImport.cpp
View File

@@ -569,3 +569,4 @@ Plugin * PLUGIN_EXPORT lmms_plugin_main( Model *, void * _data )
}
#include "moc_MidiImport.cxx"

1
plugins/MidiImport/MidiImport.h
View File

@@ -35,6 +35,7 @@
class MidiImport : public ImportFilter
{
Q_OBJECT
public:
MidiImport( const QString & _file );
virtual ~MidiImport();

2
plugins/SpectrumAnalyzer/CMakeLists.txt
View File

@@ -2,4 +2,4 @@ INCLUDE(BuildPlugin)
INCLUDE_DIRECTORIES(${FFTW3F_INCLUDE_DIRS})
LINK_DIRECTORIES(${FFTW3F_LIBRARY_DIRS})
LINK_LIBRARIES(${FFTW3F_LIBRARIES})
BUILD_PLUGIN(spectrumanalyzer SpectrumAnalyzer.cpp SpectrumAnalyzerControls.cpp SpectrumAnalyzerControlDialog.cpp SpectrumAnalyzer.h SpectrumAnalyzerControls.h SpectrumAnalyzerControlDialog.h MOCFILES SpectrumAnalyzerControls.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
BUILD_PLUGIN(spectrumanalyzer SpectrumAnalyzer.cpp SpectrumAnalyzerControls.cpp SpectrumAnalyzerControlDialog.cpp SpectrumAnalyzer.h SpectrumAnalyzerControls.h SpectrumAnalyzerControlDialog.h MOCFILES SpectrumAnalyzerControlDialog.h SpectrumAnalyzerControls.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")

2
plugins/SpectrumAnalyzer/SpectrumAnalyzerControlDialog.cpp
View File

@@ -190,5 +190,5 @@ void SpectrumAnalyzerControlDialog::paintEvent( QPaintEvent * )
}
#include "moc_SpectrumAnalyzerControlDialog.cxx"

1
plugins/SpectrumAnalyzer/SpectrumAnalyzerControlDialog.h
View File

@@ -33,6 +33,7 @@ class SpectrumAnalyzerControls;
class SpectrumAnalyzerControlDialog : public EffectControlDialog
{
Q_OBJECT
public:
SpectrumAnalyzerControlDialog( SpectrumAnalyzerControls* controls );
virtual ~SpectrumAnalyzerControlDialog()

2
plugins/VstEffect/CMakeLists.txt
View File

@@ -3,7 +3,7 @@ INCLUDE(BuildPlugin)
INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/../vst_base")
LINK_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}/../vst_base")
LINK_LIBRARIES(vstbase)
BUILD_PLUGIN(vsteffect VstEffect.cpp VstEffectControls.cpp VstEffectControlDialog.cpp VstSubPluginFeatures.cpp VstEffect.h VstEffectControls.h VstEffectControlDialog.h VstSubPluginFeatures.h MOCFILES VstEffectControls.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
BUILD_PLUGIN(vsteffect VstEffect.cpp VstEffectControls.cpp VstEffectControlDialog.cpp VstSubPluginFeatures.cpp VstEffect.h VstEffectControls.h VstEffectControlDialog.h VstSubPluginFeatures.h MOCFILES VstEffectControlDialog.h VstEffectControls.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
SET_TARGET_PROPERTIES(vsteffect PROPERTIES COMPILE_FLAGS "-Wno-attributes")
ENDIF(LMMS_SUPPORT_VST)

2
plugins/VstEffect/VstEffectControlDialog.cpp
View File

@@ -264,4 +264,4 @@ VstEffectControlDialog::~VstEffectControlDialog()
//delete m_pluginWidget;
}
#include "moc_VstEffectControlDialog.cxx"

1
plugins/VstEffect/VstEffectControlDialog.h
View File

@@ -42,6 +42,7 @@ class pixmapButton;
class VstEffectControlDialog : public EffectControlDialog
{
Q_OBJECT
public:
VstEffectControlDialog( VstEffectControls * _controls );
virtual ~VstEffectControlDialog();

2
plugins/dynamics_processor/CMakeLists.txt
View File

@@ -1,3 +1,3 @@
INCLUDE(BuildPlugin)
BUILD_PLUGIN(dynamicsprocessor dynamics_processor.cpp dynamics_processor_controls.cpp dynamics_processor_control_dialog.cpp MOCFILES dynamics_processor_controls.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
BUILD_PLUGIN(dynamicsprocessor dynamics_processor.cpp dynamics_processor_controls.cpp dynamics_processor_control_dialog.cpp MOCFILES dynamics_processor_controls.h dynamics_processor_control_dialog.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")

2
plugins/dynamics_processor/dynamics_processor_control_dialog.cpp
View File

@@ -152,3 +152,5 @@ dynProcControlDialog::dynProcControlDialog(
connect( subOneButton, SIGNAL( clicked() ),
_controls, SLOT( subOneClicked() ) );
}
#include "moc_dynamics_processor_control_dialog.cxx"

1
plugins/dynamics_processor/dynamics_processor_control_dialog.h
View File

@@ -34,6 +34,7 @@ class dynProcControls;
class dynProcControlDialog : public EffectControlDialog
{
Q_OBJECT
public:
dynProcControlDialog( dynProcControls * _controls );
virtual ~dynProcControlDialog()

1
plugins/kicker/kicker.h
View File

@@ -44,6 +44,7 @@ class NotePlayHandle;
class kickerInstrument : public Instrument
{
Q_OBJECT
public:
kickerInstrument( InstrumentTrack * _instrument_track );
virtual ~kickerInstrument();

1
plugins/lb302/lb302.h
View File

@@ -252,6 +252,7 @@ private:
class lb302SynthView : public InstrumentView
{
Q_OBJECT
public:
lb302SynthView( Instrument * _instrument,
QWidget * _parent );

1
plugins/lb303/lb303.h
View File

@@ -241,6 +241,7 @@ private:
class lb303SynthView : public InstrumentView
{
Q_OBJECT
public:
lb303SynthView( Instrument * _instrument,
QWidget * _parent );

63
plugins/monstro/Monstro.h
View File

@@ -65,37 +65,6 @@
name -> setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "tinyled_off" ) ); \
toolTip::add( name, tr( ttip ) );
#define setwavemodel( name ) \
name .addItem( tr( "Sine wave" ), static_cast<PixmapLoader*>( new PluginPixmapLoader( "sin" ) ) ); \
name .addItem( tr( "Bandlimited Triangle wave" ), static_cast<PixmapLoader*>( new PluginPixmapLoader( "tri" ) ) ); \
name .addItem( tr( "Bandlimited Saw wave" ), static_cast<PixmapLoader*>( new PluginPixmapLoader( "saw" ) ) ); \
name .addItem( tr( "Bandlimited Ramp wave" ), static_cast<PixmapLoader*>( new PluginPixmapLoader( "ramp" ) ) ); \
name .addItem( tr( "Bandlimited Square wave" ), static_cast<PixmapLoader*>( new PluginPixmapLoader( "sqr" ) ) ); \
name .addItem( tr( "Bandlimited Moog saw wave" ), static_cast<PixmapLoader*>( new PluginPixmapLoader( "moog" ) ) ); \
name .addItem( tr( "Soft square wave" ), static_cast<PixmapLoader*>( new PluginPixmapLoader( "sqrsoft" ) ) ); \
name .addItem( tr( "Absolute sine wave" ), static_cast<PixmapLoader*>( new PluginPixmapLoader( "sinabs" ) ) ); \
name .addItem( tr( "Exponential wave" ), static_cast<PixmapLoader*>( new PluginPixmapLoader( "exp" ) ) ); \
name .addItem( tr( "White noise" ), static_cast<PixmapLoader*>( new PluginPixmapLoader( "noise" ) ) ); \
name .addItem( tr( "Digital Triangle wave" ), static_cast<PixmapLoader*>( new PluginPixmapLoader( "tri" ) ) ); \
name .addItem( tr( "Digital Saw wave" ), static_cast<PixmapLoader*>( new PluginPixmapLoader( "saw" ) ) ); \
name .addItem( tr( "Digital Ramp wave" ), static_cast<PixmapLoader*>( new PluginPixmapLoader( "ramp" ) ) ); \
name .addItem( tr( "Digital Square wave" ), static_cast<PixmapLoader*>( new PluginPixmapLoader( "sqr" ) ) ); \
name .addItem( tr( "Digital Moog saw wave" ), static_cast<PixmapLoader*>( new PluginPixmapLoader( "moog" ) ) ); \
#define setlfowavemodel( name ) \
name .addItem( tr( "Sine wave" ), static_cast<PixmapLoader*>( new PluginPixmapLoader( "sin" ) ) ); \
name .addItem( tr( "Triangle wave" ), static_cast<PixmapLoader*>( new PluginPixmapLoader( "tri" ) ) ); \
name .addItem( tr( "Saw wave" ), static_cast<PixmapLoader*>( new PluginPixmapLoader( "saw" ) ) ); \
name .addItem( tr( "Ramp wave" ), static_cast<PixmapLoader*>( new PluginPixmapLoader( "ramp" ) ) ); \
name .addItem( tr( "Square wave" ), static_cast<PixmapLoader*>( new PluginPixmapLoader( "sqr" ) ) ); \
name .addItem( tr( "Moog saw wave" ), static_cast<PixmapLoader*>( new PluginPixmapLoader( "moog" ) ) ); \
name .addItem( tr( "Soft square wave" ), static_cast<PixmapLoader*>( new PluginPixmapLoader( "sqrsoft" ) ) ); \
name .addItem( tr( "Abs. sine wave" ), static_cast<PixmapLoader*>( new PluginPixmapLoader( "sinabs" ) ) ); \
name .addItem( tr( "Exponential wave" ), static_cast<PixmapLoader*>( new PluginPixmapLoader( "exp" ) ) ); \
name .addItem( tr( "Random" ), static_cast<PixmapLoader*>( new PluginPixmapLoader( "rand" ) ) ); \
name .addItem( tr( "Random smooth" ), static_cast<PixmapLoader*>( new PluginPixmapLoader( "rand" ) ) );
// UI constants
const int O1ROW = 22;
const int O2ROW = 22 + 39;
@@ -337,6 +306,38 @@ private:
class MonstroInstrument : public Instrument
{
Q_OBJECT
#define setwavemodel( name ) \
name .addItem( tr( "Sine wave" ), static_cast<PixmapLoader*>( new PluginPixmapLoader( "sin" ) ) ); \
name .addItem( tr( "Bandlimited Triangle wave" ), static_cast<PixmapLoader*>( new PluginPixmapLoader( "tri" ) ) ); \
name .addItem( tr( "Bandlimited Saw wave" ), static_cast<PixmapLoader*>( new PluginPixmapLoader( "saw" ) ) ); \
name .addItem( tr( "Bandlimited Ramp wave" ), static_cast<PixmapLoader*>( new PluginPixmapLoader( "ramp" ) ) ); \
name .addItem( tr( "Bandlimited Square wave" ), static_cast<PixmapLoader*>( new PluginPixmapLoader( "sqr" ) ) ); \
name .addItem( tr( "Bandlimited Moog saw wave" ), static_cast<PixmapLoader*>( new PluginPixmapLoader( "moog" ) ) ); \
name .addItem( tr( "Soft square wave" ), static_cast<PixmapLoader*>( new PluginPixmapLoader( "sqrsoft" ) ) ); \
name .addItem( tr( "Absolute sine wave" ), static_cast<PixmapLoader*>( new PluginPixmapLoader( "sinabs" ) ) ); \
name .addItem( tr( "Exponential wave" ), static_cast<PixmapLoader*>( new PluginPixmapLoader( "exp" ) ) ); \
name .addItem( tr( "White noise" ), static_cast<PixmapLoader*>( new PluginPixmapLoader( "noise" ) ) ); \
name .addItem( tr( "Digital Triangle wave" ), static_cast<PixmapLoader*>( new PluginPixmapLoader( "tri" ) ) ); \
name .addItem( tr( "Digital Saw wave" ), static_cast<PixmapLoader*>( new PluginPixmapLoader( "saw" ) ) ); \
name .addItem( tr( "Digital Ramp wave" ), static_cast<PixmapLoader*>( new PluginPixmapLoader( "ramp" ) ) ); \
name .addItem( tr( "Digital Square wave" ), static_cast<PixmapLoader*>( new PluginPixmapLoader( "sqr" ) ) ); \
name .addItem( tr( "Digital Moog saw wave" ), static_cast<PixmapLoader*>( new PluginPixmapLoader( "moog" ) ) );
#define setlfowavemodel( name ) \
name .addItem( tr( "Sine wave" ), static_cast<PixmapLoader*>( new PluginPixmapLoader( "sin" ) ) ); \
name .addItem( tr( "Triangle wave" ), static_cast<PixmapLoader*>( new PluginPixmapLoader( "tri" ) ) ); \
name .addItem( tr( "Saw wave" ), static_cast<PixmapLoader*>( new PluginPixmapLoader( "saw" ) ) ); \
name .addItem( tr( "Ramp wave" ), static_cast<PixmapLoader*>( new PluginPixmapLoader( "ramp" ) ) ); \
name .addItem( tr( "Square wave" ), static_cast<PixmapLoader*>( new PluginPixmapLoader( "sqr" ) ) ); \
name .addItem( tr( "Moog saw wave" ), static_cast<PixmapLoader*>( new PluginPixmapLoader( "moog" ) ) ); \
name .addItem( tr( "Soft square wave" ), static_cast<PixmapLoader*>( new PluginPixmapLoader( "sqrsoft" ) ) ); \
name .addItem( tr( "Abs. sine wave" ), static_cast<PixmapLoader*>( new PluginPixmapLoader( "sinabs" ) ) ); \
name .addItem( tr( "Exponential wave" ), static_cast<PixmapLoader*>( new PluginPixmapLoader( "exp" ) ) ); \
name .addItem( tr( "Random" ), static_cast<PixmapLoader*>( new PluginPixmapLoader( "rand" ) ) ); \
name .addItem( tr( "Random smooth" ), static_cast<PixmapLoader*>( new PluginPixmapLoader( "rand" ) ) );
public:
MonstroInstrument( InstrumentTrack * _instrument_track );
virtual ~MonstroInstrument();

2
plugins/peak_controller_effect/CMakeLists.txt
View File

@@ -1,3 +1,3 @@
INCLUDE(BuildPlugin)
BUILD_PLUGIN(peakcontrollereffect peak_controller_effect.cpp peak_controller_effect_controls.cpp peak_controller_effect_control_dialog.cpp peak_controller_effect.h peak_controller_effect_controls.h peak_controller_effect_control_dialog.h MOCFILES peak_controller_effect_controls.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
BUILD_PLUGIN(peakcontrollereffect peak_controller_effect.cpp peak_controller_effect_controls.cpp peak_controller_effect_control_dialog.cpp peak_controller_effect.h peak_controller_effect_controls.h peak_controller_effect_control_dialog.h MOCFILES peak_controller_effect_controls.h peak_controller_effect_control_dialog.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")

1
plugins/peak_controller_effect/peak_controller_effect_control_dialog.cpp
View File

@@ -105,3 +105,4 @@ PeakControllerEffectControlDialog::PeakControllerEffectControlDialog(
setLayout( tl );
}
#include "moc_peak_controller_effect_control_dialog.cxx"

1
plugins/peak_controller_effect/peak_controller_effect_control_dialog.h
View File

@@ -35,6 +35,7 @@ class ledCheckBox;
class PeakControllerEffectControlDialog : public EffectControlDialog
{
Q_OBJECT
public:
PeakControllerEffectControlDialog(
PeakControllerEffectControls * _controls );

2
plugins/stereo_enhancer/CMakeLists.txt
View File

@@ -1,4 +1,4 @@
INCLUDE(BuildPlugin)
BUILD_PLUGIN(stereoenhancer stereo_enhancer.cpp stereoenhancer_controls.cpp stereoenhancer_control_dialog.cpp stereo_enhancer.h stereoenhancer_controls.h stereoenhancer_control_dialog.h MOCFILES stereoenhancer_controls.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
BUILD_PLUGIN(stereoenhancer stereo_enhancer.cpp stereoenhancer_controls.cpp stereoenhancer_control_dialog.cpp stereo_enhancer.h stereoenhancer_controls.h stereoenhancer_control_dialog.h MOCFILES stereoenhancer_controls.h stereoenhancer_control_dialog.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")

1
plugins/stereo_enhancer/stereoenhancer_control_dialog.cpp
View File

@@ -47,3 +47,4 @@ stereoEnhancerControlDialog::stereoEnhancerControlDialog(
this->setLayout(l);
}
#include "moc_stereoenhancer_control_dialog.cxx"

1
plugins/stereo_enhancer/stereoenhancer_control_dialog.h
View File

@@ -32,6 +32,7 @@ class stereoEnhancerControls;
class stereoEnhancerControlDialog : public EffectControlDialog
{
Q_OBJECT
public:
stereoEnhancerControlDialog( stereoEnhancerControls * _controls );
virtual ~stereoEnhancerControlDialog()

2
plugins/stereo_matrix/CMakeLists.txt
View File

@@ -1,4 +1,4 @@
INCLUDE(BuildPlugin)
BUILD_PLUGIN(stereomatrix stereo_matrix.cpp stereomatrix_controls.cpp stereomatrix_control_dialog.cpp stereo_matrix.h stereomatrix_controls.h stereomatrix_control_dialog.h MOCFILES stereomatrix_controls.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
BUILD_PLUGIN(stereomatrix stereo_matrix.cpp stereomatrix_controls.cpp stereomatrix_control_dialog.cpp stereo_matrix.h stereomatrix_controls.h stereomatrix_control_dialog.h MOCFILES stereomatrix_controls.h stereomatrix_control_dialog.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")

1
plugins/stereo_matrix/stereomatrix_control_dialog.cpp
View File

@@ -68,3 +68,4 @@ stereoMatrixControlDialog::stereoMatrixControlDialog(
rrKnob->move( 40+28, 60+28 );
}
#include "moc_stereomatrix_control_dialog.cxx"

1
plugins/stereo_matrix/stereomatrix_control_dialog.h
View File

@@ -32,6 +32,7 @@ class stereoMatrixControls;
class stereoMatrixControlDialog : public EffectControlDialog
{
Q_OBJECT
public:
stereoMatrixControlDialog( stereoMatrixControls * _controls );
virtual ~stereoMatrixControlDialog()

1
plugins/stk/mallets/mallets.h
View File

@@ -133,6 +133,7 @@ protected:
class malletsInstrument : public Instrument
{
Q_OBJECT
public:
malletsInstrument( InstrumentTrack * _instrument_track );
virtual ~malletsInstrument();

2
plugins/waveshaper/CMakeLists.txt
View File

@@ -1,3 +1,3 @@
INCLUDE(BuildPlugin)
BUILD_PLUGIN(waveshaper waveshaper.cpp waveshaper_controls.cpp waveshaper_control_dialog.cpp MOCFILES waveshaper_controls.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
BUILD_PLUGIN(waveshaper waveshaper.cpp waveshaper_controls.cpp waveshaper_control_dialog.cpp MOCFILES waveshaper_controls.h waveshaper_control_dialog.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")

2
plugins/waveshaper/waveshaper_control_dialog.cpp
View File

@@ -116,3 +116,5 @@ waveShaperControlDialog::waveShaperControlDialog(
connect( subOneButton, SIGNAL( clicked() ),
_controls, SLOT( subOneClicked() ) );
}
#include "moc_waveshaper_control_dialog.cxx"

1
plugins/waveshaper/waveshaper_control_dialog.h
View File

@@ -34,6 +34,7 @@ class waveShaperControls;
class waveShaperControlDialog : public EffectControlDialog
{
Q_OBJECT
public:
waveShaperControlDialog( waveShaperControls * _controls );
virtual ~waveShaperControlDialog()