From 42ff1b5a08db258a856f51738bae17a33d1038ed Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 12 Jan 2015 09:57:28 +0000 Subject: Missing dependency. --- src/wx/wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/wx/wscript b/src/wx/wscript index fa3dfb21d..1a9508b74 100644 --- a/src/wx/wscript +++ b/src/wx/wscript @@ -90,7 +90,7 @@ def build(bld): obj.name = 'libdcpomatic2-wx' obj.export_includes = ['..'] - obj.uselib = 'WXWIDGETS DCP SUB' + obj.uselib = 'WXWIDGETS DCP SUB ZIP' if bld.env.TARGET_LINUX: obj.uselib += ' GTK' obj.use = 'libdcpomatic2' -- cgit v1.2.3 From f6481c5613e8a03fc3a3361afe406e75171bd960 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 12 Jan 2015 10:13:12 +0000 Subject: More deps. --- src/tools/wscript | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src') 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 -- cgit v1.2.3 From d76379433b9ac795fd0286f4c8fca68d68561183 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 12 Jan 2015 11:36:45 +0000 Subject: Yet more deps. --- src/wx/wscript | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/wx/wscript b/src/wx/wscript index 1a9508b74..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 ZIP' + 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' -- cgit v1.2.3 From f50ef83dc201047ff27a6ebd9b56104ce120dd9a Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 12 Jan 2015 11:54:33 +0000 Subject: Forward-port FTP fix from 1.x. --- src/lib/internet.cc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src') 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 + Copyright (C) 2014-2015 Carl Hetherington 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 #include #include +#include #include #include #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 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 != "..") { -- cgit v1.2.3 From e6c2bf5906843850b6fbcb94635129b4948e5c38 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 14 Jan 2015 10:31:39 +0000 Subject: Forward-port DAR/SAR UI stuff from 1.x. --- src/lib/video_content.cc | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'src') 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 + Copyright (C) 2013-2015 Carl Hetherington 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 (); } + -- cgit v1.2.3 From 69c9b15a947e734c9f79ed1336c28da364f82f0f Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 14 Jan 2015 10:36:27 +0000 Subject: Supporters. --- src/wx/about_dialog.cc | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src') 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")); -- cgit v1.2.3 From 3f4990bbee92ba572a495018ca9c1fce4aecd6b0 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 15 Jan 2015 10:38:23 +0000 Subject: Try to fix some OS X warnings. --- src/lib/audio_filter.h | 1 - src/lib/ffmpeg_decoder.h | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'src') 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 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. -- cgit v1.2.3 From 1524b4b3b94d515d268669712c7194b554d52c98 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 15 Jan 2015 10:51:49 +0000 Subject: Remove debug code. --- src/lib/writer.cc | 2 -- 1 file changed, 2 deletions(-) (limited to 'src') 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 ())); } -- cgit v1.2.3