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/master | |
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/master')
-rw-r--r-- | muse2/muse/master/lmaster.cpp | 4 | ||||
-rw-r--r-- | muse2/muse/master/lmaster.h | 3 | ||||
-rw-r--r-- | muse2/muse/master/master.cpp | 4 | ||||
-rw-r--r-- | muse2/muse/master/master.h | 3 | ||||
-rw-r--r-- | muse2/muse/master/masteredit.cpp | 4 | ||||
-rw-r--r-- | muse2/muse/master/masteredit.h | 3 |
6 files changed, 12 insertions, 9 deletions
diff --git a/muse2/muse/master/lmaster.cpp b/muse2/muse/master/lmaster.cpp index 23c39bc7..44dbf1e1 100644 --- a/muse2/muse/master/lmaster.cpp +++ b/muse2/muse/master/lmaster.cpp @@ -132,7 +132,7 @@ void LMaster::closeEvent(QCloseEvent* e) // songChanged //--------------------------------------------------------- -void LMaster::songChanged(int type) +void LMaster::songChanged(MusECore::SongChangedFlags_t type) { if(_isDeleting) // Ignore while while deleting to prevent crash. return; @@ -267,7 +267,7 @@ LMaster::LMaster() connect(view, SIGNAL(currentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*)), SLOT(select(QTreeWidgetItem*, QTreeWidgetItem*))); connect(view, SIGNAL(itemPressed(QTreeWidgetItem*, int)), SLOT(itemPressed(QTreeWidgetItem*, int))); connect(view, SIGNAL(itemDoubleClicked(QTreeWidgetItem*, int)), SLOT(itemDoubleClicked(QTreeWidgetItem*))); - connect(MusEGlobal::song, SIGNAL(songChanged(int, int)), SLOT(songChanged(int))); + connect(MusEGlobal::song, SIGNAL(songChanged(MusECore::SongChangedFlags_t)), SLOT(songChanged(MusECore::SongChangedFlags_t))); connect(this, SIGNAL(seekTo(int)), MusEGlobal::song, SLOT(seekTo(int))); connect(tempoButton, SIGNAL(clicked()), SLOT(tempoButtonClicked())); connect(timeSigButton, SIGNAL(clicked()), SLOT(timeSigButtonClicked())); diff --git a/muse2/muse/master/lmaster.h b/muse2/muse/master/lmaster.h index d3278333..52c75c49 100644 --- a/muse2/muse/master/lmaster.h +++ b/muse2/muse/master/lmaster.h @@ -23,6 +23,7 @@ #ifndef __LMASTER_EDIT_H__ #define __LMASTER_EDIT_H__ +#include "type_defs.h" #include "midieditor.h" #include "noteinfo.h" #include "cobject.h" @@ -165,7 +166,7 @@ class LMaster : public MidiEditor { void comboboxTimerSlot(); public slots: - void songChanged(int); + void songChanged(MusECore::SongChangedFlags_t); void configChanged(); void focusCanvas(); diff --git a/muse2/muse/master/master.cpp b/muse2/muse/master/master.cpp index 9f692465..76d22a2f 100644 --- a/muse2/muse/master/master.cpp +++ b/muse2/muse/master/master.cpp @@ -60,14 +60,14 @@ Master::Master(MidiEditor* e, QWidget* parent, int xmag, int ymag) setFocusPolicy(Qt::StrongFocus); setMouseTracking(true); connect(MusEGlobal::song, SIGNAL(posChanged(int, unsigned, bool)), this, SLOT(setPos(int, unsigned, bool))); - connect(MusEGlobal::song, SIGNAL(songChanged(int, int)), this, SLOT(songChanged(int))); + connect(MusEGlobal::song, SIGNAL(songChanged(MusECore::SongChangedFlags_t)), this, SLOT(songChanged(MusECore::SongChangedFlags_t))); } //--------------------------------------------------------- // songChanged //--------------------------------------------------------- -void Master::songChanged(int type) +void Master::songChanged(MusECore::SongChangedFlags_t type) { //if(_isDeleting) return; // todo: If things get complicated don't forget some mechanism to ignore while while deleting to prevent possible crash. diff --git a/muse2/muse/master/master.h b/muse2/muse/master/master.h index 70667f6a..37991a7f 100644 --- a/muse2/muse/master/master.h +++ b/muse2/muse/master/master.h @@ -24,6 +24,7 @@ #ifndef __MASTER_H__ #define __MASTER_H__ +#include "type_defs.h" #include "view.h" #include "song.h" #include "tools.h" @@ -69,7 +70,7 @@ class Master : public MusEGui::View { void deleteVal(int x1, int x2); private slots: - void songChanged(int); + void songChanged(MusECore::SongChangedFlags_t); signals: void followEvent(int); diff --git a/muse2/muse/master/masteredit.cpp b/muse2/muse/master/masteredit.cpp index 68ba5168..14a6a35d 100644 --- a/muse2/muse/master/masteredit.cpp +++ b/muse2/muse/master/masteredit.cpp @@ -71,7 +71,7 @@ void MasterEdit::closeEvent(QCloseEvent* e) // songChanged //--------------------------------------------------------- -void MasterEdit::songChanged(int type) +void MasterEdit::songChanged(MusECore::SongChangedFlags_t type) { if(_isDeleting) // Ignore while while deleting to prevent crash. return; @@ -246,7 +246,7 @@ MasterEdit::MasterEdit() connect(tscale, SIGNAL(tempoChanged(int)), SLOT(setTempo(int))); connect(canvas, SIGNAL(tempoChanged(int)), SLOT(setTempo(int))); - 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::song, SIGNAL(posChanged(int,unsigned,bool)), SLOT(posChanged(int,unsigned,bool))); connect(canvas, SIGNAL(followEvent(int)), hscroll, SLOT(setOffset(int))); diff --git a/muse2/muse/master/masteredit.h b/muse2/muse/master/masteredit.h index 15b5a649..5d98cabe 100644 --- a/muse2/muse/master/masteredit.h +++ b/muse2/muse/master/masteredit.h @@ -26,6 +26,7 @@ #include <QByteArray> #include <QResizeEvent> +#include "type_defs.h" #include "midieditor.h" #include "noteinfo.h" #include "cobject.h" @@ -89,7 +90,7 @@ class MasterEdit : public MidiEditor { void tempoChange(double); public slots: - void songChanged(int); + void songChanged(MusECore::SongChangedFlags_t); void focusCanvas(); signals: |