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

5 files changed, 17 insertions, 8 deletions

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 ()));
 	}