Merge pull request #1 from chris-hld/mxe

Add ssr-brs and ssr-generic

Author: Chris Hold

.gitignore

@@ -1,6 +1,8 @@
 ssr_scene_autosave.asd
 _build
+bin
 .vs
 *.o
+*_moc.cpp
 src/config.h
 *.exe

.travis.yml

@@ -10,6 +10,18 @@ env:
 
 matrix:
   include:
+    # linux with gcc 8
+    - os: linux
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          install:
+            - gcc-8
+      dist: trusty
+      env:
+        - MATRIX_EVAL="CC=gcc-8 CXX=g++-8"
+      compiler: gcc
     # linux with gcc 7
     - os: linux
       addons:
@@ -99,8 +111,8 @@ after_failure:
 branches:
   only:
     - master
-    - networking-with-osc
     - travis-integration
+    - ssr-windows
 
 notifications:
   email: false

CMakeLists.txt

@@ -46,7 +46,12 @@ set(SOURCE_FILES
 
 set(MAIN_SOURCE_FILES
     src/ssr_binaural
-    src/ssr_wfs)
+    src/ssr_brs
+    src/ssr_generic
+    src/ssr_nfc_hoa
+    src/ssr_vbap
+    src/ssr_wfs
+)
 
 # Libraries
 # Add libraries to LINKLIBS
@@ -159,43 +164,37 @@ if(GUI)
 
   option(ENABLE_GUI "graphical user interface (using Qt)" ON)
   option(ENABLE_FLOATING_CONTROL_PANEL "separate control window" ON)
-  option(STATIC_QT "Use static Qt5 libraries" ON)
+  option(STATIC_QT "Use static Qt5 libraries (Windows)" ON)
 
   find_package(Qt5 COMPONENTS Core Gui Widgets OpenGL REQUIRED)
-  #include_directories(${Qt5_DIR})
   message(STATUS "Found QT5: " ${Qt5_DIR})
 
-  # We need add -DQT_WIDGETS_LIB when using QtWidgets in Qt 5.
-  #add_definitions(${Qt5Widgets_DEFINITIONS})
-
-  #Get platform support libs
-  if(STATIC_QT)
-    add_definitions(-DQT_STATICPLUGIN)
+  if(WIN32)
+    if(STATIC_QT)
+      add_definitions(-DQT_STATICPLUGIN)
+    endif(STATIC_QT)
 
+    # Platform support libs for Windows
     set(QT5PLATFORMSUPPORT_LIBS
         Qt5::QWindowsIntegrationPlugin
     )
 
+    # Qt5PlatformSupport modules
     find_library(Qt5ThemeSupport_LIBRARY Qt5ThemeSupport)
     list(APPEND QT5PLATFORMSUPPORT_LIBS ${Qt5ThemeSupport_LIBRARY})
-    message(STATUS "Found Qt5ThemeSupport :" ${Qt5ThemeSupport_LIBRARY})
-
     find_library(Qt5FontDatabaseSupport_LIBRARY Qt5FontDatabaseSupport)
     list(APPEND QT5PLATFORMSUPPORT_LIBS ${Qt5FontDatabaseSupport_LIBRARY})
-    message(STATUS "Found Qt5FontDatabaseSupport :" ${Qt5FontDatabaseSupport_LIBRARY})
-
     find_library(Qt5EventDispatcherSupport_LIBRARY Qt5EventDispatcherSupport)
     list(APPEND QT5PLATFORMSUPPORT_LIBS ${Qt5EventDispatcherSupport_LIBRARY})
-    message(STATUS "Found Qt5EventDispatcherSupport :" ${Qt5EventDispatcherSupport_LIBRARY})
-
     find_library(Qt5AccessibilitySupport_LIBRARY Qt5AccessibilitySupport)
     list(APPEND QT5PLATFORMSUPPORT_LIBS ${Qt5AccessibilitySupport_LIBRARY})
-    message(STATUS "Found Qt5AccessibilitySupport :" ${Qt5AccessibilitySupport_LIBRARY})
-
+    find_library(Qt5WindowsUIAutomationSupport_LIBRARY Qt5WindowsUIAutomationSupport)
+    list(APPEND QT5PLATFORMSUPPORT_LIBS ${Qt5WindowsUIAutomationSupport_LIBRARY})
     find_package(Freetype REQUIRED)
     list(APPEND QT5PLATFORMSUPPORT_LIBS ${FREETYPE_LIBRARIES})
 
-  endif(STATIC_QT)
+    message(STATUS "Found Qt5PlatformSupport :" ${QT5PLATFORMSUPPORT_LIBS})
+  endif(WIN32)
 
   # OpenGL
   find_package(OpenGL REQUIRED)
@@ -220,11 +219,11 @@ if(ENABLE_IP_INTERFACE)
   )
   include_directories(${PROJECT_SOURCE_DIR}/src/network)
   add_definitions(-DASIO_STANDALONE)
-  add_definitions(-D_WIN32_WINNT=0x0601)
+  add_definitions(-D_WIN32_WINNT=0x0601)  # Windows 7
   list(APPEND LINKLIBS "-lws2_32 -lmswsock")
   message(STATUS "Enabled network interface")
 
-  else(ENABLE_IP_INTERFACE)
+else(ENABLE_IP_INTERFACE)
   message(WARNING "IP_INTERFACE disabled.")
 endif(ENABLE_IP_INTERFACE)
 
@@ -237,8 +236,8 @@ if(HEAD_TRACKER)
     src/trackerpolhemus.cpp
   )
   set(ENABLE_RAZOR ON)
-  add_definitions(-DENABLE_O_NDELAY_WORKAROUND)  # bits/fcntl2.h
   set(ENABLE_POLHEMUS ON)
+  add_definitions(-DENABLE_O_NDELAY_WORKAROUND)  # bits/fcntl2.h
   message(STATUS "Basic head tracker support")
 else(HEAD_TRACKER)
   message(WARNING "HEAD_TRACKER disabled.")
@@ -262,8 +261,16 @@ configure_file (
 # Add a few for release builds (MAKE_BUILD_TYPE=RELEASE)
 set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Wall -fomit-frame-pointer -ffast-math -funroll-loops -march=k8 -mmmx -msse -mfpmath=sse -msse2 -mfpmath=sse")
 
-# Compile
+# Compile executables
+set(EXECUTABLES
+    ssr-binaural
+    ssr-brs
+    ssr-generic
+    ssr-wfs
+)
 add_executable(ssr-binaural src/ssr_binaural.cpp ${SOURCE_FILES})
+add_executable(ssr-brs src/ssr_brs.cpp ${SOURCE_FILES})
+add_executable(ssr-generic src/ssr_generic.cpp ${SOURCE_FILES})
 add_executable(ssr-wfs src/ssr_wfs.cpp ${SOURCE_FILES})
 
 
@@ -274,9 +281,11 @@ endif(WIN32)
 
 message(STATUS "Linking: "  ${LINKLIBS} ${QT5PLATFORMSUPPORT_LIBS})
 
-target_link_libraries(ssr-binaural Threads::Threads ${LINKLIBS})
-target_link_libraries(ssr-wfs Threads::Threads ${LINKLIBS})
-if(GUI)
-  target_link_libraries(ssr-binaural Qt5::Gui Qt5::Core Qt5::Widgets Qt5::OpenGL ${QT5PLATFORMSUPPORT_LIBS})
-  target_link_libraries(ssr-wfs Qt5::Gui Qt5::Core Qt5::Widgets Qt5::OpenGL ${QT5PLATFORMSUPPORT_LIBS})
-endif(GUI)
+foreach(executable ${EXECUTABLES})
+  target_link_libraries(${executable} Threads::Threads ${LINKLIBS})
+  target_link_libraries(${executable} Threads::Threads ${LINKLIBS})
+  if(GUI)
+    target_link_libraries(${executable} Qt5::Gui Qt5::Core Qt5::Widgets Qt5::OpenGL ${QT5PLATFORMSUPPORT_LIBS})
+    target_link_libraries(${executable} Qt5::Gui Qt5::Core Qt5::Widgets Qt5::OpenGL ${QT5PLATFORMSUPPORT_LIBS})
+  endif(GUI)
+endforeach(executable ${EXECUTABLES})

MXE-settings.mk

@@ -17,7 +17,7 @@ MXE_TARGETS := x86_64-w64-mingw32.static.posix
 # This variable controls which plugins are in use.
 # See plugins/README.md for further information.
 #override MXE_PLUGIN_DIRS += plugins/apps plugins/native
-override MXE_PLUGIN_DIRS += plugins/gcc7
+override MXE_PLUGIN_DIRS += plugins/gcc8
 
 # This variable controls the download mirror for SourceForge,
 # when it is used. Enabling the value below means auto.

README

@@ -3,21 +3,26 @@ This is a fork of the SoundScape Renderer (SSR), which aims at porting the sourc
 The basic idea is to cross-compile on a linux machine an executable (.exe) for Windows.
 We use the M cross environment ([MXE](http://mxe.cc/)), which provides cross-compilation scripts for the dependencies and the MinGW64 (GCC) compiler.
 
+Pre-compiled binaries for Windows currently include:   
+ `ssr-binaural.exe`, `ssr-brs.exe`, `ssr-wfs.exe` and `ssr-generic.exe`.
+
+
 Getting started
 ---------------
-* Install Jack Audio for Windows (64bit) from [Jack Audio Downloads](http://www.jackaudio.org/downloads/)
+* Install Jack Audio for Windows (64bit) from [Jack Audio Downloads](http://www.jackaudio.org/downloads/).
 * Get it running by following the [Installation and Configuration](http://jackaudio.org/faq/jack_on_windows.html).
-  Hint: If you plan on using other (ASIO) Audio-software with Jack, don't forget to register the 64-bit JackRouter.
-* Download and extract the latest [Release](https://github.com/chris-hld/ssr/releases). It contains everything you need, including the cross-compiled executables `ssr-binaural.exe` and `ssr-wfs.exe`.
-* Adapt the configuration file `ssr.conf.windows` to your needs. Replace the paths (`Z:\SSR`) to yours. For now, please only use absolute paths.
+  Hint: If you plan on using other (ASIO) Audio-software with Jack Audio, don't forget to register the 64-bit JackRouter.
+* Download and extract the latest [Release](https://github.com/chris-hld/ssr/releases).
+It contains everything you need, including the cross-compiled executables.
+* Adapt the configuration file `ssr.conf.windows` to your needs. Replace the paths (`Z:\SSR`) to yours. For now, please use absolute paths.
 
 Running the SSR on Windows
 --------------------------
-* Have a look at the (Documentation)[http://ssr.readthedocs.io/en/latest/operation.html#running-the-ssr]
-* First, start Jack audio, e.g. with the `qjackctl.exe`.
+* Have a look at the [Documentation](http://ssr.readthedocs.io/en/latest/operation.html#running-the-ssr)
+* First, start the Jack Audio Server, e.g. with `qjackctl.exe`.
 * Start the SSR. There is a simple example script `start-ssr.cmd`.
 * Optional: Start your ASIO playback Software.
-* Connect everything using Jack Connection.
+* Connect everything using Jack Audio Connection.
 
 This could look like this:
 
@@ -42,7 +47,7 @@ Documentation: http://ssr.readthedocs.io/en/latest/
 
 Copyright (c) 2016-2018 Division of Applied Acoustics
                         Chalmers University of Technology
-                        
+
 Copyright (c) 2012-2014 Institut für Nachrichtentechnik, Universität Rostock
 
 Copyright (c) 2006-2012 Quality & Usability Lab

README.md

@@ -3,21 +3,26 @@ This is a fork of the SoundScape Renderer (SSR), which aims at porting the sourc
 The basic idea is to cross-compile on a linux machine an executable (.exe) for Windows.
 We use the M cross environment ([MXE](http://mxe.cc/)), which provides cross-compilation scripts for the dependencies and the MinGW64 (GCC) compiler.
 
+Pre-compiled binaries for Windows currently include:   
+ `ssr-binaural.exe`, `ssr-brs.exe`, `ssr-wfs.exe` and `ssr-generic.exe`.
+
+
 Getting started
 ---------------
-* Install Jack Audio for Windows (64bit) from [Jack Audio Downloads](http://www.jackaudio.org/downloads/)
+* Install Jack Audio for Windows (64bit) from [Jack Audio Downloads](http://www.jackaudio.org/downloads/).
 * Get it running by following the [Installation and Configuration](http://jackaudio.org/faq/jack_on_windows.html).
-  Hint: If you plan on using other (ASIO) Audio-software with Jack, don't forget to register the 64-bit JackRouter.
-* Download and extract the latest [Release](https://github.com/chris-hld/ssr/releases). It contains everything you need, including the cross-compiled executables `ssr-binaural.exe` and `ssr-wfs.exe`.
-* Adapt the configuration file `ssr.conf.windows` to your needs. Replace the paths (`Z:\SSR`) to yours. For now, please only use absolute paths.
+  Hint: If you plan on using other (ASIO) Audio-software with Jack Audio, don't forget to register the 64-bit JackRouter.
+* Download and extract the latest [Release](https://github.com/chris-hld/ssr/releases).
+It contains everything you need, including the cross-compiled executables.
+* Adapt the configuration file `ssr.conf.windows` to your needs. Replace the paths (`Z:\SSR`) to yours. For now, please use absolute paths.
 
 Running the SSR on Windows
 --------------------------
-* Have a look at the (Documentation)[http://ssr.readthedocs.io/en/latest/operation.html#running-the-ssr]
-* First, start Jack audio, e.g. with the `qjackctl.exe`.
+* Have a look at the [Documentation](http://ssr.readthedocs.io/en/latest/operation.html#running-the-ssr)
+* First, start the Jack Audio Server, e.g. with `qjackctl.exe`.
 * Start the SSR. There is a simple example script `start-ssr.cmd`.
 * Optional: Start your ASIO playback Software.
-* Connect everything using Jack Connection.
+* Connect everything using Jack Audio Connection.
 
 This could look like this:
 
@@ -36,11 +41,12 @@ installation instructions can be found in the file INSTALL.
 
 For questions, bug reports and feature requests:
 
-Contact: ssr@spatialaudio.net
-Website: http://spatialaudio.net/ssr/
+Contact:       ssr@spatialaudio.net
+Website:       http://spatialaudio.net/ssr/
+Documentation: http://ssr.readthedocs.io/en/latest/
 
-Copyright (c) 2016 Division of Applied Acoustics
-                   Chalmers University of Technology
+Copyright (c) 2016-2018 Division of Applied Acoustics
+                        Chalmers University of Technology
 
 Copyright (c) 2012-2014 Institut für Nachrichtentechnik, Universität Rostock
 

build.sh

@@ -1,4 +1,8 @@
-export PATH=/home/chris/git/mxe/usr/bin:$PATH
+# Configure MXE path:
+MXE_PATH=/home/chris/git/mxe
+
+
+export PATH=$MXE_PATH/usr/bin:$PATH
 
 rm -r _build
 mkdir -p _build && cd _build

ci/install-deps.sh

@@ -45,6 +45,10 @@ if [ "$TRAVIS_OS_NAME" == "linux" ]; then
   if [ "${CC}" == "gcc-7" ]; then
     sudo apt-get install gcc-7 g++-7
   fi
+  # force installation of gcc-8 if required
+  if [ "${CC}" == "gcc-8" ]; then
+    sudo apt-get install gcc-8 g++-8
+  fi
   # force installation of clang-3.8 if required
   if [ "${CC}" == "clang-3.8" ]; then
     sudo apt-get install clang-3.8