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

diff --git a/src/lib/analyse_audio_job.cc b/src/lib/analyse_audio_job.cc
index 7a1a993e7..3e771d3f6 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/>.
 
 */
 
@@ -106,7 +107,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 +146,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));
@@ -168,7 +169,7 @@ AnalyseAudioJob::analyse (shared_ptr<const AudioBuffers> b)
 			float s = data[i];
 			float as = fabsf (s);
 			if (as < 10e-7) {
-				/* SafeStringStream can't serialise and recover inf or -inf, so prevent such
+				/* locked_stringstream can't serialise and recover inf or -inf, so prevent such
 				   values by replacing with this (140dB down) */
 				s = as = 10e-7;
 			}