X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftranscoder.h;h=14f3636619a8303aacf2d568011df8883c5ec6de;hb=50c2504a2837d1c05c75206b9a16ab81d5814efe;hp=b50113742369c817aa3e0b57d28158f31d111b41;hpb=aa230169f8b59b7cb2da9a3bbb8ce5f7600285c0;p=dcpomatic.git

diff --git a/src/lib/transcoder.h b/src/lib/transcoder.h
index b50113742..14f363661 100644
--- a/src/lib/transcoder.h
+++ b/src/lib/transcoder.h
@@ -1,74 +1,53 @@
 /*
     Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic 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,
+    DCP-o-matic 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.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
-/** @file  src/transcoder.h
- *  @brief A class which takes a FilmState and some Options, then uses those to transcode a Film.
- *
- *  A decoder is selected according to the content type, and the encoder can be specified
- *  as a parameter to the constructor.
- */
-
-#include "decoder_factory.h"
+#include "types.h"
+#include <boost/weak_ptr.hpp>
 
 class Film;
-class Job;
 class Encoder;
-class FilmState;
-class Matcher;
-class VideoFilter;
-class Gain;
-class VideoDecoder;
-class AudioDecoder;
-class DelayLine;
-class EncodeOptions;
-class DecodeOptions;
+class Player;
+class Writer;
+class Job;
 
-/** @class Transcoder
- *  @brief A class which takes a FilmState and some Options, then uses those to transcode a Film.
- *
- *  A decoder is selected according to the content type, and the encoder can be specified
- *  as a parameter to the constructor.
- */
-class Transcoder
+/** @class Transcoder */
+class Transcoder : public boost::noncopyable
 {
 public:
-	Transcoder (
-		boost::shared_ptr<Film> f,
-		boost::shared_ptr<const DecodeOptions> o,
-		Job* j,
-		boost::shared_ptr<Encoder> e
-		);
+	Transcoder (boost::shared_ptr<const Film>, boost::weak_ptr<Job>);
 
 	void go ();
 
-	boost::shared_ptr<VideoDecoder> video_decoder () const {
-		return _decoders.video;
+	float current_encoding_rate () const;
+	int video_frames_enqueued () const;
+
+	/** @return true if we are in the process of calling Encoder::process_end */
+	bool finishing () const {
+		return _finishing;
 	}
 
-protected:
-	/** A Job that is running this Transcoder, or 0 */
-	Job* _job;
-	/** The encoder that we will use */
+private:
+	boost::shared_ptr<const Film> _film;
+	boost::weak_ptr<Job> _job;
+	boost::shared_ptr<Player> _player;
+	boost::shared_ptr<Writer> _writer;
 	boost::shared_ptr<Encoder> _encoder;
-	/** The decoders that we will use */
-	Decoders _decoders;
-	boost::shared_ptr<Matcher> _matcher;
-	boost::shared_ptr<DelayLine> _delay_line;
-	boost::shared_ptr<Gain> _gain;
+	bool _finishing;
 };