X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fanalyse_audio_job.cc;h=ffe7c0fc710719aff2ecdea6afd1c2438030c360;hp=7a1a993e793663e1d52d1fbc80a0eda81a75729e;hb=5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f;hpb=18d58dc6984fb2adde029131a7b2e141a5daddbf

diff --git a/src/lib/analyse_audio_job.cc b/src/lib/analyse_audio_job.cc
index 7a1a993e7..ffe7c0fc7 100644
--- a/src/lib/analyse_audio_job.cc
+++ b/src/lib/analyse_audio_job.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2012-2015 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/>.
 
 */
 
@@ -35,6 +36,7 @@ extern "C" {
 #endif
 }
 #include <boost/foreach.hpp>
+#include <boost/make_shared.hpp>
 #include <iostream>
 
 #include "i18n.h"
@@ -45,6 +47,7 @@ using std::min;
 using std::cout;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
+using boost::make_shared;
 
 int const AnalyseAudioJob::_num_points = 1024;
 
@@ -89,7 +92,7 @@ AnalyseAudioJob::json_name () const
 void
 AnalyseAudioJob::run ()
 {
-	shared_ptr<Player> player (new Player (_film, _playlist));
+	shared_ptr<Player> player = make_shared<Player> (_film, _playlist);
 	player->set_ignore_video ();
 	player->set_fast ();
 	player->set_play_referenced ();
@@ -106,7 +109,7 @@ AnalyseAudioJob::run ()
 
 	bool has_any_audio = false;
 	BOOST_FOREACH (shared_ptr<Content> c, _playlist->content ()) {
-		if (dynamic_pointer_cast<AudioContent> (c)) {
+		if (c->audio) {
 			has_any_audio = true;
 		}
 	}
@@ -145,9 +148,9 @@ AnalyseAudioJob::run ()
 		/* If there was only one piece of content in this analysis we may later need to know what its
 		   gain was when we analysed it.
 		*/
-		shared_ptr<const AudioContent> ac = dynamic_pointer_cast<const AudioContent> (_playlist->content().front ());
+		shared_ptr<const AudioContent> ac = _playlist->content().front()->audio;
 		DCPOMATIC_ASSERT (ac);
-		_analysis->set_analysis_gain (ac->audio_gain ());
+		_analysis->set_analysis_gain (ac->gain ());
 	}
 
 	_analysis->write (_film->audio_analysis_path (_playlist));