summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary Scavone <gary@music.mcgill.ca>2013-10-11 14:49:11 +0200
committerStephen Sinclair <sinclair@music.mcgill.ca>2013-10-11 14:49:11 +0200
commite824d2daadac232d8e99cd801a0ad70ce978eb01 (patch)
tree2d7f7e19962c54070ffb3ca4927c6e416af48ab3
parent330e5ca540bee67d0648def2d303e9e1d366cb53 (diff)
Version 1.0.14
-rw-r--r--RtMidi.cpp9
-rw-r--r--RtMidi.h2
-rw-r--r--doc/doxygen/Doxyfile2
-rw-r--r--doc/doxygen/tutorial.txt2
-rw-r--r--doc/release.txt3
5 files changed, 11 insertions, 7 deletions
diff --git a/RtMidi.cpp b/RtMidi.cpp
index fd4d71f..5efd81d 100644
--- a/RtMidi.cpp
+++ b/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 )
diff --git a/RtMidi.h b/RtMidi.h
index 8dc3f86..1d70dad 100644
--- a/RtMidi.h
+++ b/RtMidi.h
@@ -35,7 +35,7 @@
*/
/**********************************************************************/
-// RtMidi: Version 1.0.13
+// RtMidi: Version 1.0.14
#ifndef RTMIDI_H
#define RTMIDI_H
diff --git a/doc/doxygen/Doxyfile b/doc/doxygen/Doxyfile
index 2b17eee..029ae9c 100644
--- a/doc/doxygen/Doxyfile
+++ b/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.
diff --git a/doc/doxygen/tutorial.txt b/doc/doxygen/tutorial.txt
index 7310f7c..ffb20bf 100644
--- a/doc/doxygen/tutorial.txt
+++ b/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
diff --git a/doc/release.txt b/doc/release.txt
index b64ee9f..4aea131 100644
--- a/doc/release.txt
+++ b/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)