From e46d7bf9d40b883ef7194a893ad03de8d5fd32ef Mon Sep 17 00:00:00 2001
From: Florian Jung <flo@windfisch.org>
Date: Fri, 27 May 2011 13:40:27 +0000
Subject: applied some hunks of the patch sent in by WillyFoobar

---
 muse2/ChangeLog                                |  3 +++
 muse2/awl/sigedit.cpp                          |  2 +-
 muse2/muse/arranger/pcanvas.cpp                | 20 ++++++++++----------
 muse2/muse/master/tscale.h                     |  3 ++-
 muse2/muse/steprec.h                           |  3 +--
 muse2/muse/waveevent.cpp                       |  2 +-
 muse2/muse/widgets/function_dialogs/gatetime.h |  2 --
 muse2/muse/widgets/menutitleitem.h             |  3 +++
 8 files changed, 21 insertions(+), 17 deletions(-)

(limited to 'muse2')

diff --git a/muse2/ChangeLog b/muse2/ChangeLog
index 613cecc1..57147fc6 100644
--- a/muse2/ChangeLog
+++ b/muse2/ChangeLog
@@ -1,3 +1,6 @@
+27.05.2011:
+        - fixed bug in scoreeditor: invalid Part*s are now not used any more (flo93)
+        - applied some hunks of the patch sent in by WillyFoobar (flo93)
 25.05.2011:
         - Added midiin and steprec buttons again (flo93)
         - Added step-rec-support for drum edit and score edit (flo93)
diff --git a/muse2/awl/sigedit.cpp b/muse2/awl/sigedit.cpp
index 984a209b..0ff40de9 100644
--- a/muse2/awl/sigedit.cpp
+++ b/muse2/awl/sigedit.cpp
@@ -159,7 +159,7 @@ QAbstractSpinBox::StepEnabled SigEdit::stepEnabled() const
 //   fixup
 //---------------------------------------------------------
 
-void SigEdit::fixup(QString& input) const
+void SigEdit::fixup(QString& /*input*/) const
       {
 //      printf("fixup <%s>\n", input.toLatin1().constData());
       }
diff --git a/muse2/muse/arranger/pcanvas.cpp b/muse2/muse/arranger/pcanvas.cpp
index 54785200..8c7c89ad 100644
--- a/muse2/muse/arranger/pcanvas.cpp
+++ b/muse2/muse/arranger/pcanvas.cpp
@@ -1834,16 +1834,16 @@ void PartCanvas::drawMidiPart(QPainter& p, const QRect&, EventList* events, Midi
         
         if (heavyDebugMsg)
         {
-					if (!isdrum)
-						printf("DEBUG: arranger: cakewalk enabled, y-stretching from %i to %i. eventlist=%i\n",lowest_pitch, highest_pitch, events);
-					else
-					{
-						printf("DEBUG: arranger: cakewalk enabled, y-stretching drums: ");;
-						for (map<int,int>::iterator it=y_mapper.begin(); it!=y_mapper.end(); it++)
-							printf("%i ", it->first);
-						printf("; eventlist=%i\n",events); 
-					}
-				}
+            if (!isdrum)
+                printf("DEBUG: arranger: cakewalk enabled, y-stretching from %i to %i. eventlist=%p\n",lowest_pitch, highest_pitch, events);
+            else
+            {
+                printf("DEBUG: arranger: cakewalk enabled, y-stretching drums: ");;
+                for (map<int,int>::iterator it=y_mapper.begin(); it!=y_mapper.end(); it++)
+                    printf("%i ", it->first);
+                printf("; eventlist=%p\n",events); 
+            }
+        }
       }
       else
       {
diff --git a/muse2/muse/master/tscale.h b/muse2/muse/master/tscale.h
index 35fa39f2..d7ce86c9 100644
--- a/muse2/muse/master/tscale.h
+++ b/muse2/muse/master/tscale.h
@@ -15,8 +15,9 @@
 //---------------------------------------------------------
 
 class TScale : public View {
-      double curTempo;
       Q_OBJECT
+        
+      double curTempo;
 
       virtual void viewMouseMoveEvent(QMouseEvent* event);
       virtual void leaveEvent(QEvent*e);
diff --git a/muse2/muse/steprec.h b/muse2/muse/steprec.h
index b09a9edd..02eab46c 100644
--- a/muse2/muse/steprec.h
+++ b/muse2/muse/steprec.h
@@ -28,9 +28,8 @@ class StepRec : public QObject
 	
 	private:
 		QTimer* chord_timer;
-		int chord_timer_set_to_tick;
+		unsigned int chord_timer_set_to_tick; 
 		bool* note_held_down;
-		
 };
 
 #endif
diff --git a/muse2/muse/waveevent.cpp b/muse2/muse/waveevent.cpp
index 867ce5c8..9f81b7e3 100644
--- a/muse2/muse/waveevent.cpp
+++ b/muse2/muse/waveevent.cpp
@@ -151,7 +151,7 @@ void WaveEventBase::write(int level, Xml& xml, const Pos& offset, bool forcePath
 //off_t WaveEventBase::readAudio(SRC_STATE* src_state, off_t sfCurFrame, unsigned offset, float** buffer, int channel, int n, bool doSeek, bool overwrite)
 //off_t WaveEventBase::readAudio(AudioConverter* audConv, off_t sfCurFrame, unsigned offset, float** buffer, int channel, int n, bool doSeek, bool overwrite)
 // p3.3.33
-void WaveEventBase::readAudio(WavePart* part, unsigned offset, float** buffer, int channel, int n, bool doSeek, bool overwrite)
+void WaveEventBase::readAudio(WavePart* /*part*/, unsigned offset, float** buffer, int channel, int n, bool /*doSeek*/, bool overwrite)
 {
   // Added by Tim. p3.3.17
   #ifdef WAVEEVENT_DEBUG_PRC
diff --git a/muse2/muse/widgets/function_dialogs/gatetime.h b/muse2/muse/widgets/function_dialogs/gatetime.h
index d2555872..f8f35ffd 100644
--- a/muse2/muse/widgets/function_dialogs/gatetime.h
+++ b/muse2/muse/widgets/function_dialogs/gatetime.h
@@ -11,7 +11,6 @@
 #include "ui_gatetimebase.h"
 
 class QButtonGroup;
-class QDialog;
 class Xml;
 
 //---------------------------------------------------------
@@ -21,7 +20,6 @@ class Xml;
 class GateTime : public QDialog, public Ui::GateTimeBase {
    private:
       Q_OBJECT
-
       QButtonGroup *rangeGroup;
 
    protected slots:
diff --git a/muse2/muse/widgets/menutitleitem.h b/muse2/muse/widgets/menutitleitem.h
index 016d4663..0c345ffe 100644
--- a/muse2/muse/widgets/menutitleitem.h
+++ b/muse2/muse/widgets/menutitleitem.h
@@ -15,6 +15,9 @@
 //---------------------------------------------------------
 
 class MenuTitleItem : public QWidgetAction { 
+   private:
+      Q_OBJECT
+        
       QString s;
 
    public:
-- 
cgit v1.2.3