Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0

15 files changed, 65 insertions, 21 deletions

diff --git a/ChangeLog b/ChangeLog
index bda7699ce..f205716b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2015-01-15  Carl Hetherington  <cth@carlh.net>
+
+	* Version 2.0.34 released.
+
+2015-01-15  Carl Hetherington  <cth@carlh.net>
+
+	* Version 2.0.33 released.
+
+2015-01-15  Carl Hetherington  <cth@carlh.net>
+
+	* Version 2.0.32 released.
+
+2015-01-15  Carl Hetherington  <cth@carlh.net>
+
+	* Version 2.0.31 released.
+
+2015-01-15  Carl Hetherington  <cth@carlh.net>
+
+	* Version 2.0.30 released.
+
 2015-01-11  Carl Hetherington  <cth@carlh.net>
 
 	* Version 2.0.29 released.
diff --git a/cscript b/cscript
index bfbb09bfa..7a5686349 100644
--- a/cscript
+++ b/cscript
@@ -156,8 +156,8 @@ def make_control(debian_version, bits, filename, debug):
 
 def dependencies(target):
     return (('ffmpeg-cdist', 'f69bb08'),
-            ('libdcp', '8951dd5'),
-            ('libsub', '65244fb'))
+            ('libdcp', '5b519d9'),
+            ('libsub', '49cafda'))
 
 def build(target, options):
     cmd = './waf configure --prefix=%s' % target.directory
diff --git a/debian/changelog b/debian/changelog
index 9fe57b529..a69ecce23 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.0.29-1) UNRELEASED; urgency=low
+dcpomatic (2.0.34-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -208,8 +208,13 @@ dcpomatic (2.0.29-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
+  * New upstream release.
+  * New upstream release.
+  * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Sun, 11 Jan 2015 22:19:17 +0000
+ -- Carl Hetherington <carl@d1stkfactory>  Thu, 15 Jan 2015 16:49:22 +0000
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/debian/rules b/debian/rules
index dd27a7552..b51089f8b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,13 +14,13 @@
 
 override_dh_auto_configure:
 	LINKFLAGS=$(CDIST_LINKFLAGS) CXXFLAGS="$(CXXFLAGS) $(CDIST_CXXFLAGS)" PKG_CONFIG_PATH=$(CDIST_PKG_CONFIG_PATH) \
-		 ./waf --nocache configure --prefix=/usr --target-debian --enable-debug $(CDIST_EXTRA_CONFIGURE)
+		 ./waf configure --prefix=/usr --target-debian --enable-debug $(CDIST_EXTRA_CONFIGURE)
 
 override_dh_auto_build:
-	./waf --nocache build
+	./waf build
 
 override_dh_auto_install:
-	./waf --nocache install --destdir=debian/dcpomatic
+	./waf install --destdir=debian/dcpomatic
 	mkdir -p debian/dcpomatic/usr/share/locale/de/LC_MESSAGES/
 	cp -a /usr/local/share/locale/de/LC_MESSAGES/wxstd.mo debian/dcpomatic/usr/share/locale/de/LC_MESSAGES/dcpomatic-wxstd.mo
 	mkdir -p debian/dcpomatic/usr/share/locale/es/LC_MESSAGES/
diff --git a/platform/osx/wscript b/platform/osx/wscript
index d79c95bb5..aae1be921 100644
--- a/platform/osx/wscript
+++ b/platform/osx/wscript
@@ -1,2 +1,2 @@
 def build(bld):
-    bld.new_task_gen(features='subst', source='Info.plist.in', target='Info.plist', version=bld.env.VERSION)
+    obj = bld(features='subst', source='Info.plist.in', target='Info.plist', version=bld.env.VERSION)
diff --git a/src/lib/audio_filter.h b/src/lib/audio_filter.h
index b44175cbc..cc3734cde 100644
--- a/src/lib/audio_filter.h
+++ b/src/lib/audio_filter.h
@@ -21,7 +21,6 @@
 #include <vector>
 
 class AudioBuffers;
-class audio_filter_impulse_kernel_test;
 struct audio_filter_impulse_input_test;
 
 class AudioFilter
diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index 60c777d8d..0334a30e2 100644
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -39,7 +39,7 @@ extern "C" {
 
 class Log;
 class FilterGraph;
-class ffmpeg_pts_offset_test;
+struct ffmpeg_pts_offset_test;
 
 /** @class FFmpegDecoder
  *  @brief A decoder using FFmpeg to decode content.
diff --git a/src/lib/internet.cc b/src/lib/internet.cc
index b45eaabf7..b4395fd21 100644
--- a/src/lib/internet.cc
+++ b/src/lib/internet.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -21,6 +21,7 @@
 #include <boost/function.hpp>
 #include <boost/optional.hpp>
 #include <boost/filesystem.hpp>
+#include <boost/algorithm/string.hpp>
 #include <curl/curl.h>
 #include <zip.h>
 #include "scoped_temporary.h"
@@ -33,6 +34,7 @@ using std::string;
 using std::list;
 using boost::optional;
 using boost::function;
+using boost::algorithm::trim;
 
 static size_t
 get_from_zip_url_data (void* buffer, size_t size, size_t nmemb, void* stream)
@@ -138,7 +140,8 @@ ftp_ls (string url)
 	SafeStringStream s (ls_raw);
 	list<string> ls;
 	while (s.good ()) {
-		string const line = s.getline ();
+		string line = s.getline ();
+		trim (line);
 		if (line.length() > 55) {
 			string const file = line.substr (55);
 			if (file != "." && file != "..") {
diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index 077972fab..5dc9e3d66 100644
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -525,7 +525,15 @@ VideoContent::processing_description () const
 			video_size_after_3d_split().height
 			);
 
-		d << " (" << fixed << setprecision(2) << video_size_after_3d_split().ratio() << ":1)\n";
+
+		float ratio = video_size_after_3d_split().ratio ();
+
+		if (sample_aspect_ratio ()) {
+			d << ", " << _("pixel aspect ratio") << " " << fixed << setprecision(2) << sample_aspect_ratio().get () << ":1";
+			ratio *= sample_aspect_ratio().get ();
+		}
+
+		d << "\n" << _("Display aspect ratio") << " " << fixed << setprecision(2) << ratio << ":1\n";
 	}
 
 	if ((crop().left || crop().right || crop().top || crop().bottom) && video_size() != dcp::Size (0, 0)) {
@@ -570,3 +578,4 @@ VideoContent::processing_description () const
 
 	return d.str ();
 }
+
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 7740c6936..59d31d816 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -649,8 +649,6 @@ Writer::write (PlayerSubtitles subs)
 		return;
 	}
 
-	cout << "write " << subs.text.size() << " " << subs.from << " " << subs.to << "\n";
-	
 	if (!_subtitle_content) {
 		_subtitle_content.reset (new dcp::InteropSubtitleContent (_film->name(), _film->subtitle_language ()));
 	}
diff --git a/src/tools/wscript b/src/tools/wscript
index eb7e8ceec..175cebc96 100644
--- a/src/tools/wscript
+++ b/src/tools/wscript
@@ -10,9 +10,12 @@ def configure(conf):
 
 def build(bld):
 
-    uselib =  'BOOST_THREAD BOOST_DATETIME BOOST_FILESYSTEM OPENJPEG DCP CXML SNDFILE ZIP XMLPP '
+    uselib =  'BOOST_THREAD BOOST_DATETIME BOOST_FILESYSTEM OPENJPEG DCP CXML SNDFILE ZIP XMLPP SSH '
     uselib += 'AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC WXWIDGETS SUB CURL GLIB CAIROMM PANGOMM MAGICK '
 
+    if bld.env.TARGET_WINDOWS:
+        uselib += 'WINSOCK2'
+
     for t in ['dcpomatic_cli', 'dcpomatic_server_cli', 'server_test', 'dcpomatic_kdm', 'dcpomatic_create']:
         obj = bld(features = 'cxx cxxprogram')
         obj.uselib = uselib
diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc
index e0c3cd26f..782331f05 100644
--- a/src/wx/about_dialog.cc
+++ b/src/wx/about_dialog.cc
@@ -167,8 +167,10 @@ AboutDialog::AboutDialog (wxWindow* parent)
 	supported_by.Add (wxT ("Mike Stiebing"));
 	supported_by.Add (wxT ("Randy Stankey"));
 	supported_by.Add (wxT ("Bruce Taylor"));
+	supported_by.Add (wxT ("Richard Turner"));
 	supported_by.Add (wxT ("Wolfgang Woehl"));
 	supported_by.Add (wxT ("Wolfram Weber"));
+	supported_by.Add (wxT ("Johannes Wilbrand"));
 	supported_by.Add (wxT ("Frank de Wulf"));
 	supported_by.Add (wxT ("Pavel Zhdanko"));
 	supported_by.Add (wxT ("Daniel Židek"));
diff --git a/src/wx/wscript b/src/wx/wscript
index fa3dfb21d..061c4e808 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -90,9 +90,11 @@ def build(bld):
 
     obj.name   = 'libdcpomatic2-wx'
     obj.export_includes = ['..']
-    obj.uselib = 'WXWIDGETS DCP SUB'
+    obj.uselib = 'BOOST_FILESYSTEM BOOST_THREAD WXWIDGETS DCP SUB ZIP '
     if bld.env.TARGET_LINUX:
-        obj.uselib += ' GTK'
+        obj.uselib += 'GTK '
+    if bld.env.TARGET_WINDOWS:
+        obj.uselib += 'WINSOCK2 '
     obj.use = 'libdcpomatic2'
     obj.source = sources
     obj.target = 'dcpomatic2-wx'
diff --git a/test/wscript b/test/wscript
index e565a0728..cf3481dc5 100644
--- a/test/wscript
+++ b/test/wscript
@@ -12,7 +12,10 @@ def configure(conf):
 def build(bld):
     obj = bld(features='cxx cxxprogram')
     obj.name   = 'unit-tests'
-    obj.uselib = 'BOOST_TEST BOOST_THREAD BOOST_FILESYSTEM SNDFILE DCP OPENJPEG AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC CXML MAGICK SUB GLIB'
+    obj.uselib =  'BOOST_TEST BOOST_THREAD BOOST_FILESYSTEM BOOST_DATETIME SNDFILE DCP OPENJPEG CAIROMM PANGOMM XMLPP '
+    obj.uselib += 'AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC CXML MAGICK SUB GLIB '
+    if bld.env.TARGET_WINDOWS:
+        obj.uselib += 'WINSOCK2'
     obj.use    = 'libdcpomatic2'
     obj.source = """
                  4k_test.cc
diff --git a/wscript b/wscript
index 0f21d3226..9f686f14e 100644
--- a/wscript
+++ b/wscript
@@ -5,7 +5,7 @@ import distutils
 import distutils.spawn
 
 APPNAME = 'dcpomatic'
-VERSION = '2.0.29devel'
+VERSION = '2.0.34devel'
 
 def options(opt):
     opt.load('compiler_cxx')