Don't make _stream_states for unmapped audio, otherwise we wait for content

[dcpomatic.git] / run / dcpomatic_disk

diff --git a/run/dcpomatic_disk b/run/dcpomatic_disk
index ce8366012c1129124476ea5ff30700e75a59f759..ff5d8e7e51692c774b5e9d3479865d6ddd8f19e3 100755 (executable)
--- a/run/dcpomatic_disk
+++ b/run/dcpomatic_disk
@@ -1,7 +1,16 @@
 #!/bin/bash
 
-export LD_LIBRARY_PATH=build/src/lib:build/src/wx:build/src/asdcplib/src:$LD_LIBRARY_PATH
-export DYLD_LIBRARY_PATH=build/src/lib:build/src/wx:build/src/asdcplib/src:/Users/ci/osx-environment/64/lib
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+source $DIR/environment
+
+if [[ "$(uname -m)" == arm64 ]]; then
+    env=arm64/11.0
+else
+    env=x86_64/10.10
+fi
+
+export DYLD_LIBRARY_PATH=/Users/cah/osx-environment/$env/lib:/usr/local/lib
+
 if [ "$1" == "--debug" ]; then
     shift
     gdb --args build/src/tools/dcpomatic2_disk $*
@@ -16,13 +25,16 @@ elif [ "$1" == "--massif" ]; then
     valgrind --tool="massif" build/src/tools/dcpomatic2_disk $*
 elif [ "$1" == "--i18n" ]; then
     shift
-    LANGUAGE=de_DE.UTF8 LANG=de_DE.UTF8 LC_ALL=de_DE.UTF8 build/src/tools/dcpomatic2_disk "$*"
+    LANGUAGE=de_DE.UTF8 LANG=de_DE.UTF8 LC_ALL=de_DE.UTF8 build/src/tools/dcpomatic2_disk $*
 elif [ "$1" == "--perf" ]; then
     shift
     perf record build/src/tools/dcpomatic2_disk $*
 elif [ "$1" == "--scaled" ]; then
     shift
     ~/src/run_scaled/run_scaled --sleep=5 --scale=0.5 build/src/tools/dcpomatic2_disk $*
+elif [ "$1" == "--screenshot" ]; then
+    shift
+    GTK_PATH=/usr/local/lib/gtk-3.0 GTK_MODULES=gtk-vector-screenshot build/src/tools/dcpomatic2_disk $*
 else
     build/src/tools/dcpomatic2_disk $*
 fi