[Lmuse-cvs-traffic] muse/muse mididev.cpp, 1.10.2.4, 1.10.2.5 mididev.h, 1.3.2.3, 1.3.2.4 synth.cpp, 1.43.2.14, 1.43.2.15 synth.h, 1.22.2.6, 1.22.2.7

[terminator356 <ter...@us...>]

Update of /cvsroot/lmuse/muse/muse
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv13724/muse

Modified Files:
      Tag: REL07
	mididev.cpp mididev.h synth.cpp synth.h 
Log Message:
See ChangeLog

Index: mididev.h
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/Attic/mididev.h,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -C2 -d -r1.3.2.3 -r1.3.2.4
*** mididev.h	28 Mar 2009 01:46:09 -0000	1.3.2.3
--- mididev.h	4 Apr 2009 01:49:50 -0000	1.3.2.4
***************
*** 32,38 ****
     protected:
        QString _name;
!       int _port;        // connected to midi port; -1 - not connected
!       int _rwFlags;     // possible open flags, 1 write, 2 read, 3 rw
!       int _openFlags;   //    configured open flags
        void init();
        virtual bool putMidiEvent(const MidiPlayEvent&) = 0;
--- 32,40 ----
     protected:
        QString _name;
!       int _port;         // connected to midi port; -1 - not connected
!       int _rwFlags;      // possible open flags, 1 write, 2 read, 3 rw
!       int _openFlags;    // configured open flags
!       bool _readEnable;  // set when opened/closed.
!       bool _writeEnable; //
        void init();
        virtual bool putMidiEvent(const MidiPlayEvent&) = 0;

Index: synth.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/synth.cpp,v
retrieving revision 1.43.2.14
retrieving revision 1.43.2.15
diff -C2 -d -r1.43.2.14 -r1.43.2.15
*** synth.cpp	9 Mar 2009 02:05:17 -0000	1.43.2.14
--- synth.cpp	4 Apr 2009 01:49:50 -0000	1.43.2.15
***************
*** 211,218 ****
--- 211,261 ----
        _rwFlags    = 1;
        _openFlags  = 1;
+       _readEnable = false;
+       _writeEnable = false;
        setVolume(1.0);
        setPan(0.0);
        }
  
+ //---------------------------------------------------------
+ //   open
+ //---------------------------------------------------------
+ 
+ QString SynthI::open() 
+ { 
+   // Make it behave like a regular midi device.
+   _readEnable = false;
+   _writeEnable = (_openFlags & 0x01);
+     
+   return QString("OK");
+ }
+ 
+ //---------------------------------------------------------
+ //   close
+ //---------------------------------------------------------
+ 
+ void SynthI::close()
+ {
+   _readEnable = false;
+   _writeEnable = false;
+ }
+ 
+ //---------------------------------------------------------
+ //   putEvent
+ //---------------------------------------------------------
+ 
+ bool SynthI::putEvent(const MidiPlayEvent& ev) 
+ {
+   if(_writeEnable)
+     return sif->putEvent(ev);
+   
+   // Hmm, act as if the event went through? 
+   //return true;  
+   return false;  
+ }
+ 
+ //---------------------------------------------------------
+ //   setName
+ //---------------------------------------------------------
+ 
  void SynthI::setName(const QString& s)
        {

Index: mididev.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/Attic/mididev.cpp,v
retrieving revision 1.10.2.4
retrieving revision 1.10.2.5
diff -C2 -d -r1.10.2.4 -r1.10.2.5
*** mididev.cpp	28 Mar 2009 01:46:09 -0000	1.10.2.4
--- mididev.cpp	4 Apr 2009 01:49:49 -0000	1.10.2.5
***************
*** 58,61 ****
--- 58,63 ----
  void MidiDevice::init()
        {
+       _readEnable = false;
+       _writeEnable = false;
        _rwFlags       = 3;
        _openFlags     = 3;
***************
*** 316,319 ****
--- 318,325 ----
  bool MidiDevice::putEvent(const MidiPlayEvent& ev)
        {
+       if(!_writeEnable)
+         //return true;
+         return false;
+         
        if (ev.type() == ME_CONTROLLER) {
              int a = ev.dataA();

Index: synth.h
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/synth.h,v
retrieving revision 1.22.2.6
retrieving revision 1.22.2.7
diff -C2 -d -r1.22.2.6 -r1.22.2.7
*** synth.h	2 Feb 2009 21:38:00 -0000	1.22.2.6
--- synth.h	4 Apr 2009 01:49:50 -0000	1.22.2.7
***************
*** 116,125 ****
  
        bool getData(unsigned a, int b, unsigned c, float** data);
!       bool putEvent(const MidiPlayEvent& ev) {
!             return sif->putEvent(ev);
!             }
  
!       virtual QString open() { return QString("OK");}
!       virtual void close()   {}
        virtual bool putMidiEvent(const MidiPlayEvent&) {return true;}
        virtual Track* newTrack() const { return 0; }
--- 116,123 ----
  
        bool getData(unsigned a, int b, unsigned c, float** data);
!       bool putEvent(const MidiPlayEvent& ev);
  
!       virtual QString open();
!       virtual void close();
        virtual bool putMidiEvent(const MidiPlayEvent&) {return true;}
        virtual Track* newTrack() const { return 0; }