From 345fb0cc41b94b08134dc1f40020b4bf26e1d46b Mon Sep 17 00:00:00 2001
From: "Tim E. Real" <termtech@rogers.com>
Date: Sat, 4 Aug 2012 22:14:50 +0000
Subject: 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.

---
 muse2/muse/waveedit/waveedit.cpp | 4 ++--
 muse2/muse/waveedit/waveedit.h   | 3 ++-
 muse2/muse/waveedit/waveview.cpp | 4 ++--
 muse2/muse/waveedit/waveview.h   | 3 ++-
 4 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'muse2/muse/waveedit')

diff --git a/muse2/muse/waveedit/waveedit.cpp b/muse2/muse/waveedit/waveedit.cpp
index 67c46ad2..e1f18722 100644
--- a/muse2/muse/waveedit/waveedit.cpp
+++ b/muse2/muse/waveedit/waveedit.cpp
@@ -267,7 +267,7 @@ WaveEdit::WaveEdit(MusECore::PartList* pl)
       connect(view,  SIGNAL(horizontalScroll(unsigned)),hscroll, SLOT(setPos(unsigned)));
 
       connect(hscroll, SIGNAL(scaleChanged(int)),  SLOT(updateHScrollRange()));
-      connect(MusEGlobal::song, SIGNAL(songChanged(int, int)), SLOT(songChanged1(int)));
+      connect(MusEGlobal::song, SIGNAL(songChanged(MusECore::SongChangedFlags_t)), SLOT(songChanged1(MusECore::SongChangedFlags_t)));
 
       initShortcuts();
       
@@ -451,7 +451,7 @@ void WaveEdit::readStatus(MusECore::Xml& xml)
 //    signal from "song"
 //---------------------------------------------------------
 
-void WaveEdit::songChanged1(int bits)
+void WaveEdit::songChanged1(MusECore::SongChangedFlags_t bits)
       {
         if(_isDeleting)  // Ignore while while deleting to prevent crash.
           return;
diff --git a/muse2/muse/waveedit/waveedit.h b/muse2/muse/waveedit/waveedit.h
index b2617f49..d52eb986 100644
--- a/muse2/muse/waveedit/waveedit.h
+++ b/muse2/muse/waveedit/waveedit.h
@@ -31,6 +31,7 @@
 #include <QCloseEvent>
 #include <QByteArray>
 
+#include "type_defs.h"
 #include "midieditor.h"
 
 class QAction;
@@ -80,7 +81,7 @@ class WaveEdit : public MidiEditor {
    private slots:
       void cmd(int);
       void setTime(unsigned t);
-      void songChanged1(int);
+      void songChanged1(MusECore::SongChangedFlags_t);
       void soloChanged(bool flag);
       void moveVerticalSlider(int val);
 
diff --git a/muse2/muse/waveedit/waveview.cpp b/muse2/muse/waveedit/waveview.cpp
index 1af1d83a..df579a43 100644
--- a/muse2/muse/waveedit/waveview.cpp
+++ b/muse2/muse/waveedit/waveview.cpp
@@ -79,7 +79,7 @@ WaveView::WaveView(MidiEditor* pr, QWidget* parent, int xscale, int yscale)
 
 
       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)));
       songChanged(SC_SELECTION);
       }
 
@@ -254,7 +254,7 @@ QString WaveView::getCaption() const
 //   songChanged
 //---------------------------------------------------------
 
-void WaveView::songChanged(int flags)
+void WaveView::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/waveedit/waveview.h b/muse2/muse/waveedit/waveview.h
index a3fcf9c5..6aa55120 100644
--- a/muse2/muse/waveedit/waveview.h
+++ b/muse2/muse/waveedit/waveview.h
@@ -23,6 +23,7 @@
 #ifndef WAVE_VIEW_H
 #define WAVE_VIEW_H
 
+#include "type_defs.h"
 #include "view.h"
 #include <QWidget>
 #include <QMouseEvent>
@@ -105,7 +106,7 @@ class WaveView : public View {
 
    public slots:
       void setYScale(int);
-      void songChanged(int type);
+      void songChanged(MusECore::SongChangedFlags_t type);
 
    signals:
       void followEvent(int);
-- 
cgit v1.2.3