Merge 2.0.1 into releases

7 files changed, 17 insertions, 14 deletions

diff --git a/Makefile.in b/Makefile.in
index c53d85a..51d3fa3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -28,7 +28,7 @@ $(LIBRARIES): $(OBJECTS)
 	$(AR) ruv $(STATIC) $(OBJECTS)
 	ranlib $(STATIC)
 	$(CC) -fPIC @libflags@ $(OBJECTS) @LIBS@
-	$(LN) -s @sharedname@ $(SHARED)
+	$(LN) -sf @sharedname@ $(SHARED)
 
 #	$(CC) -shared $(OBJECTS) -o $(SHARED) @LIBS@
 
diff --git a/RtMidi.cpp b/RtMidi.cpp
index cd8b307..027c7a2 100644
--- a/RtMidi.cpp
+++ b/RtMidi.cpp
@@ -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;
 }
 
diff --git a/RtMidi.h b/RtMidi.h
index cdc5ea6..127a01c 100644
--- a/RtMidi.h
+++ b/RtMidi.h
@@ -40,7 +40,7 @@
   \file RtMidi.h
  */
 
-// RtMidi: Version 2.0.0
+// RtMidi: Version 2.0.1
 
 #ifndef RTMIDI_H
 #define RTMIDI_H
diff --git a/doc/doxygen/Doxyfile b/doc/doxygen/Doxyfile
index 33c7170..f2fb1bb 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         = 2.0.0
+PROJECT_NUMBER         = 2.0.1
 
 # 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 c9369e4..91d01a9 100644
--- a/doc/doxygen/tutorial.txt
+++ b/doc/doxygen/tutorial.txt
@@ -23,7 +23,7 @@ No incompatable API changes were made in version 2.0, however, support for multi
 

 \section download Download

 

-Latest Release (18 June 2012): <A href="http://www.music.mcgill.ca/~gary/rtmidi/release/rtmidi-2.0.0.tar.gz">Version 2.0.0</A>

+Latest Release (26 July 2012): <A href="http://www.music.mcgill.ca/~gary/rtmidi/release/rtmidi-2.0.1.tar.gz">Version 2.0.1</A>

 

 \section start Getting Started

 

@@ -350,9 +350,9 @@ In order to compile RtMidi for a specific OS and API, it is necessary to supply
 <TR>

   <TD>Linux</TD>

   <TD>ALSA Sequencer</TD>

-  <TD>__LINUX_ALSASEQ__</TD>

+  <TD>__LINUX_ALSA__</TD>

   <TD><TT>asound, pthread</TT></TD>

-  <TD><TT>g++ -Wall -D__LINUX_ALSASEQ__ -o midiprobe midiprobe.cpp RtMidi.cpp -lasound -lpthread</TT></TD>

+  <TD><TT>g++ -Wall -D__LINUX_ALSA__ -o midiprobe midiprobe.cpp RtMidi.cpp -lasound -lpthread</TT></TD>

 </TR>

 <TR>

   <TD>Linux or Mac</TD>

@@ -366,7 +366,7 @@ In order to compile RtMidi for a specific OS and API, it is necessary to supply
   <TD>CoreMidi</TD>

   <TD>__MACOSX_CORE__</TD>

   <TD><TT>CoreMidi, CoreAudio, CoreFoundation</TT></TD>

-  <TD><TT>g++ -Wall -D__MACOSX_CORE__ -o midiprobe midiprobe.cpp RtMidi.cpp -framework CoreMidi -framework CoreAudio -framework CoreFoundation</TT></TD>

+  <TD><TT>g++ -Wall -D__MACOSX_CORE__ -o midiprobe midiprobe.cpp RtMidi.cpp -framework CoreMIDI -framework CoreAudio -framework CoreFoundation</TT></TD>

 </TR>

 <TR>

   <TD>Windows</TD>

diff --git a/doc/release.txt b/doc/release.txt
index dd352b5..705cf4b 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-2012.

 

+v2.0.1: (26 July 2012)

+- small fixes for problems reported by Chris Arndt (scoping, preprocessor, and include)

+

 v2.0.0: (18 June 2012)

 - revised structure to support multiple simultaneous compiled APIs

 - revised ALSA client hierarchy so subsequent instances share same client (thanks to Dan Wilcox)

diff --git a/tests/Makefile.in b/tests/Makefile.in
index f8966bf..21d1f67 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -13,7 +13,7 @@ OBJECTS	=	RtMidi.o
 CC       = @CXX@
 DEFS     = @CPPFLAGS@
 CFLAGS   = @CXXFLAGS@
-CFLAGS  += -I$(INCLUDE)
+CFLAGS  += -I$(INCLUDE) -I$(INCLUDE)/include
 LIBRARY  = @LIBS@
 
 %.o : $(SRC_PATH)/%.cpp