[Lmuse-cvs-traffic] muse/muse/midiedit drumedit.h, 1.9.2.2, 1.9.2.3 drummap.cpp, 1.3, 1.3.2.1 prcanvas.cpp, 1.20.2.8, 1.20.2.9

[Robert J. <spa...@us...>]

Update of /cvsroot/lmuse/muse/muse/midiedit
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv5576/midiedit

Modified Files:
      Tag: REL07
	drumedit.h drummap.cpp prcanvas.cpp 
Log Message:
Fixes to remove warnings and potential errors, from WillyFoobar

Index: drummap.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/midiedit/drummap.cpp,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -d -r1.3 -r1.3.2.1
*** drummap.cpp	17 Jan 2004 11:34:00 -0000	1.3
--- drummap.cpp	27 Jan 2007 14:52:43 -0000	1.3.2.1
***************
*** 175,180 ****
        memset(drumOutmap, 0, sizeof(drumOutmap));
        for (int i = 0; i < DRUM_MAPSIZE; ++i) {
!             drumInmap[drumMap[i].enote] = i;
!             drumOutmap[drumMap[i].anote] = i;
              }
        }
--- 175,180 ----
        memset(drumOutmap, 0, sizeof(drumOutmap));
        for (int i = 0; i < DRUM_MAPSIZE; ++i) {
!             drumInmap[(unsigned int)(drumMap[i].enote)] = i;
!             drumOutmap[(unsigned int)(drumMap[i].anote)] = i;
              }
        }
***************
*** 359,364 ****
                                memset(drumOutmap, 0, sizeof(drumOutmap));
                                for (int i = 0; i < DRUM_MAPSIZE; ++i) {
!                                     drumInmap[drumMap[i].enote] = i;
!                                     drumOutmap[drumMap[i].anote] = i;
                                      }
                                return;
--- 359,364 ----
                                memset(drumOutmap, 0, sizeof(drumOutmap));
                                for (int i = 0; i < DRUM_MAPSIZE; ++i) {
!                                     drumInmap[(unsigned int)(drumMap[i].enote)] = i;
!                                     drumOutmap[(unsigned int)(drumMap[i].anote)] = i;
                                      }
                                return;

Index: prcanvas.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/midiedit/prcanvas.cpp,v
retrieving revision 1.20.2.8
retrieving revision 1.20.2.9
diff -C2 -d -r1.20.2.8 -r1.20.2.9
*** prcanvas.cpp	26 Sep 2006 20:11:15 -0000	1.20.2.8
--- prcanvas.cpp	27 Jan 2007 14:52:43 -0000	1.20.2.9
***************
*** 712,720 ****
                             || (range == 2 && inLoop)
                             || (range == 3 && selected && inLoop)) {
!                               int len   = event.lenTick();
  
                                len = rate ? (len * 100) / rate : 1;
                                len += offset;
!                               if (len <= 1)
                                      len = 1;
  
--- 712,720 ----
                             || (range == 2 && inLoop)
                             || (range == 3 && selected && inLoop)) {
!                               unsigned int len   = event.lenTick(); //prevent compiler warning: comparison singed/unsigned
  
                                len = rate ? (len * 100) / rate : 1;
                                len += offset;
!                               if (len < 1)
                                      len = 1;
  
***************
*** 833,837 ****
                    continue;
  
!             int len   = event.lenTick();
              int tick2 = tick + len;
  
--- 833,837 ----
                    continue;
  
!             unsigned int len   = event.lenTick(); //prevent compiler warning: comparison singed/unsigned
              int tick2 = tick + len;
  
***************
*** 867,871 ****
           && pos[0] < end_tick
           && !(globalKeyState & AltButton)) {
!             int len            = editor->quant();
              unsigned tick      = pos[0]; //CDW
              unsigned starttick = tick;
--- 867,871 ----
           && pos[0] < end_tick
           && !(globalKeyState & AltButton)) {
!             unsigned int len   = editor->quant();//prevent compiler warning: comparison singed/unsigned
              unsigned tick      = pos[0]; //CDW
              unsigned starttick = tick;
***************
*** 882,886 ****
                          if (!ev.isNote())
                                continue;
!                         if (ev.pitch() == pitch && ((ev.tick() + ev.lenTick()) == (int)starttick)) {
                                Event e = ev.clone();
                                e.setLenTick(ev.lenTick() + editor->rasterStep(starttick));
--- 882,886 ----
                          if (!ev.isNote())
                                continue;
!                         if (ev.pitch() == pitch && ((ev.tick() + ev.lenTick()) == /*(int)*/starttick)) {
                                Event e = ev.clone();
                                e.setLenTick(ev.lenTick() + editor->rasterStep(starttick));

Index: drumedit.h
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/midiedit/drumedit.h,v
retrieving revision 1.9.2.2
retrieving revision 1.9.2.3
diff -C2 -d -r1.9.2.2 -r1.9.2.3
*** drumedit.h	4 Jan 2007 00:35:16 -0000	1.9.2.2
--- drumedit.h	27 Jan 2007 14:52:43 -0000	1.9.2.3
***************
*** 62,65 ****
--- 62,66 ----
     public:
        DHeaderTip(QWidget * parent) : QToolTip(parent) {}
+       virtual ~DHeaderTip(){}	
     protected:
        void maybeTip(const QPoint &);
***************
*** 130,134 ****
     public:
        DrumEdit(PartList*, QWidget* parent = 0, const char* name = 0);
!       ~DrumEdit();
        virtual void readStatus(Xml&);
        virtual void writeStatus(int, Xml&) const;
--- 131,135 ----
     public:
        DrumEdit(PartList*, QWidget* parent = 0, const char* name = 0);
!       virtual ~DrumEdit();
        virtual void readStatus(Xml&);
        virtual void writeStatus(int, Xml&) const;