Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0
authorCarl Hetherington <cth@carlh.net>
Tue, 1 Sep 2015 09:31:21 +0000 (10:31 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 1 Sep 2015 09:31:21 +0000 (10:31 +0100)
15 files changed:
ChangeLog
cscript
debian/changelog
doc/manual/dcpomatic.xml
doc/manual/screenshots/dcp-tab.png
doc/manual/screenshots/prefs-advanced.png
doc/manual/screenshots/prefs-defaults.png
doc/manual/screenshots/prefs-general.png
doc/manual/screenshots/prefs-kdm-email.png
doc/manual/screenshots/prefs-keys.png
doc/manual/screenshots/prefs-tms.png
doc/manual/screenshots/subtitles-tab.png
hacks/subtitle_alignment/50.xml [new file with mode: 0644]
wscript
zanata.xml [deleted file]

index d10b06c24a81584ce3ffdf53a3553e0a01e405a7..98e349d099a5f762b4dc15facad4faec01ce666f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2015-09-01  Carl Hetherington  <cth@carlh.net>
+
+       * Version 2.1.49 released.
+
+2015-08-31  Carl Hetherington  <cth@carlh.net>
+
+       * Version 2.1.48 released.
+
 2015-08-31  Carl Hetherington  <cth@carlh.net>
 
        * Stop very long searches for subtitles where
diff --git a/cscript b/cscript
index b99ccc4e38d1a5199cc7b03bedfbb78bf15b714e..01e707fd7cb6af3bbe4cc76cb6692051faa13553 100644 (file)
--- a/cscript
+++ b/cscript
@@ -90,7 +90,9 @@ deb_depends['7'] = {'libc6': '2.13',
                     'libboost-date-time1.49.0': '1.49.0',
                     'libxmlsec1-openssl': '1.2.18',
                     'libcurl3': '7.26.0',
-                    'libzip2': '0.10.1'}
+                    'libzip2': '0.10.1',
+                    'libcairomm-1.0-1': '1.10.0-1',
+                    'libpangomm-1.4-1': '2.28.4-1'}
 
 deb_depends['8'] = {'libc6': '2.19-18',
                     'libssh-4': '0.6.3-4',
@@ -233,8 +235,8 @@ def make_spec(filename, version, target):
 
 def dependencies(target):
     return (('ffmpeg-cdist', 'bd17594'),
-            ('libdcp', '8017692'),
-            ('libsub', '7f74e96'))
+            ('libdcp', 'v1.2.3'),
+            ('libsub', 'v1.1.4'))
 
 def configure_options(target):
     opt = ''
index ae70ceaefd49ad34d913e0e72ad3478a7c5bb0b5..cbe2139734a0041601c07b4021f3cecb2f9d629c 100644 (file)
@@ -1,4 +1,4 @@
-dcpomatic (2.1.47-1) UNRELEASED; urgency=low
+dcpomatic (2.1.49-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -278,8 +278,10 @@ dcpomatic (2.1.47-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Fri, 28 Aug 2015 14:01:28 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Tue, 01 Sep 2015 00:54:03 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
index 664b05438247d91bde3d5490247b1207924d6c92..3df603a85d55e83261011e911b730732eebaa094 100644 (file)
@@ -1061,8 +1061,15 @@ burnt into the image.
 </para>
 
 <para>
-Select the <guilabel>With Subtitles</guilabel> check-box to enable
-subtitles.
+Select the <guilabel>Use Subtitles</guilabel> check-box to enable
+these subtitles.
+</para>
+
+<para>
+Select the <guilabel>Burn subtitles into image</guilabel> check-box to
+burn these subtitles into the image; if this is not ticked the
+subtitles will be included separately in the DCP to be rendered by the
+projector.
 </para>
 
 <para>
@@ -1404,13 +1411,6 @@ to what DCP-o-matic thinks is the best given the content that you have
 added.
 </para>
 
-<para>
-<guilabel>Burn subtitles into image</guilabel> should be selected if
-you want DCP-o-matic to overlay the subtitles onto the video frame
-before encoding.  Leave this un-ticked to include the subtitles
-separately in the DCP.
-</para>
-
 <para>
 The <guilabel>3D</guilabel> button will set your DCP to 3D mode if it
 is checked.  A 3D DCP will then be created, and any 2D content will be
@@ -1841,6 +1841,16 @@ like to live on the bleeding edge!
 </para>
 </section>
 
+<!-- ============================================================== -->
+<section>
+<title>Issuer and creator</title>
+
+<para>
+With these controls you can set the issuer and creator strings that
+will be put into the DCPs which you create.
+</para>
+</section>
+
 </section>
 
 <!-- ============================================================== -->
@@ -1921,9 +1931,9 @@ creation.
 <para>
 At the top of the tab is the chain of certificates that will be used
 to sign DCPs and KDMs.  DCP-o-matic creates a random chain when you
-first run it, so if you are happy to use a randomly-generated chain
-you can ignore the preferences.  Otherwise, you can add or remove
-certificates from the chain using the <guilabel>Add...</guilabel> and
+first run it and if you are happy to use this chain you can ignore the
+preferences.  Otherwise, you can add or remove certificates from the
+chain using the <guilabel>Add...</guilabel> and
 <guilabel>Remove</guilabel> buttons.
 </para>
 
@@ -1943,13 +1953,22 @@ corresponds to the public key held in the leaf certificate.
 </para>
 
 <para>
-The bottom of the tab specifies the certificate and private key that
-is used to decrypt DCPs if they are imported as sources to
-DCP-o-matic.  If you want to import an encrypted DCP you will need to
-give the decryption certificate to the distributor of the DCP so that
-they can generate a DKDM for you.  As with the certificate chain,
-DCP-o-matic will create a certificate and private key for you.  You
-can also choose to load your own certificate and key.
+Underneath the details of the certificate chain and private key for
+signing of DCPs and KDMs is a second chain and key which is used by
+DCP-o-matic when you import an encrypted DCP as a piece of content.
+The leaf certificate of this chain contains the public key that should
+be used when targeting a KDM at DCP-o-matic.
+</para>
+
+<para>
+If you want to import an encrypted DCP you will need to give the
+decryption certificate to the distributor of the DCP so that they can
+generate a DKDM for you.  You can save this certificate to disk by
+clicking <guilabel>Export DCP decryption certificate</guilabel>.  As
+with the signing chain, DCP-o-matic will create a certificate chain
+and private key for you.  You can also choose to load your own
+certificates and key or re-make the chain and key with new, random
+values.
 </para>
 
 </section>
@@ -1962,8 +1981,8 @@ can also choose to load your own certificate and key.
 <para>
 The TMS tab (shown in <xref linkend="fig-prefs-tms"/>) gives some
 options for specifying details about your theatre management system
-(TMS).  If you do this, and your TMS accepts SSH connections, you can
-upload DCPs directly from DCP-o-matic to the TMS using the
+(TMS).  If you do this, and your TMS accepts SSH or FTP connections,
+you can upload DCPs directly from DCP-o-matic to the TMS using the
 <guilabel>Send DCP to TMS</guilabel> option in the
 <guilabel>Jobs</guilabel> menu.
 </para>
@@ -1977,12 +1996,20 @@ upload DCPs directly from DCP-o-matic to the TMS using the
   </mediaobject>
 </figure>
 
+<para>
+<guilabel>Protocol</guilabel> should be set to SCP or FTP as
+appropriate for your TMS.  We know that the Arts Alliance Media (AAM)
+and the Doremi ranges uses SCP connections, and that Dolby's TMSs use
+FTP.  Do let us know if you use any other type of TMS with the
+<guilabel>Send DCP to TMS</guilabel> feature.
+</para>
+
 <para>
 <guilabel>TMS IP address</guilabel> should be set to the IP address of
 your TMS, <guilabel>TMS target path</guilabel> to the place that DCPs
 should be uploaded to (which will be relative to the home directory of
-the SSH user).  Finally, the user name and password are the
-credentials required to log into the TMS via SSH.
+the SSH or FTP user).  Finally, the user name and password are the
+credentials required to log into the TMS via SSH or FTP.
 </para>
 
 <para>
@@ -2080,6 +2107,12 @@ useful for experimentation.  Again, you are strongly advised to leave
 this unticked for normal use.
 </para>
 
+<para>
+<guilabel>Only servers encode</guilabel> makes DCP-o-matic encode
+JPEG2000 data only on encoding servers and not on the host.  We
+suggest you leave this un-ticked unless you have a good reason to do otherwise.
+</para>
+
 <para>
 The four checkboxes labelled <guilabel>Log</guilabel> control what
 sort of messages DCP-o-matic writes to its log file when creating a
index 18df48afb6de1e3767a12fdb477a5b24c33e5684..b5d22330f5528074366b0555a760b5989df17460 100644 (file)
Binary files a/doc/manual/screenshots/dcp-tab.png and b/doc/manual/screenshots/dcp-tab.png differ
index 273eeb8180c9df95c93e7c0a1dd504da6f80a1b2..54eb670db8cfda986b9d19bb14cdb4f80a2ba01d 100644 (file)
Binary files a/doc/manual/screenshots/prefs-advanced.png and b/doc/manual/screenshots/prefs-advanced.png differ
index 60ba6c53095aeefd70e0ecb287e876fb2e3b293f..53b9589beaf2b263da808f271f351ff6dc5051c8 100644 (file)
Binary files a/doc/manual/screenshots/prefs-defaults.png and b/doc/manual/screenshots/prefs-defaults.png differ
index 23b00ee789c0dff634571e23c58cc28f8d514f98..bea1be76d19ac88211dcd9f931ed0d721fd5f7f2 100644 (file)
Binary files a/doc/manual/screenshots/prefs-general.png and b/doc/manual/screenshots/prefs-general.png differ
index af1576cec16e8690682623edd20ca902f14ebd7b..15281cff5ebbea69691d9566141febf16dead7c9 100644 (file)
Binary files a/doc/manual/screenshots/prefs-kdm-email.png and b/doc/manual/screenshots/prefs-kdm-email.png differ
index 703220616ac0209c319fd5cdbff3ec6db4832eea..6c552429466526a17c3ef45e079174d74e3d043c 100644 (file)
Binary files a/doc/manual/screenshots/prefs-keys.png and b/doc/manual/screenshots/prefs-keys.png differ
index 4904741429fdd740c8cf31e161fb1b32da55785e..7e5bf38d7b7eb867fe5270814545e91e4b09f594 100644 (file)
Binary files a/doc/manual/screenshots/prefs-tms.png and b/doc/manual/screenshots/prefs-tms.png differ
index 8f9a7e3cf624644d2ba9a468e7c67c912c6349c6..4d912f65111259136c6a23cd688e385947d3a03e 100644 (file)
Binary files a/doc/manual/screenshots/subtitles-tab.png and b/doc/manual/screenshots/subtitles-tab.png differ
diff --git a/hacks/subtitle_alignment/50.xml b/hacks/subtitle_alignment/50.xml
new file mode 100644 (file)
index 0000000..91ead06
--- /dev/null
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<SubtitleReel xmlns="http://www.smpte-ra.org/schemas/428-7/2010/DCST">
+<Id>urn:uuid:d351291b-d722-48b7-baba-e7ed2ea6cc69</Id>
+<ContentTitleText></ContentTitleText>
+<AnnotationText></AnnotationText>
+<IssueDate>2015-08-26T18:04:50+01:00</IssueDate>
+<ReelNumber>1</ReelNumber>
+<Language>en</Language>
+<EditRate>24 1</EditRate>
+<TimeCodeRate>24</TimeCodeRate>
+<StartTime>00:00:00:00</StartTime>
+<LoadFont ID="arial">urn:uuid:b238ab60-719d-11e4-82f8-0800200c9a65</LoadFont>
+<SubtitleList>
+<Font ID="arial" Color="FFFFFFFF" Weight="normal" Size="42">
+
+<Subtitle SpotNumber="1" TimeIn="00:00:00:00" TimeOut="00:00:10:00" FadeUpTime="00:00:00:00" FadeDownTime="00:00:00:00">
+<Text Valign="top" Vposition="50">Align top position 50%</Text>
+</Subtitle>
+<Subtitle SpotNumber="1" TimeIn="00:00:10:00" TimeOut="00:00:20:00" FadeUpTime="00:00:00:00" FadeDownTime="00:00:00:00">
+<Text Valign="center" Vposition="0">Align center position 0%</Text>
+</Subtitle>
+<Subtitle SpotNumber="1" TimeIn="00:00:20:00" TimeOut="00:00:30:00" FadeUpTime="00:00:00:00" FadeDownTime="00:00:00:00">
+<Text Valign="bottom" Vposition="50">Align bottom position 50%</Text>
+</Subtitle>
+</Font>
+</SubtitleList>
+</SubtitleReel>
diff --git a/wscript b/wscript
index 9c79dd6984c7af3e5d51c12d72d533bad7b4dc29..d17226441551c59dca89e340eb2c9133be1d3592 100644 (file)
--- a/wscript
+++ b/wscript
@@ -26,7 +26,7 @@ import distutils.spawn
 from waflib import Logs
 
 APPNAME = 'dcpomatic'
-VERSION = '2.1.47devel'
+VERSION = '2.1.49devel'
 
 def options(opt):
     opt.load('compiler_cxx')
diff --git a/zanata.xml b/zanata.xml
deleted file mode 100644 (file)
index e67d18c..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<config xmlns="http://zanata.org/namespace/config/">
-  <url>https://translate.zanata.org/zanata/</url>
-  <project>dcpomatic</project>
-  <project-version>2.0</project-version>
-  <project-type>gettext</project-type>
-
-  <locales>
-    <locale map-from='fr_FR'>fr</locale>
-    <locale map-from='de_DE'>de-DE</locale>
-    <locale map-from='nl_NL'>nl</locale>
-    <locale map-from='sv_SE'>sv</locale>
-    <locale map-from='it_IT'>it</locale>
-    <locale map-from='es_ES'>es-ES</locale>
-    <locale map-from='ru_RU'>ru</locale>
-  </locales>
-
-  <rules>
-    <rule pattern="*.po">{filename}_{locale_with_underscore}.po</rule>
-  </rules>
-
-</config>