Merged with trunk, and a few trivial GUI updates etc.

git-svn-id: svn://localhost/ardour2/branches/midi@664 d708f5d6-7413-0410-9779-e7cbd77b26cf

16 files changed, 362 insertions, 0 deletions

diff --git a/tools/osx_packaging/Ardour2.icns b/tools/osx_packaging/Ardour2.icns
new file mode 100644
index 0000000000..0e345fc120
--- /dev/null
+++ b/tools/osx_packaging/Ardour2.icns
diff --git a/tools/osx_packaging/MenuBar.nib/classes.nib b/tools/osx_packaging/MenuBar.nib/classes.nib
new file mode 100644
index 0000000000..ea58db1189
--- /dev/null
+++ b/tools/osx_packaging/MenuBar.nib/classes.nib
@@ -0,0 +1,4 @@
+{
+IBClasses = ();
+IBVersion = 1;
+}
diff --git a/tools/osx_packaging/MenuBar.nib/info.nib b/tools/osx_packaging/MenuBar.nib/info.nib
new file mode 100644
index 0000000000..c0f4643eff
--- /dev/null
+++ b/tools/osx_packaging/MenuBar.nib/info.nib
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IBDocumentLocation</key>
+	<string>99 362 356 240 0 0 1280 832 </string>
+	<key>IBEditorPositions</key>
+	<dict>
+		<key>187</key>
+		<string>340 374 240 44 0 0 1280 832 </string>
+	</dict>
+	<key>IBFramework Version</key>
+	<string>349.0</string>
+	<key>IBOpenObjects</key>
+	<array>
+		<integer>187</integer>
+	</array>
+	<key>IBSystem Version</key>
+	<string>7F44</string>
+	<key>targetFramework</key>
+	<string>IBCarbonFramework</string>
+</dict>
+</plist>
diff --git a/tools/osx_packaging/MenuBar.nib/objects.xib b/tools/osx_packaging/MenuBar.nib/objects.xib
new file mode 100644
index 0000000000..78f0a0a012
--- /dev/null
+++ b/tools/osx_packaging/MenuBar.nib/objects.xib
@@ -0,0 +1,73 @@
+<?xml version="1.0" standalone="yes"?>
+<object class="NSIBObjectData">
+  <string name="targetFramework">IBCarbonFramework</string>
+  <object name="rootObject" class="NSCustomObject" id="1">
+    <string name="customClass">NSApplication</string>
+  </object>
+  <array count="4" name="allObjects">
+    <object class="IBCarbonMenu" id="187">
+      <string name="title">MenuBar</string>
+      <array count="1" name="items">
+        <object class="IBCarbonMenuItem" id="195">
+          <string name="title">ScriptExec</string>
+          <object name="submenu" class="IBCarbonMenu" id="193">
+            <string name="title">ScriptExec</string>
+            <string name="name">_NSAppleMenu</string>
+          </object>
+        </object>
+      </array>
+      <string name="name">_NSMainMenu</string>
+    </object>
+    <reference idRef="193"/>
+    <reference idRef="195"/>
+    <object class="IBCarbonMenuItem" id="204">
+      <string name="title">Window</string>
+      <object name="submenu" class="IBCarbonMenu">
+        <string name="title">Window</string>
+        <array count="5" name="items">
+          <object class="IBCarbonMenuItem">
+            <boolean name="dynamic">TRUE</boolean>
+            <string name="title">Minimize Window</string>
+            <string name="keyEquivalent">m</string>
+            <ostype name="command">mini</ostype>
+          </object>
+          <object class="IBCarbonMenuItem">
+            <boolean name="dynamic">TRUE</boolean>
+            <string name="title">Minimize All Windows</string>
+            <string name="keyEquivalent">m</string>
+            <int name="keyEquivalentModifier">1572864</int>
+            <ostype name="command">mini</ostype>
+          </object>
+          <object class="IBCarbonMenuItem">
+            <boolean name="separator">TRUE</boolean>
+          </object>
+          <object class="IBCarbonMenuItem">
+            <boolean name="dynamic">TRUE</boolean>
+            <string name="title">Bring All to Front</string>
+            <ostype name="command">frnt</ostype>
+          </object>
+          <object class="IBCarbonMenuItem">
+            <boolean name="dynamic">TRUE</boolean>
+            <string name="title">Bring in Front</string>
+            <int name="keyEquivalentModifier">1572864</int>
+            <ostype name="command">frnt</ostype>
+          </object>
+        </array>
+        <string name="name">_NSWindowsMenu</string>
+      </object>
+    </object>
+  </array>
+  <array count="4" name="allParents">
+    <reference idRef="1"/>
+    <reference idRef="195"/>
+    <reference idRef="187"/>
+    <reference idRef="187"/>
+  </array>
+  <dictionary count="2" name="nameTable">
+    <string>File&apos;s Owner</string>
+    <reference idRef="1"/>
+    <string>MenuBar</string>
+    <reference idRef="187"/>
+  </dictionary>
+  <unsigned_int name="nextObjectID">206</unsigned_int>
+</object>
diff --git a/tools/osx_packaging/ProgressWindow.nib/classes.nib b/tools/osx_packaging/ProgressWindow.nib/classes.nib
new file mode 100644
index 0000000000..ea58db1189
--- /dev/null
+++ b/tools/osx_packaging/ProgressWindow.nib/classes.nib
@@ -0,0 +1,4 @@
+{
+IBClasses = ();
+IBVersion = 1;
+}
diff --git a/tools/osx_packaging/ProgressWindow.nib/info.nib b/tools/osx_packaging/ProgressWindow.nib/info.nib
new file mode 100644
index 0000000000..4e51560026
--- /dev/null
+++ b/tools/osx_packaging/ProgressWindow.nib/info.nib
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IBDocumentLocation</key>
+	<string>124 298 356 240 0 0 1280 832 </string>
+	<key>IBFramework Version</key>
+	<string>349.0</string>
+	<key>IBOpenObjects</key>
+	<array>
+		<integer>180</integer>
+	</array>
+	<key>IBSystem Version</key>
+	<string>7F44</string>
+	<key>targetFramework</key>
+	<string>IBCarbonFramework</string>
+</dict>
+</plist>
diff --git a/tools/osx_packaging/ProgressWindow.nib/objects.xib b/tools/osx_packaging/ProgressWindow.nib/objects.xib
new file mode 100644
index 0000000000..6eaacc43e9
--- /dev/null
+++ b/tools/osx_packaging/ProgressWindow.nib/objects.xib
@@ -0,0 +1,53 @@
+<?xml version="1.0" standalone="yes"?>
+<object class="NSIBObjectData">
+  <string name="targetFramework">IBCarbonFramework</string>
+  <object name="rootObject" class="NSCustomObject" id="1">
+    <string name="customClass">NSApplication</string>
+  </object>
+  <array count="4" name="allObjects">
+    <object class="IBCarbonWindow" id="180">
+      <string name="windowRect">404 523 457 899 </string>
+      <string name="title">Caching Fonts...</string>
+      <object name="rootControl" class="IBCarbonRootControl" id="183">
+        <string name="bounds">0 0 53 376 </string>
+        <array count="2" name="subviews">
+          <object class="IBCarbonProgressBar" id="181">
+            <string name="bounds">19 17 32 270 </string>
+            <boolean name="small">TRUE</boolean>
+            <int name="controlSize">1</int>
+            <int name="initialValue">50</int>
+          </object>
+          <object class="IBCarbonButton" id="185">
+            <string name="bounds">16 284 34 356 </string>
+            <boolean name="small">TRUE</boolean>
+            <int name="controlSize">1</int>
+            <string name="title">Cancel</string>
+            <ostype name="command">quit</ostype>
+          </object>
+        </array>
+      </object>
+      <boolean name="hasCloseBox">FALSE</boolean>
+      <boolean name="hasHorizontalZoom">FALSE</boolean>
+      <boolean name="isResizable">FALSE</boolean>
+      <boolean name="hasVerticalZoom">FALSE</boolean>
+      <int name="themeBrush">51</int>
+      <int name="windowPosition">1</int>
+    </object>
+    <reference idRef="181"/>
+    <reference idRef="183"/>
+    <reference idRef="185"/>
+  </array>
+  <array count="4" name="allParents">
+    <reference idRef="1"/>
+    <reference idRef="183"/>
+    <reference idRef="180"/>
+    <reference idRef="183"/>
+  </array>
+  <dictionary count="2" name="nameTable">
+    <string>File&apos;s Owner</string>
+    <reference idRef="1"/>
+    <string>Window</string>
+    <reference idRef="180"/>
+  </dictionary>
+  <unsigned_int name="nextObjectID">186</unsigned_int>
+</object>
diff --git a/tools/osx_packaging/README.rtf b/tools/osx_packaging/README.rtf
new file mode 100644
index 0000000000..dd15e66151
--- /dev/null
+++ b/tools/osx_packaging/README.rtf
@@ -0,0 +1,68 @@
+{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf390
+{\fonttbl\f0\fswiss\fcharset77 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\margl1440\margr1440\vieww9000\viewh8400\viewkind0
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
+
+\f0\fs24 \cf0 This is the Mac OS X version of Ardour (http://ardour.org)\
+\
+You don't need a lot of stuff to get Ardour running on OS X. You will need:\
+\
+    * At least OS X 10.4\
+\
+    * Apple's X11 which is found on your OS X install CD (or a large download)\
+\
+    * JACK (either JackOSX - http://jackosx.com or "regular" JACK.) In\
+      general, we recommend JackOSX for new users, specifically version\
+      0.72 or above. It should run on OS X versions 10.3.x and above,\
+      including Tiger.  Version 0.73 or above must be used for Mac Intel\
+      universal binary support.\
+\
+See http://ardour.org/requirements_osx for more information.\
+\
+The universal binary of Ardour should run on OSX versions >= 10.4. A version\
+that also runs on Panther should also be available.\
+Please report any problems to osx-support@ardour.org or on the #ardour \
+IRC channel at irc.freenode.net.  And include any output from the \
+console.log as shown in the Applications->Utilities->Console application \
+in the report.\
+\
+IMPORTANT: before starting Ardour, you should configure and start the\
+JACK server. You can either use JackPilot, which comes with the\
+JackOSX package, or you can use the more advanced QJackCtl. A disk\
+image for QJackCtl is available at http://ardour.org/requirements_osx,\
+please read the included README carefully for initial setup\
+instructions.\
+\
+Because ardour does not come with any effect plugins, we are providing\
+installable packages for some of the top LADSPA plugins sets.  Please\
+download and install them from http://ardour.org/requirements_osx\
+page.\
+\
+Also see the online documentation at http://ardour.org/manual/ for\
+basic usage of the software.\
+\
+\
+FAQ\
+------------------------\
+\
+Q: When I click on the Ardour icon, the program will not start\
+\
+First, check a few basic issues:\
+   1. Are you running at least OS X 10.4 ?\
+   2. Did you install Apple's X11 application?\
+   3. Did you install a suitable version of JACK ?\
+   4. Did you start JACK running before trying to run Ardour?\
+      (Typically this is done using a JACK control app like JackPilot or qjackctl.)\
+\
+If the answer is yes to all of the above\
+   1. Launch "Console", which can be found in the "Applications->Utilities" folder\
+   2. Look at the console.log in the Console app.\
+      Press the "clear" button to remove any previous messages.\
+   3. Try to launch Ardour again\
+   4. Cut and paste the entire contents of the Console window\
+      (including any data stored in the scrollback) into a new posting\
+      in the ardour OS X forum at http://ardour.org/forums .\
+      Include details of your OS version and processor type. \
+\
+}
\ No newline at end of file
diff --git a/tools/osx_packaging/app_build.rb b/tools/osx_packaging/app_build.rb
new file mode 100755
index 0000000000..965d87003d
--- /dev/null
+++ b/tools/osx_packaging/app_build.rb
@@ -0,0 +1,22 @@
+#!/usr/bin/ruby
+
+# Ruby script for pulling together a MacOSX app bundle.
+
+if File.exist?("lib") then
+    Dir.foreach("lib") {|x| unless x[0] == 46 then File.delete("lib/"+x) end}
+else
+    Dir.mkdir "lib"
+end
+
+result = `otool -L ../../gtk2_ardour/ardour.bin`
+results = result.split("\n")
+results.delete_at(0)
+results.each do |s|
+    s = s.split[0]
+    # exclude frameworks, system libraries, X11 libraries, and libjack.
+    unless s =~ /System|\/usr\/lib|\/usr\/X11R6|libjack/ then
+        `cp #{s} lib`
+    end
+end
+
+`/usr/local/bin/platypus -a 'Ardour2' -t 'Shell' -o 'None' -u 'Paul Davis' -i '/bin/sh' -V '1.0' -s 'ArDr' -I 'org.ardour.Ardour2' -f 'bin' -f 'lib' -f 'Ardour2.icns' -f 'MenuBar.nib' -f 'ProgressWindow.nib' -f 'init' -f 'openDoc' 'script' 'Ardour2.app'`
\ No newline at end of file
diff --git a/tools/osx_packaging/bin/cache-fonts b/tools/osx_packaging/bin/cache-fonts
new file mode 100755
index 0000000000..36d60e77e7
--- /dev/null
+++ b/tools/osx_packaging/bin/cache-fonts
diff --git a/tools/osx_packaging/bin/exporter b/tools/osx_packaging/bin/exporter
new file mode 100755
index 0000000000..5a2ce0d307
--- /dev/null
+++ b/tools/osx_packaging/bin/exporter
@@ -0,0 +1,39 @@
+#!/bin/sh
+#
+# Author: Aaron Voisine <aaron@voisine.org>
+
+CWD="`(cd \"\`dirname \\\"$0\\\"\`\"; echo $PWD)`"
+TOP="`dirname \"$CWD\"`"
+ETC=$HOME/Library/"Application Support"/Ardour
+
+export "DYLD_LIBRARY_PATH=$TOP/lib"
+export "PATH=$CWD:$PATH"
+export "PANGO_RC_FILE=$ETC/pangorc"
+export "FONTCONFIG_PATH=$TOP/etc/fonts"
+export "GTK_IM_MODULE_FILE=$ETC/gtk.immodules"
+export "GDK_PIXBUF_MODULE_FILE=$ETC/gdk-pixbuf.loaders"
+export "GTK_DATA_PREFIX=$TOP"
+export "GTK_EXE_PREFIX=$TOP"
+export "GS_LIB=$TOP/share/ghostscript/8.51/lib:$TOP/share/ghostscript/fonts"
+export LANG=`grep '\b'\`defaults read .GlobalPreferences AppleCollationOrder\`_\
+       /usr/share/locale/locale.alias | sed -n 's/.*\(.._..\)\..*/\1/p;1q'`
+
+export ARDOUR2_UI_RC=ardour2_ui.rc
+export ARDOUR_CONFIG_PATH="$TOP/etc"
+export ARDOUR_DATA_PATH="$TOP/share"
+export ARDOUR_GLADE_PATH="$TOP/share/ardour2/glade"
+
+export LADSPA_RDF_PATH="$HOME/Library/Audio/Plug-Ins/LADSPA/rdf:/Library/Audio/Plug-Ins/LADSPA/rdf:$TOP/s
+hare/ladspa/rdf:/usr/local/share/ladspa/rdf:/usr/share/ladspa/rdf"
+export LADSPA_PATH="$HOME/Library/Audio/Plug-Ins/LADSPA:/Library/Audio/Plug-Ins/LADSPA:/usr/local/lib/lad
+spa:/usr/lib/ladspa"
+
+mkdir -p "$ETC"
+sed 's|${HOME}|'"$HOME|g" "$TOP/etc/pango/pangorc" > "$ETC/pangorc"
+sed 's|${CWD}|'"$TOP|g" "$TOP/etc/pango/pango.modules" > "$ETC/pango.modules"
+cp -f "$TOP/etc/pango/pangox.aliases" "$ETC"
+sed 's|${CWD}|'"$TOP|g" "$TOP/etc/gtk-2.0/gtk.immodules" > "$ETC/gtk.immodules"
+sed 's|${CWD}|'"$TOP|g" "$TOP/etc/gtk-2.0/gdk-pixbuf.loaders" \
+    > "$ETC/gdk-pixbuf.loaders"
+
+exec "$CWD/ardour" "$@"
diff --git a/tools/osx_packaging/bin/getdisplay.sh b/tools/osx_packaging/bin/getdisplay.sh
new file mode 100755
index 0000000000..a88b930e72
--- /dev/null
+++ b/tools/osx_packaging/bin/getdisplay.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+#
+# Author: Aaron Voisine <aaron@voisine.org>
+
+if [ "$DISPLAY"x == "x" ]; then
+    echo :0 > /tmp/$UID/TemporaryItems/display
+else
+    echo $DISPLAY > /tmp/$UID/TemporaryItems/display
+fi
diff --git a/tools/osx_packaging/bin/gs b/tools/osx_packaging/bin/gs
new file mode 100755
index 0000000000..9d531e32b6
--- /dev/null
+++ b/tools/osx_packaging/bin/gs
diff --git a/tools/osx_packaging/init b/tools/osx_packaging/init
new file mode 100755
index 0000000000..65c819550e
--- /dev/null
+++ b/tools/osx_packaging/init
@@ -0,0 +1,16 @@
+#!/bin/sh
+#
+# Author: Aaron Voisine <aaron@voisine.org>
+
+CWD="`(cd \"\`dirname \\\"$0\\\"\`\"; echo $PWD)`"
+
+ps -wx -ocommand | grep -e '[X]11' > dev/null
+if [ "$?" != "0" -a ! -f ~/.xinitrc ]; then
+    echo "rm -f ~/.xinitrc" > ~/.xinitrc
+    sed 's/xterm/# xterm/' /usr/X11R6/lib/X11/xinit/xinitrc >> ~/.xinitrc
+fi
+
+open -a X11 || open -a XDarwin
+
+export "FONTCONFIG_PATH=$CWD/etc/fonts"
+exec "$CWD/bin/cache-fonts"
diff --git a/tools/osx_packaging/openDoc b/tools/osx_packaging/openDoc
new file mode 100755
index 0000000000..888a42b176
--- /dev/null
+++ b/tools/osx_packaging/openDoc
@@ -0,0 +1,6 @@
+#!/bin/sh
+#
+# Author: Aaron Voisine <aaron@voisine.org>
+
+export "DISPLAY=`cat /tmp/$UID/TemporaryItems/display`"
+exec "`dirname \"$0\"`/bin/gimp-remote" "$@"
diff --git a/tools/osx_packaging/script b/tools/osx_packaging/script
new file mode 100755
index 0000000000..d689320d20
--- /dev/null
+++ b/tools/osx_packaging/script
@@ -0,0 +1,27 @@
+#!/bin/sh
+#
+# Author: Aaron Voisine <aaron@voisine.org>
+
+CWD="`dirname \"$0\"`"
+TMP=/tmp/$UID/TemporaryItems
+
+ps -wx -ocommand | grep -e '[X]11' > /dev/null
+if [ "$?" != "0" -a ! -f ~/.xinitrc ]; then
+    echo "rm -f ~/.xinitrc" > ~/.xinitrc
+    sed 's/xterm/# xterm/' /usr/X11R6/lib/X11/xinit/xinitrc >> ~/.xinitrc
+fi
+
+mkdir -p $TMP
+cp -f "$CWD/bin/getdisplay.sh" $TMP
+rm -f $TMP/display
+open-x11 $TMP/getdisplay.sh || \
+open -a XDarwin $TMP/getdisplay.sh || \
+echo ":0" > $TMP/display
+
+while [ "$?" == "0" -a ! -f $TMP/display ]; do sleep 1; done
+export "DISPLAY=`cat $TMP/display`"
+
+ps -wx -ocommand | grep -e '[X]11' > /dev/null || exit 11
+
+cd ~/
+exec "$CWD/bin/exporter" "$@"