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. 

18 files changed, 45 insertions, 34 deletions

diff --git a/muse2/muse/widgets/comment.cpp b/muse2/muse/widgets/comment.cpp
index ea08c5b3..bb0ce033 100644
--- a/muse2/muse/widgets/comment.cpp
+++ b/muse2/muse/widgets/comment.cpp
@@ -57,7 +57,7 @@ TrackComment::TrackComment(MusECore::Track* t, QWidget* parent)
       setAttribute(Qt::WA_DeleteOnClose);
       setWindowTitle(tr("MusE: Track Comment"));
       track = t;
-      connect(MusEGlobal::song, SIGNAL(songChanged(int, int)), SLOT(songChanged(int)));
+      connect(MusEGlobal::song, SIGNAL(songChanged(MusECore::SongChangedFlags_t)), SLOT(songChanged(MusECore::SongChangedFlags_t)));
       textentry->setText(track->comment());
       textentry->moveCursor(QTextCursor::End);
       connect(textentry, SIGNAL(textChanged()), SLOT(textChanged()));
@@ -69,7 +69,7 @@ TrackComment::TrackComment(MusECore::Track* t, QWidget* parent)
 //   songChanged
 //---------------------------------------------------------
 
-void TrackComment::songChanged(int flags)
+void TrackComment::songChanged(MusECore::SongChangedFlags_t flags)
       {
       if ((flags & (SC_TRACK_INSERTED|SC_TRACK_REMOVED|SC_TRACK_MODIFIED)) == 0)
             return;
diff --git a/muse2/muse/widgets/comment.h b/muse2/muse/widgets/comment.h
index f06757d2..9f71cb47 100644
--- a/muse2/muse/widgets/comment.h
+++ b/muse2/muse/widgets/comment.h
@@ -24,6 +24,7 @@
 #define __COMMENT_H__
 
 #include "ui_commentbase.h"
+#include "type_defs.h"
 
 class QWidget;
 
@@ -66,7 +67,7 @@ class TrackComment : public Comment {
       virtual void setText(const QString& s);
 
    private slots:
-      void songChanged(int);
+      void songChanged(MusECore::SongChangedFlags_t);
 
    public:
       TrackComment(MusECore::Track*, QWidget*);
diff --git a/muse2/muse/widgets/midisyncimpl.cpp b/muse2/muse/widgets/midisyncimpl.cpp
index 44d3ca04..fb20cff9 100644
--- a/muse2/muse/widgets/midisyncimpl.cpp
+++ b/muse2/muse/widgets/midisyncimpl.cpp
@@ -262,7 +262,7 @@ MidiSyncConfig::MidiSyncConfig(QWidget* parent)
       connect(syncDelaySpinBox, SIGNAL(valueChanged(int)), SLOT(syncChanged()));
   
       // Done in show().
-      //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::heartBeatTimer, SIGNAL(timeout()), SLOT(heartBeat()));
 }
 
@@ -274,7 +274,7 @@ MidiSyncConfig::~MidiSyncConfig()
 //   songChanged
 //---------------------------------------------------------
 
-void MidiSyncConfig::songChanged(int flags)
+void MidiSyncConfig::songChanged(MusECore::SongChangedFlags_t flags)
 {
       // Is it simply a midi controller value adjustment? Forget it. Otherwise, it's mainly midi port/device changes we want.
       if(flags == SC_MIDI_CONTROLLER || 
@@ -578,7 +578,7 @@ void MidiSyncConfig::cancel()
 void MidiSyncConfig::show()
 {
   songChanged(-1);
-  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::heartBeatTimer, SIGNAL(timeout()), SLOT(heartBeat()));
   QDialog::show();
 }
@@ -607,7 +607,7 @@ void MidiSyncConfig::closeEvent(QCloseEvent* e)
       }
       
       disconnect(MusEGlobal::heartBeatTimer, SIGNAL(timeout()), this, SLOT(heartBeat()));
-      disconnect(MusEGlobal::song, SIGNAL(songChanged(int, int)), this, SLOT(songChanged(int)));
+      disconnect(MusEGlobal::song, SIGNAL(songChanged(MusECore::SongChangedFlags_t)), this, SLOT(songChanged(MusECore::SongChangedFlags_t)));
       
       e->accept();
       }
diff --git a/muse2/muse/widgets/midisyncimpl.h b/muse2/muse/widgets/midisyncimpl.h
index 9c22b55f..6801b510 100644
--- a/muse2/muse/widgets/midisyncimpl.h
+++ b/muse2/muse/widgets/midisyncimpl.h
@@ -25,6 +25,7 @@
 #define __MIDISYNCIMPL_H__
 
 #include "ui_midisync.h"
+#include "type_defs.h"
 #include "sync.h"
 
 class QCloseEvent;
@@ -119,7 +120,7 @@ class MidiSyncConfig : public QDialog, public Ui::MidiSyncConfigBase {
       void dlvClicked(QTreeWidgetItem*, int);
       void dlvDoubleClicked(QTreeWidgetItem*, int);
       //void renameOk(QListViewItem*, int, const QString&);
-      void songChanged(int);
+      void songChanged(MusECore::SongChangedFlags_t);
 
    public:
       MidiSyncConfig(QWidget* parent=0);
diff --git a/muse2/muse/widgets/mtrackinfo.cpp b/muse2/muse/widgets/mtrackinfo.cpp
index fc28f5d2..1b98f100 100644
--- a/muse2/muse/widgets/mtrackinfo.cpp
+++ b/muse2/muse/widgets/mtrackinfo.cpp
@@ -265,7 +265,7 @@ MidiTrackInfo::MidiTrackInfo(QWidget* parent, MusECore::Track* sel_track) : QWid
   //oRButton->setVisible(false);
   connect(oRButton, SIGNAL(pressed()), SLOT(outRoutesPressed()));
   
-  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()));
   
   connect(MusEGlobal::heartBeatTimer, SIGNAL(timeout()), SLOT(heartBeat()));
@@ -594,7 +594,7 @@ void MidiTrackInfo::configChanged()
 //   songChanged
 //---------------------------------------------------------
 
-void MidiTrackInfo::songChanged(int type)
+void MidiTrackInfo::songChanged(MusECore::SongChangedFlags_t type)
 {
   // Is it simply a midi controller value adjustment? Forget it.
   if(type == SC_MIDI_CONTROLLER)
@@ -1368,7 +1368,7 @@ void MidiTrackInfo::iPanDoubleClicked()
 //   updateTrackInfo
 //---------------------------------------------------------
 
-void MidiTrackInfo::updateTrackInfo(int flags)
+void MidiTrackInfo::updateTrackInfo(MusECore::SongChangedFlags_t flags)
 {
       // Is it simply a midi controller value adjustment? Forget it.
       if(flags == SC_MIDI_CONTROLLER)
diff --git a/muse2/muse/widgets/mtrackinfo.h b/muse2/muse/widgets/mtrackinfo.h
index a38dcf20..fd21f066 100644
--- a/muse2/muse/widgets/mtrackinfo.h
+++ b/muse2/muse/widgets/mtrackinfo.h
@@ -24,6 +24,7 @@
 #define __MTRACKINFO_H__
 
 #include "ui_mtrackinfobase.h"
+#include "type_defs.h"
 
 namespace MusECore {
 class Track;
@@ -78,7 +79,7 @@ class MidiTrackInfo : public QWidget, public Ui::MidiTrackInfoBase
    public slots:
       void setTrack(MusECore::Track*); 
       void configChanged();
-      void songChanged(int);
+      void songChanged(MusECore::SongChangedFlags_t);
    
    signals:
       void returnPressed();
@@ -89,7 +90,7 @@ class MidiTrackInfo : public QWidget, public Ui::MidiTrackInfoBase
       MusECore::Track* track() const { return selected; }
       void setLabelText();
       void setLabelFont();
-      void updateTrackInfo(int);
+      void updateTrackInfo(MusECore::SongChangedFlags_t);
 };
 
 } // namespace MusEGui
diff --git a/muse2/muse/widgets/mtscale.cpp b/muse2/muse/widgets/mtscale.cpp
index f0e5ba8d..00947f6f 100644
--- a/muse2/muse/widgets/mtscale.cpp
+++ b/muse2/muse/widgets/mtscale.cpp
@@ -58,7 +58,7 @@ MTScale::MTScale(int* r, QWidget* parent, int xs, bool _mode)
       button = Qt::NoButton;
       setMouseTracking(true);
       connect(MusEGlobal::song, SIGNAL(posChanged(int, unsigned, bool)), SLOT(setPos(int, unsigned, bool)));
-      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(markerChanged(int)), SLOT(redraw()));
 	
       setFixedHeight(28);
@@ -69,7 +69,7 @@ MTScale::MTScale(int* r, QWidget* parent, int xs, bool _mode)
 //   songChanged
 //---------------------------------------------------------
 
-void MTScale::songChanged(int type)
+void MTScale::songChanged(MusECore::SongChangedFlags_t type)
       {
       if (type & (SC_SIG|SC_TEMPO)) {
            if ((type & SC_TEMPO) && waveMode) {
diff --git a/muse2/muse/widgets/mtscale.h b/muse2/muse/widgets/mtscale.h
index a505c832..4f76dcc2 100644
--- a/muse2/muse/widgets/mtscale.h
+++ b/muse2/muse/widgets/mtscale.h
@@ -23,6 +23,7 @@
 #ifndef __MTSCALE_H__
 #define __MTSCALE_H__
 
+#include "type_defs.h"
 #include "view.h"
 
 
@@ -42,7 +43,7 @@ class MTScale : public View {
       bool waveMode;
 
    private slots:
-      void songChanged(int);
+      void songChanged(MusECore::SongChangedFlags_t);
 
    protected:
       virtual void pdraw(QPainter&, const QRect&);
diff --git a/muse2/muse/widgets/mtscale_flo.cpp b/muse2/muse/widgets/mtscale_flo.cpp
index 787d9030..9eb0253a 100644
--- a/muse2/muse/widgets/mtscale_flo.cpp
+++ b/muse2/muse/widgets/mtscale_flo.cpp
@@ -51,7 +51,7 @@ MTScaleFlo::MTScaleFlo(ScoreCanvas* parent_editor, QWidget* parent_widget)
       button = Qt::NoButton;
       setMouseTracking(true);
       connect(MusEGlobal::song, SIGNAL(posChanged(int, unsigned, bool)), SLOT(setPos(int, unsigned, bool)));
-      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(markerChanged(int)), SLOT(redraw()));
       
       parent=parent_editor;
@@ -64,7 +64,7 @@ MTScaleFlo::MTScaleFlo(ScoreCanvas* parent_editor, QWidget* parent_widget)
 //   songChanged
 //---------------------------------------------------------
 
-void MTScaleFlo::songChanged(int type)
+void MTScaleFlo::songChanged(MusECore::SongChangedFlags_t type)
       {
       if (type & (SC_SIG|SC_TEMPO))
             redraw();
diff --git a/muse2/muse/widgets/mtscale_flo.h b/muse2/muse/widgets/mtscale_flo.h
index 9a0b414e..4b089f5e 100644
--- a/muse2/muse/widgets/mtscale_flo.h
+++ b/muse2/muse/widgets/mtscale_flo.h
@@ -23,6 +23,7 @@
 #ifndef __MTSCALE_FLO_H__
 #define __MTSCALE_FLO_H__
 
+#include "type_defs.h"
 #include "view.h"
 
 
@@ -44,7 +45,7 @@ class MTScaleFlo : public View {
       int xoffset;
 
    private slots:
-      void songChanged(int);
+      void songChanged(MusECore::SongChangedFlags_t);
 
    protected:
       virtual void draw(QPainter&, const QRect&);
diff --git a/muse2/muse/widgets/routepopup.cpp b/muse2/muse/widgets/routepopup.cpp
index 84b98d79..f3390298 100644
--- a/muse2/muse/widgets/routepopup.cpp
+++ b/muse2/muse/widgets/routepopup.cpp
@@ -737,10 +737,10 @@ RoutePopupMenu::RoutePopupMenu(const QString& title, QWidget* parent, MusECore::
 void RoutePopupMenu::init()
 {
   //printf("RoutePopupMenu::init this:%p\n", this);  
-  connect(MusEGlobal::song, SIGNAL(songChanged(int, int)), SLOT(songChanged(int)));
+  connect(MusEGlobal::song, SIGNAL(songChanged(MusECore::SongChangedFlags_t)), SLOT(songChanged(MusECore::SongChangedFlags_t)));
 }
 
-void RoutePopupMenu::songChanged(int val)
+void RoutePopupMenu::songChanged(MusECore::SongChangedFlags_t val)
 {
   if(val & (SC_ROUTE | SC_CHANNELS | SC_CONFIG))     
     updateRouteMenus();             
diff --git a/muse2/muse/widgets/routepopup.h b/muse2/muse/widgets/routepopup.h
index e4ecde4c..b379842b 100644
--- a/muse2/muse/widgets/routepopup.h
+++ b/muse2/muse/widgets/routepopup.h
@@ -24,6 +24,7 @@
 #define __ROUTEPOPUPMENU_H__
 
 //#include <QObject>
+#include "type_defs.h"
 #include "popupmenu.h"
 
 namespace MusECore {
@@ -67,7 +68,7 @@ class RoutePopupMenu : public PopupMenu
     
   private slots:
     void popupActivated(QAction*);
-    void songChanged(int);
+    void songChanged(MusECore::SongChangedFlags_t);
   
   public:
     RoutePopupMenu(QWidget* parent = 0, MusECore::Track* track = 0, bool isOutput = false);
diff --git a/muse2/muse/widgets/sig_tempo_toolbar.cpp b/muse2/muse/widgets/sig_tempo_toolbar.cpp
index 22296df2..ecc3ace6 100644
--- a/muse2/muse/widgets/sig_tempo_toolbar.cpp
+++ b/muse2/muse/widgets/sig_tempo_toolbar.cpp
@@ -46,7 +46,7 @@ namespace MusEGui
 		layout->addWidget(label);
 		layout->addWidget(tempo_edit);
 		
-		connect(MusEGlobal::song, SIGNAL(songChanged(int, int)), this, SLOT(song_changed(int)));
+		connect(MusEGlobal::song, SIGNAL(songChanged(MusECore::SongChangedFlags_t)), this, SLOT(song_changed(MusECore::SongChangedFlags_t)));
 		connect(MusEGlobal::song, SIGNAL(posChanged(int, unsigned, bool)), this, SLOT(pos_changed(int,unsigned,bool)));
 		
 		connect(tempo_edit, SIGNAL(tempoChanged(double)), MusEGlobal::song, SLOT(setTempo(double)));
@@ -61,7 +61,7 @@ namespace MusEGui
 		song_changed(SC_TEMPO);
 	}
 
-	void TempoToolbarWidget::song_changed(int type)
+	void TempoToolbarWidget::song_changed(MusECore::SongChangedFlags_t type)
 	{
 		if (type & SC_TEMPO)
 		{
@@ -92,7 +92,7 @@ namespace MusEGui
 		layout->addWidget(label);
 		layout->addWidget(sig_edit);
 		
-		connect(MusEGlobal::song, SIGNAL(songChanged(int, int)), this, SLOT(song_changed(int)));
+		connect(MusEGlobal::song, SIGNAL(songChanged(MusECore::SongChangedFlags_t)), this, SLOT(song_changed(MusECore::SongChangedFlags_t)));
 		connect(MusEGlobal::song, SIGNAL(posChanged(int, unsigned, bool)), this, SLOT(pos_changed(int,unsigned,bool)));
 		
 		connect(sig_edit, SIGNAL(valueChanged(const AL::TimeSignature&)), MusEGlobal::song, SLOT(setSig(const AL::TimeSignature&)));
@@ -107,7 +107,7 @@ namespace MusEGui
 		song_changed(SC_SIG);
 	}
 	
-	void SigToolbarWidget::song_changed(int type)
+	void SigToolbarWidget::song_changed(MusECore::SongChangedFlags_t type)
 	{
 		if (type & SC_SIG)
 		{
diff --git a/muse2/muse/widgets/sig_tempo_toolbar.h b/muse2/muse/widgets/sig_tempo_toolbar.h
index b3fd2088..51271d30 100644
--- a/muse2/muse/widgets/sig_tempo_toolbar.h
+++ b/muse2/muse/widgets/sig_tempo_toolbar.h
@@ -24,6 +24,7 @@
 #define __SIG_TEMPO_TOOLBAR_H__
 
 #include <QWidget>
+#include "type_defs.h"
 
 namespace Awl
 {
@@ -55,7 +56,7 @@ namespace MusEGui
 		
 		private slots:
 			void pos_changed(int,unsigned,bool);
-			void song_changed(int);
+			void song_changed(MusECore::SongChangedFlags_t);
   };
 
 	class TempoToolbarWidget : public QWidget
@@ -76,7 +77,7 @@ namespace MusEGui
 			
 		private slots:
 			void pos_changed(int,unsigned,bool);
-			void song_changed(int);
+			void song_changed(MusECore::SongChangedFlags_t);
   };
 }
 
diff --git a/muse2/muse/widgets/songpos_toolbar.cpp b/muse2/muse/widgets/songpos_toolbar.cpp
index ef87f378..ff52a4ad 100644
--- a/muse2/muse/widgets/songpos_toolbar.cpp
+++ b/muse2/muse/widgets/songpos_toolbar.cpp
@@ -33,12 +33,14 @@ namespace MusEGui
 	{
 		_raster=0;
 		setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
-		connect(MusEGlobal::song, SIGNAL(songChanged(int, int)), this, SLOT(song_changed(int)));
+		connect(MusEGlobal::song, SIGNAL(songChanged(MusECore::SongChangedFlags_t)), this, SLOT(song_changed(MusECore::SongChangedFlags_t)));
 		song_changed(0);
 	}
 	
-	void SongPosToolbarWidget::song_changed(int)
+	void SongPosToolbarWidget::song_changed(MusECore::SongChangedFlags_t flags)
 	{
+          if(flags & SC_MIDI_CONTROLLER)  // TODO: Filter more stuff out
+            return;
 		if (width()!=0)
 			setXMag(-(MusEGlobal::song->len()/width()));
 	}
diff --git a/muse2/muse/widgets/songpos_toolbar.h b/muse2/muse/widgets/songpos_toolbar.h
index 063b2ffd..02f0501c 100644
--- a/muse2/muse/widgets/songpos_toolbar.h
+++ b/muse2/muse/widgets/songpos_toolbar.h
@@ -23,6 +23,7 @@
 #ifndef __SONGPOS_TOOLBAR_H__
 #define __SONGPOS_TOOLBAR_H__
 
+#include "type_defs.h"
 #include "mtscale.h"
 
 namespace MusEGui
@@ -43,7 +44,7 @@ namespace MusEGui
 			virtual void resizeEvent(QResizeEvent*);
 		
 		private slots:
-			void song_changed(int);
+			void song_changed(MusECore::SongChangedFlags_t);
 		
 	};
 }
diff --git a/muse2/muse/widgets/wtscale.cpp b/muse2/muse/widgets/wtscale.cpp
index b41e7b83..bf5106b2 100644
--- a/muse2/muse/widgets/wtscale.cpp
+++ b/muse2/muse/widgets/wtscale.cpp
@@ -54,7 +54,7 @@ WTScale::WTScale(int* r, QWidget* parent, int xs)
       button = Qt::NoButton;
       setMouseTracking(true);
       connect(MusEGlobal::song, SIGNAL(posChanged(int, unsigned, bool)), SLOT(setPos(int, unsigned, bool)));
-      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(markerChanged(int)), SLOT(redraw()));
       setFixedHeight(28);
       setBg(QColor(0xe0, 0xe0, 0xe0));
@@ -64,7 +64,7 @@ WTScale::WTScale(int* r, QWidget* parent, int xs)
 //   songChanged
 //---------------------------------------------------------
 
-void WTScale::songChanged(int /*type*/)
+void WTScale::songChanged(MusECore::SongChangedFlags_t /*type*/)
       {
       }
 
diff --git a/muse2/muse/widgets/wtscale.h b/muse2/muse/widgets/wtscale.h
index 1999a91f..989daf29 100644
--- a/muse2/muse/widgets/wtscale.h
+++ b/muse2/muse/widgets/wtscale.h
@@ -23,6 +23,7 @@
 #ifndef __MTSCALE_H__
 #define __MTSCALE_H__
 
+#include "type_defs.h"
 #include "view.h"
 
 namespace MusEGui {
@@ -40,7 +41,7 @@ class WTScale : public View {
       bool barLocator;
 
    private slots:
-      void songChanged(int);
+      void songChanged(MusECore::SongChangedFlags_t);
 
    protected:
       virtual void pdraw(QPainter&, const QRect&);