diff --git a/data/locale/ca.ts b/data/locale/ca.ts index 3295f82ec..d0ff53fa9 100644 --- a/data/locale/ca.ts +++ b/data/locale/ca.ts @@ -488,7 +488,7 @@ If you're interested in translating LMMS in another language or want to imp - ChordCreator + InstrumentFunctionNoteStacking octave octava @@ -855,7 +855,7 @@ If you're interested in translating LMMS in another language or want to imp - ChordCreatorView + InstrumentFunctionNoteStackingView CHORDS ACORDS diff --git a/data/locale/cs.ts b/data/locale/cs.ts index 1118a1643..af6a41d67 100644 --- a/data/locale/cs.ts +++ b/data/locale/cs.ts @@ -488,7 +488,7 @@ If you're interested in translating LMMS in another language or want to imp - ChordCreator + InstrumentFunctionNoteStacking octave oktáva @@ -855,7 +855,7 @@ If you're interested in translating LMMS in another language or want to imp - ChordCreatorView + InstrumentFunctionNoteStackingView CHORDS AKORDY diff --git a/data/locale/de.ts b/data/locale/de.ts index cdeb4810d..3ee513bcf 100644 --- a/data/locale/de.ts +++ b/data/locale/de.ts @@ -488,7 +488,7 @@ If you're interested in translating LMMS in another language or want to imp - ChordCreator + InstrumentFunctionNoteStacking octave Oktave @@ -855,7 +855,7 @@ If you're interested in translating LMMS in another language or want to imp - ChordCreatorView + InstrumentFunctionNoteStackingView CHORDS AKKORDE diff --git a/data/locale/en.ts b/data/locale/en.ts index 8ed3172cb..20e29f33f 100644 --- a/data/locale/en.ts +++ b/data/locale/en.ts @@ -488,7 +488,7 @@ If you're interested in translating LMMS in another language or want to imp - ChordCreator + InstrumentFunctionNoteStacking octave @@ -855,7 +855,7 @@ If you're interested in translating LMMS in another language or want to imp - ChordCreatorView + InstrumentFunctionNoteStackingView CHORDS diff --git a/data/locale/es.ts b/data/locale/es.ts index b0a0e2e90..a986f5af0 100644 --- a/data/locale/es.ts +++ b/data/locale/es.ts @@ -488,7 +488,7 @@ If you're interested in translating LMMS in another language or want to imp - ChordCreator + InstrumentFunctionNoteStacking octave Octava @@ -855,7 +855,7 @@ If you're interested in translating LMMS in another language or want to imp - ChordCreatorView + InstrumentFunctionNoteStackingView CHORDS diff --git a/data/locale/fa.ts b/data/locale/fa.ts index b84820ea8..2c7fec6d5 100644 --- a/data/locale/fa.ts +++ b/data/locale/fa.ts @@ -488,7 +488,7 @@ If you're interested in translating LMMS in another language or want to imp - ChordCreator + InstrumentFunctionNoteStacking octave نت @@ -855,7 +855,7 @@ If you're interested in translating LMMS in another language or want to imp - ChordCreatorView + InstrumentFunctionNoteStackingView CHORDS diff --git a/data/locale/fr.ts b/data/locale/fr.ts index 8ca35588f..e45aca6d1 100644 --- a/data/locale/fr.ts +++ b/data/locale/fr.ts @@ -488,7 +488,7 @@ If you're interested in translating LMMS in another language or want to imp - ChordCreator + InstrumentFunctionNoteStacking octave octave @@ -855,7 +855,7 @@ If you're interested in translating LMMS in another language or want to imp - ChordCreatorView + InstrumentFunctionNoteStackingView CHORDS ACCORDS diff --git a/data/locale/gl.ts b/data/locale/gl.ts index 546ed3698..21d411161 100644 --- a/data/locale/gl.ts +++ b/data/locale/gl.ts @@ -501,7 +501,7 @@ Se lle interesa traducir o LMMS a outro idioma ou desexa mellorar as traducións - ChordCreator + InstrumentFunctionNoteStacking octave oitava @@ -872,7 +872,7 @@ Se lle interesa traducir o LMMS a outro idioma ou desexa mellorar as traducións - ChordCreatorView + InstrumentFunctionNoteStackingView CHORDS ACORDES diff --git a/data/locale/it.ts b/data/locale/it.ts index 95df96983..ccbac12ec 100644 --- a/data/locale/it.ts +++ b/data/locale/it.ts @@ -488,7 +488,7 @@ If you're interested in translating LMMS in another language or want to imp - ChordCreator + InstrumentFunctionNoteStacking octave ottava @@ -855,7 +855,7 @@ If you're interested in translating LMMS in another language or want to imp - ChordCreatorView + InstrumentFunctionNoteStackingView CHORDS ACCORDI diff --git a/data/locale/ja.ts b/data/locale/ja.ts index 275e35a97..fe1255193 100644 --- a/data/locale/ja.ts +++ b/data/locale/ja.ts @@ -488,7 +488,7 @@ If you're interested in translating LMMS in another language or want to imp - ChordCreator + InstrumentFunctionNoteStacking octave @@ -855,7 +855,7 @@ If you're interested in translating LMMS in another language or want to imp - ChordCreatorView + InstrumentFunctionNoteStackingView CHORDS diff --git a/data/locale/ko.ts b/data/locale/ko.ts index 584eb9eb5..a18db80cf 100644 --- a/data/locale/ko.ts +++ b/data/locale/ko.ts @@ -488,7 +488,7 @@ If you're interested in translating LMMS in another language or want to imp - ChordCreator + InstrumentFunctionNoteStacking octave 옥타브 @@ -855,7 +855,7 @@ If you're interested in translating LMMS in another language or want to imp - ChordCreatorView + InstrumentFunctionNoteStackingView CHORDS diff --git a/data/locale/nl.ts b/data/locale/nl.ts index de0acab03..a1c52d034 100644 --- a/data/locale/nl.ts +++ b/data/locale/nl.ts @@ -488,7 +488,7 @@ If you're interested in translating LMMS in another language or want to imp - ChordCreator + InstrumentFunctionNoteStacking octave oktaaf @@ -855,7 +855,7 @@ If you're interested in translating LMMS in another language or want to imp - ChordCreatorView + InstrumentFunctionNoteStackingView CHORDS AKKOORDEN diff --git a/data/locale/pl.ts b/data/locale/pl.ts index f3d438f20..0f399180c 100644 --- a/data/locale/pl.ts +++ b/data/locale/pl.ts @@ -494,7 +494,7 @@ Zauważone błędy i propozycje zmian tłumaczenia proszę zgłaszać na e-mail: - ChordCreator + InstrumentFunctionNoteStacking octave @@ -861,7 +861,7 @@ Zauważone błędy i propozycje zmian tłumaczenia proszę zgłaszać na e-mail: - ChordCreatorView + InstrumentFunctionNoteStackingView CHORDS AKORDY diff --git a/data/locale/pt_br.ts b/data/locale/pt_br.ts index 1ea74f00c..c01038992 100644 --- a/data/locale/pt_br.ts +++ b/data/locale/pt_br.ts @@ -488,7 +488,7 @@ If you're interested in translating LMMS in another language or want to imp - ChordCreator + InstrumentFunctionNoteStacking octave oitava @@ -855,7 +855,7 @@ If you're interested in translating LMMS in another language or want to imp - ChordCreatorView + InstrumentFunctionNoteStackingView CHORDS ACORDE diff --git a/data/locale/ru.ts b/data/locale/ru.ts index d55cdfc58..90ac1ea1c 100644 --- a/data/locale/ru.ts +++ b/data/locale/ru.ts @@ -492,7 +492,7 @@ If you're interested in translating LMMS in another language or want to imp - ChordCreator + InstrumentFunctionNoteStacking octave Октава @@ -859,7 +859,7 @@ If you're interested in translating LMMS in another language or want to imp - ChordCreatorView + InstrumentFunctionNoteStackingView CHORDS АККОРД diff --git a/data/locale/sv.ts b/data/locale/sv.ts index 1e1749a4e..1cd1b56c5 100644 --- a/data/locale/sv.ts +++ b/data/locale/sv.ts @@ -488,7 +488,7 @@ If you're interested in translating LMMS in another language or want to imp - ChordCreator + InstrumentFunctionNoteStacking octave oktav @@ -855,7 +855,7 @@ If you're interested in translating LMMS in another language or want to imp - ChordCreatorView + InstrumentFunctionNoteStackingView CHORDS diff --git a/include/InstrumentFunctionViews.h b/include/InstrumentFunctionViews.h index 29bb0640a..2a370468a 100644 --- a/include/InstrumentFunctionViews.h +++ b/include/InstrumentFunctionViews.h @@ -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; diff --git a/include/InstrumentFunctions.h b/include/InstrumentFunctions.h index b26460494..14b1ae618 100644 --- a/include/InstrumentFunctions.h +++ b/include/InstrumentFunctions.h @@ -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; } ; diff --git a/include/InstrumentTrack.h b/include/InstrumentTrack.h index 7df268b82..3514b0aa7 100644 --- a/include/InstrumentTrack.h +++ b/include/InstrumentTrack.h @@ -39,8 +39,8 @@ class QLineEdit; template 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; diff --git a/plugins/flp_import/FlpImport.cpp b/plugins/flp_import/FlpImport.cpp index 63f0dc881..c374595f8 100644 --- a/plugins/flp_import/FlpImport.cpp +++ b/plugins/flp_import/FlpImport.cpp @@ -1,5 +1,5 @@ /* - * flp_import.cpp - support for importing FLP-files + * FlpImport.cpp - support for importing FLP-files * * Copyright (c) 2006-2014 Tobias Doerffel * @@ -464,7 +464,7 @@ struct FL_Channel : public FL_Plugin filterCut( 10000 ), filterRes( 0.1 ), filterEnabled( false ), - arpDir( Arpeggiator::ArpDirUp ), + arpDir( InstrumentFunctionArpeggio::ArpDirUp ), arpRange( 0 ), selectedArp( 0 ), arpTime( 100 ), @@ -603,14 +603,14 @@ bool FlpImport::tryImport( TrackContainer* tc ) basicFilters<>::NumFilters+basicFilters<>::LowPass } ; - const Arpeggiator::ArpDirections mappedArpDir[] = + const InstrumentFunctionArpeggio::ArpDirections mappedArpDir[] = { - Arpeggiator::ArpDirUp, - Arpeggiator::ArpDirUp, - Arpeggiator::ArpDirDown, - Arpeggiator::ArpDirUpAndDown, - Arpeggiator::ArpDirUpAndDown, - Arpeggiator::ArpDirRandom + InstrumentFunctionArpeggio::ArpDirUp, + InstrumentFunctionArpeggio::ArpDirUp, + InstrumentFunctionArpeggio::ArpDirDown, + InstrumentFunctionArpeggio::ArpDirUpAndDown, + InstrumentFunctionArpeggio::ArpDirUpAndDown, + InstrumentFunctionArpeggio::ArpDirRandom } ; QMap mappedPluginTypes; @@ -1519,7 +1519,7 @@ else } } - Arpeggiator * arp = &t->m_arpeggiator; + InstrumentFunctionArpeggio * arp = &t->m_arpeggio; arp->m_arpDirectionModel.setValue( it->arpDir ); arp->m_arpRangeModel.setValue( it->arpRange ); arp->m_arpModel.setValue( it->selectedArp ); diff --git a/src/core/InstrumentFunctions.cpp b/src/core/InstrumentFunctions.cpp index f6ef44715..1de453df8 100644 --- a/src/core/InstrumentFunctions.cpp +++ b/src/core/InstrumentFunctions.cpp @@ -33,111 +33,111 @@ -ChordCreator::ChordTable::Init ChordCreator::ChordTable::s_initTable[] = +InstrumentFunctionNoteStacking::ChordTable::Init InstrumentFunctionNoteStacking::ChordTable::s_initTable[] = { - { QT_TRANSLATE_NOOP( "ChordCreator", "octave" ), { 0, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "Major" ), { 0, 4, 7, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "Majb5" ), { 0, 4, 6, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "minor" ), { 0, 3, 7, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "minb5" ), { 0, 3, 6, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "sus2" ), { 0, 2, 7, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "sus4" ), { 0, 5, 7, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "aug" ), { 0, 4, 8, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "augsus4" ), { 0, 5, 8, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "tri" ), { 0, 3, 6, 9, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "octave" ), { 0, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Major" ), { 0, 4, 7, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Majb5" ), { 0, 4, 6, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "minor" ), { 0, 3, 7, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "minb5" ), { 0, 3, 6, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "sus2" ), { 0, 2, 7, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "sus4" ), { 0, 5, 7, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "aug" ), { 0, 4, 8, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "augsus4" ), { 0, 5, 8, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "tri" ), { 0, 3, 6, 9, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "6" ), { 0, 4, 7, 9, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "6sus4" ), { 0, 5, 7, 9, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "6add9" ), { 0, 4, 7, 9, 14, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "m6" ), { 0, 3, 7, 9, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "m6add9" ), { 0, 3, 7, 9, 14, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "6" ), { 0, 4, 7, 9, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "6sus4" ), { 0, 5, 7, 9, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "6add9" ), { 0, 4, 7, 9, 14, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "m6" ), { 0, 3, 7, 9, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "m6add9" ), { 0, 3, 7, 9, 14, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "7" ), { 0, 4, 7, 10, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "7sus4" ), { 0, 5, 7, 10, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "7#5" ), { 0, 4, 8, 10, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "7b5" ), { 0, 4, 6, 10, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "7#9" ), { 0, 4, 7, 10, 15, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "7b9" ), { 0, 4, 7, 10, 13, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "7#5#9" ), { 0, 4, 8, 10, 15, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "7#5b9" ), { 0, 4, 8, 10, 13, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "7b5b9" ), { 0, 4, 6, 10, 13, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "7add11" ), { 0, 4, 7, 10, 17, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "7add13" ), { 0, 4, 7, 10, 21, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "7#11" ), { 0, 4, 7, 10, 18, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "Maj7" ), { 0, 4, 7, 11, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "Maj7b5" ), { 0, 4, 6, 11, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "Maj7#5" ), { 0, 4, 8, 11, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "Maj7#11" ), { 0, 4, 7, 11, 18, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "Maj7add13" ), { 0, 4, 7, 11, 21, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "m7" ), { 0, 3, 7, 10, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "m7b5" ), { 0, 3, 6, 10, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "m7b9" ), { 0, 3, 7, 10, 13, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "m7add11" ), { 0, 3, 7, 10, 17, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "m7add13" ), { 0, 3, 7, 10, 21, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "m-Maj7" ), { 0, 3, 7, 11, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "m-Maj7add11" ), { 0, 3, 7, 11, 17, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "m-Maj7add13" ), { 0, 3, 7, 11, 21, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "7" ), { 0, 4, 7, 10, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "7sus4" ), { 0, 5, 7, 10, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "7#5" ), { 0, 4, 8, 10, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "7b5" ), { 0, 4, 6, 10, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "7#9" ), { 0, 4, 7, 10, 15, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "7b9" ), { 0, 4, 7, 10, 13, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "7#5#9" ), { 0, 4, 8, 10, 15, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "7#5b9" ), { 0, 4, 8, 10, 13, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "7b5b9" ), { 0, 4, 6, 10, 13, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "7add11" ), { 0, 4, 7, 10, 17, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "7add13" ), { 0, 4, 7, 10, 21, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "7#11" ), { 0, 4, 7, 10, 18, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Maj7" ), { 0, 4, 7, 11, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Maj7b5" ), { 0, 4, 6, 11, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Maj7#5" ), { 0, 4, 8, 11, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Maj7#11" ), { 0, 4, 7, 11, 18, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Maj7add13" ), { 0, 4, 7, 11, 21, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "m7" ), { 0, 3, 7, 10, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "m7b5" ), { 0, 3, 6, 10, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "m7b9" ), { 0, 3, 7, 10, 13, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "m7add11" ), { 0, 3, 7, 10, 17, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "m7add13" ), { 0, 3, 7, 10, 21, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "m-Maj7" ), { 0, 3, 7, 11, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "m-Maj7add11" ), { 0, 3, 7, 11, 17, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "m-Maj7add13" ), { 0, 3, 7, 11, 21, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "9" ), { 0, 4, 7, 10, 14, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "9sus4" ), { 0, 5, 7, 10, 14, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "add9" ), { 0, 4, 7, 14, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "9#5" ), { 0, 4, 8, 10, 14, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "9b5" ), { 0, 4, 6, 10, 14, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "9#11" ), { 0, 4, 7, 10, 14, 18, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "9b13" ), { 0, 4, 7, 10, 14, 20, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "Maj9" ), { 0, 4, 7, 11, 14, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "Maj9sus4" ), { 0, 5, 7, 11, 15, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "Maj9#5" ), { 0, 4, 8, 11, 14, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "Maj9#11" ), { 0, 4, 7, 11, 14, 18, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "m9" ), { 0, 3, 7, 10, 14, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "madd9" ), { 0, 3, 7, 14, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "m9b5" ), { 0, 3, 6, 10, 14, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "m9-Maj7" ), { 0, 3, 7, 11, 14, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "9" ), { 0, 4, 7, 10, 14, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "9sus4" ), { 0, 5, 7, 10, 14, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "add9" ), { 0, 4, 7, 14, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "9#5" ), { 0, 4, 8, 10, 14, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "9b5" ), { 0, 4, 6, 10, 14, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "9#11" ), { 0, 4, 7, 10, 14, 18, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "9b13" ), { 0, 4, 7, 10, 14, 20, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Maj9" ), { 0, 4, 7, 11, 14, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Maj9sus4" ), { 0, 5, 7, 11, 15, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Maj9#5" ), { 0, 4, 8, 11, 14, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Maj9#11" ), { 0, 4, 7, 11, 14, 18, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "m9" ), { 0, 3, 7, 10, 14, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "madd9" ), { 0, 3, 7, 14, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "m9b5" ), { 0, 3, 6, 10, 14, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "m9-Maj7" ), { 0, 3, 7, 11, 14, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "11" ), { 0, 4, 7, 10, 14, 17, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "11b9" ), { 0, 4, 7, 10, 13, 17, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "Maj11" ), { 0, 4, 7, 11, 14, 17, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "m11" ), { 0, 3, 7, 10, 14, 17, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "m-Maj11" ), { 0, 3, 7, 11, 14, 17, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "11" ), { 0, 4, 7, 10, 14, 17, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "11b9" ), { 0, 4, 7, 10, 13, 17, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Maj11" ), { 0, 4, 7, 11, 14, 17, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "m11" ), { 0, 3, 7, 10, 14, 17, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "m-Maj11" ), { 0, 3, 7, 11, 14, 17, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "13" ), { 0, 4, 7, 10, 14, 21, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "13#9" ), { 0, 4, 7, 10, 15, 21, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "13b9" ), { 0, 4, 7, 10, 13, 21, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "13b5b9" ), { 0, 4, 6, 10, 13, 21, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "Maj13" ), { 0, 4, 7, 11, 14, 21, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "m13" ), { 0, 3, 7, 10, 14, 21, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "m-Maj13" ), { 0, 3, 7, 11, 14, 21, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "13" ), { 0, 4, 7, 10, 14, 21, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "13#9" ), { 0, 4, 7, 10, 15, 21, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "13b9" ), { 0, 4, 7, 10, 13, 21, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "13b5b9" ), { 0, 4, 6, 10, 13, 21, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Maj13" ), { 0, 4, 7, 11, 14, 21, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "m13" ), { 0, 3, 7, 10, 14, 21, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "m-Maj13" ), { 0, 3, 7, 11, 14, 21, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "Major" ), { 0, 2, 4, 5, 7, 9, 11, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "Harmonic minor" ), { 0, 2, 3, 5, 7, 8, 11, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "Melodic minor" ), { 0, 2, 3, 5, 7, 9, 11, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "Whole tone" ), { 0, 2, 4, 6, 8, 10, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "Diminished" ), { 0, 2, 3, 5, 6, 8, 9, 11, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "Major pentatonic" ), { 0, 2, 4, 7, 9, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "Minor pentatonic" ), { 0, 3, 5, 7, 10, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "Jap in sen" ), { 0, 1, 5, 7, 10, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "Major bebop" ), { 0, 2, 4, 5, 7, 8, 9, 11, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "Dominant bebop" ), { 0, 2, 4, 5, 7, 9, 10, 11, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "Blues" ), { 0, 3, 5, 6, 7, 10, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "Arabic" ), { 0, 1, 4, 5, 7, 8, 11, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "Enigmatic" ), { 0, 1, 4, 6, 8, 10, 11, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "Neopolitan" ), { 0, 1, 3, 5, 7, 9, 11, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "Neopolitan minor" ), { 0, 1, 3, 5, 7, 8, 11, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "Hungarian minor" ), { 0, 2, 3, 6, 7, 8, 11, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "Dorian" ), { 0, 2, 3, 5, 7, 9, 10, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "Phrygolydian" ), { 0, 1, 3, 5, 7, 8, 10, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "Lydian" ), { 0, 2, 4, 6, 7, 9, 11, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "Mixolydian" ), { 0, 2, 4, 5, 7, 9, 10, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "Aeolian" ), { 0, 2, 3, 5, 7, 8, 10, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "Locrian" ), { 0, 1, 3, 5, 6, 8, 10, -1 } }, - { QT_TRANSLATE_NOOP( "ChordCreator", "Minor" ), { 0, 2, 3, 5, 7, 8, 10, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Major" ), { 0, 2, 4, 5, 7, 9, 11, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Harmonic minor" ), { 0, 2, 3, 5, 7, 8, 11, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Melodic minor" ), { 0, 2, 3, 5, 7, 9, 11, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Whole tone" ), { 0, 2, 4, 6, 8, 10, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Diminished" ), { 0, 2, 3, 5, 6, 8, 9, 11, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Major pentatonic" ), { 0, 2, 4, 7, 9, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Minor pentatonic" ), { 0, 3, 5, 7, 10, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Jap in sen" ), { 0, 1, 5, 7, 10, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Major bebop" ), { 0, 2, 4, 5, 7, 8, 9, 11, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Dominant bebop" ), { 0, 2, 4, 5, 7, 9, 10, 11, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Blues" ), { 0, 3, 5, 6, 7, 10, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Arabic" ), { 0, 1, 4, 5, 7, 8, 11, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Enigmatic" ), { 0, 1, 4, 6, 8, 10, 11, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Neopolitan" ), { 0, 1, 3, 5, 7, 9, 11, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Neopolitan minor" ), { 0, 1, 3, 5, 7, 8, 11, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Hungarian minor" ), { 0, 2, 3, 6, 7, 8, 11, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Dorian" ), { 0, 2, 3, 5, 7, 9, 10, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Phrygolydian" ), { 0, 1, 3, 5, 7, 8, 10, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Lydian" ), { 0, 2, 4, 6, 7, 9, 11, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Mixolydian" ), { 0, 2, 4, 5, 7, 9, 10, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Aeolian" ), { 0, 2, 3, 5, 7, 8, 10, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Locrian" ), { 0, 1, 3, 5, 6, 8, 10, -1 } }, + { QT_TRANSLATE_NOOP( "InstrumentFunctionNoteStacking", "Minor" ), { 0, 2, 3, 5, 7, 8, 10, -1 } }, } ; -ChordCreator::Chord::Chord( const char * n, const ChordSemiTones & semi_tones ) : - m_name( ChordCreator::tr( n ) ) +InstrumentFunctionNoteStacking::Chord::Chord( const char * n, const ChordSemiTones & semi_tones ) : + m_name( InstrumentFunctionNoteStacking::tr( n ) ) { for( m_size = 0; m_size < MAX_CHORD_POLYPHONY; m_size++ ) { @@ -153,7 +153,7 @@ ChordCreator::Chord::Chord( const char * n, const ChordSemiTones & semi_tones ) -bool ChordCreator::Chord::hasSemiTone( int8_t semi_tone ) const +bool InstrumentFunctionNoteStacking::Chord::hasSemiTone( int8_t semi_tone ) const { for( int i = 0; i < size(); ++i ) { @@ -168,7 +168,7 @@ bool ChordCreator::Chord::hasSemiTone( int8_t semi_tone ) const -ChordCreator::ChordTable::ChordTable() : +InstrumentFunctionNoteStacking::ChordTable::ChordTable() : QVector() { for( int i = 0; @@ -182,7 +182,7 @@ ChordCreator::ChordTable::ChordTable() : -const ChordCreator::Chord & ChordCreator::ChordTable::getByName( const QString & name, bool is_scale ) const +const InstrumentFunctionNoteStacking::Chord & InstrumentFunctionNoteStacking::ChordTable::getByName( const QString & name, bool is_scale ) const { for( int i = 0; i < size(); i++ ) { @@ -197,7 +197,7 @@ const ChordCreator::Chord & ChordCreator::ChordTable::getByName( const QString & -ChordCreator::ChordCreator( Model * _parent ) : +InstrumentFunctionNoteStacking::InstrumentFunctionNoteStacking( Model * _parent ) : Model( _parent, tr( "Chords" ) ), m_chordsEnabledModel( false, this ), m_chordsModel( this, tr( "Chord type" ) ), @@ -213,14 +213,14 @@ ChordCreator::ChordCreator( Model * _parent ) : -ChordCreator::~ChordCreator() +InstrumentFunctionNoteStacking::~InstrumentFunctionNoteStacking() { } -void ChordCreator::processNote( notePlayHandle * _n ) +void InstrumentFunctionNoteStacking::processNote( notePlayHandle * _n ) { const int base_note_key = _n->key(); const ChordTable & chord_table = ChordTable::getInstance(); @@ -229,9 +229,7 @@ void ChordCreator::processNote( notePlayHandle * _n ) // at the same time we only add sub-notes if nothing of the note was // played yet, because otherwise we would add chord-subnotes every // time an audio-buffer is rendered... - if( ( ( _n->isTopNote() && - _n->instrumentTrack()->isArpeggiatorEnabled() == false ) || - _n->isPartOfArpeggio() ) && + if( ( ( _n->isTopNote() && _n->instrumentTrack()->isArpeggioEnabled() == false ) || _n->isPartOfArpeggio() ) && _n->totalFramesPlayed() == 0 && m_chordsEnabledModel.value() == true ) { @@ -282,7 +280,7 @@ void ChordCreator::processNote( notePlayHandle * _n ) -void ChordCreator::saveSettings( QDomDocument & _doc, QDomElement & _this ) +void InstrumentFunctionNoteStacking::saveSettings( QDomDocument & _doc, QDomElement & _this ) { m_chordsEnabledModel.saveSettings( _doc, _this, "chord-enabled" ); m_chordsModel.saveSettings( _doc, _this, "chord" ); @@ -292,7 +290,7 @@ void ChordCreator::saveSettings( QDomDocument & _doc, QDomElement & _this ) -void ChordCreator::loadSettings( const QDomElement & _this ) +void InstrumentFunctionNoteStacking::loadSettings( const QDomElement & _this ) { m_chordsEnabledModel.loadSettings( _this, "chord-enabled" ); m_chordsModel.loadSettings( _this, "chord" ); @@ -305,7 +303,7 @@ void ChordCreator::loadSettings( const QDomElement & _this ) -Arpeggiator::Arpeggiator( Model * _parent ) : +InstrumentFunctionArpeggio::InstrumentFunctionArpeggio( Model * _parent ) : Model( _parent, tr( "Arpeggio" ) ), m_arpEnabledModel( false ), m_arpModel( this, tr( "Arpeggio type" ) ), @@ -317,7 +315,7 @@ Arpeggiator::Arpeggiator( Model * _parent ) : m_arpDirectionModel( this, tr( "Arpeggio direction" ) ), m_arpModeModel( this, tr( "Arpeggio mode" ) ) { - const ChordCreator::ChordTable & chord_table = ChordCreator::ChordTable::getInstance(); + const InstrumentFunctionNoteStacking::ChordTable & chord_table = InstrumentFunctionNoteStacking::ChordTable::getInstance(); for( int i = 0; i < chord_table.size(); ++i ) { m_arpModel.addItem( chord_table[i].getName() ); @@ -339,14 +337,14 @@ Arpeggiator::Arpeggiator( Model * _parent ) : -Arpeggiator::~Arpeggiator() +InstrumentFunctionArpeggio::~InstrumentFunctionArpeggio() { } -void Arpeggiator::processNote( notePlayHandle * _n ) +void InstrumentFunctionArpeggio::processNote( notePlayHandle * _n ) { const int base_note_key = _n->key(); if( _n->isTopNote() == false || @@ -375,7 +373,7 @@ void Arpeggiator::processNote( notePlayHandle * _n ) } } - const ChordCreator::ChordTable & chord_table = ChordCreator::ChordTable::getInstance(); + const InstrumentFunctionNoteStacking::ChordTable & chord_table = InstrumentFunctionNoteStacking::ChordTable::getInstance(); const int cur_chord_size = chord_table[selected_arp].size(); const int range = (int)( cur_chord_size * m_arpRangeModel.value() ); const int total_range = range * cnphv.size(); @@ -512,7 +510,7 @@ void Arpeggiator::processNote( notePlayHandle * _n ) -void Arpeggiator::saveSettings( QDomDocument & _doc, QDomElement & _this ) +void InstrumentFunctionArpeggio::saveSettings( QDomDocument & _doc, QDomElement & _this ) { m_arpEnabledModel.saveSettings( _doc, _this, "arp-enabled" ); m_arpModel.saveSettings( _doc, _this, "arp" ); @@ -527,7 +525,7 @@ void Arpeggiator::saveSettings( QDomDocument & _doc, QDomElement & _this ) -void Arpeggiator::loadSettings( const QDomElement & _this ) +void InstrumentFunctionArpeggio::loadSettings( const QDomElement & _this ) { m_arpEnabledModel.loadSettings( _this, "arp-enabled" ); m_arpModel.loadSettings( _this, "arp" ); diff --git a/src/core/note_play_handle.cpp b/src/core/note_play_handle.cpp index 9654cde23..88482599c 100644 --- a/src/core/note_play_handle.cpp +++ b/src/core/note_play_handle.cpp @@ -2,7 +2,7 @@ * note_play_handle.cpp - implementation of class notePlayHandle, part of * rendering engine * - * Copyright (c) 2004-2012 Tobias Doerffel + * Copyright (c) 2004-2014 Tobias Doerffel * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net * @@ -101,7 +101,7 @@ notePlayHandle::notePlayHandle( InstrumentTrack * _it, setFrames( _frames ); - if( !isTopNote() || !instrumentTrack()->isArpeggiatorEnabled() ) + if( !isTopNote() || !instrumentTrack()->isArpeggioEnabled() ) { // send MIDI-note-on-event m_instrumentTrack->processOutEvent( midiEvent( MidiNoteOn, @@ -339,7 +339,7 @@ void notePlayHandle::noteOff( const f_cnt_t _s ) m_releaseFramesToDo = qMax( 0, // 10, m_instrumentTrack->m_soundShaping.releaseFrames() ); - if( !isTopNote() || !instrumentTrack()->isArpeggiatorEnabled() ) + if( !isTopNote() || !instrumentTrack()->isArpeggioEnabled() ) { // send MIDI-note-off-event m_instrumentTrack->processOutEvent( midiEvent( MidiNoteOff, @@ -387,8 +387,7 @@ float notePlayHandle::volumeLevel( const f_cnt_t _frame ) bool notePlayHandle::isArpeggioBaseNote() const { - return isTopNote() && ( m_partOfArpeggio || - m_instrumentTrack->isArpeggiatorEnabled() ); + return isTopNote() && ( m_partOfArpeggio || m_instrumentTrack->isArpeggioEnabled() ); } diff --git a/src/gui/piano_roll.cpp b/src/gui/piano_roll.cpp index 27ebbcace..0c854808d 100644 --- a/src/gui/piano_roll.cpp +++ b/src/gui/piano_roll.cpp @@ -520,7 +520,7 @@ pianoRoll::pianoRoll() : this, SLOT( quantizeChanged() ) ); - const ChordCreator::ChordTable & chord_table = ChordCreator::ChordTable::getInstance(); + const InstrumentFunctionNoteStacking::ChordTable & chord_table = InstrumentFunctionNoteStacking::ChordTable::getInstance(); // setup scale-stuff QLabel * scale_lbl = new QLabel( m_toolBar ); @@ -644,7 +644,7 @@ void pianoRoll::changeNoteEditMode( int i ) void pianoRoll::markSemiTone( int i ) { const int key = getKey( mapFromGlobal( m_semiToneMarkerMenu->pos() ).y() ); - const ChordCreator::Chord * chord = 0; + const InstrumentFunctionNoteStacking::Chord * chord = 0; switch( static_cast( i ) ) { @@ -665,13 +665,13 @@ void pianoRoll::markSemiTone( int i ) break; } case stmaMarkCurrentScale: - chord = & ChordCreator::ChordTable::getInstance() + chord = & InstrumentFunctionNoteStacking::ChordTable::getInstance() .getScaleByName( m_scaleModel.currentText() ); case stmaMarkCurrentChord: { if( ! chord ) { - chord = & ChordCreator::ChordTable::getInstance() + chord = & InstrumentFunctionNoteStacking::ChordTable::getInstance() .getChordByName( m_chordModel.currentText() ); } @@ -1602,7 +1602,7 @@ void pianoRoll::mousePressEvent( QMouseEvent * _me ) new_note.setVolume( m_lastNoteVolume ); created_new_note = m_pattern->addNote( new_note ); - const ChordCreator::Chord & chord = ChordCreator::ChordTable::getInstance() + const InstrumentFunctionNoteStacking::Chord & chord = InstrumentFunctionNoteStacking::ChordTable::getInstance() .getChordByName( m_chordModel.currentText() ); if( ! chord.isEmpty() ) @@ -3855,10 +3855,10 @@ int pianoRoll::quantization() const void pianoRoll::updateSemiToneMarkerMenu() { - const ChordCreator::Chord & scale = ChordCreator::ChordTable::getInstance() + const InstrumentFunctionNoteStacking::Chord & scale = InstrumentFunctionNoteStacking::ChordTable::getInstance() .getScaleByName( m_scaleModel.currentText() ); - const ChordCreator::Chord & chord = ChordCreator::ChordTable::getInstance() + const InstrumentFunctionNoteStacking::Chord & chord = InstrumentFunctionNoteStacking::ChordTable::getInstance() .getChordByName( m_chordModel.currentText() ); emit semiToneMarkerMenuScaleSetEnabled( ! scale.isEmpty() ); diff --git a/src/gui/widgets/InstrumentFunctionViews.cpp b/src/gui/widgets/InstrumentFunctionViews.cpp index 543d9c6c4..e2305906e 100644 --- a/src/gui/widgets/InstrumentFunctionViews.cpp +++ b/src/gui/widgets/InstrumentFunctionViews.cpp @@ -38,7 +38,7 @@ #include "tooltip.h" -ChordCreatorView::ChordCreatorView( ChordCreator* cc, QWidget* parent ) : +InstrumentFunctionNoteStackingView::InstrumentFunctionNoteStackingView( InstrumentFunctionNoteStacking* cc, QWidget* parent ) : QWidget( parent ), ModelView( NULL, this ), m_cc( cc ), @@ -74,7 +74,7 @@ ChordCreatorView::ChordCreatorView( ChordCreator* cc, QWidget* parent ) : -ChordCreatorView::~ChordCreatorView() +InstrumentFunctionNoteStackingView::~InstrumentFunctionNoteStackingView() { delete m_chordsGroupBox; } @@ -82,9 +82,9 @@ ChordCreatorView::~ChordCreatorView() -void ChordCreatorView::modelChanged() +void InstrumentFunctionNoteStackingView::modelChanged() { - m_cc = castModel(); + m_cc = castModel(); m_chordsGroupBox->setModel( &m_cc->m_chordsEnabledModel ); m_chordsComboBox->setModel( &m_cc->m_chordsModel ); m_chordRangeKnob->setModel( &m_cc->m_chordRangeModel ); @@ -96,7 +96,7 @@ void ChordCreatorView::modelChanged() -ArpeggiatorView::ArpeggiatorView( Arpeggiator* arp, QWidget* parent ) : +InstrumentFunctionArpeggioView::InstrumentFunctionArpeggioView( InstrumentFunctionArpeggio* arp, QWidget* parent ) : QWidget( parent ), ModelView( NULL, this ), m_a( arp ), @@ -180,7 +180,7 @@ ArpeggiatorView::ArpeggiatorView( Arpeggiator* arp, QWidget* parent ) : -ArpeggiatorView::~ArpeggiatorView() +InstrumentFunctionArpeggioView::~InstrumentFunctionArpeggioView() { delete m_arpGroupBox; } @@ -188,9 +188,9 @@ ArpeggiatorView::~ArpeggiatorView() -void ArpeggiatorView::modelChanged() +void InstrumentFunctionArpeggioView::modelChanged() { - m_a = castModel(); + m_a = castModel(); m_arpGroupBox->setModel( &m_a->m_arpEnabledModel ); m_arpComboBox->setModel( &m_a->m_arpModel ); m_arpRangeKnob->setModel( &m_a->m_arpRangeModel ); diff --git a/src/tracks/InstrumentTrack.cpp b/src/tracks/InstrumentTrack.cpp index 2b15cceca..a88f07fcb 100644 --- a/src/tracks/InstrumentTrack.cpp +++ b/src/tracks/InstrumentTrack.cpp @@ -108,8 +108,8 @@ InstrumentTrack::InstrumentTrack( TrackContainer* tc ) : m_effectChannelModel( 0, 0, NumFxChannels, this, tr( "FX channel" ) ), m_instrument( NULL ), m_soundShaping( this ), - m_arpeggiator( this ), - m_chordCreator( this ), + m_arpeggio( this ), + m_noteStacking( this ), m_piano( this ) { m_pitchModel.setCenterValue( 0 ); @@ -490,8 +490,8 @@ void InstrumentTrack::playNote( notePlayHandle * _n, { // arpeggio- and chord-widget has to do its work -> adding sub-notes // for chords/arpeggios - m_chordCreator.processNote( _n ); - m_arpeggiator.processNote( _n ); + m_noteStacking.processNote( _n ); + m_arpeggio.processNote( _n ); if( !_n->isArpeggioBaseNote() && m_instrument != NULL ) { @@ -782,8 +782,8 @@ void InstrumentTrack::saveTrackSpecificSettings( QDomDocument & _doc, _this.appendChild( i ); } m_soundShaping.saveState( _doc, _this ); - m_chordCreator.saveState( _doc, _this ); - m_arpeggiator.saveState( _doc, _this ); + m_noteStacking.saveState( _doc, _this ); + m_arpeggio.saveState( _doc, _this ); m_midiPort.saveState( _doc, _this ); m_audioPort.effects()->saveState( _doc, _this ); } @@ -842,13 +842,13 @@ void InstrumentTrack::loadTrackSpecificSettings( const QDomElement & _this ) { m_soundShaping.restoreState( node.toElement() ); } - else if( m_chordCreator.nodeName() == node.nodeName() ) + else if( m_noteStacking.nodeName() == node.nodeName() ) { - m_chordCreator.restoreState( node.toElement() ); + m_noteStacking.restoreState( node.toElement() ); } - else if( m_arpeggiator.nodeName() == node.nodeName() ) + else if( m_arpeggio.nodeName() == node.nodeName() ) { - m_arpeggiator.restoreState( node.toElement() ); + m_arpeggio.restoreState( node.toElement() ); } else if( m_midiPort.nodeName() == node.nodeName() ) { @@ -1356,11 +1356,11 @@ InstrumentTrackWindow::InstrumentTrackWindow( InstrumentTrackView * _itv ) : QWidget* instrumentFunctions = new QWidget( m_tabWidget ); QVBoxLayout* instrumentFunctionsLayout = new QVBoxLayout( instrumentFunctions ); instrumentFunctionsLayout->setMargin( 5 ); - m_chordView = new ChordCreatorView( &m_track->m_chordCreator ); - m_arpView= new ArpeggiatorView( &m_track->m_arpeggiator ); + m_noteStackingView = new InstrumentFunctionNoteStackingView( &m_track->m_noteStacking ); + m_arpeggioView = new InstrumentFunctionArpeggioView( &m_track->m_arpeggio ); - instrumentFunctionsLayout->addWidget( m_chordView ); - instrumentFunctionsLayout->addWidget( m_arpView ); + instrumentFunctionsLayout->addWidget( m_noteStackingView ); + instrumentFunctionsLayout->addWidget( m_arpeggioView ); instrumentFunctionsLayout->addStretch(); // MIDI tab @@ -1463,8 +1463,8 @@ void InstrumentTrackWindow::modelChanged() } m_ssView->setModel( &m_track->m_soundShaping ); - m_chordView->setModel( &m_track->m_chordCreator ); - m_arpView->setModel( &m_track->m_arpeggiator ); + m_noteStackingView->setModel( &m_track->m_noteStacking ); + m_arpeggioView->setModel( &m_track->m_arpeggio ); m_midiView->setModel( &m_track->m_midiPort ); m_effectView->setModel( m_track->m_audioPort.effects() ); updateName();