Include tidying.

diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc
index d2d90a1f5b42ce9c0d493ea402765995f1a9512d..4d821ad6008e0b36f78fde9655e63642fb7e15e8 100644 (file)
--- a/src/lib/audio_content.cc
+++ b/src/lib/audio_content.cc
@@ -18,14 +18,12 @@
 */
 
 #include "audio_content.h"
-#include "analyse_audio_job.h"
-#include "job_manager.h"
 #include "film.h"
 #include "exceptions.h"
 #include "config.h"
 #include "frame_rate_change.h"
 #include "raw_convert.h"
-#include "playlist.h"
+#include "compose.hpp"
 #include <libcxml/cxml.h>
 #include <boost/foreach.hpp>
 

diff --git a/src/lib/audio_decoder_stream.cc b/src/lib/audio_decoder_stream.cc
index 36274b502692e3d95bbd76e7a8162d7968a287b3..52a33c172a2cd416fd13a6908fb64af74cb1768a 100644 (file)
--- a/src/lib/audio_decoder_stream.cc
+++ b/src/lib/audio_decoder_stream.cc
@@ -25,6 +25,7 @@
 #include "util.h"
 #include "film.h"
 #include "log.h"
+#include "compose.hpp"
 #include <iostream>
 
 #include "i18n.h"

diff --git a/src/lib/cinema.cc b/src/lib/cinema.cc
index f774392386b7136568b2dbe06e16b1f6e50f7654..11bc888da32127ef4a6e2cd917026496aaa206d9 100644 (file)
--- a/src/lib/cinema.cc
+++ b/src/lib/cinema.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 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
@@ -18,6 +18,7 @@
 */
 
 #include "cinema.h"
+#include "screen.h"
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
 
@@ -66,22 +67,3 @@ Cinema::remove_screen (shared_ptr<Screen> s)
 {
        _screens.remove (s);
 }
-
-Screen::Screen (cxml::ConstNodePtr node)
-       : name (node->string_child ("Name"))
-{
-       if (node->optional_string_child ("Certificate")) {
-               certificate = dcp::Certificate (node->string_child ("Certificate"));
-       }
-}
-
-void
-Screen::as_xml (xmlpp::Element* parent) const
-{
-       parent->add_child("Name")->add_child_text (name);
-       if (certificate) {
-               parent->add_child("Certificate")->add_child_text (certificate->certificate (true));
-       }
-}
-
-

diff --git a/src/lib/cinema.h b/src/lib/cinema.h
index 4639261c30bebc93e6237e6abe05546763026415..8d4473fb140cdd14b9117a48641a494ba285dafc 100644 (file)
--- a/src/lib/cinema.h
+++ b/src/lib/cinema.h
@@ -18,37 +18,14 @@
 */
 
 /** @file  src/lib/cinema.h
- *  @brief Screen and Cinema classes.
+ *  @brief Cinema class.
  */
 
 #include <libcxml/cxml.h>
 #include <dcp/certificate.h>
 #include <boost/enable_shared_from_this.hpp>
 
-class Cinema;
-
-/** @class Screen
- *  @brief A representation of a Screen for KDM generation.
- *
- *  This is the name of the screen and the certificate of its
- *  server.
- */
-class Screen
-{
-public:
-       Screen (std::string const & n, boost::optional<dcp::Certificate> cert)
-               : name (n)
-               , certificate (cert)
-       {}
-
-       Screen (cxml::ConstNodePtr);
-
-       void as_xml (xmlpp::Element *) const;
-
-       boost::shared_ptr<Cinema> cinema;
-       std::string name;
-       boost::optional<dcp::Certificate> certificate;
-};
+class Screen;
 
 /** @class Cinema
  *  @brief A description of a Cinema for KDM generation.

diff --git a/src/lib/content.cc b/src/lib/content.cc
index f0d35186abde70627236c808658a4126f70aa1b0..a8e592ba75d88d2d19b054cbbba5c9a93ac72499 100644 (file)
--- a/src/lib/content.cc
+++ b/src/lib/content.cc
@@ -28,6 +28,7 @@
 #include "film.h"
 #include "safe_stringstream.h"
 #include "job.h"
+#include "compose.hpp"
 #include "raw_convert.h"
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>

diff --git a/src/lib/dcp_video.cc b/src/lib/dcp_video.cc
index 7610e6c9f43a5e1dda8643c8ad5f850ec5e1c67b..5b5edba95f79232ed2fce74b886c49fe9a8a8752 100644 (file)
--- a/src/lib/dcp_video.cc
+++ b/src/lib/dcp_video.cc
@@ -39,24 +39,15 @@
 #include "player_video.h"
 #include "raw_convert.h"
 #include "data.h"
+#include "compose.hpp"
 #include <libcxml/cxml.h>
 #include <dcp/openjpeg_image.h>
 #include <dcp/rgb_xyz.h>
 #include <dcp/colour_matrix.h>
-#include <boost/array.hpp>
 #include <boost/asio.hpp>
-#include <boost/filesystem.hpp>
-#include <boost/lexical_cast.hpp>
 #include <stdint.h>
-#include <cstring>
-#include <cstdlib>
-#include <stdexcept>
-#include <cstdio>
 #include <iomanip>
 #include <iostream>
-#include <fstream>
-#include <unistd.h>
-#include <errno.h>
 
 #define LOG_GENERAL(...) _log->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL);
 #define LOG_DEBUG_ENCODE(...) _log->log (String::compose (__VA_ARGS__), Log::TYPE_DEBUG_ENCODE);
@@ -66,7 +57,6 @@
 using std::string;
 using std::cout;
 using boost::shared_ptr;
-using boost::lexical_cast;
 using dcp::Size;
 
 #define DCI_COEFFICENT (48.0 / 52.37)

diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index 9b195bade0bf9f36dfe81b7e4a1aec88beaf4452..09788d3fae2a81f0cb3298e3f98adcd96eb32b01 100644 (file)
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -34,8 +34,8 @@
 #include "player.h"
 #include "player_video.h"
 #include "data.h"
+#include "compose.hpp"
 #include <libcxml/cxml.h>
-#include <boost/lambda/lambda.hpp>
 #include <boost/foreach.hpp>
 #include <iostream>
 
@@ -45,17 +45,11 @@
 #define LOG_ERROR(...) _film->log()->log (String::compose (__VA_ARGS__), Log::TYPE_ERROR);
 #define LOG_TIMING(...) _film->log()->microsecond_log (String::compose (__VA_ARGS__), Log::TYPE_TIMING);
 
-using std::pair;
-using std::string;
-using std::vector;
 using std::list;
 using std::cout;
-using std::min;
-using std::make_pair;
 using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::optional;
-using boost::scoped_array;
 
 int const Encoder::_history_size = 25;
 

diff --git a/src/lib/ffmpeg.cc b/src/lib/ffmpeg.cc
index 4eee089928480577a12948b52c23497d383bcdba..1620b32b40a3c393567c714f68223b860d57a67d 100644 (file)
--- a/src/lib/ffmpeg.cc
+++ b/src/lib/ffmpeg.cc
@@ -20,12 +20,12 @@
 #include "ffmpeg.h"
 #include "ffmpeg_content.h"
 #include "film.h"
-#include "ffmpeg_audio_stream.h"
-#include "ffmpeg_subtitle_stream.h"
 #include "exceptions.h"
 #include "util.h"
 #include "raw_convert.h"
 #include "log.h"
+#include "ffmpeg_subtitle_stream.h"
+#include "compose.hpp"
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>

diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index 0c9225a6abc2f6485ab7fe31b6e0cb376ea4671d..a17419dc7b143f8f37432d24ea5043a0b7a70b02 100644 (file)
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -34,18 +34,16 @@
 #include "ffmpeg_content.h"
 #include "raw_image_proxy.h"
 #include "film.h"
-#include "timer.h"
+#include "compose.hpp"
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
 }
 #include <boost/foreach.hpp>
-#include <stdexcept>
 #include <vector>
 #include <iomanip>
 #include <iostream>
 #include <stdint.h>
-#include <sndfile.h>
 
 #include "i18n.h"
 
@@ -55,16 +53,12 @@ extern "C" {
 #define LOG_WARNING(...) _video_content->film()->log()->log (String::compose (__VA_ARGS__), Log::TYPE_WARNING);
 
 using std::cout;
-using std::string;
 using std::vector;
 using std::list;
 using std::min;
 using std::pair;
-using std::make_pair;
 using std::max;
 using boost::shared_ptr;
-using boost::optional;
-using boost::dynamic_pointer_cast;
 using dcp::Size;
 
 FFmpegDecoder::FFmpegDecoder (shared_ptr<const FFmpegContent> c, shared_ptr<Log> log)
@@ -535,4 +529,3 @@ FFmpegDecoder::decode_bitmap_subtitle (AVSubtitleRect const * rect, ContentTimeP
 
        image_subtitle (period, image, scaled_rect);
 }
-

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index 60217b07372f3c2da65bc225462cec03deb493e7..28d8e4baa637c5b88208b93f056eaaef36733912 100644 (file)
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -22,21 +22,16 @@
  */
 
 #include "util.h"
-#include "decoder.h"
 #include "video_decoder.h"
 #include "audio_decoder.h"
 #include "subtitle_decoder.h"
 #include "ffmpeg.h"
-#include "rect.h"
 extern "C" {
 #include <libavcodec/avcodec.h>
 }
 #include <boost/shared_ptr.hpp>
-#include <boost/optional.hpp>
 #include <boost/thread/mutex.hpp>
 #include <stdint.h>
-#include <vector>
-#include <string>
 
 class Log;
 class FilterGraph;

diff --git a/src/lib/film.cc b/src/lib/film.cc
index a20a44e77c25fc194d95bec4f393972731465748..9066b7c5a7f7b79bca06aa07e365bf7e651aa7a6 100644 (file)
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -33,16 +33,16 @@
 #include "examine_content_job.h"
 #include "config.h"
 #include "playlist.h"
-#include "player.h"
 #include "dcp_content_type.h"
 #include "ratio.h"
 #include "cross.h"
-#include "cinema.h"
 #include "safe_stringstream.h"
 #include "environment_info.h"
 #include "raw_convert.h"
 #include "audio_processor.h"
 #include "md5_digester.h"
+#include "compose.hpp"
+#include "screen.h"
 #include <libcxml/cxml.h>
 #include <dcp/cpl.h>
 #include <dcp/certificate_chain.h>
@@ -52,13 +52,11 @@
 #include <libxml++/libxml++.h>
 #include <boost/filesystem.hpp>
 #include <boost/algorithm/string.hpp>
-#include <boost/lexical_cast.hpp>
 #include <boost/foreach.hpp>
 #include <unistd.h>
 #include <stdexcept>
 #include <iostream>
 #include <algorithm>
-#include <fstream>
 #include <cstdlib>
 #include <iomanip>
 #include <set>
@@ -66,28 +64,20 @@
 #include "i18n.h"
 
 using std::string;
-using std::multimap;
 using std::pair;
-using std::map;
 using std::vector;
 using std::setfill;
 using std::min;
 using std::max;
 using std::make_pair;
-using std::endl;
 using std::cout;
 using std::list;
 using std::set;
 using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
-using boost::to_upper_copy;
-using boost::ends_with;
-using boost::starts_with;
 using boost::optional;
 using boost::is_any_of;
-using dcp::Size;
-using dcp::CertificateChain;
 
 #define LOG_GENERAL(...) log()->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL);
 #define LOG_GENERAL_NC(...) log()->log (__VA_ARGS__, Log::TYPE_GENERAL);
@@ -933,7 +923,7 @@ Film::examine_and_add_content (shared_ptr<Content> c)
        shared_ptr<Job> j (new ExamineContentJob (shared_from_this(), c));
 
        _job_connections.push_back (
-               j->Finished.connect (bind (&Film::maybe_add_content, this, boost::weak_ptr<Job> (j), boost::weak_ptr<Content> (c)))
+               j->Finished.connect (bind (&Film::maybe_add_content, this, weak_ptr<Job> (j), weak_ptr<Content> (c)))
                );
 
        JobManager::instance()->add (j);
@@ -1001,7 +991,7 @@ Film::active_frame_rate_change (DCPTime t) const
 }
 
 void
-Film::playlist_content_changed (boost::weak_ptr<Content> c, int p, bool frequent)
+Film::playlist_content_changed (weak_ptr<Content> c, int p, bool frequent)
 {
        _dirty = true;
 

diff --git a/src/lib/filter_graph.cc b/src/lib/filter_graph.cc
index da7b0413397b9b01d7529414a4730f7aff59638c..817459bcc3a9fd9ce05fbcf598bed723b1d98378 100644 (file)
--- a/src/lib/filter_graph.cc
+++ b/src/lib/filter_graph.cc
@@ -21,6 +21,13 @@
  *  @brief A graph of FFmpeg filters.
  */
 
+#include "filter_graph.h"
+#include "filter.h"
+#include "exceptions.h"
+#include "image.h"
+#include "ffmpeg_content.h"
+#include "safe_stringstream.h"
+#include "compose.hpp"
 extern "C" {
 #include <libavfilter/avfiltergraph.h>
 #include <libavfilter/buffersrc.h>
@@ -28,13 +35,6 @@ extern "C" {
 #include <libavfilter/buffersink.h>
 #include <libavformat/avio.h>
 }
-#include "decoder.h"
-#include "filter_graph.h"
-#include "filter.h"
-#include "exceptions.h"
-#include "image.h"
-#include "ffmpeg_content.h"
-#include "safe_stringstream.h"
 
 #include "i18n.h"
 

diff --git a/src/lib/filter_graph.h b/src/lib/filter_graph.h
index 5b43c5512fb9fa127bf5c364e292a22d9a7e1ce0..45caef82082e5013574d29e06f1d44df1af0107b 100644 (file)
--- a/src/lib/filter_graph.h
+++ b/src/lib/filter_graph.h
@@ -26,6 +26,7 @@
 
 #include "util.h"
 
+struct AVFilterContext;
 class Image;
 class VideoFilter;
 class FFmpegContent;

diff --git a/src/lib/image_examiner.cc b/src/lib/image_examiner.cc
index 6ad32f511e1971ddd8d24123e4bdf0ba2bcfe696..bb0f365d62c1423e159a7baf3a5e23f6be393ab0 100644 (file)
--- a/src/lib/image_examiner.cc
+++ b/src/lib/image_examiner.cc
@@ -24,6 +24,7 @@
 #include "exceptions.h"
 #include "config.h"
 #include "cross.h"
+#include "compose.hpp"
 #include <dcp/openjpeg_image.h>
 #include <dcp/exceptions.h>
 #include <Magick++.h>

diff --git a/src/lib/job.cc b/src/lib/job.cc
index def874ba2505ac19053c9a4f5e7c04308fc21a15..25a533654a0afa08d466e9f5f906b6fdc9ec2532 100644 (file)
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -17,19 +17,20 @@
 
 */
 
-/** @file src/job.cc
+/** @file  src/job.cc
  *  @brief A parent class to represent long-running tasks which are run in their own thread.
  */
 
-#include <boost/thread.hpp>
-#include <boost/filesystem.hpp>
-#include <dcp/exceptions.h>
 #include "job.h"
 #include "util.h"
 #include "cross.h"
 #include "exceptions.h"
 #include "film.h"
 #include "log.h"
+#include "compose.hpp"
+#include <dcp/exceptions.h>
+#include <boost/thread.hpp>
+#include <boost/filesystem.hpp>
 
 #include "i18n.h"
 

diff --git a/src/lib/kdm.cc b/src/lib/kdm.cc
index 0ded8f2c1589c3ffaa327520145919f9eb6e60ab..d62f1e66035494696bc4c6a11f1aa0440b57bca2 100644 (file)
--- a/src/lib/kdm.cc
+++ b/src/lib/kdm.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 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
@@ -17,19 +17,21 @@
 
 */
 
-#include <list>
-#include <boost/shared_ptr.hpp>
-#include <zip.h>
-#include <dcp/encrypted_kdm.h>
-#include <dcp/types.h>
 #include "kdm.h"
 #include "cinema.h"
+#include "screen.h"
 #include "exceptions.h"
 #include "util.h"
 #include "film.h"
 #include "config.h"
 #include "safe_stringstream.h"
 #include "quickmail.h"
+#include "compose.hpp"
+#include <zip.h>
+#include <dcp/encrypted_kdm.h>
+#include <dcp/types.h>
+#include <boost/shared_ptr.hpp>
+#include <list>
 
 using std::list;
 using std::string;

diff --git a/src/lib/kdm.h b/src/lib/kdm.h
index b80ef454f2ddc2b3092b19bb55783f5f63aa5c01..a776b62b312766eea3194ce66292e80f29e2ef7b 100644 (file)
--- a/src/lib/kdm.h
+++ b/src/lib/kdm.h
@@ -17,6 +17,8 @@
 
 */
 
+#include <dcp/local_time.h>
+#include <dcp/types.h>
 #include <boost/date_time.hpp>
 #include <boost/filesystem.hpp>
 
@@ -51,4 +53,3 @@ extern void email_kdms (
        dcp::LocalTime to,
        dcp::Formulation formulation
        );
-

diff --git a/src/lib/screen.cc b/src/lib/screen.cc
new file mode 100644 (file)
index 0000000..347e1d6
--- /dev/null
+++ b/src/lib/screen.cc
@@ -0,0 +1,38 @@
+/*
+    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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include "screen.h"
+#include <libxml++/libxml++.h>
+
+Screen::Screen (cxml::ConstNodePtr node)
+       : name (node->string_child ("Name"))
+{
+       if (node->optional_string_child ("Certificate")) {
+               certificate = dcp::Certificate (node->string_child ("Certificate"));
+       }
+}
+
+void
+Screen::as_xml (xmlpp::Element* parent) const
+{
+       parent->add_child("Name")->add_child_text (name);
+       if (certificate) {
+               parent->add_child("Certificate")->add_child_text (certificate->certificate (true));
+       }
+}

diff --git a/src/lib/screen.h b/src/lib/screen.h
new file mode 100644 (file)
index 0000000..6bac3ec
--- /dev/null
+++ b/src/lib/screen.h
@@ -0,0 +1,48 @@
+/*
+    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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <dcp/certificate.h>
+#include <libcxml/cxml.h>
+#include <boost/optional.hpp>
+#include <string>
+
+class Cinema;
+
+/** @class Screen
+ *  @brief A representation of a Screen for KDM generation.
+ *
+ *  This is the name of the screen and the certificate of its
+ *  server.
+ */
+class Screen
+{
+public:
+       Screen (std::string const & n, boost::optional<dcp::Certificate> cert)
+               : name (n)
+               , certificate (cert)
+       {}
+
+       Screen (cxml::ConstNodePtr);
+
+       void as_xml (xmlpp::Element *) const;
+
+       boost::shared_ptr<Cinema> cinema;
+       std::string name;
+       boost::optional<dcp::Certificate> certificate;
+};

diff --git a/src/lib/server.cc b/src/lib/server.cc
index 79840c25bb2701bebc57f010fe764ae6c08348b0..2fc9404669724c41ada2cd80391d121e57609b12 100644 (file)
--- a/src/lib/server.cc
+++ b/src/lib/server.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-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
@@ -32,6 +32,7 @@
 #include "data.h"
 #include "safe_stringstream.h"
 #include "raw_convert.h"
+#include "compose.hpp"
 #include <libcxml/cxml.h>
 #include <boost/algorithm/string.hpp>
 #include <boost/scoped_array.hpp>
@@ -47,16 +48,12 @@
 #define LOG_ERROR_NC(...)   _log->log (__VA_ARGS__, Log::TYPE_ERROR);
 
 using std::string;
-using std::multimap;
 using std::vector;
 using std::list;
 using std::cout;
 using std::cerr;
-using std::setprecision;
 using std::fixed;
 using boost::shared_ptr;
-using boost::algorithm::is_any_of;
-using boost::algorithm::split;
 using boost::thread;
 using boost::bind;
 using boost::scoped_array;
@@ -304,4 +301,3 @@ Server::handle_accept (shared_ptr<Socket> socket, boost::system::error_code cons
 
        start_accept ();
 }
-

diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index 122f7f79921545a79522c40bb185f3b6cccf5b1f..eb1991297dbd8b1659fe40ba8943b26f74c6fd6f 100644 (file)
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -21,13 +21,14 @@
  *  @brief A job which transcodes from one format to another.
  */
 
-#include <iostream>
-#include <iomanip>
 #include "transcode_job.h"
 #include "film.h"
 #include "transcoder.h"
 #include "log.h"
 #include "safe_stringstream.h"
+#include "compose.hpp"
+#include <iostream>
+#include <iomanip>
 
 #include "i18n.h"
 

diff --git a/src/lib/util.cc b/src/lib/util.cc
index 56f1b528643226f21b4ffd671baccbf3601221ac..76e76328d861110a5441ce36f95dabcb0982c307 100644 (file)
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -35,16 +35,18 @@
 #include "md5_digester.h"
 #include "audio_processor.h"
 #include "safe_stringstream.h"
+#include "compose.hpp"
 #include <dcp/util.h>
 #include <dcp/picture_asset.h>
 #include <dcp/sound_asset.h>
 #include <dcp/subtitle_asset.h>
+extern "C" {
+#include <libavfilter/avfilter.h>
+}
 #include <curl/curl.h>
 #include <glib.h>
 #include <pangomm/init.h>
 #include <boost/algorithm/string.hpp>
-#include <boost/bind.hpp>
-#include <boost/lambda/lambda.hpp>
 #include <boost/thread.hpp>
 #include <boost/filesystem.hpp>
 #ifdef DCPOMATIC_WINDOWS

diff --git a/src/lib/util.h b/src/lib/util.h
index 95d272979f603e736d631a6b92d432683edb67dc..9e811f8ad19f2c823cccbb140885497bfd9cce0d 100644 (file)
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -24,15 +24,11 @@
 #ifndef DCPOMATIC_UTIL_H
 #define DCPOMATIC_UTIL_H
 
-#include "compose.hpp"
 #include "types.h"
-#include "exceptions.h"
 #include "dcpomatic_time.h"
 #include <dcp/util.h>
-#include <dcp/picture_asset_writer.h>
 extern "C" {
 #include <libavcodec/avcodec.h>
-#include <libavfilter/avfilter.h>
 }
 #include <boost/shared_ptr.hpp>
 #include <boost/optional.hpp>

diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index 1b4a625d6ef829b9fd58346d7e7b72da0ded4824..c1aa637ef95b4f95df7e5a844ed768b34f7a02c8 100644 (file)
--- a/src/lib/video_decoder.cc
+++ b/src/lib/video_decoder.cc
@@ -19,11 +19,10 @@
 
 #include "video_decoder.h"
 #include "image.h"
-#include "image_proxy.h"
-#include "raw_image_proxy.h"
 #include "raw_image_proxy.h"
 #include "film.h"
 #include "log.h"
+#include "compose.hpp"
 
 #include "i18n.h"
 
@@ -143,7 +142,7 @@ VideoDecoder::fill_one_eye (Frame from, Frame to, Eyes eye)
        }
 
        /* Fill with black... */
-       boost::shared_ptr<const ImageProxy> filler_image (new RawImageProxy (_black_image));
+       shared_ptr<const ImageProxy> filler_image (new RawImageProxy (_black_image));
        Part filler_part = PART_WHOLE;
 
        /* ...unless there's some video we can fill with */
@@ -174,8 +173,8 @@ VideoDecoder::fill_both_eyes (Frame from, Frame to, Eyes eye)
        }
 
        /* Fill with black... */
-       boost::shared_ptr<const ImageProxy> filler_left_image (new RawImageProxy (_black_image));
-       boost::shared_ptr<const ImageProxy> filler_right_image (new RawImageProxy (_black_image));
+       shared_ptr<const ImageProxy> filler_left_image (new RawImageProxy (_black_image));
+       shared_ptr<const ImageProxy> filler_right_image (new RawImageProxy (_black_image));
        Part filler_left_part = PART_WHOLE;
        Part filler_right_part = PART_WHOLE;
 
@@ -280,8 +279,8 @@ VideoDecoder::video (shared_ptr<const ImageProxy> image, Frame frame)
           and the things we are about to push.
        */
 
-       boost::optional<Frame> from;
-       boost::optional<Frame> to;
+       optional<Frame> from;
+       optional<Frame> to;
 
        if (_decoded_video.empty() && _last_seek_time && _last_seek_accurate) {
                from = _last_seek_time->frames_round (_video_content->video_frame_rate ());

diff --git a/src/lib/wscript b/src/lib/wscript
index 3457329e65b6d93ee2ab8e82816fc2d7f2025c5d..ef40c760662dc77725b7c3685d12abba62ae68f9 100644 (file)
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -95,6 +95,7 @@ sources = """
           safe_stringstream.cc
           scoped_temporary.cc
           scp_uploader.cc
+          screen.cc
           send_kdm_email_job.cc
           send_problem_report_job.cc
           server.cc

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 743172e9b74e95a668883d04c49cf86e0ab76cbf..d2747944ffaa22adb09791ef367ee16db5250c7a 100644 (file)
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -37,6 +37,7 @@
 #include "lib/update.h"
 #include "lib/cross.h"
 #include "lib/content_factory.h"
+#include "lib/compose.hpp"
 #include "wx/film_viewer.h"
 #include "wx/film_editor.h"
 #include "wx/job_manager_view.h"

diff --git a/src/wx/audio_plot.cc b/src/wx/audio_plot.cc
index 605738b4fdabfdad2fd16ee26c9b14e75c2669c1..a622e2b8686a3dca116a6db94efb606339a063d7 100644 (file)
--- a/src/wx/audio_plot.cc
+++ b/src/wx/audio_plot.cc
@@ -20,6 +20,7 @@
 #include "audio_plot.h"
 #include "lib/audio_decoder.h"
 #include "lib/audio_analysis.h"
+#include "lib/compose.hpp"
 #include "wx/wx_util.h"
 #include <wx/graphics.h>
 #include <boost/bind.hpp>

diff --git a/src/wx/job_manager_view.cc b/src/wx/job_manager_view.cc
index 1df64ba1c00ba80c8deb4431e1e8617870bb2d9b..2dfb4113168259ac9a9181fba79db0f9bf206fd5 100644 (file)
--- a/src/wx/job_manager_view.cc
+++ b/src/wx/job_manager_view.cc
@@ -21,12 +21,13 @@
  *  @brief Class generating a GTK widget to show the progress of jobs.
  */
 
+#include "job_manager_view.h"
+#include "wx_util.h"
 #include "lib/job_manager.h"
 #include "lib/job.h"
 #include "lib/util.h"
 #include "lib/exceptions.h"
-#include "job_manager_view.h"
-#include "wx_util.h"
+#include "lib/compose.hpp"
 
 using std::string;
 using std::list;

diff --git a/src/wx/job_manager_view.h b/src/wx/job_manager_view.h
index a83b481dc874027f54aeeecee18afe0c168e1df8..c6805aaa91671ed9085b2b7021fd00c94b152dbd 100644 (file)
--- a/src/wx/job_manager_view.h
+++ b/src/wx/job_manager_view.h
@@ -21,9 +21,10 @@
  *  @brief Class which is a wxPanel for showing the progress of jobs.
  */
 
-#include <string>
-#include <boost/shared_ptr.hpp>
 #include <wx/wx.h>
+#include <boost/shared_ptr.hpp>
+#include <string>
+#include <list>
 
 class Job;
 class JobRecord;

diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc
index 8d629b662ee9af315fe1f0fe1acfb61656d28110..7046c160e58b4f1513d694119db27175cdb948c9 100644 (file)
--- a/src/wx/kdm_dialog.cc
+++ b/src/wx/kdm_dialog.cc
@@ -24,6 +24,7 @@
 #include "lib/cinema.h"
 #include "lib/config.h"
 #include "lib/film.h"
+#include "lib/screen.h"
 #include <libcxml/cxml.h>
 #ifdef DCPOMATIC_USE_OWN_DIR_PICKER
 #include "dir_picker_ctrl.h"