Some include tidying.
authorCarl Hetherington <cth@carlh.net>
Fri, 5 Dec 2014 15:10:42 +0000 (15:10 +0000)
committerCarl Hetherington <cth@carlh.net>
Fri, 5 Dec 2014 15:10:42 +0000 (15:10 +0000)
65 files changed:
src/lib/analyse_audio_job.h
src/lib/audio_analysis.h
src/lib/audio_filter.h
src/lib/audio_mapping.h
src/lib/audio_processor.h
src/lib/cinema.h
src/lib/cinema_sound_processor.h
src/lib/colour_conversion.h
src/lib/config.h
src/lib/content.h
src/lib/content_subtitle.h
src/lib/cross.h
src/lib/dcp_content.h
src/lib/dcp_content_type.h
src/lib/dcp_video.h
src/lib/dcpomatic_time.h
src/lib/decoder.h
src/lib/encoded_data.h
src/lib/encoder.h
src/lib/examine_content_job.h
src/lib/exceptions.h
src/lib/ffmpeg.h
src/lib/ffmpeg_content.h
src/lib/ffmpeg_decoder.h
src/lib/ffmpeg_examiner.h
src/lib/ffmpeg_stream.h
src/lib/file_group.h
src/lib/film.cc
src/lib/film.h
src/lib/filter.h
src/lib/image.h
src/lib/image_content.h
src/lib/image_proxy.h
src/lib/isdcf_metadata.h
src/lib/j2k_image_proxy.h
src/lib/job.h
src/lib/job_manager.h
src/lib/log.h
src/lib/md5_digester.h
src/lib/player.h
src/lib/player_subtitles.h
src/lib/player_video.h
src/lib/playlist.h
src/lib/ratio.h
src/lib/render_subtitles.h
src/lib/resampler.h
src/lib/scaler.h
src/lib/send_kdm_email_job.h
src/lib/send_problem_report_job.h
src/lib/server.h
src/lib/server_finder.h
src/lib/sndfile_content.h
src/lib/sndfile_decoder.h
src/lib/subrip_subtitle.h
src/lib/subtitle_decoder.h
src/lib/timer.h
src/lib/transcode_job.h
src/lib/types.h
src/lib/update.h
src/lib/util.h
src/lib/video_content_scale.h
src/lib/video_decoder.h
src/lib/video_examiner.h
src/lib/writer.h
src/tools/dcpomatic.cc

index a218cb3..bde9d0d 100644 (file)
@@ -24,7 +24,6 @@
 #include "job.h"
 #include "audio_analysis.h"
 #include "types.h"
-#include "dcpomatic_time.h"
 
 class AudioBuffers;
 class AudioContent;
index b91a1cf..865d647 100644 (file)
@@ -24,9 +24,8 @@
 #ifndef DCPOMATIC_AUDIO_ANALYSIS_H
 #define DCPOMATIC_AUDIO_ANALYSIS_H
 
-#include <vector>
-#include <list>
 #include <boost/filesystem.hpp>
+#include <vector>
 
 /** @class AudioPoint
  *  @brief A single point of an audio analysis for one portion of one channel.
index 9fc69da..b44175c 100644 (file)
@@ -17,8 +17,8 @@
 
 */
 
-#include <vector>
 #include <boost/shared_ptr.hpp>
+#include <vector>
 
 class AudioBuffers;
 class audio_filter_impulse_kernel_test;
index a76d83a..fdb23df 100644 (file)
 #ifndef DCPOMATIC_AUDIO_MAPPING_H
 #define DCPOMATIC_AUDIO_MAPPING_H
 
-#include <vector>
-#include <boost/shared_ptr.hpp>
-#include <dcp/types.h>
 #include <libcxml/cxml.h>
+#include <dcp/types.h>
+#include <boost/shared_ptr.hpp>
+#include <vector>
 
 namespace xmlpp {
        class Node;
index 9b332e7..610e973 100644 (file)
 #ifndef DCPOMATIC_AUDIO_PROCESSOR_H
 #define DCPOMATIC_AUDIO_PROCESSOR_H
 
+#include "channel_count.h"
+#include <boost/shared_ptr.hpp>
 #include <list>
 #include <string>
-#include <boost/shared_ptr.hpp>
-#include "channel_count.h"
 
 class AudioBuffers;
 
index 8421f46..5c03868 100644 (file)
@@ -21,9 +21,9 @@
  *  @brief Screen and Cinema classes.
  */
 
-#include <boost/enable_shared_from_this.hpp>
-#include <dcp/certificates.h>
 #include <libcxml/cxml.h>
+#include <dcp/certificates.h>
+#include <boost/enable_shared_from_this.hpp>
 
 class Cinema;
 
index f735b12..30ab7d5 100644 (file)
@@ -24,9 +24,9 @@
 #ifndef DCPOMATIC_CINEMA_SOUND_PROCESSOR_H
 #define DCPOMATIC_CINEMA_SOUND_PROCESSOR_H
 
+#include <boost/utility.hpp>
 #include <string>
 #include <vector>
-#include <boost/utility.hpp>
 
 /** @class CinemaSoundProcessor
  *  @brief Class to describe a cimema's sound processor.
index 706e51f..dbc6c9d 100644 (file)
 #undef check
 #endif
 
+#include <libcxml/cxml.h>
 #include <boost/utility.hpp>
 #include <boost/optional.hpp>
 #include <boost/numeric/ublas/matrix.hpp>
-#include <libcxml/cxml.h>
 
 namespace xmlpp {
        class Node;
index 28b1dbd..45a9e28 100644 (file)
 #ifndef DCPOMATIC_CONFIG_H
 #define DCPOMATIC_CONFIG_H
 
-#include <vector>
-#include <boost/shared_ptr.hpp>
-#include <boost/signals2.hpp>
-#include <boost/filesystem.hpp>
-#include <dcp/metadata.h>
-#include <dcp/certificates.h>
-#include <dcp/signer.h>
 #include "isdcf_metadata.h"
 #include "colour_conversion.h"
 #include "video_content.h"
+#include <dcp/metadata.h>
+#include <dcp/certificates.h>
+#include <dcp/signer.h>
+#include <boost/shared_ptr.hpp>
+#include <boost/signals2.hpp>
+#include <boost/filesystem.hpp>
+#include <vector>
 
 class ServerDescription;
 class Scaler;
index c2841b6..e383f9f 100644 (file)
 #ifndef DCPOMATIC_CONTENT_H
 #define DCPOMATIC_CONTENT_H
 
-#include <set>
+#include "types.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>
-#include <libxml++/libxml++.h>
-#include <libcxml/cxml.h>
-#include "types.h"
-#include "dcpomatic_time.h"
 
 namespace cxml {
        class Node;
index 8868618..36bc22b 100644 (file)
 #ifndef DCPOMATIC_CONTENT_SUBTITLE_H
 #define DCPOMATIC_CONTENT_SUBTITLE_H
 
-#include <list>
-#include <dcp/subtitle_string.h>
 #include "dcpomatic_time.h"
 #include "rect.h"
 #include "image_subtitle.h"
+#include <dcp/subtitle_string.h>
+#include <list>
 
 class Image;
 
index c206fa5..6a77aaa 100644 (file)
 #ifndef DCPOMATIC_CROSS_H
 #define DCPOMATIC_CROSS_H
 
-#include <boost/filesystem.hpp>
 #ifdef DCPOMATIC_OSX
 #include <IOKit/pwr_mgt/IOPMLib.h>
 #endif
+#include <boost/filesystem.hpp>
 
 #ifdef DCPOMATIC_WINDOWS
 #define WEXITSTATUS(w) (w)
index d6fe8c8..82f5a80 100644 (file)
  *  @brief DCPContent class.
  */
 
-#include <libcxml/cxml.h>
-#include <dcp/encrypted_kdm.h>
-#include <dcp/decrypted_kdm.h>
 #include "video_content.h"
 #include "single_stream_audio_content.h"
 #include "subtitle_content.h"
+#include <libcxml/cxml.h>
+#include <dcp/encrypted_kdm.h>
+#include <dcp/decrypted_kdm.h>
 
 class DCPContentProperty
 {
index ebfe095..3439800 100644 (file)
@@ -24,9 +24,9 @@
  *  @brief A description of the type of content for a DCP (e.g. feature, trailer etc.)
  */
 
+#include <dcp/dcp.h>
 #include <string>
 #include <vector>
-#include <dcp/dcp.h>
 
 /** @class DCPContentType
  *  @brief A description of the type of content for a DCP (e.g. feature, trailer etc.)
index d517a8f..051333c 100644 (file)
@@ -18,8 +18,8 @@
 
 */
 
-#include <dcp/picture_mxf_writer.h>
 #include "util.h"
+#include <dcp/picture_mxf_writer.h>
 
 /** @file  src/dcp_video_frame.h
  *  @brief A single frame of video destined for a DCP.
index 9c74c51..2408bff 100644 (file)
 #ifndef DCPOMATIC_TIME_H
 #define DCPOMATIC_TIME_H
 
+#include "frame_rate_change.h"
+#include "safe_stringstream.h"
+#include <stdint.h>
 #include <cmath>
 #include <ostream>
 #include <sstream>
 #include <iomanip>
-#include <stdint.h>
-#include "frame_rate_change.h"
-#include "safe_stringstream.h"
 
 class dcpomatic_round_up_test;
 
index 583a926..c1b8598 100644 (file)
 #ifndef DCPOMATIC_DECODER_H
 #define DCPOMATIC_DECODER_H
 
+#include "types.h"
+#include "dcpomatic_time.h"
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
 #include <boost/utility.hpp>
-#include "types.h"
-#include "dcpomatic_time.h"
 
 class Decoded;
 
index 232ed6e..245a888 100644 (file)
 
 */
 
+#include "types.h"
+#include <dcp/picture_mxf_writer.h>
 #include <boost/noncopyable.hpp>
 #include <boost/filesystem.hpp>
-#include <dcp/picture_mxf_writer.h>
-#include "types.h"
 
 class Socket;
 class Film;
index 51df017..1da5d1c 100644 (file)
  *  @brief Encoder to J2K and WAV for DCP.
  */
 
+#include "util.h"
+#include "config.h"
+#include "cross.h"
+#include "exceptions.h"
+extern "C" {
+#include <libavutil/samplefmt.h>
+#include <libswresample/swresample.h>
+}
 #include <boost/shared_ptr.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/condition.hpp>
 #include <boost/optional.hpp>
 #include <list>
 #include <stdint.h>
-extern "C" {
-#include <libavutil/samplefmt.h>
-#include <libswresample/swresample.h>
-}
-#include "util.h"
-#include "config.h"
-#include "cross.h"
-#include "exceptions.h"
 
 class Image;
 class AudioBuffers;
index f0d9eae..e59dba0 100644 (file)
@@ -17,8 +17,8 @@
 
 */
 
-#include <boost/shared_ptr.hpp>
 #include "job.h"
+#include <boost/shared_ptr.hpp>
 
 class Content;
 class Log;
index 90a0abf..05c66df 100644 (file)
 #ifndef DCPOMATIC_EXCEPTIONS_H
 #define DCPOMATIC_EXCEPTIONS_H
 
-#include <stdexcept>
-#include <cstring>
-#include <boost/exception/all.hpp>
-#include <boost/filesystem.hpp>
 #include <boost/thread.hpp>
 extern "C" {
 #include <libavutil/pixfmt.h>
 }
+#include <boost/exception/all.hpp>
+#include <boost/filesystem.hpp>
+#include <stdexcept>
+#include <cstring>
 
 /** @class StringError
  *  @brief A parent class for exceptions using messages held in a std::string
index 8aaa54f..6dd9da0 100644 (file)
 #ifndef DCPOMATIC_FFMPEG_H
 #define DCPOMATIC_FFMPEG_H
 
-#include <vector>
-#include <boost/shared_ptr.hpp>
-#include <boost/thread/mutex.hpp>
 extern "C" {
 #include <libavcodec/avcodec.h>
 }
 #include "file_group.h"
+#include <boost/shared_ptr.hpp>
+#include <boost/thread/mutex.hpp>
+#include <vector>
 
 struct AVFilterGraph;
 struct AVCodecContext;
index fca3bf8..8203b7a 100644 (file)
 #ifndef DCPOMATIC_FFMPEG_CONTENT_H
 #define DCPOMATIC_FFMPEG_CONTENT_H
 
-#include <boost/enable_shared_from_this.hpp>
-#include <boost/lexical_cast.hpp>
 #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 9f85c2d..60c777d 100644 (file)
  *  @brief A decoder using FFmpeg to decode content.
  */
 
-#include <vector>
-#include <string>
-#include <stdint.h>
-#include <boost/shared_ptr.hpp>
-#include <boost/optional.hpp>
-#include <boost/thread/mutex.hpp>
-extern "C" {
-#include <libavcodec/avcodec.h>
-}
 #include "util.h"
 #include "decoder.h"
 #include "video_decoder.h"
 #include "audio_decoder.h"
 #include "subtitle_decoder.h"
 #include "ffmpeg.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;
index 4378e24..1ef7e3b 100644 (file)
@@ -17,9 +17,9 @@
 
 */
 
-#include <boost/optional.hpp>
 #include "ffmpeg.h"
 #include "video_examiner.h"
+#include <boost/optional.hpp>
 
 class FFmpegAudioStream;
 class FFmpegSubtitleStream;
index 6bbcd0b..6479bd7 100644 (file)
@@ -20,8 +20,8 @@
 #ifndef DCPOMATIC_FFMPEG_STREAM_H
 #define DCPOMATIC_FFMPEG_STREAM_H
 
-#include <boost/lexical_cast.hpp>
 #include <libcxml/cxml.h>
+#include <boost/lexical_cast.hpp>
 
 struct AVFormatContext;
 struct AVStream;
index 5a65de9..9c67afb 100644 (file)
@@ -24,8 +24,8 @@
 #ifndef DCPOMATIC_FILE_GROUP_H
 #define DCPOMATIC_FILE_GROUP_H
 
-#include <vector>
 #include <boost/filesystem.hpp>
+#include <vector>
 
 /** @class FileGroup
  *  @brief A class to make a list of files behave like they were concatenated.
index 22dc0ca..f0ddd14 100644 (file)
 
 */
 
-#include <stdexcept>
-#include <iostream>
-#include <algorithm>
-#include <fstream>
-#include <cstdlib>
-#include <iomanip>
-#include <unistd.h>
-#include <boost/filesystem.hpp>
-#include <boost/algorithm/string.hpp>
-#include <boost/lexical_cast.hpp>
-#include <libxml++/libxml++.h>
-#include <libcxml/cxml.h>
-#include <dcp/cpl.h>
-#include <dcp/signer.h>
-#include <dcp/util.h>
-#include <dcp/local_time.h>
-#include <dcp/raw_convert.h>
 #include "film.h"
 #include "job.h"
 #include "util.h"
 #include "cross.h"
 #include "cinema.h"
 #include "safe_stringstream.h"
+#include <libcxml/cxml.h>
+#include <dcp/cpl.h>
+#include <dcp/signer.h>
+#include <dcp/util.h>
+#include <dcp/local_time.h>
+#include <dcp/raw_convert.h>
+#include <dcp/decrypted_kdm.h>
+#include <libxml++/libxml++.h>
+#include <boost/filesystem.hpp>
+#include <boost/algorithm/string.hpp>
+#include <boost/lexical_cast.hpp>
+#include <unistd.h>
+#include <stdexcept>
+#include <iostream>
+#include <algorithm>
+#include <fstream>
+#include <cstdlib>
+#include <iomanip>
+
 
 #include "i18n.h"
 
index 1906de9..8628d8b 100644 (file)
 #ifndef DCPOMATIC_FILM_H
 #define DCPOMATIC_FILM_H
 
-#include <string>
-#include <vector>
-#include <inttypes.h>
-#include <boost/signals2.hpp>
-#include <boost/enable_shared_from_this.hpp>
-#include <boost/filesystem.hpp>
-#include <dcp/key.h>
-#include <dcp/decrypted_kdm.h>
-#include <dcp/encrypted_kdm.h>
 #include "util.h"
 #include "types.h"
 #include "isdcf_metadata.h"
 #include "frame_rate_change.h"
+#include <dcp/key.h>
+#include <dcp/encrypted_kdm.h>
+#include <boost/signals2.hpp>
+#include <boost/enable_shared_from_this.hpp>
+#include <boost/filesystem.hpp>
+#include <string>
+#include <vector>
+#include <inttypes.h>
 
 class DCPContentType;
 class Log;
index 258e749..66ecc43 100644 (file)
@@ -24,9 +24,9 @@
 #ifndef DCPOMATIC_FILTER_H
 #define DCPOMATIC_FILTER_H
 
+#include <boost/utility.hpp>
 #include <string>
 #include <vector>
-#include <boost/utility.hpp>
 
 /** @class Filter
  *  @brief A class to describe one of FFmpeg's video filters.
index 172250e..8ca6aae 100644 (file)
 #ifndef DCPOMATIC_IMAGE_H
 #define DCPOMATIC_IMAGE_H
 
-#include <string>
-#include <boost/shared_ptr.hpp>
-#include <boost/function.hpp>
+#include "util.h"
+#include "position.h"
+#include "position_image.h"
+#include <dcp/image.h>
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavfilter/avfilter.h>
 }
-#include <dcp/image.h>
-#include "util.h"
-#include "position.h"
-#include "position_image.h"
+#include <boost/shared_ptr.hpp>
+#include <boost/function.hpp>
+#include <string>
 
 class Scaler;
 
index 6b70d57..8c50fd8 100644 (file)
@@ -20,8 +20,8 @@
 #ifndef DCPOMATIC_IMAGE_CONTENT_H
 #define DCPOMATIC_IMAGE_CONTENT_H
 
-#include <boost/enable_shared_from_this.hpp>
 #include "video_content.h"
+#include <boost/enable_shared_from_this.hpp>
 
 namespace cxml {
        class Node;
index 79b2bf4..e2d86b8 100644 (file)
  *  @brief ImageProxy and subclasses.
  */
 
-#include <boost/shared_ptr.hpp>
-#include <boost/filesystem.hpp>
 #include <Magick++.h>
 #include <libxml++/libxml++.h>
+#include <boost/shared_ptr.hpp>
+#include <boost/filesystem.hpp>
 
 class Image;
 class Socket;
index e63f290..62c821d 100644 (file)
@@ -20,9 +20,9 @@
 #ifndef DCPOMATIC_ISDCF_METADATA_H
 #define DCPOMATIC_ISDCF_METADATA_H
 
-#include <string>
-#include <libxml++/libxml++.h>
 #include <libcxml/cxml.h>
+#include <libxml++/libxml++.h>
+#include <string>
 
 class ISDCFMetadata
 {
index 299180f..7790f61 100644 (file)
@@ -17,8 +17,8 @@
 
 */
 
-#include <dcp/util.h>
 #include "image_proxy.h"
+#include <dcp/util.h>
 
 class EncodedData;
 
index b7dfc58..28c12a3 100644 (file)
 #ifndef DCPOMATIC_JOB_H
 #define DCPOMATIC_JOB_H
 
-#include <string>
 #include <boost/thread/mutex.hpp>
 #include <boost/enable_shared_from_this.hpp>
 #include <boost/signals2.hpp>
 #include <boost/thread.hpp>
+#include <string>
 
 class Film;
 
index f0673df..9d8620c 100644 (file)
  *  @brief A simple scheduler for jobs.
  */
 
-#include <list>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread.hpp>
 #include <boost/signals2.hpp>
+#include <list>
 
 class Job;
 extern void wait_for_jobs ();
index cee1ce4..300df74 100644 (file)
  *  @brief A very simple logging class.
  */
 
-#include <string>
 #include <boost/thread/mutex.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/signals2.hpp>
+#include <string>
 
 /** @class Log
  *  @brief A very simple logging class.
index d5b6a9c..981334e 100644 (file)
 
 */
 
-#include <string>
+#include <openssl/md5.h>
 #include <boost/noncopyable.hpp>
 #include <boost/optional.hpp>
-#include <openssl/md5.h>
+#include <string>
 
 class MD5Digester : public boost::noncopyable
 {
index 3852965..5d2273a 100644 (file)
@@ -20,9 +20,6 @@
 #ifndef DCPOMATIC_PLAYER_H
 #define DCPOMATIC_PLAYER_H
 
-#include <list>
-#include <boost/shared_ptr.hpp>
-#include <boost/enable_shared_from_this.hpp>
 #include "playlist.h"
 #include "content.h"
 #include "film.h"
@@ -34,6 +31,9 @@
 #include "piece.h"
 #include "content_video.h"
 #include "player_subtitles.h"
+#include <boost/shared_ptr.hpp>
+#include <boost/enable_shared_from_this.hpp>
+#include <list>
 
 class Job;
 class Film;
index 46994ea..d0a3b4f 100644 (file)
@@ -20,8 +20,8 @@
 #ifndef DCPOMATIC_PLAYER_SUBTITLES_H
 #define DCPOMATIC_PLAYER_SUBTITLES_H
 
-#include <dcp/subtitle_string.h>
 #include "image_subtitle.h"
+#include <dcp/subtitle_string.h>
 
 class PlayerSubtitles
 {
index f1d0543..935690a 100644 (file)
 
 */
 
-#include <boost/shared_ptr.hpp>
-extern "C" {
-#include <libavutil/pixfmt.h>
-}
 #include "types.h"
 #include "position.h"
 #include "colour_conversion.h"
 #include "position_image.h"
+extern "C" {
+#include <libavutil/pixfmt.h>
+}
+#include <boost/shared_ptr.hpp>
 
 class Image;
 class ImageProxy;
index 9e3dbb6..91051e9 100644 (file)
 #ifndef DCPOMATIC_PLAYLIST_H
 #define DCPOMATIC_PLAYLIST_H
 
-#include <list>
-#include <boost/shared_ptr.hpp>
-#include <boost/enable_shared_from_this.hpp>
 #include "ffmpeg_content.h"
 #include "audio_mapping.h"
 #include "util.h"
 #include "frame_rate_change.h"
+#include <boost/shared_ptr.hpp>
+#include <boost/enable_shared_from_this.hpp>
+#include <list>
 
 class Content;
 class FFmpegContent;
index f1a180d..360fb23 100644 (file)
@@ -20,9 +20,9 @@
 #ifndef DCPOMATIC_RATIO_H
 #define DCPOMATIC_RATIO_H
 
-#include <vector>
-#include <boost/utility.hpp>
 #include <dcp/util.h>
+#include <boost/utility.hpp>
+#include <vector>
 
 class Ratio : public boost::noncopyable
 {
index d83dc11..218b866 100644 (file)
@@ -17,8 +17,8 @@
 
 */
 
+#include "position_image.h"
 #include <dcp/subtitle_string.h>
 #include <dcp/util.h>
-#include "position_image.h"
 
 PositionImage render_subtitles (std::list<dcp::SubtitleString>, dcp::Size);
index 4ee11a7..21ef412 100644 (file)
 
 */
 
-#include <boost/shared_ptr.hpp>
-#include <boost/utility.hpp>
+#include "types.h"
+#include "audio_content.h"
 extern "C" {
 #include <libswresample/swresample.h>
 }
-#include "types.h"
-#include "audio_content.h"
+#include <boost/shared_ptr.hpp>
+#include <boost/utility.hpp>
 
 class AudioBuffers;
 
index 14077ff..0f0bcb1 100644 (file)
@@ -24,9 +24,9 @@
 #ifndef DCPOMATIC_SCALER_H
 #define DCPOMATIC_SCALER_H
 
+#include <boost/utility.hpp>
 #include <string>
 #include <vector>
-#include <boost/utility.hpp>
 
 /** @class Scaler
  *  @brief Class to describe one of FFmpeg's software scalers
index af84a13..8d9f9b0 100644 (file)
@@ -17,9 +17,9 @@
 
 */
 
-#include <boost/filesystem.hpp>
-#include <dcp/types.h>
 #include "job.h"
+#include <dcp/types.h>
+#include <boost/filesystem.hpp>
 
 class Screen;
 
index d77eec5..c40011d 100644 (file)
@@ -17,9 +17,9 @@
 
 */
 
-#include <boost/filesystem.hpp>
-#include <dcp/types.h>
 #include "job.h"
+#include <dcp/types.h>
+#include <boost/filesystem.hpp>
 
 class SendProblemReportJob : public Job
 {
index e2e1d46..1dc3b7b 100644 (file)
  *  encoding work, and a class to implement such a server.
  */
 
-#include <string>
+#include "log.h"
+#include "exceptions.h"
+#include <libxml++/libxml++.h>
 #include <boost/thread.hpp>
 #include <boost/asio.hpp>
 #include <boost/thread/condition.hpp>
 #include <boost/optional.hpp>
-#include <libxml++/libxml++.h>
-#include "log.h"
-#include "exceptions.h"
+#include <string>
 
 class Socket;
 
index 202bee8..6f02042 100644 (file)
@@ -17,8 +17,8 @@
 
 */
 
-#include <boost/signals2.hpp>
 #include "server.h"
+#include <boost/signals2.hpp>
 
 class ServerFinder : public ExceptionStore
 {
index cb255fd..1fff01f 100644 (file)
 #ifndef DCPOMATIC_SNDFILE_CONTENT_H
 #define DCPOMATIC_SNDFILE_CONTENT_H
 
+#include "single_stream_audio_content.h"
 extern "C" {
 #include <libavutil/audioconvert.h>
 }
-#include "single_stream_audio_content.h"
 
 namespace cxml {
        class Node;
index 41d5faf..5ebe1da 100644 (file)
 
 */
 
-#include <sndfile.h>
 #include "decoder.h"
 #include "audio_decoder.h"
 #include "audio_examiner.h"
+#include <sndfile.h>
 
 class SndfileContent;
 
index 646fc1f..6fd0bdf 100644 (file)
 #ifndef DCPOMATIC_SUBRIP_SUBTITLE_H
 #define DCPOMATIC_SUBRIP_SUBTITLE_H
 
-#include <boost/optional.hpp>
-#include <dcp/types.h>
 #include "types.h"
 #include "dcpomatic_time.h"
+#include <dcp/types.h>
+#include <boost/optional.hpp>
 
 struct SubRipSubtitlePiece
 {
index 142cfa4..3d4f90a 100644 (file)
 #ifndef DCPOMATIC_SUBTITLE_DECODER_H
 #define DCPOMATIC_SUBTITLE_DECODER_H
 
-#include <dcp/subtitle_string.h>
 #include "decoder.h"
 #include "rect.h"
 #include "types.h"
 #include "content_subtitle.h"
+#include <dcp/subtitle_string.h>
 
 class Film;
 class DCPTimedSubtitle;
index 4a5aa12..8c4b046 100644 (file)
@@ -25,9 +25,9 @@
 #ifndef DCPOMATIC_TIMER_H
 #define DCPOMATIC_TIMER_H
 
+#include <sys/time.h>
 #include <string>
 #include <map>
-#include <sys/time.h>
 
 /** @class PeriodTimer
  *  @brief A class to allow timing of a period within the caller.
index 9128206..97a7d49 100644 (file)
@@ -21,8 +21,8 @@
  *  @brief A job which transcodes from one format to another.
  */
 
-#include <boost/shared_ptr.hpp>
 #include "job.h"
+#include <boost/shared_ptr.hpp>
 
 class Transcoder;
 
index 9a6a30b..c069944 100644 (file)
 #ifndef DCPOMATIC_TYPES_H
 #define DCPOMATIC_TYPES_H
 
-#include <vector>
-#include <stdint.h>
-#include <boost/shared_ptr.hpp>
-#include <dcp/util.h>
 #include "dcpomatic_time.h"
 #include "position.h"
+#include <dcp/util.h>
+#include <boost/shared_ptr.hpp>
+#include <vector>
+#include <stdint.h>
 
 class Content;
 class VideoContent;
index c86adb8..f3a0ffc 100644 (file)
  *  @brief UpdateChecker class.
  */
 
+#include <curl/curl.h>
 #include <boost/signals2.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/condition.hpp>
 #include <boost/thread.hpp>
-#include <curl/curl.h>
 
 /** Class to check for the existance of an update for DCP-o-matic on a remote server */
 class UpdateChecker
index 886e2a6..b6817f8 100644 (file)
 #ifndef DCPOMATIC_UTIL_H
 #define DCPOMATIC_UTIL_H
 
-#include <string>
-#include <vector>
-#include <boost/shared_ptr.hpp>
-#include <boost/asio.hpp>
-#include <boost/optional.hpp>
-#include <boost/filesystem.hpp>
+#include "compose.hpp"
+#include "types.h"
+#include "video_content.h"
 #include <dcp/util.h>
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavfilter/avfilter.h>
 }
-#include "compose.hpp"
-#include "types.h"
-#include "video_content.h"
+#include <boost/shared_ptr.hpp>
+#include <boost/asio.hpp>
+#include <boost/optional.hpp>
+#include <boost/filesystem.hpp>
+#include <string>
+#include <vector>
 
 #undef check
 
index d457d82..f5d97fd 100644 (file)
@@ -20,9 +20,9 @@
 #ifndef DCPOMATIC_VIDEO_CONTENT_SCALE_H
 #define DCPOMATIC_VIDEO_CONTENT_SCALE_H
 
-#include <vector>
-#include <boost/shared_ptr.hpp>
 #include <dcp/util.h>
+#include <boost/shared_ptr.hpp>
+#include <vector>
 
 namespace cxml {
        class Node;
index 24ee7f4..f37d4b1 100644 (file)
 #ifndef DCPOMATIC_VIDEO_DECODER_H
 #define DCPOMATIC_VIDEO_DECODER_H
 
-#include <boost/signals2.hpp>
-#include <boost/shared_ptr.hpp>
 #include "decoder.h"
 #include "video_content.h"
 #include "util.h"
 #include "content_video.h"
+#include <boost/signals2.hpp>
+#include <boost/shared_ptr.hpp>
 
 class VideoContent;
 class ImageProxy;
index 55b27ac..2dcacfc 100644 (file)
@@ -21,9 +21,9 @@
  *  @brief VideoExaminer class.
  */
 
-#include <dcp/types.h>
 #include "types.h"
 #include "video_content.h"
+#include <dcp/types.h>
 
 /** @class VideoExaminer
  *  @brief Parent for classes which examine video sources and obtain information about them.
index 66fe98e..2fcae3d 100644 (file)
  *  @brief Writer class.
  */
 
-#include <list>
-#include <boost/shared_ptr.hpp>
-#include <boost/thread.hpp>
-#include <boost/thread/condition.hpp>
-#include <dcp/subtitle_content.h>
 #include "exceptions.h"
 #include "types.h"
 #include "player_subtitles.h"
+#include <dcp/subtitle_content.h>
+#include <boost/shared_ptr.hpp>
+#include <boost/thread.hpp>
+#include <boost/thread/condition.hpp>
+#include <list>
 
 class Film;
 class EncodedData;
index b0df7b3..0c82898 100644 (file)
 
 */
 
-#include <iostream>
-#include <fstream>
-#include <boost/filesystem.hpp>
-#ifdef __WXMSW__
-#include <shellapi.h>
-#endif
-#ifdef __WXOSX__
-#include <ApplicationServices/ApplicationServices.h>
-#endif
-#include <wx/generic/aboutdlgg.h>
-#include <wx/stdpaths.h>
-#include <wx/cmdline.h>
-#include <wx/preferences.h>
-#include <dcp/exceptions.h>
+#include "lib/film.h"
+#include "lib/config.h"
+#include "lib/util.h"
+#include "lib/version.h"
+#include "lib/ui_signaller.h"
+#include "lib/log.h"
+#include "lib/job_manager.h"
+#include "lib/transcode_job.h"
+#include "lib/exceptions.h"
+#include "lib/cinema.h"
+#include "lib/kdm.h"
+#include "lib/send_kdm_email_job.h"
+#include "lib/server_finder.h"
+#include "lib/update.h"
+#include "lib/content_factory.h"
 #include "wx/film_viewer.h"
 #include "wx/film_editor.h"
 #include "wx/job_manager_view.h"
 #include "wx/update_dialog.h"
 #include "wx/content_panel.h"
 #include "wx/report_problem_dialog.h"
-#include "lib/film.h"
-#include "lib/config.h"
-#include "lib/util.h"
-#include "lib/version.h"
-#include "lib/ui_signaller.h"
-#include "lib/log.h"
-#include "lib/job_manager.h"
-#include "lib/transcode_job.h"
-#include "lib/exceptions.h"
-#include "lib/cinema.h"
-#include "lib/kdm.h"
-#include "lib/send_kdm_email_job.h"
-#include "lib/server_finder.h"
-#include "lib/update.h"
-#include "lib/content_factory.h"
+#include <dcp/exceptions.h>
+#include <wx/generic/aboutdlgg.h>
+#include <wx/stdpaths.h>
+#include <wx/cmdline.h>
+#include <wx/preferences.h>
+#ifdef __WXMSW__
+#include <shellapi.h>
+#endif
+#ifdef __WXOSX__
+#include <ApplicationServices/ApplicationServices.h>
+#endif
+#include <boost/filesystem.hpp>
+#include <iostream>
+#include <fstream>
 
 using std::cout;
 using std::string;