Fix a couple of things; go back to un-numbered MXF file names for a bit.

4 files changed, 9 insertions, 9 deletions

diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index c2416b87e..6b14b2698 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -53,7 +53,7 @@ int const Encoder::_history_size = 25;
 /** @param f Film that we are encoding.
  *  @param o Options.
  */
-Encoder::Encoder (shared_ptr<const Film> f)
+Encoder::Encoder (shared_ptr<Film> f)
 	: _film (f)
 	, _just_skipped (false)
 	, _video_frames_in (0)
diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index fc89d674a..429b46a18 100644
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -62,7 +62,7 @@ class Writer;
 class Encoder : public VideoSink, public AudioSink
 {
 public:
-	Encoder (boost::shared_ptr<const Film> f);
+	Encoder (boost::shared_ptr<Film> f);
 	virtual ~Encoder ();
 
 	/** Called to indicate that a processing run is about to begin */
@@ -96,7 +96,7 @@ private:
 	void terminate_worker_threads ();
 
 	/** Film that we are encoding */
-	boost::shared_ptr<const Film> _film;
+	boost::shared_ptr<Film> _film;
 
 	/** Mutex for _time_history, _just_skipped and _last_frame */
 	mutable boost::mutex _history_mutex;
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index df6f20791..56cfa43a7 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -33,7 +33,7 @@ using boost::shared_ptr;
 
 unsigned int const Writer::_maximum_frames_in_memory = 8;
 
-Writer::Writer (shared_ptr<const Film> f)
+Writer::Writer (shared_ptr<Film> f)
 	: _film (f)
 	, _thread (0)
 	, _finish (false)
@@ -42,7 +42,7 @@ Writer::Writer (shared_ptr<const Film> f)
 	_picture_asset.reset (
 		new libdcp::MonoPictureAsset (
 			_film->dir (_film->dcp_name()),
-			String::compose ("video_%1.mxf", 0),
+			"video.mxf",
 			DCPFrameRate (_film->frames_per_second()).frames_per_second,
 			_film->format()->dcp_size()
 			)
@@ -54,7 +54,7 @@ Writer::Writer (shared_ptr<const Film> f)
 		_sound_asset.reset (
 			new libdcp::SoundAsset (
 				_film->dir (_film->dcp_name()),
-				String::compose ("audio_%1.mxf", 0),
+				"audio.mxf",
 				DCPFrameRate (_film->frames_per_second()).frames_per_second,
 				_film->audio_channels(),
 				dcp_audio_sample_rate (_film->audio_stream()->sample_rate())
@@ -199,7 +199,7 @@ Writer::finish ()
 	int const frames = _last_written_frame + 1;
 	int const duration = frames - _film->trim_start() - _film->trim_end();
 	
-	_film->set_intrinsic_duration (frames);
+	_film->set_dcp_intrinsic_duration (frames);
 	
 	_picture_asset->set_entry_point (_film->trim_start ());
 	_picture_asset->set_duration (duration);
diff --git a/src/lib/writer.h b/src/lib/writer.h
index 77f98f160..1aaea4d9d 100644
--- a/src/lib/writer.h
+++ b/src/lib/writer.h
@@ -36,7 +36,7 @@ namespace libdcp {
 class Writer
 {
 public:
-	Writer (boost::shared_ptr<const Film>);
+	Writer (boost::shared_ptr<Film>);
 	
 	void write (boost::shared_ptr<const EncodedData>, int);
 	void write (boost::shared_ptr<const AudioBuffers>);
@@ -47,7 +47,7 @@ private:
 
 	void thread ();
 
-	boost::shared_ptr<const Film> _film;
+	boost::shared_ptr<Film> _film;
 
 	boost::thread* _thread;
 	bool _finish;