[Lmuse-cvs-traffic] muse/muse/midiedit pianoroll.cpp,1.33,1.34 pianoroll.h,1.11,1.12

[Mathias L. <lun...@us...>]

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

Modified Files:
	pianoroll.cpp pianoroll.h 
Log Message:
added permanent ctrlpanel settings

Index: pianoroll.h
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/midiedit/pianoroll.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** pianoroll.h	15 Sep 2004 18:25:36 -0000	1.11
--- pianoroll.h	22 Sep 2004 23:35:04 -0000	1.12
***************
*** 9,13 ****
  #define __PIANOROLL_H__
  
- #include "noteinfo.h"
  #include "cobject.h"
  #include "extmidieditor.h"
--- 9,12 ----
***************
*** 15,19 ****
  #include "event.h"
  
- class MidiPart;
  class TimeLabel;
  class PitchLabel;
--- 14,17 ----
***************
*** 25,29 ****
  class Splitter;
  class PartList;
- class Toolbar1;
  class Xml;
  class QuantConfig;
--- 23,26 ----
***************
*** 38,42 ****
  class PianoRoll : public ExtMidiEditor {
        Event selEvent;
-       MidiPart* selPart;
        int selTick;
  
--- 35,38 ----
***************
*** 52,64 ****
        bool deltaMode;
  
-       NoteInfo* info;
- 
-       Toolbar1* toolbar;
-       Splitter* splitter;
  
        QToolButton* speaker;
        QToolButton* followSongButton;
-       QToolBar* tools;
-       EditToolBar* tools2;
  
        QPopupMenu* eventColor;
--- 48,54 ----
***************
*** 82,87 ****
        void setSelection(int, Event&, Part*);
        void noteinfoChanged(NoteInfo::ValType, int);
-       CtrlEdit* addCtrl();
-       void removeCtrl(CtrlEdit* ctrl);
        void soloChanged(bool flag);
        void configQuant();
--- 72,75 ----
***************
*** 96,101 ****
        void selectionChanged(); // enable/disable "Copy" & "Paste"
        void setSpeaker(bool);
-       void setTime(unsigned);
-       void follow(int pos);
        void songChanged1(int);
        void configChanged();
--- 84,87 ----

Index: pianoroll.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/midiedit/pianoroll.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** pianoroll.cpp	22 Sep 2004 17:05:39 -0000	1.33
--- pianoroll.cpp	22 Sep 2004 23:35:03 -0000	1.34
***************
*** 29,33 ****
  
  
! static const int xscale = -10;
  static const int yscale = 1;
  static const int pianoWidth = 40;
--- 29,33 ----
  
  
! static const int xscale = EXTMIDIEDITOR_XSCALE;
  static const int yscale = 1;
  static const int pianoWidth = 40;
***************
*** 306,333 ****
        }
  
- //---------------------------------------------------------
- //   follow
- //---------------------------------------------------------
- 
- void PianoRoll::follow(int pos)
-       {
-       int s, e;
-       canvas->range(&s, &e);
- 
-       if (pos < e && pos >= s)
-             hscroll->setOffset(pos);
-       if (pos < s)
-             hscroll->setOffset(s);
-       }
- 
- //---------------------------------------------------------
- //   setTime
- //---------------------------------------------------------
- 
- void PianoRoll::setTime(unsigned tick)
-       {
-       toolbar->setTime(tick);
-       time->setPos(3, tick, false);
-       }
  
  //---------------------------------------------------------
--- 306,309 ----
***************
*** 460,501 ****
  
  //---------------------------------------------------------
- //   addCtrl
- //---------------------------------------------------------
- 
- CtrlEdit* PianoRoll::addCtrl()
-       {
-       CtrlEdit* ctrlEdit = new CtrlEdit(splitter, this, xscale, false, "pianoCtrlEdit");
-       connect(tools2,   SIGNAL(toolChanged(int)),   ctrlEdit, SLOT(setTool(int)));
-       connect(hscroll,  SIGNAL(scrollChanged(int)), ctrlEdit, SLOT(setXPos(int)));
-       connect(hscroll,  SIGNAL(scaleChanged(int)),  ctrlEdit, SLOT(setXMag(int)));
-       connect(ctrlEdit, SIGNAL(timeChanged(unsigned)),   SLOT(setTime(unsigned)));
-       connect(ctrlEdit, SIGNAL(destroyedCtrl(CtrlEdit*)), SLOT(removeCtrl(CtrlEdit*)));
-       connect(ctrlEdit, SIGNAL(yposChanged(int)), toolbar, SLOT(setInt(int)));
- 
-       ctrlEdit->setTool(tools2->curTool());
-       ctrlEdit->setXPos(hscroll->pos());
-       ctrlEdit->setXMag(hscroll->getScaleValue());
- 
-       ctrlEdit->show();
-       ctrlEditList.push_back(ctrlEdit);
-       return ctrlEdit;
-       }
- 
- //---------------------------------------------------------
- //   removeCtrl
- //---------------------------------------------------------
- 
- void PianoRoll::removeCtrl(CtrlEdit* ctrl)
-       {
-       for (std::list<CtrlEdit*>::iterator i = ctrlEditList.begin();
-          i != ctrlEditList.end(); ++i) {
-             if (*i == ctrl) {
-                   ctrlEditList.erase(i);
-                   break;
-                   }
-             }
-       }
- 
- //---------------------------------------------------------
  //   closeEvent
  //---------------------------------------------------------
--- 436,439 ----
***************
*** 828,829 ****
--- 766,768 ----
        ((PianorollSettings*)settings)->setApplyTo(val);
        }
+