Remove QLinkHut

This allow to remove the dependency on Qt.
For testing LinkHut is good enough as it provides the same functionality.

Author: fgo-ableton

.appveyor.yml

@@ -15,50 +15,34 @@ environment:
     - AUDIO_DRIVER: Asio
       CONFIGURATION: Release
       GENERATOR: Visual Studio 12 2013
-      QT_VERSION: 5.6
-      QT: msvc2013
     # Visual Studio 2013, 64-bit Release, Asio driver
     - AUDIO_DRIVER: Asio
       CONFIGURATION: Release
       GENERATOR: Visual Studio 12 2013 Win64
-      QT_VERSION: 5.10
-      QT: msvc2013_64
     # Visual Studio 2013, 64-bit Debug, Wasapi driver
     - AUDIO_DRIVER: Wasapi
       CONFIGURATION: Debug
       GENERATOR: Visual Studio 12 2013 Win64
-      QT_VERSION: 5.10
-      QT: msvc2013_64
     # Visual Studio 2015, 32-bit Release, Asio driver
     - AUDIO_DRIVER: Asio
       CONFIGURATION: Release
       GENERATOR: Visual Studio 14 2015
-      QT_VERSION: 5.10
-      QT: msvc2015
     # Visual Studio 2015, 64-bit Debug, Asio driver
     - AUDIO_DRIVER: Asio
       CONFIGURATION: Debug
       GENERATOR: Visual Studio 14 2015 Win64
-      QT_VERSION: 5.10
-      QT: msvc2015_64
     # Visual Studio 2015, 64-bit Release, Asio driver
     - AUDIO_DRIVER: Asio
       CONFIGURATION: Release
       GENERATOR: Visual Studio 14 2015 Win64
-      QT_VERSION: 5.10
-      QT: msvc2015_64
     # Visual Studio 2015, 64-bit Release, Wasapi driver
     - AUDIO_DRIVER: Wasapi
       CONFIGURATION: Release
       GENERATOR: Visual Studio 14 2015 Win64
-      QT_VERSION: 5.10
-      QT: msvc2015_64
     # Visual Studio 2017, 64-bit Release, Asio driver
     - AUDIO_DRIVER: Asio
       CONFIGURATION: Release
       GENERATOR: Visual Studio 15 2017 Win64
-      QT_VERSION: 5.10
-      QT: msvc2017_64
 
 matrix:
   exclude:
@@ -75,10 +59,9 @@ matrix:
 
 install:
   - git submodule update --init --recursive
-  - set PATH=%PATH%;C:\Qt\%QT_VERSION%\%QT%\bin
 
 build_script:
-  - python ci/configure.py -q -a %AUDIO_DRIVER% -g "%GENERATOR%"
+  - python ci/configure.py -a %AUDIO_DRIVER% -g "%GENERATOR%"
   - python ci/build.py --configuration %CONFIGURATION%
 
 test_script:

.travis.yml

@@ -45,7 +45,7 @@ matrix:
           packages: ['clang-3.6', 'g++-5', 'valgrind', 'portaudio19-dev']
       env: COMPILER=clang++-3.6 WORDSIZE=64 CONFIGURATION=Debug AUDIO=Alsa
 
-    # Linux with Clang 3.6, 64-bit Release, Jack
+    # Linux with Clang 3.8, 64-bit Release, Jack
     - os: linux
       dist: trusty
       compiler: clang
@@ -116,15 +116,7 @@ before_install:
   - CXX=$COMPILER
 
   # Install homebrew packages for Mac OS X
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then HOMEBREW_NO_AUTO_UPDATE=1 brew install qt5 && brew update && brew install ninja; fi
-
-  # Install QT for Linux
-  - |
-    if [ "$TRAVIS_OS_NAME" = "linux" ]; then
-      sudo apt-add-repository -y ppa:beineri/opt-qt-5.10.1-trusty
-      sudo apt-get -qy update
-      sudo apt-get -qy install qtdeclarative5-dev
-    fi
+  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update && brew install ninja; fi
 
 install:
   - git submodule update --init --recursive
@@ -144,19 +136,16 @@ script:
       idf.py build
     else
       if [ "$TRAVIS_OS_NAME" = "osx" ]; then
-        PATH=`brew --prefix qt5`/bin:${PATH}
         if [ "$WORDSIZE" -eq 64 ]; then
-          python ci/configure.py --configuration $CONFIGURATION --generator Ninja --with-qt
+          python ci/configure.py --configuration $CONFIGURATION --generator Ninja
         else
           python ci/configure.py --configuration $CONFIGURATION --generator Ninja --flags "\-DCMAKE_OSX_ARCHITECTURES=i386"
         fi
         python ci/build.py --configuration $CONFIGURATION --arguments "all -v"
       else
         if [ "$WORDSIZE" -eq 64 ]; then
-          PATH=$PWD/5.5/gcc_64:${PATH}
-          python ci/configure.py --configuration $CONFIGURATION --with-qt -a $AUDIO
+          python ci/configure.py --configuration $CONFIGURATION -a $AUDIO
         else
-          PATH=$PWD/5.5/gcc:${PATH}
           python ci/configure.py --configuration $CONFIGURATION -a $AUDIO --flags "\-DCMAKE_CXX_FLAGS=\"\-m32\""
         fi
         python ci/build.py --configuration $CONFIGURATION --arguments "VERBOSE=1 -j8"

CMakeLists.txt

@@ -11,7 +11,6 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 #       |_|
 
 # Note: Please use the LINK_* prefix for all project-specific options
-option(LINK_BUILD_QT_EXAMPLES "Build examples (Requires Qt)" OFF)
 
 if(UNIX)
   option(LINK_ENABLE_ASAN "Build with Address Sanitizier (ASan)" OFF)

README.md

@@ -32,28 +32,8 @@ $ cmake ..
 $ cmake --build .
 ```
 
-In order to build the GUI example application **QLinkHut**, the [Qt][qt] installation
-path must be set in the system PATH and `LINK_BUILD_QT_EXAMPLES` must be set:
-
-```
-$ mkdir build
-$ cd build
-$ cmake -DLINK_BUILD_QT_EXAMPLES=ON ..
-$ cmake --build .
-```
-
 The output binaries for the example applications and the unit-tests will be placed in a
-`bin` subdirectory of the CMake binary directory. Also note that the word size of the Qt
-installation must match how Link has been configured. Look for the value of
-`LINK_WORD_SIZE` in the CMake output to verify that the word size matches Qt's.
-
-When running QLinkHut on Windows, the Qt binary path must be in the system `PATH` before
-launching the executable. So to launch QLinkHut from Visual Studio, one must go to the
-QLinkHut Properties -> Debugging -> Environment, and set it to:
-
-```
-PATH=$(Path);C:\path\to\Qt\5.5\msvc64_bin\bin
-```
+`bin` subdirectory of the CMake binary directory.
 
 # Integrating Link in your Application
 
@@ -100,7 +80,6 @@ insight as to the compiler flags needed to build Link.
 
 | Platform | Minimum Required     | Optional (only required for examples) |
 |----------|----------------------|---------------------------------------|
-| **All**  | CMake 3.0            | Qt 5.5                                |
 | Windows  | MSVC 2013            | Steinberg ASIO SDK 2.3                |
 | Mac      | Xcode 7.0            |                                       |
 | Linux    | Clang 3.6 or GCC 5.2 | libportaudio19-dev                    |
@@ -115,8 +94,8 @@ information on the LinkKit SDK for iOS.
 
 An overview of Link concepts can be found at http://ableton.github.io/link. Those that
 are new to Link should start there. The [Link.hpp](include/ableton/Link.hpp) header
-contains the full Link public interface. See the LinkHut and QLinkHut projects in this
-repo for an example usage of the `Link` type.
+contains the full Link public interface. See the LinkHut projects in this repo for an
+example usage of the `Link` type.
 
 ## Time and Clocks
 
@@ -175,4 +154,3 @@ example apps.
 [catch]: https://github.com/philsquared/Catch
 [cmake]: https://www.cmake.org
 [license]: LICENSE.md
-[qt]: https://www.qt.io

TEST-PLAN.md

@@ -6,53 +6,58 @@ behave consistently with respect to these test cases. ## Tempo Changes
 
 ### TEMPO-1: Tempo changes should be transmitted between connected apps.
 
-- Open LinkHut, press **Play**, when using QLinkHut click the **Link** button to enable
-Link. - Open App and **enable** Link. - Without starting to play, change tempo in App
-**⇒** LinkHut clicks should speed up or slow down to match the tempo specified in
-the App. - Start playing in the App **⇒** App and LinkHut should be in sync - Change
-tempo in App and in LinkHut **⇒** App and LinkHut should remain in sync
+- Open LinkHut, press **Play** and **enable** Link.
+- Open App and **enable** Link.
+- Without starting to play, change tempo in App **⇒** LinkHut clicks should speed up or slow down to match the tempo specified in
+the App.
+- Start playing in the App **⇒** App and LinkHut should be in sync
+- Change tempo in App and in LinkHut **⇒** App and LinkHut should remain in sync
 
 ### TEMPO-2: Opening an app with Link enabled should not change the tempo of an existing Link session.
 
-- Open App and **enable** Link. - Set App tempo to 100bpm. - Terminate App. - Open
-LinkHut, press **Play** and **enable** Link. - Set LinkHut tempo to 130bpm. - Open App
-and **enable** Link. **⇒** Link should be connected (“1 Link”) and the App and
+- Open App and **enable** Link.
+- Set App tempo to 100bpm.
+- Terminate App.
+- Open LinkHut, press **Play** and **enable** Link.
+- Set LinkHut tempo to 130bpm.
+- Open App and **enable** Link. **⇒** Link should be connected (“1 Link”) and the App and
 LinkHut’s tempo should both be 130bpm.
 
 ### TEMPO-3: When connected, loading a new document should not change the Link session tempo.
 
-- Open LinkHut, press **Play**, when using QLinkHut click the **Link** button to enable
-Link. - Set LinkHut tempo to 130bpm. - Open App and **enable** Link **⇒** LinkHut’s
-tempo should not change. - Load new Song/Set/Session with a tempo other than 130bpm
-**⇒** App and LinkHut tempo should both be 130bpm.
+- Open LinkHut, press **Play** and **enable** Link.
+- Set LinkHut tempo to 130bpm.
+- Open App and **enable** Link **⇒** LinkHut’s tempo should not change.
+- Load new Song/Set/Session with a tempo other than 130bpm **⇒** App and LinkHut tempo should both be 130bpm.
 
 ### TEMPO-4: Tempo range handling.
 
-- Open LinkHut, press **Play**, when using QLinkHut click the **Link** button to enable
-Link. - Open App, start Audio, and **enable** Link. - Change tempo in LinkHut to
-**20bpm** **⇒** App and LinkHut should stay in sync. - Change Tempo in LinkHut to
-**999bpm** **⇒** App and LinkHut should stay in sync. - If App does not support the
-full range of tempos supported by Link, it should stay in sync by switching to a multiple
-of the Link session tempo.
+- Open LinkHut, press **Play**, enable Link.
+- Open App, start Audio, and **enable** Link.
+- Change tempo in LinkHut to **20bpm** **⇒** App and LinkHut should stay in sync.
+- Change Tempo in LinkHut to **999bpm** **⇒** App and LinkHut should stay in sync.
+- If App does not support the full range of tempos supported by Link, it should stay in sync by switching to a multiple of the Link session tempo.
 
 ### TEMPO-5: Enabling Link does not change app's tempo if there is no Link session to join.
-- Open App, start playing. - Change App tempo to something other than the default.
-- **Enable** Link **⇒** App's tempo should not change. - Change App tempo to a new
-value (not the default). - **Disable** Link **⇒** App's tempo should not change.
+- Open App, start playing.
+- Change App tempo to something other than the default.
+- **Enable** Link **⇒** App's tempo should not change.
+- Change App tempo to a new value (not the default).
+- **Disable** Link **⇒** App's tempo should not change.
 
 ## Beat Time
 
 These cases verify the continuity of beat time across Link operations.
 
 ### BEATTIME-1: Enabling Link does not change app's beat time if there is no Link session to join.
-- Open App, start playing. - **Enable** Link **⇒** No beat time jump or
-audible discontinuity should occur. - **Disable** Link **⇒** No beat time jump or
-audible discontinuity should occur.
+- Open App, start playing.
+- **Enable** Link **⇒** No beat time jump or audible discontinuity should occur.
+- **Disable** Link **⇒** No beat time jump or audible discontinuity should occur.
 
 ### BEATTIME-2: App's beat time does not change if another participant joins its session.
-- Open App and **enable** Link. - Start playing. - Open LinkHut, when using QLinkHut
-**enable** Link **⇒** No beat time jump or audible discontinuity should occur in the
-App.
+- Open App and **enable** Link.
+- Start playing.
+- Open LinkHut and **enable** Link **⇒** No beat time jump or audible discontinuity should occur in the App.
 
 **Note**: When joining an existing Link session, an app should adjust to the existing
 session's tempo and phase, which will usually result in a beat time jump. Apps that are
@@ -63,13 +68,11 @@ a new participant joins the session.
 
 ### STARTSTOPSTATE-1: Listening to start/stop commands from other peers.
 - Open App, set Link and Start Stop Sync to **Enabled**.
-- Open LinkHut and set Start Stop Sync to **Enabled**. When using QLinkHut click the **Link** button to enable
-Link. Press **Play** **⇒** App should start playing according to its quantization.
+- Open LinkHut, **enable** Link and Start Stop Sync and press **Play** **⇒** App should start playing according to its quantization.
 - Stop playback in LinkHut **⇒** App should stop playing.
 
 ### STARTSTOPSTATE-2: Sending start/stop commands to other peers.
-- Open LinkHut and set Start Stop Sync to **Enabled**. When using QLinkHut click the **Link** button to enable
-Link. Press **Play**.
+- Open LinkHut, **enable** Link and Start Stop Sync and press **Play**.
 - Open App, set Link and Start Stop Sync to **Enabled** **⇒** App should not be
 playing while LinkHut continues playing.
 - Start playback in App **⇒** App should join playing according to its quantization.
@@ -84,10 +87,11 @@ audio engine.
 
 ### AUDIOENGINE-1: Correct alignment of app audio with shared session
 
- - Connect the audio out of your computer to the audio in. Alternatively use
+- Connect the audio out of your computer to the audio in. Alternatively use
 [SoundFlower](https://github.com/mattingalls/Soundflower) to be able to record the output
-of your app and LinkHut. - Open LinkHut, press **Play**, , when using QLinkHut click the
-**Link** button to enable Link. - Open App and **enable** Link. - Start playing audio
-(preferably a short, click-like sample) with notes on the same beats as LinkHut. - Record
-audio within application of choice. - Validate whether onset of the sample aligns with
-the pulse generated by LinkHut (tolerance: less than 3 ms).
+of your app and LinkHut.
+- Open LinkHut, **enable** Link and press **Play**.
+- Open App and **enable** Link.
+- Start playing audio (preferably a short, click-like sample) with notes on the same beats as LinkHut.
+- Record audio within application of choice.
+- Validate whether onset of the sample aligns with the pulse generated by LinkHut (tolerance: less than 3 ms).

ci/configure.py

@@ -26,11 +26,6 @@ def parse_args():
         '-c', '--configuration',
         help='Build configuration to use (not supported by IDE generators)')
 
-    arg_parser.add_argument(
-        '-q', '--with-qt',
-        help='Build Qt example apps',
-        action='store_true')
-
     arg_parser.add_argument(
         '-g', '--generator',
         help='CMake generator to use (default: Determined by CMake)')
@@ -54,9 +49,6 @@ def build_cmake_args(args):
         cmake_args.append('-G')
         cmake_args.append(args.generator)
 
-    if args.with_qt:
-        cmake_args.append('-DLINK_BUILD_QT_EXAMPLES=ON')
-
     if args.configuration is not None:
         cmake_args.append('-DCMAKE_BUILD_TYPE=' + args.configuration)