Renamed instrument function classes and instances

Arpeggiator got InstrumentFunctionArpeggio and ChordCreator got
InstrumentFunctionNoteStacking. All related views and instances have
been renamed for better consistency.
This commit is contained in:
Tobias Doerffel
2014-01-25 01:27:28 +01:00
parent c6b7ccd9f7
commit ec45c381c3
25 changed files with 212 additions and 215 deletions

View File

@@ -35,23 +35,23 @@ class groupBox;
class knob;
class TempoSyncKnob;
class Arpeggiator;
class ChordCreator;
class InstrumentFunctionArpeggio;
class InstrumentFunctionNoteStacking;
class ChordCreatorView : public QWidget, public ModelView
class InstrumentFunctionNoteStackingView : public QWidget, public ModelView
{
Q_OBJECT
public:
ChordCreatorView( ChordCreator* cc, QWidget* parent = NULL );
virtual ~ChordCreatorView();
InstrumentFunctionNoteStackingView( InstrumentFunctionNoteStacking* cc, QWidget* parent = NULL );
virtual ~InstrumentFunctionNoteStackingView();
private:
virtual void modelChanged();
ChordCreator * m_cc;
InstrumentFunctionNoteStacking * m_cc;
groupBox * m_chordsGroupBox;
comboBox * m_chordsComboBox;
@@ -63,18 +63,18 @@ private:
class ArpeggiatorView : public QWidget, public ModelView
class InstrumentFunctionArpeggioView : public QWidget, public ModelView
{
Q_OBJECT
public:
ArpeggiatorView( Arpeggiator* arp, QWidget* parent = NULL );
virtual ~ArpeggiatorView();
InstrumentFunctionArpeggioView( InstrumentFunctionArpeggio* arp, QWidget* parent = NULL );
virtual ~InstrumentFunctionArpeggioView();
private:
virtual void modelChanged();
Arpeggiator * m_a;
InstrumentFunctionArpeggio * m_a;
groupBox * m_arpGroupBox;
comboBox * m_arpComboBox;
knob * m_arpRangeKnob;

View File

@@ -37,7 +37,7 @@ class notePlayHandle;
class ChordCreator : public Model, public JournallingObject
class InstrumentFunctionNoteStacking : public Model, public JournallingObject
{
Q_OBJECT
@@ -48,8 +48,8 @@ private:
typedef int8_t ChordSemiTones [MAX_CHORD_POLYPHONY];
public:
ChordCreator( Model * _parent );
virtual ~ChordCreator();
InstrumentFunctionNoteStacking( Model * _parent );
virtual ~InstrumentFunctionNoteStacking();
void processNote( notePlayHandle * _n );
@@ -149,14 +149,14 @@ private:
FloatModel m_chordRangeModel;
friend class ChordCreatorView;
friend class InstrumentFunctionNoteStackingView;
} ;
class Arpeggiator : public Model, public JournallingObject
class InstrumentFunctionArpeggio : public Model, public JournallingObject
{
Q_OBJECT
public:
@@ -169,8 +169,8 @@ public:
NumArpDirections
} ;
Arpeggiator( Model * _parent );
virtual ~Arpeggiator();
InstrumentFunctionArpeggio( Model * _parent );
virtual ~InstrumentFunctionArpeggio();
void processNote( notePlayHandle * _n );
@@ -203,7 +203,7 @@ private:
friend class FlpImport;
friend class InstrumentTrack;
friend class ArpeggiatorView;
friend class InstrumentFunctionArpeggioView;
} ;

View File

@@ -39,8 +39,8 @@
class QLineEdit;
template<class T> class QQueue;
class ArpeggiatorView;
class ChordCreatorView;
class InstrumentFunctionArpeggioView;
class InstrumentFunctionNoteStackingView;
class EffectRackView;
class InstrumentSoundShapingView;
class fadeButton;
@@ -162,9 +162,9 @@ public:
return &m_piano;
}
bool isArpeggiatorEnabled() const
bool isArpeggioEnabled() const
{
return m_arpeggiator.m_arpEnabledModel.value();
return m_arpeggio.m_arpEnabledModel.value();
}
// simple helper for removing midiport-XML-node when loading presets
@@ -238,8 +238,8 @@ private:
Instrument * m_instrument;
InstrumentSoundShaping m_soundShaping;
Arpeggiator m_arpeggiator;
ChordCreator m_chordCreator;
InstrumentFunctionArpeggio m_arpeggio;
InstrumentFunctionNoteStacking m_noteStacking;
Piano m_piano;
@@ -402,8 +402,8 @@ private:
tabWidget * m_tabWidget;
PluginView * m_instrumentView;
InstrumentSoundShapingView * m_ssView;
ChordCreatorView * m_chordView;
ArpeggiatorView * m_arpView;
InstrumentFunctionNoteStackingView* m_noteStackingView;
InstrumentFunctionArpeggioView* m_arpeggioView;
InstrumentMidiIOView * m_midiView;
EffectRackView * m_effectView;