diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-06-29 23:19:04 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-07-01 17:27:02 +0100 |
| commit | c5b9ad09ab5eaf032b0816f619ab5d75254e8597 (patch) | |
| tree | 2d1cba3086b6448f454ecac9d1dd0875a12b5214 /src/wx | |
| parent | f9fcc34179a6f86425427741c60d8876099d3ed3 (diff) | |
Go back to player having a playlist and not assuming it uses the film's content.
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/audio_dialog.cc | 6 | ||||
| -rw-r--r-- | src/wx/film_viewer.cc | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc index fd523aa02..70046f52f 100644 --- a/src/wx/audio_dialog.cc +++ b/src/wx/audio_dialog.cc @@ -126,7 +126,7 @@ AudioDialog::try_to_load_analysis () if (!boost::filesystem::exists (path)) { _plot->set_analysis (shared_ptr<AudioAnalysis> ()); _analysis.reset (); - shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film)); + shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film, film->playlist ())); _analysis_finished_connection = job->Finished.connect (bind (&AudioDialog::analysis_finished, this)); JobManager::instance()->add (job); return; @@ -136,7 +136,7 @@ AudioDialog::try_to_load_analysis () _analysis.reset (new AudioAnalysis (path)); } catch (xmlpp::exception& e) { /* Probably an old-style analysis file: recreate it */ - shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film)); + shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film, film->playlist ())); _analysis_finished_connection = job->Finished.connect (bind (&AudioDialog::analysis_finished, this)); JobManager::instance()->add (job); return; @@ -265,5 +265,3 @@ AudioDialog::Show (bool show) try_to_load_analysis (); return r; } - - diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index 7a306de62..6f29bcc33 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -138,7 +138,7 @@ FilmViewer::set_film (shared_ptr<Film> film) } try { - _player.reset (new Player (_film)); + _player.reset (new Player (_film, _film->playlist ())); } catch (bad_alloc) { error_dialog (this, _("There is not enough free memory to do that.")); _film.reset (); |