[Lmuse-cvs-traffic] muse/muse/midiedit drumedit.cpp,1.56,1.57 prcanvas.cpp,1.46,1.47 prcanvas.h,1.22,1.23

[werner s. <wsc...@us...>]

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

Modified Files:
	drumedit.cpp prcanvas.cpp prcanvas.h 
Log Message:
update midi parts and events in gui while recording


Index: drumedit.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/midiedit/drumedit.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** drumedit.cpp	28 Oct 2005 12:23:57 -0000	1.56
--- drumedit.cpp	31 Oct 2005 14:55:04 -0000	1.57
***************
*** 230,234 ****
        connect(canvas, SIGNAL(selectionChanged(int, Event&, Part*)),
           SLOT(setSelection(int, Event&, Part*)));
!       connect(canvas, SIGNAL(followEvent(int)), SLOT(follow(int)));
  
        setCaption(canvas->getCaption());
--- 230,234 ----
        connect(canvas, SIGNAL(selectionChanged(int, Event&, Part*)),
           SLOT(setSelection(int, Event&, Part*)));
! //TD      connect(canvas, SIGNAL(followEvent(int)), SLOT(follow(int)));
  
        setCaption(canvas->getCaption());

Index: prcanvas.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/midiedit/prcanvas.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** prcanvas.cpp	27 Oct 2005 17:27:19 -0000	1.46
--- prcanvas.cpp	31 Oct 2005 14:55:04 -0000	1.47
***************
*** 17,20 ****
--- 17,21 ----
  #include "song.h"
  #include "audio.h"
+ #include "midi.h"
  
  //---------------------------------------------------------
***************
*** 32,36 ****
  
        songChanged(SC_TRACK_INSERTED);
!       connect(song, SIGNAL(midiNote(int, int)), SLOT(midiNote(int,int)));
        }
  
--- 33,37 ----
  
        songChanged(SC_TRACK_INSERTED);
!       connect(song, SIGNAL(midiEvent(MidiEvent)), SLOT(midiNote(MidiEvent)));
        }
  
***************
*** 668,673 ****
  //---------------------------------------------------------
  
! void PianoCanvas::midiNote(int pitch, int velo)
        {
        if (_midiin && _steprec && curPart
           && !audio->isPlaying() && velo && pos[0].tick() >= startTick
--- 669,679 ----
  //---------------------------------------------------------
  
! void PianoCanvas::midiNote(MidiEvent me)
        {
+       if (me.type() != ME_NOTEON)
+             return;
+       int pitch = me.dataA();
+       int velo  = me.dataB();
+ 
        if (_midiin && _steprec && curPart
           && !audio->isPlaying() && velo && pos[0].tick() >= startTick

Index: prcanvas.h
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/midiedit/prcanvas.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** prcanvas.h	21 Oct 2005 19:08:23 -0000	1.22
--- prcanvas.h	31 Oct 2005 14:55:04 -0000	1.23
***************
*** 66,70 ****
  
     private slots:
!       void midiNote(int pitch, int velo);
  
     signals:
--- 66,70 ----
  
     private slots:
!       void midiNote(MidiEvent);
  
     signals: