Add dcpomatic_combine tool (#1245).

22 files changed, 232 insertions, 1 deletions

diff --git a/graphics/linux/128/dcpomatic2_combiner.png b/graphics/linux/128/dcpomatic2_combiner.png
new file mode 100644
index 000000000..27ad5d0e7
--- /dev/null
+++ b/graphics/linux/128/dcpomatic2_combiner.png
diff --git a/graphics/linux/16/dcpomatic2_combiner.png b/graphics/linux/16/dcpomatic2_combiner.png
new file mode 100644
index 000000000..ae6f698cc
--- /dev/null
+++ b/graphics/linux/16/dcpomatic2_combiner.png
diff --git a/graphics/linux/22/dcpomatic2_combiner.png b/graphics/linux/22/dcpomatic2_combiner.png
new file mode 100644
index 000000000..4fa3d3b0a
--- /dev/null
+++ b/graphics/linux/22/dcpomatic2_combiner.png
diff --git a/graphics/linux/256/dcpomatic2_combiner.png b/graphics/linux/256/dcpomatic2_combiner.png
new file mode 100644
index 000000000..7388b2ee8
--- /dev/null
+++ b/graphics/linux/256/dcpomatic2_combiner.png
diff --git a/graphics/linux/32/dcpomatic2_combiner.png b/graphics/linux/32/dcpomatic2_combiner.png
new file mode 100644
index 000000000..e24e0e0e5
--- /dev/null
+++ b/graphics/linux/32/dcpomatic2_combiner.png
diff --git a/graphics/linux/48/dcpomatic2_combiner.png b/graphics/linux/48/dcpomatic2_combiner.png
new file mode 100644
index 000000000..10fcca296
--- /dev/null
+++ b/graphics/linux/48/dcpomatic2_combiner.png
diff --git a/graphics/linux/512/dcpomatic2_combiner.png b/graphics/linux/512/dcpomatic2_combiner.png
new file mode 100644
index 000000000..345166990
--- /dev/null
+++ b/graphics/linux/512/dcpomatic2_combiner.png
diff --git a/graphics/linux/64/dcpomatic2_combiner.png b/graphics/linux/64/dcpomatic2_combiner.png
new file mode 100644
index 000000000..4c52f59c3
--- /dev/null
+++ b/graphics/linux/64/dcpomatic2_combiner.png
diff --git a/graphics/osx/dcpomatic2_combiner.icns b/graphics/osx/dcpomatic2_combiner.icns
new file mode 100644
index 000000000..8f4f5c2a7
--- /dev/null
+++ b/graphics/osx/dcpomatic2_combiner.icns
diff --git a/graphics/osx/dcpomatic2_combiner.iconset/icon_128x128.png b/graphics/osx/dcpomatic2_combiner.iconset/icon_128x128.png
new file mode 100644
index 000000000..27ad5d0e7
--- /dev/null
+++ b/graphics/osx/dcpomatic2_combiner.iconset/icon_128x128.png
diff --git a/graphics/osx/dcpomatic2_combiner.iconset/icon_128x128@2x.png b/graphics/osx/dcpomatic2_combiner.iconset/icon_128x128@2x.png
new file mode 100644
index 000000000..27ad5d0e7
--- /dev/null
+++ b/graphics/osx/dcpomatic2_combiner.iconset/icon_128x128@2x.png
diff --git a/graphics/osx/dcpomatic2_combiner.iconset/icon_16x16.png b/graphics/osx/dcpomatic2_combiner.iconset/icon_16x16.png
new file mode 100644
index 000000000..ae6f698cc
--- /dev/null
+++ b/graphics/osx/dcpomatic2_combiner.iconset/icon_16x16.png
diff --git a/graphics/osx/dcpomatic2_combiner.iconset/icon_16x16@2x.png b/graphics/osx/dcpomatic2_combiner.iconset/icon_16x16@2x.png
new file mode 100644
index 000000000..ae6f698cc
--- /dev/null
+++ b/graphics/osx/dcpomatic2_combiner.iconset/icon_16x16@2x.png
diff --git a/graphics/osx/dcpomatic2_combiner.iconset/icon_256x256.png b/graphics/osx/dcpomatic2_combiner.iconset/icon_256x256.png
new file mode 100644
index 000000000..7388b2ee8
--- /dev/null
+++ b/graphics/osx/dcpomatic2_combiner.iconset/icon_256x256.png
diff --git a/graphics/osx/dcpomatic2_combiner.iconset/icon_256x256@2x.png b/graphics/osx/dcpomatic2_combiner.iconset/icon_256x256@2x.png
new file mode 100644
index 000000000..7388b2ee8
--- /dev/null
+++ b/graphics/osx/dcpomatic2_combiner.iconset/icon_256x256@2x.png
diff --git a/graphics/osx/dcpomatic2_combiner.iconset/icon_32x32.png b/graphics/osx/dcpomatic2_combiner.iconset/icon_32x32.png
new file mode 100644
index 000000000..e24e0e0e5
--- /dev/null
+++ b/graphics/osx/dcpomatic2_combiner.iconset/icon_32x32.png
diff --git a/graphics/osx/dcpomatic2_combiner.iconset/icon_32x32@2x.png b/graphics/osx/dcpomatic2_combiner.iconset/icon_32x32@2x.png
new file mode 100644
index 000000000..e24e0e0e5
--- /dev/null
+++ b/graphics/osx/dcpomatic2_combiner.iconset/icon_32x32@2x.png
diff --git a/graphics/osx/dcpomatic2_combiner.iconset/icon_512x512.png b/graphics/osx/dcpomatic2_combiner.iconset/icon_512x512.png
new file mode 100644
index 000000000..345166990
--- /dev/null
+++ b/graphics/osx/dcpomatic2_combiner.iconset/icon_512x512.png
diff --git a/graphics/osx/dcpomatic2_combiner.iconset/icon_512x512@2x.png b/graphics/osx/dcpomatic2_combiner.iconset/icon_512x512@2x.png
new file mode 100644
index 000000000..345166990
--- /dev/null
+++ b/graphics/osx/dcpomatic2_combiner.iconset/icon_512x512@2x.png
diff --git a/graphics/src/dcpomatic2_combiner.svg b/graphics/src/dcpomatic2_combiner.svg
new file mode 100644
index 000000000..8a150c521
--- /dev/null
+++ b/graphics/src/dcpomatic2_combiner.svg
@@ -0,0 +1,231 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="0 0 1000 1000"
+   sodipodi:docname="dcpomatic2_combine.svg"
+   inkscape:version="1.0 (4035a4f, 2020-05-01)"
+   version="1.1"
+   id="svg2"
+   height="1066.6666"
+   width="1066.6666">
+  <defs
+     id="defs4">
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="Arrow1Mstart"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow1Mstart">
+      <path
+         transform="scale(0.4) translate(10,0)"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         id="path893" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible;"
+       id="marker1193"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow1Lend">
+      <path
+         transform="scale(0.8) rotate(180) translate(12.5,0)"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         id="path1191" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="marker1189"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow1Lstart">
+      <path
+         transform="scale(0.8) translate(12.5,0)"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         id="path1187" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="marker1167"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow1Lstart">
+      <path
+         transform="scale(0.8) translate(12.5,0)"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         id="path1165" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible;"
+       id="Arrow1Lend"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow1Lend">
+      <path
+         transform="scale(0.8) rotate(180) translate(12.5,0)"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         id="path890" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="Arrow1Lstart"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow1Lstart">
+      <path
+         transform="scale(0.8) translate(12.5,0)"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         id="path887" />
+    </marker>
+    <linearGradient
+       id="linearGradient3594"
+       y2="742.5"
+       gradientUnits="userSpaceOnUse"
+       x2="-886.76001"
+       gradientTransform="matrix(-0.84033,-0.84033,-0.84033,0.84033,136.32259,-691.39649)"
+       y1="742.5"
+       x1="-772.01001">
+      <stop
+         id="stop4687"
+         stop-color="#fff"
+         offset="0" />
+      <stop
+         id="stop4689"
+         stop-color="#fff"
+         stop-opacity="0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3601"
+       y2="613.94"
+       gradientUnits="userSpaceOnUse"
+       x2="385.04001"
+       gradientTransform="matrix(0.70711,-0.70711,0.70711,0.70711,-203.97741,756.21351)"
+       y1="63.870998"
+       x1="386.39001">
+      <stop
+         id="stop3797"
+         stop-color="#ffe800"
+         offset="0" />
+      <stop
+         id="stop3799"
+         stop-color="#dfb300"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3609"
+       y2="161.84"
+       gradientUnits="userSpaceOnUse"
+       x2="212.92999"
+       y1="358.29999"
+       x1="409.38"
+       gradientTransform="translate(-77.797413,384.00351)">
+      <stop
+         id="stop4034"
+         stop-color="#dfb300"
+         offset="0" />
+      <stop
+         id="stop3374"
+         stop-color="#dfb300"
+         offset=".5" />
+      <stop
+         id="stop3376"
+         stop-color="#dfb300"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3632"
+       y2="448.35001"
+       gradientUnits="userSpaceOnUse"
+       x2="382.89999"
+       gradientTransform="matrix(0.70711,-0.70711,0.70711,0.70711,-203.97741,756.21351)"
+       y1="448.35001"
+       x1="403.63">
+      <stop
+         id="stop3636"
+         stop-color="#ffe800"
+         stop-opacity=".39216"
+         offset="0" />
+      <stop
+         id="stop3638"
+         stop-color="#dfb300"
+         stop-opacity=".39216"
+         offset="1" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     inkscape:snap-midpoints="true"
+     inkscape:document-rotation="0"
+     inkscape:window-maximized="1"
+     inkscape:window-y="27"
+     inkscape:window-x="0"
+     inkscape:window-height="986"
+     inkscape:window-width="1680"
+     showgrid="false"
+     inkscape:current-layer="layer1"
+     inkscape:document-units="px"
+     inkscape:cy="589.03894"
+     inkscape:cx="-138.64759"
+     inkscape:zoom="0.34926264"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(0,-52.362188)"
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1">
+    <image
+       sodipodi:absref="/home/carl/src/dcpomatic/graphics/src/dcpomatic.png"
+       xlink:href="dcpomatic.png"
+       id="image4358"
+       preserveAspectRatio="none"
+       height="960.00006"
+       width="960.00006"
+       x="10.670144"
+       y="80.386467" />
+    <path
+       d="m 490.67101,280.27778 a 46.083593,46.083593 0 0 0 -46.08414,46.08418 V 514.30317 H 256.6457 a 46.083685,46.083685 0 0 0 -46.08423,46.08417 46.083685,46.083685 0 0 0 46.08423,46.08249 h 187.94117 v 187.94291 a 46.083593,46.083593 0 0 0 46.08414,46.08248 46.083593,46.083593 0 0 0 46.08256,-46.08248 V 606.46983 h 187.94284 a 46.083685,46.083685 0 0 0 46.08247,-46.08249 46.083685,46.083685 0 0 0 -46.08247,-46.08417 H 536.75357 V 326.36196 a 46.083593,46.083593 0 0 0 -46.08256,-46.08418 z"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#5e5e5e;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:15.5608;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;opacity:0.79289843"
+       id="path1288" />
+  </g>
+</svg>
diff --git a/graphics/update b/graphics/update
index cee8a3ca1..5896867bc 100755
--- a/graphics/update
+++ b/graphics/update
@@ -23,7 +23,7 @@ function required_font()
     fi
 }
 
-svg_apps="dcpomatic2_kdm dcpomatic2_server dcpomatic2_batch dcpomatic2_player dcpomatic2_playlist dcpomatic2_disk"
+svg_apps="dcpomatic2_kdm dcpomatic2_server dcpomatic2_batch dcpomatic2_player dcpomatic2_playlist dcpomatic2_disk dcpomatic2_combiner"
 required_font "Libre Baskerville"
 
 
diff --git a/graphics/windows/dcpomatic2_combiner.ico b/graphics/windows/dcpomatic2_combiner.ico
new file mode 100644
index 000000000..0db1eb108
--- /dev/null
+++ b/graphics/windows/dcpomatic2_combiner.ico