Browse Source

Fix in Jack API for improperly made changesfrom a previous patch

Gary Scavone 11 năm trước cách đây
mục cha
commit
653a2a1234
2 tập tin đã thay đổi với 7 bổ sung7 xóa
  1. 1 1
      RtMidi.cpp
  2. 6 6
      RtMidi.h

+ 1 - 1
RtMidi.cpp

@@ -3575,7 +3575,7 @@ void MidiInJack :: connect()
   // Initialize JACK client
   if (( data->client = jack_client_open( clientName.c_str(), JackNoStartServer, NULL )) == 0) {
     errorString_ = "MidiInJack::initialize: JACK server not running?";
-    error( RtError::WARNING, errorString_ );
+    error( RtMidiError::WARNING, errorString_ );
     return;
   }
 

+ 6 - 6
RtMidi.h

@@ -570,9 +570,6 @@ class MidiInCore: public MidiInApi
   std::string getPortName( unsigned int portNumber );
 
  protected:
-  std::string clientName;
-
-  void connect( void );
   void initialize( const std::string& clientName );
 };
 
@@ -590,9 +587,6 @@ class MidiOutCore: public MidiOutApi
   void sendMessage( std::vector<unsigned char> *message );
 
  protected:
-  std::string clientName;
-
-  void connect( void );
   void initialize( const std::string& clientName );
 };
 
@@ -613,6 +607,9 @@ class MidiInJack: public MidiInApi
   std::string getPortName( unsigned int portNumber );
 
  protected:
+  std::string clientName;
+
+  void connect( void );
   void initialize( const std::string& clientName );
 };
 
@@ -630,6 +627,9 @@ class MidiOutJack: public MidiOutApi
   void sendMessage( std::vector<unsigned char> *message );
 
  protected:
+  std::string clientName;
+
+  void connect( void );
   void initialize( const std::string& clientName );
 };