Gary Scavone 11 éve
szülő
commit
e824d2daad
5 módosított fájl, 11 hozzáadás és 7 törlés
  1. 5 4
      RtMidi.cpp
  2. 1 1
      RtMidi.h
  3. 1 1
      doc/doxygen/Doxyfile
  4. 1 1
      doc/doxygen/tutorial.txt
  5. 3 0
      doc/release.txt

+ 5 - 4
RtMidi.cpp

@@ -35,7 +35,7 @@
 */
 /**********************************************************************/
 
-// RtMidi: Version 1.0.13
+// RtMidi: Version 1.0.14
 
 #include "RtMidi.h"
 #include <sstream>
@@ -1421,7 +1421,7 @@ void RtMidiOut :: openPort( unsigned int portNumber, const std::string portName
   if ( data->vport < 0 ) {
     data->vport = snd_seq_create_simple_port( data->seq, portName.c_str(),
                                               SND_SEQ_PORT_CAP_READ|SND_SEQ_PORT_CAP_SUBS_READ,
-                                              SND_SEQ_PORT_TYPE_MIDI_GENERIC );
+                                              SND_SEQ_PORT_TYPE_MIDI_GENERIC|SND_SEQ_PORT_TYPE_APPLICATION );
     if ( data->vport < 0 ) {
       errorString_ = "RtMidiOut::openPort: ALSA error creating output port.";
       error( RtError::DRIVER_ERROR );
@@ -1460,7 +1460,7 @@ void RtMidiOut :: openVirtualPort( std::string portName )
   if ( data->vport < 0 ) {
     data->vport = snd_seq_create_simple_port( data->seq, portName.c_str(),
                                               SND_SEQ_PORT_CAP_READ|SND_SEQ_PORT_CAP_SUBS_READ,
-                                              SND_SEQ_PORT_TYPE_MIDI_GENERIC );
+                                              SND_SEQ_PORT_TYPE_MIDI_GENERIC|SND_SEQ_PORT_TYPE_APPLICATION );
 
     if ( data->vport < 0 ) {
       errorString_ = "RtMidiOut::openVirtualPort: ALSA error creating virtual port.";
@@ -2660,9 +2660,9 @@ RtMidiOut :: ~RtMidiOut()
   JackMidiData *data = static_cast<JackMidiData *> (apiData_);
 
   // Cleanup
+  jack_client_close( data->client );
   jack_ringbuffer_free( data->buffSize );
   jack_ringbuffer_free( data->buffMessage );
-  jack_client_close( data->client );
 }
 
 void RtMidiOut :: openPort( unsigned int portNumber, const std::string portName )
@@ -2751,6 +2751,7 @@ void RtMidiOut :: closePort()
 
   if ( data->port == NULL ) return;
   jack_port_unregister( data->client, data->port );
+  data->port = NULL;
 }
 
 void RtMidiOut :: sendMessage( std::vector<unsigned char> *message )

+ 1 - 1
RtMidi.h

@@ -35,7 +35,7 @@
 */
 /**********************************************************************/
 
-// RtMidi: Version 1.0.13
+// RtMidi: Version 1.0.14
 
 #ifndef RTMIDI_H
 #define RTMIDI_H

+ 1 - 1
doc/doxygen/Doxyfile

@@ -31,7 +31,7 @@ PROJECT_NAME           = RtMidi
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 1.0.13
+PROJECT_NUMBER         = 1.0.14
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 

+ 1 - 1
doc/doxygen/tutorial.txt

@@ -17,7 +17,7 @@ MIDI input and output functionality are separated into two classes, RtMidiIn and
 
 \section download Download
 
-Latest Release (7 April 2011): <A href="http://www.music.mcgill.ca/~gary/rtmidi/release/rtmidi-1.0.13.tar.gz">Version 1.0.13</A>
+Latest Release (17 April 2011): <A href="http://www.music.mcgill.ca/~gary/rtmidi/release/rtmidi-1.0.14.tar.gz">Version 1.0.14</A>
 
 \section start Getting Started
 

+ 3 - 0
doc/release.txt

@@ -2,6 +2,9 @@ RtMidi - a set of C++ classes that provides a common API for realtime MIDI input
 
 By Gary P. Scavone, 2003-2011.
 
+v1.0.14: (17 April 2011)
+- bug fix to Jack MIDI support (thanks to Alexander Svetalkin and Pedro Lopez-Cabanillas)
+
 v1.0.13: (7 April 2011)
 - updated RtError.h to the same version as in RtAudio
 - new Jack MIDI support in Linux (thanks to Alexander Svetalkin)