int const AnalyseAudioJob::_num_points = 1024;
-AnalyseAudioJob::AnalyseAudioJob (shared_ptr<const Film> f, shared_ptr<const Playlist> p)
+AnalyseAudioJob::AnalyseAudioJob (shared_ptr<const Film> f)
: Job (f)
- , _playlist (p)
, _done (0)
, _samples_per_point (1)
, _overall_peak (0)
#include "types.h"
class AudioBuffers;
-class Playlist;
/** @class AnalyseAudioJob
- * @brief A job to analyse the audio of a playlist and make a note of its
+ * @brief A job to analyse the audio of a film and make a note of its
* broad peak and RMS levels.
*
* After computing the peak and RMS levels the job will write a file
- * to Playlist::audio_analysis_path.
+ * to Film::audio_analysis_path.
*/
class AnalyseAudioJob : public Job
{
public:
- AnalyseAudioJob (boost::shared_ptr<const Film>, boost::shared_ptr<const Playlist>);
+ AnalyseAudioJob (boost::shared_ptr<const Film>);
std::string name () const;
std::string json_name () const;
private:
void analyse (boost::shared_ptr<const AudioBuffers>);
- boost::shared_ptr<const Playlist> _playlist;
int64_t _done;
int64_t _samples_per_point;
std::vector<AudioPoint> _current;
if (!boost::filesystem::exists (path)) {
_plot->set_analysis (shared_ptr<AudioAnalysis> ());
_analysis.reset ();
- shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film, _playlist));
+ shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film));
_analysis_finished_connection = job->Finished.connect (bind (&AudioDialog::analysis_finished, this));
JobManager::instance()->add (job);
return;
_analysis.reset (new AudioAnalysis (path));
} catch (xmlpp::exception& e) {
/* Probably an old-style analysis file: recreate it */
- shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film, _playlist));
+ shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film));
_analysis_finished_connection = job->Finished.connect (bind (&AudioDialog::analysis_finished, this));
JobManager::instance()->add (job);
return;
film->examine_and_add_content (c);
wait_for_jobs ();
- shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film, film->playlist ()));
+ shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film));
job->Finished.connect (boost::bind (&finished));
JobManager::instance()->add (job);
wait_for_jobs ();
film->examine_and_add_content (c);
wait_for_jobs ();
- shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film, film->playlist ()));
+ shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film));
job->Finished.connect (boost::bind (&finished));
JobManager::instance()->add (job);
wait_for_jobs ();
film->examine_and_add_content (c);
wait_for_jobs ();
- shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film, film->playlist ()));
+ shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film));
job->Finished.connect (boost::bind (&finished));
JobManager::instance()->add (job);
wait_for_jobs ();