diff options
author | Tim E. Real <termtech@rogers.com> | 2012-08-04 22:14:50 +0000 |
---|---|---|
committer | Tim E. Real <termtech@rogers.com> | 2012-08-04 22:14:50 +0000 |
commit | 345fb0cc41b94b08134dc1f40020b4bf26e1d46b (patch) | |
tree | 78f6da3cf9cd64a84ead190e615a175a6a82242d /muse2/muse/mixer | |
parent | 8ee7ac503d93d7a0b6cf3b49c3255d389ba59c17 (diff) |
REWRITE: Introducing: More bits for Song Changed SC_* flags.
Added MusECore::SongChangedFlags_t (in new type_defs.h file). Declared as int64 type.
All Song Changed parameters, handlers, connections, calls, colateral operations etc. now use
this new SongChangedFlags_t.
All the handlers are now ready for the code bodies to accept any extra flags, devs need not
do anything more than define new SC_* flags and write support inside the handlers.
Please beware these possible extra flags when writing songChanged handlers and setting updateFlags.
Diffstat (limited to 'muse2/muse/mixer')
-rw-r--r-- | muse2/muse/mixer/amixer.cpp | 4 | ||||
-rw-r--r-- | muse2/muse/mixer/amixer.h | 3 | ||||
-rw-r--r-- | muse2/muse/mixer/astrip.cpp | 2 | ||||
-rw-r--r-- | muse2/muse/mixer/astrip.h | 3 | ||||
-rw-r--r-- | muse2/muse/mixer/mstrip.cpp | 2 | ||||
-rw-r--r-- | muse2/muse/mixer/mstrip.h | 3 | ||||
-rw-r--r-- | muse2/muse/mixer/rack.cpp | 4 | ||||
-rw-r--r-- | muse2/muse/mixer/rack.h | 3 | ||||
-rw-r--r-- | muse2/muse/mixer/routedialog.cpp | 4 | ||||
-rw-r--r-- | muse2/muse/mixer/routedialog.h | 4 | ||||
-rw-r--r-- | muse2/muse/mixer/strip.h | 3 |
11 files changed, 21 insertions, 14 deletions
diff --git a/muse2/muse/mixer/amixer.cpp b/muse2/muse/mixer/amixer.cpp index 1dd09c4f..fbdc4d30 100644 --- a/muse2/muse/mixer/amixer.cpp +++ b/muse2/muse/mixer/amixer.cpp @@ -238,7 +238,7 @@ AudioMixerApp::AudioMixerApp(QWidget* parent, MusEGlobal::MixerConfig* c) connect(view, SIGNAL(layoutRequest()), SLOT(setSizing())); ///connect(this, SIGNAL(layoutRequest()), SLOT(setSizing())); - connect(MusEGlobal::song, SIGNAL(songChanged(int, int)), SLOT(songChanged(int))); + connect(MusEGlobal::song, SIGNAL(songChanged(MusECore::SongChangedFlags_t)), SLOT(songChanged(MusECore::SongChangedFlags_t))); connect(MusEGlobal::muse, SIGNAL(configChanged()), SLOT(configChanged())); //MusEGlobal::song->update(); // calls update mixer @@ -554,7 +554,7 @@ void AudioMixerApp::configChanged() // songChanged //--------------------------------------------------------- -void AudioMixerApp::songChanged(int flags) +void AudioMixerApp::songChanged(MusECore::SongChangedFlags_t flags) { // Is it simply a midi controller value adjustment? Forget it. if(flags == SC_MIDI_CONTROLLER) diff --git a/muse2/muse/mixer/amixer.h b/muse2/muse/mixer/amixer.h index e1c70ca3..4a45d214 100644 --- a/muse2/muse/mixer/amixer.h +++ b/muse2/muse/mixer/amixer.h @@ -26,6 +26,7 @@ #include <QScrollArea> +#include "type_defs.h" #include "cobject.h" #include "synth.h" #include "node.h" @@ -123,7 +124,7 @@ class AudioMixerApp : public QMainWindow { //void layoutRequest(); private slots: - void songChanged(int); + void songChanged(MusECore::SongChangedFlags_t); //void configChanged() { songChanged(-1); } void configChanged(); //void addNewTrack(QAction*); diff --git a/muse2/muse/mixer/astrip.cpp b/muse2/muse/mixer/astrip.cpp index 3b0a8707..49954a0c 100644 --- a/muse2/muse/mixer/astrip.cpp +++ b/muse2/muse/mixer/astrip.cpp @@ -170,7 +170,7 @@ void AudioStrip::updateRouteButtons() // songChanged //--------------------------------------------------------- -void AudioStrip::songChanged(int val) +void AudioStrip::songChanged(MusECore::SongChangedFlags_t val) { // Is it simply a midi controller value adjustment? Forget it. if (val == SC_MIDI_CONTROLLER) diff --git a/muse2/muse/mixer/astrip.h b/muse2/muse/mixer/astrip.h index c0df5360..f995ce5e 100644 --- a/muse2/muse/mixer/astrip.h +++ b/muse2/muse/mixer/astrip.h @@ -27,6 +27,7 @@ #include <vector> +#include "type_defs.h" #include "strip.h" //#include "route.h" @@ -111,7 +112,7 @@ class AudioStrip : public Strip { public slots: virtual void configChanged(); - virtual void songChanged(int); + virtual void songChanged(MusECore::SongChangedFlags_t); public: AudioStrip(QWidget* parent, MusECore::AudioTrack*); diff --git a/muse2/muse/mixer/mstrip.cpp b/muse2/muse/mixer/mstrip.cpp index 6f98ffb8..f8e7b7f3 100644 --- a/muse2/muse/mixer/mstrip.cpp +++ b/muse2/muse/mixer/mstrip.cpp @@ -459,7 +459,7 @@ void MidiStrip::configChanged() // songChanged //--------------------------------------------------------- -void MidiStrip::songChanged(int val) +void MidiStrip::songChanged(MusECore::SongChangedFlags_t val) { if (mute && (val & SC_MUTE)) { // mute && off mute->blockSignals(true); diff --git a/muse2/muse/mixer/mstrip.h b/muse2/muse/mixer/mstrip.h index d5bf5a9f..2a400799 100644 --- a/muse2/muse/mixer/mstrip.h +++ b/muse2/muse/mixer/mstrip.h @@ -25,6 +25,7 @@ #ifndef __MSTRIP_H__ #define __MSTRIP_H__ +#include "type_defs.h" #include "strip.h" #include <QLabel> @@ -89,7 +90,7 @@ class MidiStrip : public Strip { virtual void heartBeat(); public slots: - virtual void songChanged(int); + virtual void songChanged(MusECore::SongChangedFlags_t); virtual void configChanged(); public: diff --git a/muse2/muse/mixer/rack.cpp b/muse2/muse/mixer/rack.cpp index 8b5bc716..f7a6d899 100644 --- a/muse2/muse/mixer/rack.cpp +++ b/muse2/muse/mixer/rack.cpp @@ -174,7 +174,7 @@ EffectRack::EffectRack(QWidget* parent, MusECore::AudioTrack* t) connect(this, SIGNAL(itemDoubleClicked(QListWidgetItem*)), this, SLOT(doubleClicked(QListWidgetItem*))); - connect(MusEGlobal::song, SIGNAL(songChanged(int, int)), SLOT(songChanged(int))); + connect(MusEGlobal::song, SIGNAL(songChanged(MusECore::SongChangedFlags_t)), SLOT(songChanged(MusECore::SongChangedFlags_t))); EffectRackDelegate* er_delegate = new EffectRackDelegate(this, track); setItemDelegate(er_delegate); @@ -207,7 +207,7 @@ EffectRack::~EffectRack() // songChanged //--------------------------------------------------------- -void EffectRack::songChanged(int typ) +void EffectRack::songChanged(MusECore::SongChangedFlags_t typ) { if (typ & (SC_ROUTE | SC_RACK)) { updateContents(); diff --git a/muse2/muse/mixer/rack.h b/muse2/muse/mixer/rack.h index 49905f48..4c93b05e 100644 --- a/muse2/muse/mixer/rack.h +++ b/muse2/muse/mixer/rack.h @@ -25,6 +25,7 @@ #define __RACK_H__ #include <QListWidget> +#include "type_defs.h" class QDragEnterEvent; class QDragLeaveEvent; @@ -62,7 +63,7 @@ class EffectRack : public QListWidget { private slots: void menuRequested(QListWidgetItem*); void doubleClicked(QListWidgetItem*); - void songChanged(int); + void songChanged(MusECore::SongChangedFlags_t); void updateContents(); protected: diff --git a/muse2/muse/mixer/routedialog.cpp b/muse2/muse/mixer/routedialog.cpp index 2d73a6c0..c0eba948 100644 --- a/muse2/muse/mixer/routedialog.cpp +++ b/muse2/muse/mixer/routedialog.cpp @@ -47,7 +47,7 @@ RouteDialog::RouteDialog(QWidget* parent) connect(newDstList, SIGNAL(itemSelectionChanged()), SLOT(dstSelectionChanged())); connect(removeButton, SIGNAL(clicked()), SLOT(removeRoute())); connect(connectButton, SIGNAL(clicked()), SLOT(addRoute())); - connect(MusEGlobal::song, SIGNAL(songChanged(int, int)), SLOT(songChanged(int))); + connect(MusEGlobal::song, SIGNAL(songChanged(MusECore::SongChangedFlags_t)), SLOT(songChanged(MusECore::SongChangedFlags_t))); routingChanged(); } @@ -118,7 +118,7 @@ void RouteDialog::routingChanged() // songChanged //--------------------------------------------------------- -void RouteDialog::songChanged(int v) +void RouteDialog::songChanged(MusECore::SongChangedFlags_t v) { if (v & (SC_TRACK_INSERTED | SC_TRACK_REMOVED | SC_ROUTE)) { routingChanged(); diff --git a/muse2/muse/mixer/routedialog.h b/muse2/muse/mixer/routedialog.h index 4d1856e5..8fab5e36 100644 --- a/muse2/muse/mixer/routedialog.h +++ b/muse2/muse/mixer/routedialog.h @@ -25,6 +25,8 @@ #define __ROUTEDIALOG_H__ #include "ui_routedialogbase.h" +#include "type_defs.h" + class QCloseEvent; class QDialog; @@ -47,7 +49,7 @@ class RouteDialog : public QDialog, public Ui::RouteDialogBase { void addRoute(); void srcSelectionChanged(); void dstSelectionChanged(); - void songChanged(int); + void songChanged(MusECore::SongChangedFlags_t); signals: void closed(); diff --git a/muse2/muse/mixer/strip.h b/muse2/muse/mixer/strip.h index 5e788484..bf446013 100644 --- a/muse2/muse/mixer/strip.h +++ b/muse2/muse/mixer/strip.h @@ -31,6 +31,7 @@ #include <QGridLayout> #include <QLabel> +#include "type_defs.h" #include "globaldefs.h" //#include "route.h" @@ -86,7 +87,7 @@ class Strip : public QFrame { public slots: void resetPeaks(); - virtual void songChanged(int) = 0; + virtual void songChanged(MusECore::SongChangedFlags_t) = 0; virtual void configChanged() = 0; public: |