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

reworked automatableModel (not template-based anymore), removed levelObject, splitted comboBox/comboBoxModel-source-files, began to unify context-menu-creation for controls

Browse Source 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1031 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Tobias Doerffel
2008-05-28 11:47:45 +00:00
parent f6ce2f136c
commit d5701ac014
63 changed files with 1244 additions and 1198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/audio_file_processor/audio_file_processor.cpp
View File

@@ -31,7 +31,6 @@
#include "audio_file_processor.h"
#include "automatable_model_templates.h"
#include "engine.h"
#include "song.h"
#include "instrument_track.h"

1
plugins/bass_booster/bass_booster.cpp
View File

@@ -24,7 +24,6 @@
#include "bass_booster.h"
#include "automatable_model_templates.h"
#undef SINGLE_SOURCE_COMPILE

1
plugins/bass_booster/bassbooster_controls.cpp
View File

@@ -25,7 +25,6 @@
#include "bassbooster_controls.h"
#include "bass_booster.h"
#include "automatable_model_templates.h"

1
plugins/kicker/kicker.cpp
View File

@@ -32,7 +32,6 @@
#include "knob.h"
#include "note_play_handle.h"
#include "sweep_oscillator.h"
#include "automatable_model_templates.h"
#undef SINGLE_SOURCE_COMPILE
#include "embed.cpp"

1
plugins/lb302/lb302.cpp
View File

@@ -39,7 +39,6 @@
#include "note_play_handle.h"
#include "templates.h"
#include "audio_port.h"
#include "automatable_model_templates.h"
#undef SINGLE_SOURCE_COMPILE
#include "embed.cpp"

3
plugins/midi_import/midi_import.cpp
View File

@@ -33,7 +33,6 @@
#include "instrument_track.h"
#include "pattern.h"
#include "automation_pattern.h"
#include "level_object.h"
#include "instrument.h"
#include "debug.h"
#include "embed.h"
@@ -182,7 +181,7 @@ invalid_format:
automationPattern * tap = _tc->tempoAutomationPattern();
if( tap != NULL )
{
tap->object()->setLevel( 120 );
tap->object()->setValue( 120 );
tap->putValue( 0, 120 );
}

2
plugins/organic/organic.cpp
View File

@@ -503,7 +503,7 @@ void organicInstrumentView::modelChanged( void )
oscillatorObject::oscillatorObject( model * _parent, track * _track ) :
model( _parent ),
m_waveShape( oscillator::SineWave, 0, oscillator::NumWaveShapes-1, 1, this ),
m_waveShape( oscillator::SineWave, 0, oscillator::NumWaveShapes-1, this ),
m_oscModel( 0.0f, 0.0f, 5.0f, 1.0f, this ),
m_volModel( 100.0f, 0.0f, 100.0f, 1.0f, this ),
m_panModel( DefaultPanning, PanningLeft, PanningRight, 1.0f, this ),

5
plugins/sf2_player/sf2_player.cpp
View File

@@ -36,7 +36,6 @@
#include "note_play_handle.h"
#include "knob.h"
#include "song.h"
#include "automatable_model_templates.h"
#include "main_window.h"
#include "patches_dialog.h"
@@ -77,8 +76,8 @@ sf2Instrument::sf2Instrument( instrumentTrack * _instrument_track ) :
m_font( NULL ),
m_fontId( 0 ),
m_filename( "" ),
m_bankNum( -1, -1, 999, 1, this ),
m_patchNum( -1, -1, 127, 1, this ),
m_bankNum( -1, -1, 999, this ),
m_patchNum( -1, -1, 127, this ),
m_gain( 1.0f, 0.0f, 5.0f, 0.01f, this ),
m_reverbOn( 0, this ),
m_reverbRoomSize( FLUID_REVERB_DEFAULT_ROOMSIZE, 0, 1.0, 0.01f, this ),

1
plugins/stereo_enhancer/stereoenhancer_controls.cpp
View File

@@ -24,7 +24,6 @@
#include "stereoenhancer_controls.h"
#include "stereo_enhancer.h"
#include "automatable_model_templates.h"
stereoEnhancerControls::stereoEnhancerControls( stereoEnhancerEffect * _eff ) :

1
plugins/stereo_matrix/stereomatrix_controls.cpp
View File

@@ -24,7 +24,6 @@
#include "stereomatrix_controls.h"
#include "stereo_matrix.h"
#include "automatable_model_templates.h"
stereoMatrixControls::stereoMatrixControls( stereoMatrixEffect * _eff ) :

5
plugins/triple_oscillator/triple_oscillator.cpp
View File

@@ -39,7 +39,6 @@
#include "song_editor.h"
#include "tooltip.h"
#include "volume_knob.h"
#include "automatable_model_templates.h"
#undef SINGLE_SOURCE_COMPILE
@@ -79,9 +78,9 @@ oscillatorObject::oscillatorObject( model * _parent, track * _track ) :
m_phaseOffsetModel( 0.0f, 0.0f, 360.0f, 1.0f, this ),
m_stereoPhaseDetuningModel( 0.0f, 0.0f, 360.0f, 1.0f, this ),
m_waveShapeModel( oscillator::SineWave, 0, oscillator::NumWaveShapes-1,
1, this ),
this ),
m_modulationAlgoModel( oscillator::SignalMix, 0,
oscillator::NumModulationAlgos-1, 1, this ),
oscillator::NumModulationAlgos-1, this ),
m_sampleBuffer( new sampleBuffer ),
m_volumeLeft( 0.0f ),
m_volumeRight( 0.0f ),

2
plugins/vibed/nine_button_selector.cpp
View File

@@ -53,7 +53,7 @@ nineButtonSelector::nineButtonSelector( QPixmap _button0_on,
Uint32 _x, Uint32 _y,
QWidget * _parent ):
QWidget( _parent ),
autoModelView( new nineButtonSelectorModel(0, 8, _default, 1, NULL, TRUE ) )
intModelView( new nineButtonSelectorModel(0, 8, _default, NULL, TRUE ) )
{
setFixedSize( 50, 50 );
m_base = QPixmap::grabWidget( _parent, _x, _y );

4
plugins/vibed/nine_button_selector.h
View File

@@ -62,7 +62,7 @@ public:
// };
protected:
void FASTCALL setSelected( Uint8 _new_button );
void setSelected( Uint8 _new_button );
public slots:
void button0Clicked( void );
@@ -93,6 +93,6 @@ private:
};
typedef nineButtonSelector::autoModel nineButtonSelectorModel;
typedef intModel nineButtonSelectorModel;
#endif

4
plugins/vibed/vibed.cpp
View File

@@ -28,8 +28,6 @@
#include <QtGui/QWhatsThis>
#include "vibed.h"
#include "automatable_model_templates.h"
#include "engine.h"
#include "instrument_track.h"
#include "note_play_handle.h"
@@ -111,7 +109,7 @@ vibed::vibed( instrumentTrack * instrument_track ) :
led = new boolModel( harm==0, this );
m_powerButtons.append( led );
harmonic = new nineButtonSelectorModel( 2, 0, 8, 1, this );
harmonic = new nineButtonSelectorModel( 2, 0, 8, this );
m_harmonics.append( harmonic );
graphTmp = new graphModel( -1.0, 1.0, m_sampleLength, this );