Implement a reliable port selection API

.dir-locals.el

@@ -0,0 +1,8 @@
+;;; Directory Local Variables
+;;; For more information see (info "(emacs) Directory Variables")
+
+((c++-mode
+  (c-basic-offset . 2))
+ (c-mode
+  (c-basic-offset . 2)))
+

.gitignore

@@ -1,10 +1,15 @@
 /config
 /configure
-/Makefile.in
+/doc/html
+Makefile
+Makefile.in
 /aclocal.m4
 /autom4te.cache
 /configure
-/m4
-/doc/Makefile.in
-/tests/Makefile.in
-/build*/
+/m4/libtool.m4
+/m4/ltoptions.m4
+/m4/ltsugar.m4
+/m4/ltversion.m4
+/m4/lt~obsolete.m4
+*.orig
+*~

.travis.yml

@@ -1,4 +1,8 @@
-language: cpp
+git:
+  depth: 1
+branches:
+  except:
+    - /(?i:appveyor)/
 sudo: false  # docker VM
 matrix:
   include:
@@ -15,11 +19,17 @@ matrix:
     env: HOST="" API="jack"
     compiler: clang
   - os: linux
-    env: HOST="--host=i686-w64-mingw32" API="winmm"
+    env: HOST="--with-jack" API="alsa"
     compiler: gcc
   - os: linux
-    env: HOST="--host=x86_64-w64-mingw32" API="winmm"
-    compiler: gcc
+    env: HOST="--with-jack" API="alsa"
+    compiler: clang
+  # - os: linux
+  #   env: HOST="--host=i686-w64-mingw32" API="winmm"
+  #  compiler: gcc
+  # - os: linux
+  #  env: HOST="--host=x86_64-w64-mingw32" API="winmm"
+  #  compiler: gcc
   # jack and asound not found on ARM gnueabihf
   # - os: linux
   #   env: HOST="--host=arm-linux-gnueabihf" API="alsa"
@@ -28,20 +38,56 @@ matrix:
   #   env: HOST="--host=arm-linux-gnueabihf" API="jack"
   #   compiler: gcc
   - os: osx
-    env: HOST="" API="core"
+    env: HOST="" API="coremidi"
+    compiler: gcc
+  - os: osx
+    env: HOST="" API="coremidi"
+    compiler: clang
+  - os: osx
+    env: HOST="" API="jack"
+    compiler: gcc
+  - os: osx
+    env: HOST="" API="jack"
+    compiler: clang
+  - os: osx
+    env: HOST="--with-jack" API="coremidi"
     compiler: gcc
   - os: osx
-    env: HOST="" API="core"
+    env: HOST="--with-jack" API="coremidi"
     compiler: clang
-install:
-- if [ $TRAVIS_OS_NAME = linux ]; then sudo apt-get install libasound2-dev libjack-dev doxygen g++-mingw-w64-i686 g++-mingw-w64-x86-64 g++-arm-linux-gnueabihf; fi
-- if [ $TRAVIS_OS_NAME = osx ]; then brew install doxygen || (brew update && brew install doxygen); fi
-- if [ -n "$HOST" ]; then unset CXX; unset CC; fi
-script: ./autogen.sh --enable-debug --with-$API $HOST && make
-after_script:
-- make check
-- make distcheck
-- make install
-# ALSA: no access to /dev/snd/seq
-# JACK: Jack server not running
-# - tests/midiprobe
+language: c++
+group: travis_latest
+
+
+addons:
+  apt:
+    packages:
+    - autoconf
+    - libtool
+    - autopoint
+    - automake
+    - libasound-dev
+    - libjack-dev
+    - libcppunit-dev
+    - doxygen
+    - g++-mingw-w64-i686
+    - g++-mingw-w64-x86-64
+    - g++-arm-linux-gnueabihf
+
+
+before_install:
+    - eval "${MATRIX_EVAL}"
+    - if test "$TRAVIS_OS_NAME" = osx ; then  brew update ; fi
+    - if test "$TRAVIS_OS_NAME" = osx ; then if brew upgrade boost ; then echo "upgraded" ; else echo "nothing to be done"; fi ;  fi
+    - if test "$TRAVIS_OS_NAME" = osx ; then rm -rf /usr/local/include/c++ ; fi # fix broken gcc installation
+    - if test "$TRAVIS_OS_NAME" = osx ; then brew install $EXTRA_BREW  gettext flex bison libtool autoconf jack   doxygen ; fi
+    - if test "$TRAVIS_OS_NAME" = osx ; then brew link --force $EXTRA_BREW gettext flex bison libtool autoconf jack ; fi
+    - mkdir -p config
+    - touch config/config.rpath
+
+script:
+    - mkdir -p config
+    - touch config/config.rpath
+    - ./autogen.sh --disable-apisearch --with-$API $HOST && make && make -j4 && $TEST_RUNNER make check || (cat test-suite.log ; false)
+    - make distcheck
+    - cat tests/errors.log

Makefile.am

@@ -1,21 +1,13 @@
-SUBDIRS = . tests
+ACLOCAL_AMFLAGS = -I m4 -I rtmidi-m4 --install
+SUBDIRS = po
 if MAKE_DOC
 SUBDIRS += doc
 endif
-
-lib_LTLIBRARIES = %D%/librtmidi.la
-%C%_librtmidi_la_LDFLAGS = -no-undefined -export-dynamic -version-info @SO_VERSION@
-%C%_librtmidi_la_SOURCES = \
-  %D%/RtMidi.cpp \
-  %D%/rtmidi_c.cpp
-
-rtmidi_incdir = $(includedir)/rtmidi
-rtmidi_inc_HEADERS = \
-  %D%/RtMidi.h \
-  %D%/rtmidi_c.h
-
-pkgconfigdatadir = $(libdir)/pkgconfig
-pkgconfigdata_DATA = rtmidi.pc
-
-EXTRA_DIST = autogen.sh README.md msw
-
+RTMIDICONFIGRPATH = config/config.rpath
+DLLPROGRAMS = $(check_PROGRAMS)
+check_PROGRAMS =
+TESTS =
+CLEANFILES =
+DISTCLEANFILES =
+
+include %D%/Makefile.library

Makefile.library

@@ -0,0 +1,59 @@
+# -*- makefile-automake -*-
+RTMIDITESTCXXFLAGS = $(EXTRA_RTMIDITESTCXXFLAGS) -I$(top_srcdir)/%D%
+RTMIDILIBRARYNAME = %D%/librtmidi@rtmidi_suffix@.la
+RTMIDITESTLDFLAGS = $(EXTRA_RTMIDITESTLDFLAGS) $(RTMIDILIBRARYNAME)
+lib_LTLIBRARIES += %D%/librtmidi@rtmidi_suffix@.la
+DLLPROGRAMS += %D%/librtmidi@rtmidi_suffix@.*
+DLLPROGRAMS += %D%/.libs/librtmidi@rtmidi_suffix@.*
+
+DISTCLEANFILES += \
+	%D%/rtmidi@rtmidi_suffix@.pc \
+	%D%/rtmidi@rtmidi_suffix@-config
+
+%C%_librtmidi@rtmidi_suffix@_la_LDFLAGS = \
+	$(RTMIDI_LIBS) \
+	$(LDADD) \
+	-export-dynamic \
+	-version-info  @RTMIDI_SO_VERSION@ \
+	-no-undefined \
+	-v
+%C%_librtmidi@rtmidi_suffix@_la_CXXFLAGS = \
+	$(rtmidi_visibility) \
+	$(CXXFLAGS) \
+	$(CPPFLAGS) \
+	$(RTMIDI_API) \
+	$(RTMIDI_LIB_CFLAGS) \
+	-DRTMIDI_NO_WARN_DEPRECATED
+%C%_librtmidi@rtmidi_suffix@_la_SOURCES = \
+  %D%/RtMidi.cpp \
+  %D%/RtMidi.h \
+  %D%/rtmidi_c.cpp \
+  %D%/rtmidi_c.h
+
+%C%_librtmidi@rtmidi_suffix@_ladir = $(includedir)/rtmidi@rtmidi_suffix@
+%C%_librtmidi@rtmidi_suffix@_la_HEADERS = \
+  %D%/RtMidi.h \
+  %D%/rtmidi_c.h
+
+
+EXTRA_DIST += \
+	$(RTMIDICONFIGRPATH) \
+	%D%/m4/ChangeLog \
+	%D%/rtmidi-config.in \
+	%D%/rtmidi.pc.in \
+	%D%/autogen.sh \
+	%D%/README.md \
+	%D%/msw	
+
+pkgconfigdatadir = $(libdir)/pkgconfig
+pkgconfigdata_DATA = %D%/rtmidi@rtmidi_suffix@.pc
+
+%D%/rtmidi@rtmidi_suffix@.pc: %D%/rtmidi.pc
+	if cmp "$<" "$@" ; then : ; else cp "$<" "$@" ; fi
+%D%/rtmidi@rtmidi_suffix@-config: %D%/rtmidi-config
+	if cmp "$<" "$@" ; then : ; else cp -a "$<" "$@" ; fi
+
+
+
+
+include %D%/tests/Makefile.am

README.md

@@ -1,10 +1,82 @@
-# RtMidi
+[![Build Status](https://travis-ci.org/keinstein/rtmidi.svg?branch=master-ts)](https://travis-ci.org/keinstein/rtmidi)[![Build status](https://ci.appveyor.com/api/projects/status/ac98q210qscfjayk/branch/master-ts?svg=true)](https://ci.appveyor.com/project/keinstein/rtmidi/branch/travis-tests)
 
-[![Build Status](https://travis-ci.org/thestk/rtmidi.svg?branch=master)](https://travis-ci.org/thestk/rtmidi)
+Extended RtMidi fork for Mutabor, GUI based Software, and saving MIDI connections
+=================================================================================
 
 A set of C++ classes that provide a common API for realtime MIDI input/output across Linux (ALSA & JACK), Macintosh OS X (CoreMIDI & JACK) and Windows (Multimedia).
 
 By Gary P. Scavone, 2003-2017.
+Forked by Tobias Schlemmer, 2014-2018.
+
+This fork has been started because the original RtMidi did not work
+for Mutabor and ALSA. Mutabor has a two-step activation scheme. The
+MIDI configuration is set up while no connections are active. After
+compiling the tuning logic all MIDI interfaces are activated at
+once. Each MIDI connection that RtMidi makes is reported as MIDI
+device again by RtMidi. This leads to a renumbering of all MIDI
+endpoints which have a higher ALSA device ID than the current RtMidi
+instance. The result is unexpected behaviour.
+
+As a side effect this library uses a different namespace and is more
+C++-ish than the original RtMidi.
+
+Incompatible changes against upstream
+-------------------------------------
+
+- The old API has been deprecated as there is no way to rely on
+  consecutive port numbers. It is always the responsibility of the 
+  end user not to change the MIDI configuration between certain points
+  in the execution path of the library. Obviously they usually lack the
+  necessary information for that Currently, it is still available, but a 
+  compiler warning is generated if applicable
+
+- `__MACOSX_CORE__` has been renamed to `__MACOSX_COREMIDI__`
+
+- The classes of RtMidi now reside in the namespace rtmidi.
+- The beginning letters “Rt” are dropped from the names
+- For easy adoption of the new interface wrappers for the old API are provided.
+- The library uses backend provided port descriptors, now. This provides a more reliable port handling for changing environments (See below).
+
+- The way MIDI devices are enumerated has changed. The old way, using the ordinal number of MIDI devices works only in cases where MIDI devices are not added or removed during the program session. When a virtual MIDI port or USB MIDI device is added or removed the ordinal number of each of the other devices may change.
+
+   Suppose your computer has the following list of MIDI devices.
+      1. MIDI loopback device
+      2. Removable USB MIDI device
+      3. Another MIDI device
+      4. Software MIDI Synth
+      5. A virtual MIDI port
+
+	After the software obtained this list, your friend remembers that he
+	must catch the next bus and unplugs his removable USB MIDI device.
+	The software does not recognize this removal and keeps the above list,
+	while the system has a new one:
+      1. MIDI loopback device
+	  2. Another MIDI device
+	  3. Software MIDI Synth
+	  4. A virtual MIDI port
+
+	Somehow you told the software to use the Software MIDI Synth. The
+	program stores the number 4 as it obtained during enumeration of the
+	MIDI devices. Instead of playing the music using your sound card it
+	sends the music to a different port.
+
+	While this behaviour is only annoying in interactive environments it
+	results in unpredictable behaviour if several ports are opened at
+	once. E.g. in the ALSA backend every opened port results in an
+	aditional newly created virtual port.
+
+	In order to avoid such problems, most backends identify ports (except
+	WinMM) by different data structures.
+
+	The current version introduces a new class \ref rtmidi::PortDescriptor
+	in order to hide this implementation detail from the user code. In
+	order to avoid the above problems these are retrieved at once using \ref rtmidi::Midi::getPortList.
+	This new feature also allows to retreive the port descriptor of an open device using
+	\ref rtmidi::Midi::getDescriptor. The latter can be used to obtain
+
+
+Compilation
+-----------
 
 This distribution of RtMidi contains the following:
 
@@ -15,9 +87,10 @@ On Unix systems, type `./configure` in the top level directory, then `make` in t
 
 If you checked out the code from git, please run `./autogen.sh` before `./configure`.
 
-## Overview
+Overview
+--------
 
-RtMidi is a set of C++ classes (RtMidiIn, RtMidiOut, and API specific classes) that provide a common API (Application Programming Interface) for realtime MIDI input/output across Linux (ALSA, JACK), Macintosh OS X (CoreMIDI, JACK), and Windows (Multimedia Library) operating systems.  RtMidi significantly simplifies the process of interacting with computer MIDI hardware and software.  It was designed with the following goals:
+RtMidi is a set of C++ classes (rtmidi::MidiIn, rtmidi::MidiOut, and API specific classes) that provide a common API (Application Programming Interface) for realtime MIDI input/output across Linux (ALSA, JACK), Macintosh OS X (CoreMIDI, JACK), and Windows (Multimedia Library) operating systems.  RtMidi significantly simplifies the process of interacting with computer MIDI hardware and software.  It was designed with the following goals:
 
   - object oriented C++ design
   - simple, common API across all supported platforms
@@ -26,21 +99,25 @@ RtMidi is a set of C++ classes (RtMidiIn, RtMidiOut, and API specific classes) t
 
 MIDI input and output functionality are separated into two classes, RtMidiIn and RtMidiOut.  Each class instance supports only a single MIDI connection.  RtMidi does not provide timing functionality (i.e., output messages are sent immediately).  Input messages are timestamped with delta times in seconds (via a double floating point type).  MIDI data is passed to the user as raw bytes using an std::vector<unsigned char>.
 
-## Windows
+Windows
+-------
 
 In some cases, for example to use RtMidi with GS Synth, it may be necessary for your program to call CoInitializeEx and CoUninitialize on entry to and exit from the thread that uses RtMidi.
 
-## Further reading
+Further reading
+---------------
 
-For complete documentation on RtMidi, see the doc directory of the distribution or surf to http://music.mcgill.ca/~gary/rtmidi/.
+For complete documentation on the original RtMidi, see the doc directory of the distribution or surf to http://music.mcgill.ca/~gary/rtmidi/.
 
 
-## Legal and ethical
+Legal and ethical
+-----------------
 
 The RtMidi license is similar to the MIT License, with the added *feature* that modifications be sent to the developer.
 
     RtMidi: realtime MIDI i/o C++ classes
     Copyright (c) 2003-2017 Gary P. Scavone
+	Forked by Tobias Schlemmer, 2014-2018.
 
     Permission is hereby granted, free of charge, to any person
     obtaining a copy of this software and associated documentation files