Include tidying src/lib/a-j*.h
authorCarl Hetherington <cth@carlh.net>
Wed, 26 Aug 2015 15:57:52 +0000 (16:57 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 26 Aug 2015 17:00:33 +0000 (18:00 +0100)
61 files changed:
src/lib/analyse_audio_job.h
src/lib/audio_analysis.h
src/lib/audio_content.cc
src/lib/audio_content.h
src/lib/audio_decoder.cc
src/lib/audio_decoder.h
src/lib/audio_mapping.h
src/lib/cinema.h
src/lib/colour_conversion.h
src/lib/config.cc
src/lib/config.h
src/lib/content.h
src/lib/dcp_content.cc
src/lib/dcp_content.h
src/lib/dcp_content_type.h
src/lib/dcp_decoder.cc
src/lib/dcp_decoder.h
src/lib/dcp_examiner.cc
src/lib/dcp_subtitle.h
src/lib/dcp_subtitle_content.cc
src/lib/dcp_video.cc
src/lib/dcp_video.h
src/lib/dcpomatic_time.h
src/lib/decoder.h
src/lib/encoder.h
src/lib/examine_content_job.h
src/lib/exceptions.h
src/lib/ffmpeg_audio_stream.h
src/lib/ffmpeg_content.cc
src/lib/ffmpeg_content.h
src/lib/film.h
src/lib/filter_graph.h
src/lib/image.h
src/lib/image_content.cc
src/lib/image_content.h
src/lib/image_decoder.h
src/lib/image_examiner.h
src/lib/image_proxy.h
src/lib/isdcf_metadata.cc
src/lib/isdcf_metadata.h
src/lib/j2k_image_proxy.cc
src/lib/j2k_image_proxy.h
src/lib/magick_image_proxy.cc
src/lib/magick_image_proxy.h
src/lib/player_video.cc
src/lib/playlist.cc
src/lib/raw_image_proxy.cc
src/lib/server.cc
src/lib/server_description.h
src/lib/server_finder.h
src/lib/single_stream_audio_content.cc
src/lib/sndfile_content.cc
src/lib/subrip_content.cc
src/lib/subtitle_content.cc
src/lib/video_content.cc
src/tools/dcpomatic.cc
src/tools/dcpomatic_cli.cc
src/tools/dcpomatic_create.cc
src/wx/audio_dialog.cc
test/srt_subtitle_test.cc
test/test.cc

index 234424b..c255d9c 100644 (file)
  */
 
 #include "job.h"
-#include "audio_analysis.h"
 #include "types.h"
 
 class AudioBuffers;
+class AudioAnalysis;
 class Playlist;
 
 /** @class AnalyseAudioJob
index 478b0e5..6c0be69 100644 (file)
 #ifndef DCPOMATIC_AUDIO_ANALYSIS_H
 #define DCPOMATIC_AUDIO_ANALYSIS_H
 
-#include <vector>
-#include <list>
-#include <boost/filesystem.hpp>
-#include <boost/optional.hpp>
+#include "dcpomatic_time.h"
 #include <libcxml/cxml.h>
-#include "types.h"
+#include <boost/optional.hpp>
+#include <boost/filesystem.hpp>
+#include <vector>
+
+namespace xmlpp {
+       class Element;
+}
 
 class AudioPoint
 {
index 5e14fb2..39d93d3 100644 (file)
@@ -25,6 +25,7 @@
 #include "raw_convert.h"
 #include "compose.hpp"
 #include <libcxml/cxml.h>
+#include <libxml++/libxml++.h>
 #include <boost/foreach.hpp>
 
 #include "i18n.h"
index 2ecb512..82c95a5 100644 (file)
 #include "audio_stream.h"
 #include "audio_mapping.h"
 
-namespace cxml {
-       class Node;
-}
-
 /** @class AudioContentProperty
  *  @brief Names for properties of AudioContent.
  */
index 20c8ea1..0d55910 100644 (file)
@@ -20,6 +20,7 @@
 #include "audio_decoder.h"
 #include "audio_buffers.h"
 #include "audio_decoder_stream.h"
+#include "audio_content.h"
 #include <boost/foreach.hpp>
 #include <iostream>
 
index 387b1ad..6cdaeee 100644 (file)
 #define DCPOMATIC_AUDIO_DECODER_H
 
 #include "decoder.h"
-#include "content.h"
-#include "audio_content.h"
 #include "content_audio.h"
+#include "audio_stream.h"
 #include <boost/enable_shared_from_this.hpp>
 
 class AudioBuffers;
+class AudioContent;
 class AudioDecoderStream;
 
 /** @class AudioDecoder.
index ca9b984..6c7d672 100644 (file)
 #define DCPOMATIC_AUDIO_MAPPING_H
 
 #include <libcxml/cxml.h>
-#include <dcp/types.h>
-#include <boost/shared_ptr.hpp>
 #include <vector>
 
 namespace xmlpp {
        class Node;
 }
 
-namespace cxml {
-       class Node;
-}
-
 /** @class AudioMapping.
  *  @brief A many-to-many mapping of audio channels.
  */
index 8d4473f..3bf958d 100644 (file)
  */
 
 #include <libcxml/cxml.h>
-#include <dcp/certificate.h>
 #include <boost/enable_shared_from_this.hpp>
 
+namespace xmlpp {
+       class Element;
+}
+
 class Screen;
 
 /** @class Cinema
index eaf43f5..5803746 100644 (file)
@@ -27,7 +27,6 @@
 
 #include <dcp/colour_conversion.h>
 #include <libcxml/cxml.h>
-#include <boost/utility.hpp>
 
 namespace xmlpp {
        class Node;
index 6a3734d..cec054a 100644 (file)
@@ -34,6 +34,7 @@
 #include <dcp/certificate_chain.h>
 #include <libcxml/cxml.h>
 #include <glib.h>
+#include <libxml++/libxml++.h>
 #include <boost/filesystem.hpp>
 #include <boost/algorithm/string.hpp>
 #include <boost/foreach.hpp>
index 0839ea9..9d583ff 100644 (file)
 #define DCPOMATIC_CONFIG_H
 
 #include "isdcf_metadata.h"
-#include "video_content.h"
-#include <dcp/metadata.h>
-#include <dcp/certificate.h>
+#include "types.h"
 #include <dcp/certificate_chain.h>
 #include <boost/shared_ptr.hpp>
 #include <boost/signals2.hpp>
 #include <boost/filesystem.hpp>
 #include <vector>
 
-class ServerDescription;
-class Scaler;
-class Filter;
 class CinemaSoundProcessor;
 class DCPContentType;
 class Ratio;
index b7f7987..14fa3c3 100644 (file)
 #include "types.h"
 #include "signaller.h"
 #include "dcpomatic_time.h"
-#include <libxml++/libxml++.h>
 #include <libcxml/cxml.h>
 #include <boost/filesystem.hpp>
 #include <boost/signals2.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/enable_shared_from_this.hpp>
 
+namespace xmlpp {
+       class Node;
+}
+
 namespace cxml {
        class Node;
 }
index 57c103e..f0f1e32 100644 (file)
@@ -25,6 +25,7 @@
 #include "compose.hpp"
 #include <dcp/dcp.h>
 #include <dcp/exceptions.h>
+#include <libxml++/libxml++.h>
 #include <iterator>
 
 #include "i18n.h"
index d7a29c6..b4aebc4 100644 (file)
@@ -29,7 +29,6 @@
 #include "subtitle_content.h"
 #include <libcxml/cxml.h>
 #include <dcp/encrypted_kdm.h>
-#include <dcp/decrypted_kdm.h>
 
 class DCPContentProperty
 {
index c370fef..ff10933 100644 (file)
@@ -20,8 +20,8 @@
 #ifndef DCPOMATIC_DCP_CONTENT_TYPE_H
 #define DCPOMATIC_DCP_CONTENT_TYPE_H
 
-/** @file src/content_type.h
- *  @brief A description of the type of content for a DCP (e.g. feature, trailer etc.)
+/** @file src/dcp_content_type.h
+ *  @brief DCPContentType class.
  */
 
 #include <dcp/dcp.h>
index 9cd327a..ec1f02d 100644 (file)
@@ -23,6 +23,7 @@
 #include "image.h"
 #include "config.h"
 #include <dcp/dcp.h>
+#include <dcp/decrypted_kdm.h>
 #include <dcp/cpl.h>
 #include <dcp/reel.h>
 #include <dcp/mono_picture_asset.h>
index d735ca6..f23b5b8 100644 (file)
@@ -30,7 +30,6 @@ namespace dcp {
 }
 
 class DCPContent;
-class Log;
 struct dcp_subtitle_within_dcp_test;
 
 class DCPDecoder : public VideoDecoder, public AudioDecoder, public SubtitleDecoder
index 5da4a50..ce5ccf4 100644 (file)
@@ -23,6 +23,7 @@
 #include "image.h"
 #include "config.h"
 #include <dcp/dcp.h>
+#include <dcp/decrypted_kdm.h>
 #include <dcp/cpl.h>
 #include <dcp/reel.h>
 #include <dcp/reel_picture_asset.h>
index 4b4d4c9..9d6076f 100644 (file)
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DCPOMATIC_SRC_LIB_DCP_SUBTITLE_H
-#define DCPOMATIC_SRC_LIB_DCP_SUBTITLE_H
+#ifndef DCPOMATIC_DCP_SUBTITLE_H
+#define DCPOMATIC_DCP_SUBTITLE_H
 
 #include <boost/shared_ptr.hpp>
 #include <boost/filesystem.hpp>
index 8b09b6f..8e24cb4 100644 (file)
@@ -23,6 +23,7 @@
 #include <dcp/interop_subtitle_asset.h>
 #include <dcp/smpte_subtitle_asset.h>
 #include <dcp/interop_load_font_node.h>
+#include <libxml++/libxml++.h>
 #include <boost/foreach.hpp>
 
 #include "i18n.h"
index 848a539..82206c0 100644 (file)
@@ -44,7 +44,9 @@
 #include <dcp/openjpeg_image.h>
 #include <dcp/rgb_xyz.h>
 #include <dcp/colour_matrix.h>
+#include <libxml++/libxml++.h>
 #include <boost/asio.hpp>
+#include <boost/thread.hpp>
 #include <stdint.h>
 #include <iomanip>
 #include <iostream>
index 4c77141..cb38cd5 100644 (file)
 
 */
 
-#include "util.h"
-#include <dcp/picture_asset_writer.h>
+#include "types.h"
+#include "data.h"
+#include "server_description.h"
 #include <libcxml/cxml.h>
 
 /** @file  src/dcp_video_frame.h
  *  @brief A single frame of video destined for a DCP.
  */
 
-class ServerDescription;
-class Scaler;
-class Image;
 class Log;
-class Subtitle;
 class PlayerVideo;
-class Data;
 
 /** @class DCPVideo
  *  @brief A single frame of video destined for a DCP.
index ba3c8fc..792eb2c 100644 (file)
@@ -30,7 +30,6 @@
 #include <stdint.h>
 #include <cmath>
 #include <ostream>
-#include <sstream>
 #include <iomanip>
 
 class dcpomatic_round_up_test;
index c930698..8378373 100644 (file)
@@ -26,8 +26,6 @@
 
 #include "types.h"
 #include "dcpomatic_time.h"
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
 #include <boost/utility.hpp>
 
 class Decoded;
index e9daab5..12f1e15 100644 (file)
@@ -35,8 +35,6 @@
 #include <list>
 #include <stdint.h>
 
-class Image;
-class AudioBuffers;
 class Film;
 class ServerDescription;
 class DCPVideo;
index b97e782..4b813bc 100644 (file)
@@ -21,7 +21,6 @@
 #include <boost/shared_ptr.hpp>
 
 class Content;
-class Log;
 
 class ExamineContentJob : public Job
 {
index 268e8c3..12342b3 100644 (file)
 #ifndef DCPOMATIC_EXCEPTIONS_H
 #define DCPOMATIC_EXCEPTIONS_H
 
-#include <boost/thread.hpp>
 extern "C" {
 #include <libavutil/pixfmt.h>
 }
 #include <boost/exception/all.hpp>
 #include <boost/filesystem.hpp>
+#include <boost/thread/mutex.hpp>
 #include <stdexcept>
 #include <cstring>
 
index 84882e8..5e782ac 100644 (file)
@@ -18,7 +18,6 @@
 */
 
 #include "ffmpeg_stream.h"
-#include "audio_mapping.h"
 #include "audio_stream.h"
 #include "dcpomatic_time.h"
 
index 4e49e12..53982db 100644 (file)
@@ -36,6 +36,7 @@ extern "C" {
 #include <libavformat/avformat.h>
 #include <libavutil/pixdesc.h>
 }
+#include <libxml++/libxml++.h>
 #include <boost/foreach.hpp>
 
 #include "i18n.h"
index 09f8ed5..3159abf 100644 (file)
@@ -23,9 +23,6 @@
 #include "video_content.h"
 #include "audio_content.h"
 #include "subtitle_content.h"
-#include "audio_mapping.h"
-#include <boost/enable_shared_from_this.hpp>
-#include <boost/lexical_cast.hpp>
 
 struct AVFormatContext;
 struct AVStream;
index f1df571..a9a3979 100644 (file)
@@ -30,7 +30,6 @@
 #include "isdcf_metadata.h"
 #include "frame_rate_change.h"
 #include "signaller.h"
-#include "ratio.h"
 #include <dcp/key.h>
 #include <dcp/encrypted_kdm.h>
 #include <boost/signals2.hpp>
 #include <vector>
 #include <inttypes.h>
 
+namespace xmlpp {
+       class Document;
+}
+
 class DCPContentType;
 class Log;
 class Content;
@@ -49,6 +52,7 @@ class AudioContent;
 class Screen;
 class AudioProcessor;
 class AudioMapping;
+class Ratio;
 struct isdcf_name_test;
 
 /** @class Film
index 45caef8..6a52030 100644 (file)
@@ -28,7 +28,6 @@
 
 struct AVFilterContext;
 class Image;
-class VideoFilter;
 class FFmpegContent;
 
 /** @class FilterGraph
index fabcb56..7c5f50a 100644 (file)
 #include "position_image.h"
 #include "types.h"
 #include <dcp/colour_conversion.h>
-extern "C" {
-#include <libavcodec/avcodec.h>
-#include <libavfilter/avfilter.h>
-}
 #include <boost/shared_ptr.hpp>
-#include <boost/function.hpp>
-#include <string>
 
+struct AVFrame;
 class Socket;
 
 class Image
index 87aa1d6..37aa7cb 100644 (file)
@@ -17,7 +17,6 @@
 
 */
 
-#include <libcxml/cxml.h>
 #include "image_content.h"
 #include "image_examiner.h"
 #include "compose.hpp"
@@ -26,6 +25,8 @@
 #include "frame_rate_change.h"
 #include "exceptions.h"
 #include "safe_stringstream.h"
+#include <libcxml/cxml.h>
+#include <libxml++/libxml++.h>
 
 #include "i18n.h"
 
index 4a8d91b..67ea466 100644 (file)
 #define DCPOMATIC_IMAGE_CONTENT_H
 
 #include "video_content.h"
-#include <boost/enable_shared_from_this.hpp>
-
-namespace cxml {
-       class Node;
-}
 
 class ImageContent : public VideoContent
 {
index ed5ce65..4d96306 100644 (file)
 
 #include "video_decoder.h"
 
-namespace Magick {
-       class Image;
-}
-
 class ImageContent;
 
 class ImageDecoder : public VideoDecoder
index f159e38..792c7b4 100644 (file)
 
 #include "video_examiner.h"
 
-namespace Magick {
-       class Image;
-}
-
 class ImageContent;
 
 class ImageExaminer : public VideoExaminer
index 1f19a41..d6b3f87 100644 (file)
  */
 
 #include <dcp/types.h>
-#include <Magick++.h>
-#include <libxml++/libxml++.h>
 #include <boost/shared_ptr.hpp>
 #include <boost/optional.hpp>
-#include <boost/filesystem.hpp>
+#include <boost/utility.hpp>
 
 class Image;
 class Socket;
 
-namespace cxml {
+namespace xmlpp {
        class Node;
 }
 
-namespace dcp {
-       class MonoPictureFrame;
-       class StereoPictureFrame;
+namespace cxml {
+       class Node;
 }
 
 /** @class ImageProxy
index 4a0e57d..f201844 100644 (file)
@@ -20,6 +20,7 @@
 #include "isdcf_metadata.h"
 #include "raw_convert.h"
 #include <libcxml/cxml.h>
+#include <libxml++/libxml++.h>
 #include <iostream>
 
 #include "i18n.h"
index 0e90423..cf4ad34 100644 (file)
 #define DCPOMATIC_ISDCF_METADATA_H
 
 #include <libcxml/cxml.h>
-#include <libxml++/libxml++.h>
 #include <string>
 
+namespace xmlpp {
+       class Node;
+}
+
 class ISDCFMetadata
 {
 public:
index 9914887..f809c5b 100644 (file)
@@ -28,6 +28,7 @@
 #include <dcp/colour_conversion.h>
 #include <dcp/rgb_xyz.h>
 #include <libcxml/cxml.h>
+#include <libxml++/libxml++.h>
 
 #include "i18n.h"
 
index 191d759..666bcf9 100644 (file)
 #include "data.h"
 #include <dcp/util.h>
 
+namespace dcp {
+       class MonoPictureFrame;
+       class StereoPictureFrame;
+}
+
 class Data;
 
 class J2KImageProxy : public ImageProxy
index 41aede6..6b14369 100644 (file)
 
 */
 
-#include <Magick++.h>
 #include "magick_image_proxy.h"
 #include "cross.h"
 #include "exceptions.h"
 #include "dcpomatic_socket.h"
 #include "image.h"
 #include "compose.hpp"
+#include <Magick++.h>
+#include <libxml++/libxml++.h>
 
 #include "i18n.h"
 
index d22789e..6e94492 100644 (file)
@@ -18,7 +18,9 @@
 */
 
 #include "image_proxy.h"
+#include <Magick++.h>
 #include <boost/thread/mutex.hpp>
+#include <boost/filesystem.hpp>
 
 class MagickImageProxy : public ImageProxy
 {
index 018f047..38374fa 100644 (file)
@@ -23,6 +23,7 @@
 #include "j2k_image_proxy.h"
 #include "film.h"
 #include "raw_convert.h"
+#include <libxml++/libxml++.h>
 
 using std::string;
 using std::cout;
index 4e46fdb..8942109 100644 (file)
@@ -17,8 +17,6 @@
 
 */
 
-#include <libcxml/cxml.h>
-#include <boost/shared_ptr.hpp>
 #include "playlist.h"
 #include "sndfile_content.h"
 #include "sndfile_decoder.h"
@@ -31,6 +29,9 @@
 #include "config.h"
 #include "util.h"
 #include "md5_digester.h"
+#include <libcxml/cxml.h>
+#include <libxml++/libxml++.h>
+#include <boost/shared_ptr.hpp>
 
 #include "i18n.h"
 
index c9a76e8..a7c77ce 100644 (file)
 #include "image.h"
 #include "raw_convert.h"
 #include <dcp/util.h>
+#include <libcxml/cxml.h>
 extern "C" {
 #include <libavutil/pixfmt.h>
 }
-#include <libcxml/cxml.h>
+#include <libxml++/libxml++.h>
 
 #include "i18n.h"
 
index e7e2a3c..f9f9141 100644 (file)
@@ -23,6 +23,7 @@
  */
 
 #include "server.h"
+#include "util.h"
 #include "dcpomatic_socket.h"
 #include "image.h"
 #include "dcp_video.h"
@@ -35,6 +36,7 @@
 #include "compose.hpp"
 #include "log.h"
 #include <libcxml/cxml.h>
+#include <libxml++/libxml++.h>
 #include <boost/algorithm/string.hpp>
 #include <boost/scoped_array.hpp>
 #include <string>
index b0a1a53..35d2df3 100644 (file)
@@ -17,6 +17,9 @@
 
 */
 
+#ifndef DCPOMATIC_SERVER_DESCRIPTION_H
+#define DCPOMATIC_SERVER_DESCRIPTION_H
+
 /** @class ServerDescription
  *  @brief Class to describe a server to which we can send encoding work.
  */
@@ -62,3 +65,5 @@ private:
        /** number of threads to use on the server */
        int _threads;
 };
+
+#endif
index 3bb0e03..400cabe 100644 (file)
 
 */
 
-#include "server.h"
 #include "signaller.h"
+#include "server_description.h"
 #include "config.h"
 #include <boost/signals2.hpp>
+#include <boost/thread/condition.hpp>
+
+class Socket;
 
 class ServerFinder : public Signaller, public ExceptionStore
 {
index 3862342..617989d 100644 (file)
@@ -21,6 +21,7 @@
 #include "audio_examiner.h"
 #include "film.h"
 #include "raw_convert.h"
+#include <libxml++/libxml++.h>
 
 #include "i18n.h"
 
index a93650b..2d63304 100644 (file)
@@ -27,6 +27,7 @@
 #include "safe_stringstream.h"
 #include "raw_convert.h"
 #include <libcxml/cxml.h>
+#include <libxml++/libxml++.h>
 
 #include "i18n.h"
 
index 7ab13c2..ac982c9 100644 (file)
@@ -23,6 +23,7 @@
 #include "film.h"
 #include "font.h"
 #include "raw_convert.h"
+#include <libxml++/libxml++.h>
 
 #include "i18n.h"
 
index 29c610d..2aa982e 100644 (file)
@@ -24,6 +24,7 @@
 #include "font.h"
 #include "raw_convert.h"
 #include <libcxml/cxml.h>
+#include <libxml++/libxml++.h>
 #include <boost/foreach.hpp>
 
 #include "i18n.h"
index 1c0bc5a..fa03938 100644 (file)
@@ -32,6 +32,7 @@
 #include "raw_convert.h"
 #include <libcxml/cxml.h>
 #include <dcp/colour_matrix.h>
+#include <libxml++/libxml++.h>
 #include <iomanip>
 
 #include "i18n.h"
index f16087a..1ab316f 100644 (file)
@@ -39,6 +39,7 @@
 #include "lib/film.h"
 #include "lib/config.h"
 #include "lib/util.h"
+#include "lib/video_content.h"
 #include "lib/version.h"
 #include "lib/signal_manager.h"
 #include "lib/log.h"
index 2659b61..af148b2 100644 (file)
@@ -30,6 +30,7 @@
 #include "lib/server_finder.h"
 #include "lib/json_server.h"
 #include "lib/ratio.h"
+#include "lib/video_content.h"
 #include "lib/audio_content.h"
 #include <dcp/version.h>
 #include <boost/foreach.hpp>
index 0130b51..e3feacb 100644 (file)
@@ -27,6 +27,7 @@
 #include "lib/dcp_content_type.h"
 #include "lib/ratio.h"
 #include "lib/image_content.h"
+#include <libxml++/libxml++.h>
 #include <boost/filesystem.hpp>
 #include <getopt.h>
 #include <string>
index 17d50ef..a144983 100644 (file)
@@ -25,6 +25,7 @@
 #include "lib/analyse_audio_job.h"
 #include "lib/audio_content.h"
 #include "lib/job_manager.h"
+#include <libxml++/libxml++.h>
 #include <boost/filesystem.hpp>
 
 using std::cout;
index 4bf2e59..4920f0b 100644 (file)
@@ -25,6 +25,7 @@
 #include "lib/subrip_content.h"
 #include "lib/dcp_content_type.h"
 #include "lib/font.h"
+#include "lib/ratio.h"
 #include "test.h"
 #include <boost/test/unit_test.hpp>
 #include <boost/algorithm/string.hpp>
index b86796b..0603860 100644 (file)
  *  @brief Overall test stuff and useful methods for tests.
  */
 
-#include <vector>
-#include <list>
-#include <Magick++.h>
-#include <sndfile.h>
-#include <libxml++/libxml++.h>
-#include <dcp/dcp.h>
 #include "lib/config.h"
 #include "lib/util.h"
 #include "lib/signal_manager.h"
 #include "lib/cross.h"
 #include "lib/server_finder.h"
 #include "lib/image.h"
+#include "lib/ratio.h"
+#include <dcp/dcp.h>
+#include <sndfile.h>
+#include <libxml++/libxml++.h>
+#include <Magick++.h>
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE dcpomatic_test
 #include <boost/test/unit_test.hpp>
+#include <list>
+#include <vector>
 
 using std::string;
 using std::vector;