diff options
Diffstat (limited to 'RtMidi.cpp')
| -rw-r--r-- | RtMidi.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -36,7 +36,7 @@ */ /**********************************************************************/ -// RtMidi: Version 2.0.0 +// RtMidi: Version 2.0.1 #include "RtMidi.h" #include <sstream> @@ -1056,7 +1056,7 @@ static unsigned int s_numPorts = 0; // The client name to use when creating the sequencer, which is // currently set on the first call to createSequencer. -static string s_clientName = "RtMidi Client"; +static std::string s_clientName = "RtMidi Client"; // A structure to hold variables related to the ALSA API // implementation. @@ -2366,8 +2366,8 @@ void MidiOutWinMM :: sendMessage( std::vector<unsigned char> *message ) #include <setupapi.h> #include <mmsystem.h> -#include "include/ks.h" -#include "include/ksmedia.h" +#include "ks.h" +#include "ksmedia.h" #define INSTANTIATE_GUID(a) GUID const a = { STATIC_ ## a } @@ -3614,6 +3614,8 @@ void MidiOutJack :: initialize( const std::string& clientName ) { JackMidiData *data = new JackMidiData; + data->port = NULL; + // Initialize JACK client if (( data->client = jack_client_open( clientName.c_str(), JackNullOption, NULL )) == 0) { errorString_ = "MidiOutJack::initialize: JACK server not running?"; @@ -3626,8 +3628,6 @@ void MidiOutJack :: initialize( const std::string& clientName ) data->buffMessage = jack_ringbuffer_create( JACK_RINGBUFFER_SIZE ); jack_activate( data->client ); - data->port = NULL; - apiData_ = (void *) data; } |