Merge branch 'master' of ssh://carlh.dnsalias.org/home/carl/git/dvdomatic

5 files changed, 46 insertions, 20 deletions

diff --git a/ChangeLog b/ChangeLog
index 90062e2e0..4f724e51b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2013-02-17  Carl Hetherington  <cth@carlh.net>
+
+	* Version 0.73beta6 released.
+
+2013-02-17  Carl Hetherington  <cth@carlh.net>
+
+	* Version 0.73beta3 released.
+
 2013-02-16  Carl Hetherington  <cth@carlh.net>
 
 	* Version 0.73beta2 released.
diff --git a/debian/changelog b/debian/changelog
index 318575c8c..38483128c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+dvdomatic (0.73beta6-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Carl Hetherington <carl@houllier.lan>  Sun, 17 Feb 2013 23:05:56 +0000
+
+dvdomatic (0.73beta3-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Carl Hetherington <carl@houllier.lan>  Sun, 17 Feb 2013 23:05:05 +0000
+
 dvdomatic (0.73beta2-1) UNRELEASED; urgency=low
 
   * New upstream release.
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index d64622cba..f25256379 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -140,7 +140,7 @@ Encoder::process_end ()
 			}
 
 			out->set_frames (frames);
-			_writer->write (out);
+			write_audio (out);
 		}
 
 		swr_free (&_swr_context);
@@ -319,23 +319,7 @@ Encoder::process_audio (shared_ptr<AudioBuffers> data)
 	}
 #endif
 
-	if (_film->audio_channels() == 1) {
-		/* We need to switch things around so that the mono channel is on
-		   the centre channel of a 5.1 set (with other channels silent).
-		*/
-
-		shared_ptr<AudioBuffers> b (new AudioBuffers (6, data->frames ()));
-		b->make_silent (libdcp::LEFT);
-		b->make_silent (libdcp::RIGHT);
-		memcpy (b->data()[libdcp::CENTRE], data->data()[0], data->frames() * sizeof(float));
-		b->make_silent (libdcp::LFE);
-		b->make_silent (libdcp::LS);
-		b->make_silent (libdcp::RS);
-
-		data = b;
-	}
-
-	_writer->write (data);
+	write_audio (data);
 }
 
 void
@@ -435,3 +419,25 @@ Encoder::encoder_thread (ServerDescription* server)
 		_condition.notify_all ();
 	}
 }
+
+void
+Encoder::write_audio (shared_ptr<const AudioBuffers> data)
+{
+	if (_film->audio_channels() == 1) {
+		/* We need to switch things around so that the mono channel is on
+		   the centre channel of a 5.1 set (with other channels silent).
+		*/
+
+		shared_ptr<AudioBuffers> b (new AudioBuffers (6, data->frames ()));
+		b->make_silent (libdcp::LEFT);
+		b->make_silent (libdcp::RIGHT);
+		memcpy (b->data()[libdcp::CENTRE], data->data()[0], data->frames() * sizeof(float));
+		b->make_silent (libdcp::LFE);
+		b->make_silent (libdcp::LS);
+		b->make_silent (libdcp::RS);
+
+		data = b;
+	}
+
+	_writer->write (data);
+}
diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 69a5c5a23..86880bc34 100644
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -88,7 +88,7 @@ private:
 	
 	void frame_done ();
 	
-	void write_audio (boost::shared_ptr<const AudioBuffers> audio);
+	void write_audio (boost::shared_ptr<const AudioBuffers> data);
 
 	void encoder_thread (ServerDescription *);
 	void terminate_threads ();
diff --git a/wscript b/wscript
index a029d41a6..53af42d51 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dvdomatic'
-VERSION = '0.73beta2'
+VERSION = '0.73beta6'
 
 def options(opt):
     opt.load('compiler_cxx')