Emit no audio from DCPs if none is mapped

[dcpomatic.git] / src / wx / playlist_controls.cc

diff --git a/src/wx/playlist_controls.cc b/src/wx/playlist_controls.cc
index 7ed5c44952a92a7c61710c9c6e1701d0889609bc..3a1bba3628bf1c48b697aa298b898b33e6d1b44f 100644 (file)
--- a/src/wx/playlist_controls.cc
+++ b/src/wx/playlist_controls.cc
@@ -26,19 +26,21 @@
 #include "static_text.h"
 #include "wx_util.h"
 #include "lib/compose.hpp"
+#include "lib/constants.h"
 #include "lib/cross.h"
 #include "lib/dcp_content.h"
 #include "lib/ffmpeg_content.h"
+#include "lib/film.h"
 #include "lib/internet.h"
 #include "lib/player_video.h"
 #include "lib/scoped_temporary.h"
-#include "lib/warnings.h"
-#include <dcp/raw_convert.h>
 #include <dcp/exceptions.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/raw_convert.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/listctrl.h>
 #include <wx/progdlg.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 
 
 using std::cout;
@@ -51,7 +53,7 @@ using boost::optional;
 using namespace dcpomatic;
 
 
-PlaylistControls::PlaylistControls (wxWindow* parent, shared_ptr<FilmViewer> viewer)
+PlaylistControls::PlaylistControls(wxWindow* parent, FilmViewer& viewer)
        : Controls (parent, viewer, false)
        , _play_button (new Button(this, _("Play")))
        , _pause_button (new Button(this, _("Pause")))
@@ -68,15 +70,15 @@ PlaylistControls::PlaylistControls (wxWindow* parent, shared_ptr<FilmViewer> vie
        _spl_view = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT | wxLC_NO_HEADER);
        _spl_view->AppendColumn (wxT(""), wxLIST_FORMAT_LEFT, 740);
 
-       wxBoxSizer* left_sizer = new wxBoxSizer (wxVERTICAL);
-       wxBoxSizer* e_sizer = new wxBoxSizer (wxHORIZONTAL);
+       auto left_sizer = new wxBoxSizer(wxVERTICAL);
+       auto e_sizer = new wxBoxSizer(wxHORIZONTAL);
 
        wxFont subheading_font (*wxNORMAL_FONT);
        subheading_font.SetWeight (wxFONTWEIGHT_BOLD);
 
-       wxBoxSizer* spl_header = new wxBoxSizer (wxHORIZONTAL);
+       auto spl_header = new wxBoxSizer(wxHORIZONTAL);
        {
-               wxStaticText* m = new StaticText (this, "Playlists");
+               auto m = new StaticText(this, "Playlists");
                m->SetFont (subheading_font);
                spl_header->Add (m, 1, wxALIGN_CENTER_VERTICAL);
        }
@@ -88,9 +90,9 @@ PlaylistControls::PlaylistControls (wxWindow* parent, shared_ptr<FilmViewer> vie
 
        _content_view = new ContentView (this);
 
-       wxBoxSizer* content_header = new wxBoxSizer (wxHORIZONTAL);
+       auto content_header = new wxBoxSizer(wxHORIZONTAL);
        {
-               wxStaticText* m = new StaticText (this, "Content");
+               auto m = new StaticText(this, "Content");
                m->SetFont (subheading_font);
                content_header->Add (m, 1, wxALIGN_CENTER_VERTICAL);
        }
@@ -115,7 +117,7 @@ PlaylistControls::PlaylistControls (wxWindow* parent, shared_ptr<FilmViewer> vie
        _previous_button->Bind (wxEVT_BUTTON, boost::bind(&PlaylistControls::previous_clicked,  this));
        _spl_view->Bind        (wxEVT_LIST_ITEM_SELECTED,   boost::bind(&PlaylistControls::spl_selection_changed, this));
        _spl_view->Bind        (wxEVT_LIST_ITEM_DESELECTED, boost::bind(&PlaylistControls::spl_selection_changed, this));
-       viewer->Finished.connect (boost::bind(&PlaylistControls::viewer_finished, this));
+       _viewer.Finished.connect(boost::bind(&PlaylistControls::viewer_finished, this));
        _refresh_spl_view->Bind (wxEVT_BUTTON, boost::bind(&PlaylistControls::update_playlist_directory, this));
        _refresh_content_view->Bind (wxEVT_BUTTON, boost::bind(&ContentView::update, _content_view));
 
@@ -148,32 +150,24 @@ PlaylistControls::deselect_playlist ()
                _selected_playlist = boost::none;
                _spl_view->SetItemState (selected, 0, wxLIST_STATE_SELECTED);
        }
-       ResetFilm (shared_ptr<Film>(new Film(optional<boost::filesystem::path>())));
+       ResetFilm(std::make_shared<Film>(optional<boost::filesystem::path>()));
 }
 
 void
 PlaylistControls::play_clicked ()
 {
-       auto viewer = _viewer.lock ();
-       if (viewer) {
-               viewer->start ();
-       }
+       _viewer.start();
 }
 
 void
 PlaylistControls::setup_sensitivity ()
 {
-       auto viewer = _viewer.lock ();
-       if (!viewer) {
-               return;
-       }
-
        Controls::setup_sensitivity ();
        bool const active_job = _active_job && *_active_job != "examine_content";
        bool const c = _film && !_film->content().empty() && !active_job;
-       _play_button->Enable (c && !viewer->playing());
-       _pause_button->Enable (viewer->playing());
-       _spl_view->Enable (!viewer->playing());
+       _play_button->Enable(c && !_viewer.playing());
+       _pause_button->Enable(_viewer.playing());
+       _spl_view->Enable(!_viewer.playing());
        _next_button->Enable (can_do_next());
        _previous_button->Enable (can_do_previous());
 }
@@ -181,22 +175,14 @@ PlaylistControls::setup_sensitivity ()
 void
 PlaylistControls::pause_clicked ()
 {
-       auto viewer = _viewer.lock ();
-       if (viewer) {
-               viewer->stop ();
-       }
+       _viewer.stop();
 }
 
 void
 PlaylistControls::stop_clicked ()
 {
-       auto viewer = _viewer.lock ();
-       if (!viewer) {
-               return;
-       }
-
-       viewer->stop ();
-       viewer->seek (DCPTime(), true);
+       _viewer.stop();
+       _viewer.seek(DCPTime(), true);
        if (_selected_playlist) {
                _selected_playlist_position = 0;
                update_current_content ();
@@ -411,12 +397,6 @@ PlaylistControls::config_changed (int property)
        }
 }
 
-void
-PlaylistControls::set_film (shared_ptr<Film> film)
-{
-       Controls::set_film (film);
-       setup_sensitivity ();
-}
 
 void
 PlaylistControls::update_current_content ()
@@ -434,8 +414,7 @@ PlaylistControls::update_current_content ()
 void
 PlaylistControls::viewer_finished ()
 {
-       auto viewer = _viewer.lock ();
-       if (!_selected_playlist || !viewer) {
+       if (!_selected_playlist) {
                return;
        }
 
@@ -443,11 +422,11 @@ PlaylistControls::viewer_finished ()
        if (_selected_playlist_position < int(_playlists[*_selected_playlist].get().size())) {
                /* Next piece of content on the SPL */
                update_current_content ();
-               viewer->start ();
+               _viewer.start();
        } else {
                /* Finished the whole SPL */
                _selected_playlist_position = 0;
-               ResetFilm (shared_ptr<Film>(new Film(optional<boost::filesystem::path>())));
+               ResetFilm(std::make_shared<Film>(optional<boost::filesystem::path>()));
                _play_button->Enable (true);
                _pause_button->Enable (false);
        }