Remove some unused stuff.

diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index ddfb296c9a9b4fffbf8e2b94928594907566fb68..2ad53da8bf42684e544e753bc6b0ca4708c72d19 100644 (file)
--- a/src/lib/audio_decoder.h
+++ b/src/lib/audio_decoder.h
@@ -26,6 +26,7 @@
 
 #include "decoder.h"
 #include "content.h"
+#include "audio_content.h"
 
 class AudioBuffers;
 

diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc
index 637e0ddb291101af81f28115327f195a3e128116..3f4cda6eb5a4345595410fe475314f3d24881bd7 100644 (file)
--- a/src/lib/decoder.cc
+++ b/src/lib/decoder.cc
@@ -34,5 +34,5 @@ using boost::shared_ptr;
 Decoder::Decoder (shared_ptr<const Film> f)
        : _film (f)
 {
-       _film_connection = f->Changed.connect (bind (&Decoder::film_changed, this, _1));
+
 }

diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index 6cce9e68d6939b0506900a6a1f888ff7b9481240..9eb4850f9750fa7ad967c63a7545653b82f4b642 100644 (file)
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -24,17 +24,11 @@
 #ifndef DCPOMATIC_DECODER_H
 #define DCPOMATIC_DECODER_H
 
-#include <vector>
-#include <string>
-#include <stdint.h>
 #include <boost/shared_ptr.hpp>
-#include <boost/signals2.hpp>
-#include "film.h"
+#include <boost/weak_ptr.hpp>
+#include <boost/utility.hpp>
 
-class Image;
-class Log;
-class DelayLine;
-class FilterGraph;
+class Film;
 
 /** @class Decoder.
  *  @brief Parent class for decoders of content.
@@ -56,13 +50,6 @@ protected:
 
        /** The Film that we are decoding in */
        boost::weak_ptr<const Film> _film;
-
-private:
-       /** This will be called when our Film emits Changed */
-       virtual void film_changed (Film::Property) {}
-
-       /** Connection to our Film */
-       boost::signals2::scoped_connection _film_connection;
 };
 
 #endif

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index e6a99b157b4ba2d4d5871583109a5375d78f02f3..e3aa484d1a18673be645298d811d338decd4d338 100644 (file)
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -39,6 +39,7 @@ extern "C" {
 #include "ffmpeg.h"
 
 class Film;
+class FilterGraph;
 class ffmpeg_pts_offset_test;
 
 /** @class FFmpegDecoder

diff --git a/src/lib/filter_graph.cc b/src/lib/filter_graph.cc
index a3bb0093edb1e7a84896d8286b04840962f246d4..cd5d198079683f588c2a12c68a1648e4a5136e29 100644 (file)
--- a/src/lib/filter_graph.cc
+++ b/src/lib/filter_graph.cc
@@ -33,6 +33,7 @@ extern "C" {
 #include "filter.h"
 #include "exceptions.h"
 #include "image.h"
+#include "ffmpeg_content.h"
 
 #include "i18n.h"
 

diff --git a/src/lib/filter_graph.h b/src/lib/filter_graph.h
index 49b78df16949c393b58560b07d52c677ca6c0245..9b403c2bc65734cf03a9b8458180a0b8695a26fc 100644 (file)
--- a/src/lib/filter_graph.h
+++ b/src/lib/filter_graph.h
@@ -28,6 +28,7 @@
 
 class Image;
 class VideoFilter;
+class FFmpegContent;
 
 /** @class FilterGraph
  *  @brief A graph of FFmpeg filters.

diff --git a/src/lib/sndfile_content.cc b/src/lib/sndfile_content.cc
index 549af09b10cd116857d9748f29102dca90f39b93..e5491480fc7737065567ad931699c0cbc57c67aa 100644 (file)
--- a/src/lib/sndfile_content.cc
+++ b/src/lib/sndfile_content.cc
@@ -20,6 +20,7 @@
 #include <libcxml/cxml.h>
 #include "sndfile_content.h"
 #include "sndfile_decoder.h"
+#include "film.h"
 #include "compose.hpp"
 #include "job.h"
 

diff --git a/src/lib/subtitle_decoder.h b/src/lib/subtitle_decoder.h
index 628f4d60d6da6b61a49fefcc26671bdcac4cd047..eeeadbd3f65fdda2f9ee46b90c9745f2ce713f8f 100644 (file)
--- a/src/lib/subtitle_decoder.h
+++ b/src/lib/subtitle_decoder.h
@@ -24,6 +24,7 @@
 
 class Film;
 class TimedSubtitle;
+class Image;
 
 class SubtitleDecoder : public virtual Decoder
 {

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 0560cbb6f18e6dfcaada224413f018f5ddcc4483..26a11c805ceccb1ba82a669fc3d6e4473c82531b 100644 (file)
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -20,10 +20,14 @@
 #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"
 
 class VideoContent;
+class Image;
 
 class VideoDecoder : public virtual Decoder
 {