X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fanalyse_audio_job.h;h=5d6c091bcfbf3b835c68bdd771f3247c2bca6140;hb=86a866d5f3f5bf2fec67d1c813524479c6727eab;hp=65282b1926ee349617fcc2bae57f88775c4c4f49;hpb=419afb743ad2aaf1ea301356ac09f9a26ee15567;p=dcpomatic.git

diff --git a/src/lib/analyse_audio_job.h b/src/lib/analyse_audio_job.h
index 65282b192..5d6c091bc 100644
--- a/src/lib/analyse_audio_job.h
+++ b/src/lib/analyse_audio_job.h
@@ -1,19 +1,20 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 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/>.
 
 */
 
@@ -24,6 +25,7 @@
 #include "job.h"
 #include "audio_point.h"
 #include "types.h"
+#include "dcpomatic_time.h"
 
 class AudioBuffers;
 class AudioAnalysis;
@@ -42,28 +44,32 @@ class Filter;
 class AnalyseAudioJob : public Job
 {
 public:
-	AnalyseAudioJob (boost::shared_ptr<const Film>, boost::shared_ptr<const Playlist>);
+	AnalyseAudioJob (boost::shared_ptr<const Film>, boost::shared_ptr<const Playlist>, bool from_zero);
 	~AnalyseAudioJob ();
 
 	std::string name () const;
 	std::string json_name () const;
 	void run ();
 
-	boost::shared_ptr<const Playlist> playlist () const {
-		return _playlist;
+	boost::filesystem::path path () const {
+		return _path;
 	}
 
 private:
-	void analyse (boost::shared_ptr<const AudioBuffers>);
+	void analyse (boost::shared_ptr<const AudioBuffers>, dcpomatic::DCPTime time);
 
 	boost::shared_ptr<const Playlist> _playlist;
+	/** playlist's audio analysis path when the job was created */
+	boost::filesystem::path _path;
+	dcpomatic::DCPTime _start;
+	bool _from_zero;
 
 	int64_t _done;
 	int64_t _samples_per_point;
 	AudioPoint* _current;
 
-	float _sample_peak;
-	Frame _sample_peak_frame;
+	float* _sample_peak;
+	Frame* _sample_peak_frame;
 
 	boost::shared_ptr<AudioAnalysis> _analysis;