diff --git a/Makefile.am b/Makefile.am index 517039b3..b427f558 100644 --- a/Makefile.am +++ b/Makefile.am @@ -123,15 +123,6 @@ doc: .PHONY: doc -if ENABLE_APP_BUNDLE -dmg: install - $(MAKE) -C data/MacOSX $@ -else -dmg: - @echo "You have to run './configure --enable-app-bundle' first!"; false -endif -.PHONY: dmg - .NOTPARALLEL: install # remove pkgdatadir and docdir (if empty) diff --git a/configure.ac b/configure.ac index 9c6934fc..233c7f54 100644 --- a/configure.ac +++ b/configure.ac @@ -713,32 +713,6 @@ ENABLE_AUTO([isatty], [support for isatty()], AC_SEARCH_LIBS([isatty], , , [have_isatty=no]) ]) -dnl trying to mimic the default setting -pkgdatadir="\$(datadir)/$PACKAGE" - -ENABLE_EXPLICIT([app-bundle], [creation of a MacOSX application bundle], -[ - AC_CHECK_PROG([have_dylibbundler], [dylibbundler], [yes], [no]) - AS_IF([test x$enable_app_bundle = xyes -o x$enable_app_bundle = x], - [DMG_NAME=SoundScapeRenderer-$PACKAGE_VERSION.dmg], - [DMG_NAME=$enable_app_bundle]) - dmgrootdir=$(pwd)/MacOSX-App-Bundle - bundledir=\${dmgrootdir}/SoundScapeRenderer-$PACKAGE_VERSION - - dnl WARNING: any user-specified --prefix, --bindir, ... is overwritten! - dnl however, it can still be specified at make time (although kinda useless)! - prefix=\${bundledir}/SoundScapeRenderer.app/Contents - bindir=\${exec_prefix}/MacOS - datarootdir=\${prefix}/Resources - pkgdatadir="\$(datadir)" - docdir=${bundledir}/Documentation - - dnl linker flag to add space to the output file header padding, - dnl so when dylibbundler is changing paths to shared libs later on, - dnl longer paths will fit in too. - LDFLAGS="$LDFLAGS -headerpad_max_install_names" -]) - ENABLE_AUTO([browser-gui], [creation of HTML/JavaScript files for browser GUI], [ AC_ARG_VAR([YARN], [Yarn package manager command]) @@ -760,11 +734,6 @@ ENABLE_AUTO([browser-gui], [creation of HTML/JavaScript files for browser GUI], ]) ]) -AC_SUBST(DMG_NAME) -AC_SUBST(dmgrootdir) -AC_SUBST(bundledir) -AC_SUBST(pkgdatadir) - AC_SUBST(OPT_FLAGS) AC_SUBST(PKG_FLAGS) AC_SUBST(WARNING_FLAGS) @@ -772,9 +741,7 @@ AC_SUBST(DEBUGGING_FLAGS) dnl List of output files generated by AC_OUTPUT from their respective *.in files AC_CONFIG_FILES([Makefile src/Makefile man/Makefile browser-gui/Makefile]) -AC_CONFIG_FILES([tests/Makefile]) -AC_CONFIG_FILES([data/Makefile data/MacOSX/Makefile]) -AC_CONFIG_FILES([data/MacOSX/Info.plist data/MacOSX/DMG-Layout.applescript]) +AC_CONFIG_FILES([tests/Makefile data/Makefile]) dnl AC_OUTPUT should be the last command (except maybe some status messages) dnl It generates and runs config.status, which in turn creates the Makefiles and @@ -834,13 +801,7 @@ echo "| Network: legacy/WebSocket/FUDI ......... : $have_ip_interface/$have_webs echo "| Qt GUI/Browser GUI ..................... : $have_gui/$have_browser_gui" echo "|" echo "| Enable debugging/optimization .......... : $have_debugging/$have_optimization" -AS_IF([test x$have_app_bundle = xyes], -[ -echo "| Mac OS X application bundle (disk image) : $DMG_NAME" -], -[ echo "| Install prefix ......................... : $prefix" -]) AS_IF([test x$have_ecasound = xyes -a x$have_ecasound_program != xyes], [ @@ -854,20 +815,8 @@ AS_IF([test x$have_manpages != xyes], echo "|> WARNING: help2man was not found!" echo "|> Disabling building of manpages" ]) -AS_IF([test x$have_app_bundle = xyes -a x$have_dylibbundler != xyes], -[ - echo "|" - echo "|> WARNING: dylibbundler was not found!" - echo "|> It is needed for creating the app bundle." -]) echo "|" echo -AS_IF([test x$have_app_bundle = xyes], -[ -echo 'If everything looks OK, continue with "make" and "make dmg".' -], -[ echo 'If everything looks OK, continue with "make" and "make install".' -]) echo diff --git a/data/MacOSX/.background/background.png b/data/MacOSX/.background/background.png deleted file mode 100644 index 6b3fafda..00000000 Binary files a/data/MacOSX/.background/background.png and /dev/null differ diff --git a/data/MacOSX/DMG-Layout.applescript.in b/data/MacOSX/DMG-Layout.applescript.in deleted file mode 100644 index 00bc3f03..00000000 --- a/data/MacOSX/DMG-Layout.applescript.in +++ /dev/null @@ -1,18 +0,0 @@ -tell application "Finder" - tell disk "SoundScape Renderer @PACKAGE_VERSION@" - open - set current view of container window to icon view - set toolbar visible of container window to false - set statusbar visible of container window to false - set the bounds of container window to {400, 100, 820, 500} - set theViewOptions to the icon view options of container window - set arrangement of theViewOptions to not arranged - set label position of theViewOptions to right - set icon size of theViewOptions to 60 - set background picture of theViewOptions to file ".background:background.png" - set position of item "Jack.webloc" of container window to {285, 60} - set position of item "SoundScapeRenderer-@PACKAGE_VERSION@" of container window to {115, 135} - set position of item "Applications" of container window to {115, 230} - set position of item "Getting-Started.txt" of container window to {215, 320} - end tell -end tell \ No newline at end of file diff --git a/data/MacOSX/Getting-Started.txt b/data/MacOSX/Getting-Started.txt deleted file mode 100644 index b2d4c00e..00000000 --- a/data/MacOSX/Getting-Started.txt +++ /dev/null @@ -1,7 +0,0 @@ -GETTING (THE SSR) STARTED - -You should have a proper version of Jack installed by now (32 or 64 bit - matching the architecture of the SSR build you are using). If not, get it from https://jackaudio.org/ or from Homebrew. You can also obtain QJackCtl from there. - -Open QJackCtl and hit "play". This will start the Jack server process in background, which is needed by the SSR. - -Start SSR. It consists of a GUI and a terminal window. The latter provides information about interesting things (e.g. if you forgot to start Jack). If something is not working, have a look there. \ No newline at end of file diff --git a/data/MacOSX/Info.plist.in b/data/MacOSX/Info.plist.in deleted file mode 100644 index 6f2e5e2b..00000000 --- a/data/MacOSX/Info.plist.in +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - NSPrincipalClass - NSApplication - NSHighResolutionCapable - True - CFBundleExecutable - run-ssr.sh - CFBundleIconFile - SSRIcon - CFBundleName - SoundScape Renderer - CFBundleVersion - @PACKAGE_VERSION@ - - diff --git a/data/MacOSX/Jack.webloc b/data/MacOSX/Jack.webloc deleted file mode 100644 index f99435b2..00000000 --- a/data/MacOSX/Jack.webloc +++ /dev/null @@ -1,8 +0,0 @@ - - - - - URL - http://www.jackaudio.org/downloads/ - - diff --git a/data/MacOSX/Makefile.am b/data/MacOSX/Makefile.am deleted file mode 100644 index 4b68004d..00000000 --- a/data/MacOSX/Makefile.am +++ /dev/null @@ -1,99 +0,0 @@ -## This file will be processed by automake (which is called by autogen.sh) to -## generate Makefile.in, which in turn will be processed by configure to -## generate Makefile. - -## comments starting with a single # are copied to Makefile.in (and afterwards -## to Makefile), comments with ## are dropped. - -## This file is only taken into account if --enable-app-bundle was chosen! -if ENABLE_APP_BUNDLE - -dist_pkgdata_DATA = SSRIcon.icns qt.conf -contentsdir = $(prefix) -contents_DATA = Info.plist -dist_bin_SCRIPTS = run-ssr.sh -dist_noinst_SCRIPTS = run-ssr.applescript - -nobase_dist_dmgroot_DATA = .background/background.png Jack.webloc Getting-Started.txt - -# this is done after installing the executable -install-exec-hook: - cp -f `which ecasound` $(DESTDIR)$(bindir) - chmod +w $(DESTDIR)$(bindir)/ecasound - for exec in $(SSR_executables) ecasound; do \ - dylibbundler \ - --create-dir --overwrite-files --bundle-deps \ - --fix-file $(DESTDIR)$(bindir)/$$exec \ - --dest-dir $(DESTDIR)$(contentsdir)/Libraries \ - --install-path @executable_path/../Libraries \ - ; done - osacompile -o $(DESTDIR)$(bindir)/run-ssr.scpt \ - $(srcdir)/run-ssr.applescript - -install-data-hook: - mkdir -p $(DESTDIR)$(contentsdir)/PlugIns/platforms - cp -f `qmake -query QT_INSTALL_PLUGINS`/platforms/libqcocoa.dylib $(DESTDIR)$(contentsdir)/PlugIns/platforms - install_name_tool -id @executable_path/../PlugIns/platforms/libqcocoa.dylib $(DESTDIR)$(contentsdir)/PlugIns/platforms/libqcocoa.dylib - - -cd $(DESTDIR)$(dmgrootdir) && $(LN_S) /Applications - for qtc in QtGui QtCore QtOpenGL QtWidgets QtPrintSupport QtDBus; do \ - install_name_tool -change $(QTLIBDIR)/$$qtc.framework/Versions/5/$$qtc @executable_path/../Frameworks/$$qtc.framework/Versions/5/$$qtc $(DESTDIR)$(contentsdir)/PlugIns/platforms/libqcocoa.dylib \ - ; mkdir -p $(prefix)/Frameworks/$$qtc.framework/Versions/5 \ - ; cp $(QTLIBDIR)/$$qtc.framework/Versions/5/$$qtc $(prefix)/Frameworks/$$qtc.framework/Versions/5/ \ - ; chmod +w $(prefix)/Frameworks/$$qtc.framework/Versions/5/$$qtc \ - ; install_name_tool -id @executable_path/../Frameworks/Versions/5/$$qtc.framework/$$qtc $(prefix)/Frameworks/$$qtc.framework/Versions/5/$$qtc \ - ; install_name_tool -change $(QTLIBDIR)/QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore $(prefix)/Frameworks/$$qtc.framework/Versions/5/$$qtc \ - ; install_name_tool -change $(QTLIBDIR)/QtGui.framework/Versions/5/QtGui @executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui $(prefix)/Frameworks/$$qtc.framework/Versions/5/$$qtc \ - ; install_name_tool -change $(QTLIBDIR)/QtWidgets.framework/Versions/5/QtWidgets @executable_path/../Frameworks/QtWidgets.framework/Versions/5/QtWidgets $(prefix)/Frameworks/$$qtc.framework/Versions/5/$$qtc \ - ; done - - for exec in $(SSR_executables); do \ - install_name_tool -change /usr/local/opt/qt/lib/QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore $(prefix)/MacOS/$$exec \ - ; install_name_tool -change /usr/local/opt/qt/lib/QtGui.framework/Versions/5/QtGui @executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui $(prefix)/MacOS/$$exec \ - ; install_name_tool -change /usr/local/opt/qt/lib/QtOpenGL.framework/Versions/5/QtOpenGL @executable_path/../Frameworks/QtOpenGL.framework/Versions/5/QtOpenGL $(prefix)/MacOS/$$exec \ - ; install_name_tool -change /usr/local/opt/qt/lib/QtWidgets.framework/Versions/5/QtWidgets @executable_path/../Frameworks/QtWidgets.framework/Versions/5/QtWidgets $(prefix)/MacOS/$$exec \ - ; install_name_tool -change /usr/local/opt/qt/lib/QtPrintSupport.framework/Versions/5/QtPrintSupport @executable_path/../Frameworks/QtPrintSupport.framework/Versions/5/QtPrintSupport $(prefix)/MacOS/$$exec \ - ; done - -# fix linking of libraries - install_name_tool -change /usr/local/lib/libogg.0.dylib @executable_path/../Libraries/libogg.0.dylib $(prefix)/Libraries/libvorbis.0.dylib - install_name_tool -change /usr/local/Cellar/libvorbis/1.3.5/lib/libvorbis.0.dylib @executable_path/../Libraries/libvorbis.0.dylib $(prefix)/Libraries/libvorbisenc.2.dylib - install_name_tool -change /usr/local/lib/libogg.0.dylib @executable_path/../Libraries/libogg.0.dylib $(prefix)/Libraries/libvorbisenc.2.dylib - -# fix linking of frameworks - for qtc in QtGui QtCore QtOpenGL QtWidgets QtPrintSupport; do \ - install_name_tool -id @executable_path/../Frameworks/$$qtc.framework/Versions/5/$$qtc $(DESTDIR)$(contentsdir)/Frameworks/$$qtc.framework/Versions/5/$$qtc \ - ; done - -# code sign frameworks - for qtc in QtGui QtCore QtOpenGL QtWidgets QtPrintSupport QtDBus; do \ - mkdir -p $(dmgrootdir)/SoundScapeRenderer-@PACKAGE_VERSION@/SoundScapeRenderer.app/Contents/Frameworks/$$qtc.framework/Resources/ \ - ; cp /usr/local/opt/qt/lib/$$qtc.framework/Resources/Info.plist $(dmgrootdir)/SoundScapeRenderer-@PACKAGE_VERSION@/SoundScapeRenderer.app/Contents/Frameworks/$$qtc.framework/Resources/ \ - ; codesign --force --deep --sign "Developer ID Application: Jens Ahrens" $(dmgrootdir)/SoundScapeRenderer-@PACKAGE_VERSION@/SoundScapeRenderer.app/Contents/Frameworks/$$qtc.framework \ - ; done - -# code sign app - codesign --force --deep --sign "Developer ID Application: Jens Ahrens" $(dmgrootdir)/SoundScapeRenderer-@PACKAGE_VERSION@/SoundScapeRenderer.app - - -# create a DMG image -dmg: - @test -d "$(dmgrootdir)" || ( echo; echo; \ - echo "MacOSX App-Bundle directory not found!"; \ - echo "run 'make install' first!"; echo; false ) - hdiutil create -ov -attach -format UDRW \ - -volname "SoundScape Renderer @PACKAGE_VERSION@" \ - -srcfolder "$(dmgrootdir)" \ - "$(top_builddir)/SSRTemp.dmg" - osascript DMG-Layout.applescript - hdiutil detach "/Volumes/SoundScape Renderer @PACKAGE_VERSION@" - hdiutil convert -ov -format UDZO -imagekey zlib-level=9 \ - -o "$(top_builddir)/$(DMG_NAME)" \ - "$(top_builddir)/SSRTemp.dmg" - $(RM) "$(top_builddir)/SSRTemp.dmg" - $(RM) -r "$(dmgrootdir)" - codesign --deep --force --timestamp --sign 'Developer ID Application: Jens Ahrens' $(top_builddir)/$(DMG_NAME) - -.PHONY: dmg - -endif diff --git a/data/MacOSX/SSRIcon.icns b/data/MacOSX/SSRIcon.icns deleted file mode 100644 index 6d9e2553..00000000 Binary files a/data/MacOSX/SSRIcon.icns and /dev/null differ diff --git a/data/MacOSX/qt.conf b/data/MacOSX/qt.conf deleted file mode 100644 index 64d72973..00000000 --- a/data/MacOSX/qt.conf +++ /dev/null @@ -1,2 +0,0 @@ -[Paths] -Plugins = PlugIns diff --git a/data/MacOSX/run-ssr.applescript b/data/MacOSX/run-ssr.applescript deleted file mode 100644 index 2357a1fb..00000000 --- a/data/MacOSX/run-ssr.applescript +++ /dev/null @@ -1,83 +0,0 @@ --- To store last chosen renderer type -property previousSelection : 1 - -on run argv - -- Get absolute path to SSR binary via args - -- For relative paths to work, the binary must be placed in MacOS/ folder of .app bundle - set ssrBinPath to first item of argv - set argv to rest of argv - - -- Make list of renderer type names and their parameter equivalents - set rendererNames to {"Binaural (using HRIRs)", "Binaural Room Synthesis (using BRIRs)", "Stereophonic (Vector Base Amplitude Panning)", "Wave Field Synthesis", "Ambisonics Amplitude Panning", "Distance-Coded Ambisonics (experimental)", "Generic Renderer"} - set rendererOptions to {"--binaural", "--brs", "--vbap", "--wfs", "--aap", "--dca", "--generic"} - - -- Process other given command line options - set pickRendererType to true - set options to "" as Unicode text - repeat with arg in argv - set options to options & " " & arg - if arg is in rendererOptions then - set pickRendererType to false - end if - end repeat - - -- Let user pick renderer type if none was given in argv - set rendererOption to "" as Unicode text - if (pickRendererType) then - if previousSelection is greater than (count of rendererNames) then - set previousSelection to 1 - end if - tell application "System Events" - activate - set selectedRendererName to choose from list rendererNames with title "Start SoundScape Renderer" with prompt "Please make sure Jack is running. Select the type of renderer for this session:" default items {item previousSelection of rendererNames} - end tell - if selectedRendererName is false then - return - else - set selectedRendererName to first item of selectedRendererName - repeat with i from 1 to (count of items in rendererNames) - if selectedRendererName is equal to (item i of rendererNames) then - set rendererOption to item i of rendererOptions - -- Save user choice - set previousSelection to i - exit repeat - end if - end repeat - end if - end if - - -- Assemble shell command string - set command to "export ECASOUND=\"" & ssrBinPath & "/ecasound\" ; cd \"" & ssrBinPath & "/../../..\" ; \"" & ssrBinPath & "/ssr\" " & rendererOption & options & " && (echo SSR quit normally with exit code $?) || (echo SSR encountered an error and had to quit. See above. Exit code: $?)" - - -- Open new Terminal window, cd to SSR working dir and start SSR - tell application "System Events" to set terminalRunning to (exists process "Terminal") - tell application "Terminal" - if terminalRunning then - activate - set ssrTab to do script command - else -- Terminal not running yet. Start it and use fresh default window - activate - set ssrTab to do script command in front window - end if - - -- Position Terminal window in upper left corner - set position of front window to {0, 0} - - -- Wait until SSR quits - delay 2 - repeat until (ssrTab's history contains command) - delay 1 - end repeat - repeat while (ssrTab is busy) - delay 1 - end repeat - - -- Close Terminal window if SSR did quit with exit code 0 - ignoring case - if (ssrTab's history contains "SSR quit normally with exit code 0") and (ssrTab's history does not contain "--help") then - close (first window whose selected tab is ssrTab) saving no - end if - end ignoring - end tell - -end run diff --git a/data/MacOSX/run-ssr.sh b/data/MacOSX/run-ssr.sh deleted file mode 100755 index 238162e7..00000000 --- a/data/MacOSX/run-ssr.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -thispath="$(dirname "$0")" - -# add all except -psn* to $OPTIONS: -while [[ $1 ]]; do - case "$1" in - -psn*) - shift - ;; - *) - OPTIONS+=("$1") - shift - ;; - esac -done - -# Run script with absolute path to SSR binary as parameter. -# Script runs in background process (&), else we would have two SSR icons in the dock. -# For relative paths to work, this script and the SSR binary must be placed in MacOS/ folder of .app bundle. -osascript "$thispath/run-ssr.scpt" "$thispath" "${OPTIONS[@]}" & diff --git a/data/Makefile.am b/data/Makefile.am index 9e72d326..08fa3e31 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -7,18 +7,7 @@ dist_bin_SCRIPTS = ssr -if ENABLE_APP_BUNDLE -SUBDIRS = MacOSX -extrasdir = $(bundledir)/Extras -scenesdir = $(bundledir)/Scenes - -## these are always distributed, but only installed if ENABLE_APP_BUNDLE -dist_scenes_DATA = \ - scenes/asdf2html.xsl \ - scenes/live_input.asd -else extrasdir = $(pkgdatadir) -endif ## stuff that will end up in $prefix/share/ssr/ nobase_dist_pkgdata_DATA = \ @@ -44,7 +33,7 @@ nobase_dist_pkgdata_DATA = \ ## the whole directory is distributed, including browser GUI files EXTRA_DIST = websocket_resources -## stuff that will end up either in $prefix/share/ssr/ or in $bundledir/Extras +## stuff that will end up in $prefix/share/ssr/ nobase_dist_extras_DATA = \ reproduction_setups/2.0.asd \ reproduction_setups/2.1.asd \ diff --git a/doc/manual/building-from-source.rst b/doc/manual/building-from-source.rst index 3c1744c6..232fbffc 100644 --- a/doc/manual/building-from-source.rst +++ b/doc/manual/building-from-source.rst @@ -251,12 +251,6 @@ choose). If there are errors, double-check whether all :ref:`dependencies` are installed and whether the :ref:`configuration options ` are correct. -To build the Application Bundle for macOS, use these commands:: - - ./configure --enable-app-bundle - make - make dmg - Installing ---------- diff --git a/doc/manual/operation.rst b/doc/manual/operation.rst index 391816a9..0ff9c508 100644 --- a/doc/manual/operation.rst +++ b/doc/manual/operation.rst @@ -399,106 +399,6 @@ file using jack.) 6. Open an audio file in vlc and press play -Using the macOS App Bundle --------------------------- - -*Note: As of now, we do not provide an app bundle anymore for technical -reasons. We still keep the documentation here as we might be able to provide -a bundle again in the future.* - -1. Start JACK. -2. Double-click the SoundScape Renderer icon |icon|, select the renderer type, - and off you go! - -.. |icon| image:: images/ssr_logo_mac_30px.png - -When the SSR is started, a Terminal window displaying the standard SSR output -is automatically opened. If the SSR closes with an error, it remains open for -you to inspect the error messages. - -The SSR and JACK must have the same sampling rate, otherwise error will be -generated. - -More options can be specified by using the config file. The details of using -the config file is described on the Section -:ref:`ssr_configuration_file`. - -Running via the Command Line (Terminal) -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -The application bundle is more convenient, but brings limitations when using -the command line. The included start script changes the working directory to -the directory that includes the SSR application bundle, so only absolute paths -should be used on the command line. - -What can be done using configuration files, should be done using configuration -files. - -SSR can be started on the command line by using:: - - open -a SoundScapeRenderer - -If the SSR is placed in ``/Applications`` (or ``$HOME/Applications``) and was -run several times already, OS X should find it. If not, you would have to -specify the full path, i.e. :: - - open /Applications/SoundScapeRenderer-0.4.0/SoundScapeRenderer.app - -The SSR starts with a prompt for renderer selection, with the default renderer -set on the Binaural renderer. As mentioned above in Section -:ref:`ssr_configuration_file`, -more options at the start up can -be specified using the configuration file. - -To start the SSR using a different renderer module and skip the prompt for the -selection do:: - - open -a SoundScapeRenderer --args --binaural - -Of course, instead of ``--binaural``, you can also use any of the other -available renderers (e.g. ``--wfs`` for Wave Field Synthesis). To see all -available command line arguments (specifying a renderer skips the prompt for renderer -selection):: - - open -a SoundScapeRenderer --args --binaural "--help" - -.. note:: The arguments other than the renderer selection have to be enclosed in - quotation marks (``""``)! - -To load a scene do:: - - open -a SoundScapeRenderer --args --binaural "/absolute/path/to/scene.asd" - -.. note:: Paths have to be absolute! - -To load a scene that has spaces in its path name do:: - - open -a SoundScapeRenderer --args --binaural "/path/to/file\ with\ spaces.asd" - -.. note:: Spaces have to be escaped using backslashes! - -In addition to the config files in standard locations mentioned above, you can -also specify a config file on the command line:: - - open -a SoundScapeRenderer --args --binaural "--config=my_config_file.conf" - -When you want to record the output of the SSR and play it back again, you -should always provide the .wav extension of the file name, along with the -absolute path of your desired destination location for the file. As an -example, if you want to run the SSR and record the output to a file name -output.wav, you would need the command given below:: - - open -a SoundScapeRenderer --args --binaural "--record=/tmp/output.wav" - -But if you use a relative path instead of the absolute path, the file that -contains the output of the SSR will be saved inside the directory of the -SoundScape Renderer in the Applications folder. - -If you want to start more than one instance of SSR, then add the ``-n`` option to the call -of ``open`` for all instances other than the first one:: - - open -n -a SoundScapeRenderer --binaural - Using a Head-Tracker ^^^^^^^^^^^^^^^^^^^^ diff --git a/doc/manual/use-cases.rst b/doc/manual/use-cases.rst index 59e89acb..151b82f6 100644 --- a/doc/manual/use-cases.rst +++ b/doc/manual/use-cases.rst @@ -122,16 +122,12 @@ to replace the head tracking with another interface that allows us to select the desired filter indices. Here is a Pd patch that does exactly this: :gh-link-es:`data_linked_in_ssr_manual/select_filter_by_index.pd` -On Linux, start SSR using:: +Start the SSR using:: ssr-binaural --fudi-server=1147 --hrirs=data/scenes/impulse_responses/irs_1-in-1-out.wav and drag and drop an audio file into the GUI. -On macOS, start SSR just as with Linux. Or, if you have an app bundle, use:: - - open -a SoundScapeRenderer --args --brs "--fudi-server=1147 --hrirs=data/scenes/impulse_responses/irs_1-in-1-out.wav" - Start Pd with the control patch and play around with the filter index. You will find that, depending on the chosen filter index, different amounts of lowpass filtering will be applied in this example. diff --git a/src/Makefile.am b/src/Makefile.am index d65dafc1..014ac29a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -25,11 +25,7 @@ AM_CPPFLAGS += -I$(srcdir)/../apf AM_CPPFLAGS += -I$(srcdir)/../gml/include AM_CPPFLAGS += -I$(srcdir)/../rapidjson/include -if ENABLE_APP_BUNDLE -AM_CPPFLAGS += -DSSR_DATA_DIR=\"SoundScapeRenderer.app/Contents/Resources\" -else AM_CPPFLAGS += -DSSR_DATA_DIR="\"$(pkgdatadir)\"" -endif ## this is somehow needed for Solaris (or not?) AM_CPPFLAGS += -D_POSIX_PTHREAD_SEMANTICS