[Lmuse-cvs-traffic] muse/synti/libsynti gui.cpp,1.6,1.7 gui.h,1.4,1.5 mess.cpp,1.2,1.3 mess.h,1.5,1.6 mpevent.cpp,1.2,1.3 mpevent.h,1.2,1.3

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

Update of /cvsroot/lmuse/muse/synti/libsynti
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27019/synti/libsynti

Modified Files:
	gui.cpp gui.h mess.cpp mess.h mpevent.cpp mpevent.h 
Log Message:
updates for midi plugin


Index: mess.h
===================================================================
RCS file: /cvsroot/lmuse/muse/synti/libsynti/mess.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** mess.h	3 May 2005 20:45:48 -0000	1.5
--- mess.h	11 May 2005 14:18:48 -0000	1.6
***************
*** 52,56 ****
        // some of the next three functions:
  
!       virtual bool processEvent(const MidiPlayEvent&);
        virtual bool setController(int, int, int) { return false; }
        virtual bool playNote(int, int, int) { return false; }
--- 52,56 ----
        // some of the next three functions:
  
!       virtual bool processEvent(const MidiEvent&);
        virtual bool setController(int, int, int) { return false; }
        virtual bool playNote(int, int, int) { return false; }
***************
*** 63,68 ****
  
        // synthesizer -> host communication
!       void sendEvent(MidiPlayEvent);  // called from synti
!       MidiPlayEvent receiveEvent();   // called from host
        int eventsPending() const;
  
--- 63,68 ----
  
        // synthesizer -> host communication
!       void sendEvent(MidiEvent);  // called from synti
!       MidiEvent receiveEvent();   // called from host
        int eventsPending() const;
  

Index: mpevent.h
===================================================================
RCS file: /cvsroot/lmuse/muse/synti/libsynti/mpevent.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mpevent.h	3 May 2005 16:57:56 -0000	1.2
--- mpevent.h	11 May 2005 14:18:48 -0000	1.3
***************
*** 13,25 ****
  
  //---------------------------------------------------------
! //   MEvent
! //    baseclass for MidiPlayEvent and MidiRecordEvent
! //---------------------------------------------------------
! 
! //---------------------------------------------------------
! //   MEvent
  //---------------------------------------------------------
  
! class MEvent {
        unsigned _time;
        EvData edata;
--- 13,20 ----
  
  //---------------------------------------------------------
! //   MidiEvent
  //---------------------------------------------------------
  
! class MidiEvent {
        unsigned _time;
        EvData edata;
***************
*** 28,38 ****
  
     public:
!       MEvent() {}
!       MEvent(unsigned tm, int c, int t, int a, int b)
          : _time(tm), _channel(c & 0xf), _type(t), _a(a), _b(b) {}
!       MEvent(unsigned t, int type, const unsigned char* data, int len);
!       MEvent(unsigned t, int tpe, EvData d) : _time(t), edata(d), _type(tpe) {}
  
!       ~MEvent()         {}
  
        int channel() const      { return _channel; }
--- 23,33 ----
  
     public:
!       MidiEvent() {}
!       MidiEvent(unsigned tm, int c, int t, int a, int b)
          : _time(tm), _channel(c & 0xf), _type(t), _a(a), _b(b) {}
!       MidiEvent(unsigned t, int type, const unsigned char* data, int len);
!       MidiEvent(unsigned t, int tpe, EvData d) : _time(t), edata(d), _type(tpe) {}
  
!       ~MidiEvent()         {}
  
        int channel() const      { return _channel; }
***************
*** 57,98 ****
        };
  
- //---------------------------------------------------------
- //   MidiRecordEvent
- //    allocated and deleted in midiseq thread context
- //---------------------------------------------------------
- 
- class MidiPlayEvent;
- 
- class MidiRecordEvent : public MEvent {
-    public:
-       MidiRecordEvent() {}
-       MidiRecordEvent(const MEvent& e) : MEvent(e) {}
-       MidiRecordEvent(unsigned tm, int c, int t, int a, int b)
-         : MEvent(tm, c, t, a, b) {}
-       MidiRecordEvent(unsigned t, int tpe, const unsigned char* data, int len)
-         : MEvent(t, tpe, data, len) {}
-       MidiRecordEvent(unsigned t, int type, EvData data)
-         : MEvent(t, type, data) {}
-       ~MidiRecordEvent() {}
-       };
- 
- //---------------------------------------------------------
- //   MidiPlayEvent
- //    allocated and deleted in audio thread context
- //---------------------------------------------------------
- 
- class MidiPlayEvent : public MEvent {
-    public:
-       MidiPlayEvent() {}
-       MidiPlayEvent(const MEvent& e) : MEvent(e) {}
-       MidiPlayEvent(unsigned tm, int c, int t, int a, int b)
-         : MEvent(tm, c, t, a, b) {}
-       MidiPlayEvent(unsigned t, int type, const unsigned char* data, int len)
-         : MEvent(t, type, data, len) {}
-       MidiPlayEvent(unsigned t, int type, EvData data)
-         : MEvent(t, type, data) {}
-       ~MidiPlayEvent() {}
-       };
- 
  #endif
  
--- 52,55 ----

Index: mpevent.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/synti/libsynti/mpevent.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mpevent.cpp	3 May 2005 16:57:56 -0000	1.2
--- mpevent.cpp	11 May 2005 14:18:48 -0000	1.3
***************
*** 10,17 ****
  
  //---------------------------------------------------------
! //   MEvent
  //---------------------------------------------------------
  
! MEvent::MEvent(unsigned t, int tpe, const unsigned char* data, int len)
        {
        _time = t;
--- 10,17 ----
  
  //---------------------------------------------------------
! //   MidiEvent
  //---------------------------------------------------------
  
! MidiEvent::MidiEvent(unsigned t, int tpe, const unsigned char* data, int len)
        {
        _time = t;

Index: gui.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/synti/libsynti/gui.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** gui.cpp	3 May 2005 16:57:56 -0000	1.6
--- gui.cpp	11 May 2005 14:18:48 -0000	1.7
***************
*** 64,68 ****
  //---------------------------------------------------------
  
! void MessGui::sendEvent(const MidiPlayEvent& ev)
        {
        if (wFifoSize == EVENT_FIFO_SIZE) {
--- 64,68 ----
  //---------------------------------------------------------
  
! void MessGui::sendEvent(const MidiEvent& ev)
        {
        if (wFifoSize == EVENT_FIFO_SIZE) {
***************
*** 81,88 ****
  void MessGui::sendController(int ch, int idx, int val)
        {
! //      MidiPlayEvent pe(0, ch, ME_CONTROLLER, idx, val);
  //      sendEvent(pe);
  
!       sendEvent(MidiPlayEvent(0, ch, ME_CONTROLLER, idx, val));
        }
  
--- 81,88 ----
  void MessGui::sendController(int ch, int idx, int val)
        {
! //      MidiEvent pe(0, ch, ME_CONTROLLER, idx, val);
  //      sendEvent(pe);
  
!       sendEvent(MidiEvent(0, ch, ME_CONTROLLER, idx, val));
        }
  
***************
*** 93,100 ****
  void MessGui::sendSysex(unsigned char* p, int n)
        {
! //      MidiPlayEvent pe(0, 0, ME_SYSEX, p, n);
  //      sendEvent(pe);
  
!       sendEvent(MidiPlayEvent(0, ME_SYSEX, p, n));
        }
  
--- 93,100 ----
  void MessGui::sendSysex(unsigned char* p, int n)
        {
! //      MidiEvent pe(0, 0, ME_SYSEX, p, n);
  //      sendEvent(pe);
  
!       sendEvent(MidiEvent(0, ME_SYSEX, p, n));
        }
  
***************
*** 104,108 ****
  //---------------------------------------------------------
  
! void MessGui::writeEvent(const MidiPlayEvent& ev)
        {
        if (rFifoSize == EVENT_FIFO_SIZE) {
--- 104,108 ----
  //---------------------------------------------------------
  
! void MessGui::writeEvent(const MidiEvent& ev)
        {
        if (rFifoSize == EVENT_FIFO_SIZE) {
***************
*** 121,127 ****
  //---------------------------------------------------------
  
! MidiPlayEvent MessGui::readEvent()
        {
!       MidiPlayEvent ev = wFifo[wFifoRindex];
        wFifoRindex = (wFifoRindex + 1) % EVENT_FIFO_SIZE;
        --wFifoSize;
--- 121,127 ----
  //---------------------------------------------------------
  
! MidiEvent MessGui::readEvent()
        {
!       MidiEvent ev = wFifo[wFifoRindex];
        wFifoRindex = (wFifoRindex + 1) % EVENT_FIFO_SIZE;
        --wFifoSize;

Index: gui.h
===================================================================
RCS file: /cvsroot/lmuse/muse/synti/libsynti/gui.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** gui.h	19 Jun 2004 09:50:37 -0000	1.4
--- gui.h	11 May 2005 14:18:48 -0000	1.5
***************
*** 25,29 ****
  
        // Event Fifo  synti -> GUI
!       MidiPlayEvent rFifo[EVENT_FIFO_SIZE];
        volatile int rFifoSize;
        int rFifoWindex;
--- 25,29 ----
  
        // Event Fifo  synti -> GUI
!       MidiEvent rFifo[EVENT_FIFO_SIZE];
        volatile int rFifoSize;
        int rFifoWindex;
***************
*** 31,35 ****
  
        // Event Fifo  GUI -> synti
!       MidiPlayEvent wFifo[EVENT_FIFO_SIZE];
        volatile int wFifoSize;
        int wFifoWindex;
--- 31,35 ----
  
        // Event Fifo  GUI -> synti
!       MidiEvent wFifo[EVENT_FIFO_SIZE];
        volatile int wFifoSize;
        int wFifoWindex;
***************
*** 39,47 ****
        int readFd;
        void readMessage();
!       void sendEvent(const MidiPlayEvent& ev);
        void sendController(int,int,int);
        void sendSysex(unsigned char*, int);
  
!       virtual void processEvent(const MidiPlayEvent&) {};
  
     public:
--- 39,47 ----
        int readFd;
        void readMessage();
!       void sendEvent(const MidiEvent& ev);
        void sendController(int,int,int);
        void sendSysex(unsigned char*, int);
  
!       virtual void processEvent(const MidiEvent&) {};
  
     public:
***************
*** 49,55 ****
        virtual ~MessGui();
  
!       void writeEvent(const MidiPlayEvent&);
        int fifoSize() const { return wFifoSize; }
!       MidiPlayEvent readEvent();
        };
  
--- 49,55 ----
        virtual ~MessGui();
  
!       void writeEvent(const MidiEvent&);
        int fifoSize() const { return wFifoSize; }
!       MidiEvent readEvent();
        };
  

Index: mess.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/synti/libsynti/mess.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mess.cpp	15 Apr 2004 13:46:18 -0000	1.2
--- mess.cpp	11 May 2005 14:18:48 -0000	1.3
***************
*** 17,21 ****
  struct MessP {
        // Event Fifo  synti -> Host:
!       MidiPlayEvent fifo[FIFO_SIZE];
        volatile int fifoSize;
        int fifoWindex;
--- 17,21 ----
  struct MessP {
        // Event Fifo  synti -> Host:
!       MidiEvent fifo[FIFO_SIZE];
        volatile int fifoSize;
        int fifoWindex;
***************
*** 64,68 ****
  //---------------------------------------------------------
  
! void Mess::sendEvent(MidiPlayEvent ev)
        {
        if (d->fifoSize == FIFO_SIZE) {
--- 64,68 ----
  //---------------------------------------------------------
  
! void Mess::sendEvent(MidiEvent ev)
        {
        if (d->fifoSize == FIFO_SIZE) {
***************
*** 80,86 ****
  //---------------------------------------------------------
  
! MidiPlayEvent Mess::receiveEvent()
        {
!       MidiPlayEvent ev = d->fifo[d->fifoRindex];
        d->fifoRindex = (d->fifoRindex + 1) % FIFO_SIZE;
        --(d->fifoSize);
--- 80,86 ----
  //---------------------------------------------------------
  
! MidiEvent Mess::receiveEvent()
        {
!       MidiEvent ev = d->fifo[d->fifoRindex];
        d->fifoRindex = (d->fifoRindex + 1) % FIFO_SIZE;
        --(d->fifoSize);
***************
*** 106,110 ****
  //---------------------------------------------------------
  
! bool Mess::processEvent(const MidiPlayEvent& ev)
        {
        switch(ev.type()) {
--- 106,110 ----
  //---------------------------------------------------------
  
! bool Mess::processEvent(const MidiEvent& ev)
        {
        switch(ev.type()) {