Merge 1.0.6 into releases

6 files changed, 15 insertions, 15 deletions

diff --git a/RtMidi.cpp b/RtMidi.cpp
index cbf7eb6..63a0710 100644
--- a/RtMidi.cpp
+++ b/RtMidi.cpp
@@ -8,7 +8,7 @@
     RtMidi WWW site: http://music.mcgill.ca/~gary/rtmidi/
 
     RtMidi: realtime MIDI i/o C++ classes
-    Copyright (c) 2003-2005 Gary P. Scavone
+    Copyright (c) 2003-2006 Gary P. Scavone
 
     Permission is hereby granted, free of charge, to any person
     obtaining a copy of this software and associated documentation files
@@ -35,7 +35,7 @@
 */
 /**********************************************************************/
 
-// RtMidi: Version 1.0.5, in development
+// RtMidi: Version 1.0.6
 
 #include "RtMidi.h"
 #include <sstream>
@@ -768,12 +768,9 @@ extern "C" void *alsaMidiHandler( void *ptr )
       else
         message.bytes.insert( message.bytes.end(), buffer, &buffer[nBytes] );
 
-      if ( ev->type == SND_SEQ_EVENT_SYSEX && message.bytes.back() == 0xF7 )
-        continueSysex = false;
-      else {
-        continueSysex = true;
+      continueSysex = ( ev->type == SND_SEQ_EVENT_SYSEX && message.bytes.back() != 0xF7 );
+      if ( continueSysex )
         break;
-      }
 
       // Calculate the time stamp:
       message.timeStamp = 0.0;
diff --git a/RtMidi.h b/RtMidi.h
index 9b6efb6..6902516 100644
--- a/RtMidi.h
+++ b/RtMidi.h
@@ -8,7 +8,7 @@
     RtMidi WWW site: http://music.mcgill.ca/~gary/rtmidi/
 
     RtMidi: realtime MIDI i/o C++ classes
-    Copyright (c) 2003-2005 Gary P. Scavone
+    Copyright (c) 2003-2006 Gary P. Scavone
 
     Permission is hereby granted, free of charge, to any person
     obtaining a copy of this software and associated documentation files
@@ -35,7 +35,7 @@
 */
 /**********************************************************************/
 
-// RtMidi: Version 1.0.5, in development
+// RtMidi: Version 1.0.6
 
 #ifndef RTMIDI_H
 #define RTMIDI_H
diff --git a/doc/doxygen/footer.html b/doc/doxygen/footer.html
index c8a06bb..200e499 100644
--- a/doc/doxygen/footer.html
+++ b/doc/doxygen/footer.html
@@ -1,7 +1,7 @@
 <HR>

 

 <table><tr><td><img src="../images/mcgill.gif" width=165></td>

-  <td>&copy;2003-2005 Gary P. Scavone, McGill University. All Rights Reserved.<br>

+  <td>&copy;2003-2006 Gary P. Scavone, McGill University. All Rights Reserved.<br>

   Maintained by Gary P. Scavone, gary at music.mcgill.ca</td></tr>

 </table>

 

diff --git a/doc/doxygen/tutorial.txt b/doc/doxygen/tutorial.txt
index afaf0b7..9a97a31 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 (18 November 2005): <A href="http://music.mcgill.ca/~gary/rtmidi/release/rtmidi-1.0.5.tar.gz">Version 1.0.5</A>

+Latest Release (9 March 2006): <A href="http://music.mcgill.ca/~gary/rtmidi/release/rtmidi-1.0.6.tar.gz">Version 1.0.6</A>

 

 \section start Getting Started

 

@@ -394,7 +394,7 @@ Many thanks to the following people for providing bug fixes:
 \section license License

 

     RtMidi: realtime MIDI i/o C++ classes<BR>

-    Copyright (c) 2003-2005 Gary P. Scavone

+    Copyright (c) 2003-2006 Gary P. Scavone

 

     Permission is hereby granted, free of charge, to any person

     obtaining a copy of this software and associated documentation files

diff --git a/doc/release.txt b/doc/release.txt
index 4ab1e87..fc3025b 100644
--- a/doc/release.txt
+++ b/doc/release.txt
@@ -1,6 +1,9 @@
 RtMidi - a set of C++ classes that provides a common API for realtime MIDI input/output across Linux (ALSA), SGI, Macintosh OS X (CoreMidi), and Windows (Multimedia) operating systems.

 

-By Gary P. Scavone, 2003-2005.

+By Gary P. Scavone, 2003-2006.

+

+v1.0.6: (9 March 2006)

+- bug fix for timestamp problem in ALSA  (thanks to Pedro Lopez-Cabanillas)

 

 v1.0.5: (18 November 2005)

 - added optional port name to openVirtualPort() functions

diff --git a/readme b/readme
index 6000b27..b05c5dd 100644
--- a/readme
+++ b/readme
@@ -1,6 +1,6 @@
 RtMidi - a set of C++ classes that provides a common API for realtime MIDI input/output across Linux (ALSA), SGI, Macintosh OS X (CoreMidi), and Windows (Multimedia) operating systems.
 
-By Gary P. Scavone, 2003-2005.
+By Gary P. Scavone, 2003-2006.
 
 This distribution of RtMidi contains the following:
 
@@ -30,7 +30,7 @@ LEGAL AND ETHICAL:
 The RtMidi license is similar to the the MIT License, with the added "feature" that modifications be sent to the developer.
 
     RtMidi: realtime MIDI i/o C++ classes
-    Copyright (c) 2003-2005 Gary P. Scavone
+    Copyright (c) 2003-2006 Gary P. Scavone
 
     Permission is hereby granted, free of charge, to any person
     obtaining a copy of this software and associated documentation files