X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fplaylist_controls.cc;h=c098aa970dfd2413940e38bcde7651c35b75a6a5;hb=5ee919f413a6c1048aecf83676d42ab3fd94e06e;hp=56ff5f40d1ce7235abd83083dea1b8c3f38311f4;hpb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;p=dcpomatic.git diff --git a/src/wx/playlist_controls.cc b/src/wx/playlist_controls.cc index 56ff5f40d..c098aa970 100644 --- a/src/wx/playlist_controls.cc +++ b/src/wx/playlist_controls.cc @@ -18,34 +18,41 @@ */ -#include "playlist_controls.h" -#include "film_viewer.h" -#include "wx_util.h" + #include "content_view.h" #include "dcpomatic_button.h" +#include "film_viewer.h" +#include "playlist_controls.h" #include "static_text.h" -#include "lib/player_video.h" -#include "lib/dcp_content.h" +#include "wx_util.h" +#include "lib/compose.hpp" +#include "lib/constants.h" #include "lib/cross.h" -#include "lib/scoped_temporary.h" -#include "lib/internet.h" +#include "lib/dcp_content.h" #include "lib/ffmpeg_content.h" -#include "lib/compose.hpp" -#include +#include "lib/internet.h" +#include "lib/player_video.h" +#include "lib/scoped_temporary.h" #include +#include +#include +LIBDCP_DISABLE_WARNINGS #include #include +LIBDCP_ENABLE_WARNINGS + -using std::string; using std::cout; +using std::dynamic_pointer_cast; using std::exception; -using std::sort; using std::shared_ptr; -using std::dynamic_pointer_cast; +using std::sort; +using std::string; using boost::optional; using namespace dcpomatic; -PlaylistControls::PlaylistControls (wxWindow* parent, shared_ptr viewer) + +PlaylistControls::PlaylistControls(wxWindow* parent, FilmViewer& viewer) : Controls (parent, viewer, false) , _play_button (new Button(this, _("Play"))) , _pause_button (new Button(this, _("Pause"))) @@ -109,7 +116,7 @@ PlaylistControls::PlaylistControls (wxWindow* parent, shared_ptr 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)); @@ -142,13 +149,13 @@ PlaylistControls::deselect_playlist () _selected_playlist = boost::none; _spl_view->SetItemState (selected, 0, wxLIST_STATE_SELECTED); } - ResetFilm (shared_ptr(new Film(optional()))); + ResetFilm(std::make_shared(optional())); } void PlaylistControls::play_clicked () { - _viewer->start (); + _viewer.start(); } void @@ -157,9 +164,9 @@ PlaylistControls::setup_sensitivity () 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()); } @@ -167,14 +174,14 @@ PlaylistControls::setup_sensitivity () void PlaylistControls::pause_clicked () { - _viewer->stop (); + _viewer.stop(); } void PlaylistControls::stop_clicked () { - _viewer->stop (); - _viewer->seek (DCPTime(), true); + _viewer.stop(); + _viewer.seek(DCPTime(), true); if (_selected_playlist) { _selected_playlist_position = 0; update_current_content (); @@ -216,28 +223,6 @@ PlaylistControls::next_clicked () update_current_content (); } -void -PlaylistControls::log (wxString s) -{ - optional log = Config::instance()->player_activity_log_file(); - if (!log) { - return; - } - - struct timeval time; - gettimeofday (&time, 0); - char buffer[64]; - time_t const sec = time.tv_sec; - struct tm* t = localtime (&sec); - strftime (buffer, 64, "%c", t); - wxString ts = std_to_wx(string(buffer)) + N_(": "); - FILE* f = fopen_boost (*log, "a"); - if (!f) { - return; - } - fprintf (f, "%s%s\n", wx_to_std(ts).c_str(), wx_to_std(s).c_str()); - fclose (f); -} void PlaylistControls::add_playlist_to_list (SPL spl) @@ -288,7 +273,7 @@ PlaylistControls::update_playlist_directory () } sort (_playlists.begin(), _playlists.end(), SPLComparator()); - BOOST_FOREACH (SPL i, _playlists) { + for (auto i: _playlists) { add_playlist_to_list (i); } @@ -345,11 +330,9 @@ PlaylistControls::spl_selection_changed () void PlaylistControls::select_playlist (int selected, int position) { - log (wxString::Format("load-playlist %s", std_to_wx(_playlists[selected].name()).data())); - wxProgressDialog dialog (_("DCP-o-matic"), "Loading playlist and KDMs"); - BOOST_FOREACH (SPLEntry const & i, _playlists[selected].get()) { + for (auto const& i: _playlists[selected].get()) { dialog.Pulse (); shared_ptr dcp = dynamic_pointer_cast (i.content); if (dcp && dcp->needs_kdm()) { @@ -375,7 +358,7 @@ PlaylistControls::select_playlist (int selected, int position) _current_spl_view->DeleteAllItems (); int N = 0; - BOOST_FOREACH (SPLEntry i, _playlists[selected].get()) { + for (auto i: _playlists[selected].get()) { wxListItem it; it.SetId (N); it.SetColumn (0); @@ -444,11 +427,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(new Film(optional()))); + ResetFilm(std::make_shared(optional())); _play_button->Enable (true); _pause_button->Enable (false); }