X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fswaroop_controls.cc;h=f38fd33432a2ca1a8a4047242bca98eae6ac273e;hb=d4658d7d79bcf5bfa52f6f26eee3506bb8db82f5;hp=73b24a02d769e9aa0c67c12c70e5bd896ba4be3b;hpb=eaa4e297c91fbc4ae32e5b6b04c1800d42ceed71;p=dcpomatic.git diff --git a/src/wx/swaroop_controls.cc b/src/wx/swaroop_controls.cc index 73b24a02d..f38fd3343 100644 --- a/src/wx/swaroop_controls.cc +++ b/src/wx/swaroop_controls.cc @@ -22,9 +22,14 @@ #include "film_viewer.h" #include "wx_util.h" #include "content_view.h" +#include "dcpomatic_button.h" +#include "static_text.h" #include "lib/player_video.h" #include "lib/dcp_content.h" +#include "lib/cross.h" +#include #include +#include using std::string; using std::cout; @@ -35,13 +40,19 @@ using boost::optional; SwaroopControls::SwaroopControls (wxWindow* parent, shared_ptr viewer) : Controls (parent, viewer, false) - , _play_button (new wxButton(this, wxID_ANY, _("Play"))) - , _pause_button (new wxButton(this, wxID_ANY, _("Pause"))) - , _stop_button (new wxButton(this, wxID_ANY, _("Stop"))) + , _play_button (new Button(this, _("Play"))) + , _pause_button (new Button(this, _("Pause"))) + , _stop_button (new Button(this, _("Stop"))) + , _next_button (new Button(this, "Next")) + , _previous_button (new Button(this, "Previous")) + , _current_disable_timeline (false) + , _current_disable_next_previous (false) { + _button_sizer->Add (_previous_button, 0, wxEXPAND); _button_sizer->Add (_play_button, 0, wxEXPAND); _button_sizer->Add (_pause_button, 0, wxEXPAND); _button_sizer->Add (_stop_button, 0, wxEXPAND); + _button_sizer->Add (_next_button, 0, wxEXPAND); _spl_view = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT | wxLC_NO_HEADER); _spl_view->AppendColumn (wxT(""), wxLIST_FORMAT_LEFT, 740); @@ -49,10 +60,34 @@ SwaroopControls::SwaroopControls (wxWindow* parent, shared_ptr viewe wxBoxSizer* left_sizer = new wxBoxSizer (wxVERTICAL); wxBoxSizer* e_sizer = new wxBoxSizer (wxHORIZONTAL); - left_sizer->Add (_spl_view, 1, wxALL | wxEXPAND, DCPOMATIC_SIZER_GAP); + wxFont subheading_font (*wxNORMAL_FONT); + subheading_font.SetWeight (wxFONTWEIGHT_BOLD); + + wxBoxSizer* spl_header = new wxBoxSizer (wxHORIZONTAL); + { + wxStaticText* m = new StaticText (this, "Playlists"); + m->SetFont (subheading_font); + spl_header->Add (m, 1, wxALIGN_CENTER_VERTICAL); + } + _refresh_spl_view = new Button (this, "Refresh"); + spl_header->Add (_refresh_spl_view, 0, wxBOTTOM, DCPOMATIC_SIZER_GAP / 2); + + left_sizer->Add (spl_header, 0, wxLEFT | wxRIGHT | wxEXPAND, DCPOMATIC_SIZER_GAP); + left_sizer->Add (_spl_view, 1, wxLEFT | wxRIGHT | wxBOTTOM | wxEXPAND, DCPOMATIC_SIZER_GAP); _content_view = new ContentView (this); - left_sizer->Add (_content_view, 1, wxALL | wxEXPAND, DCPOMATIC_SIZER_GAP); + + wxBoxSizer* content_header = new wxBoxSizer (wxHORIZONTAL); + { + wxStaticText* m = new StaticText (this, "Content"); + m->SetFont (subheading_font); + content_header->Add (m, 1, wxALIGN_CENTER_VERTICAL); + } + _refresh_content_view = new Button (this, "Refresh"); + content_header->Add (_refresh_content_view, 0, wxBOTTOM, DCPOMATIC_SIZER_GAP / 2); + + left_sizer->Add (content_header, 0, wxTOP | wxLEFT | wxRIGHT | wxEXPAND, DCPOMATIC_SIZER_GAP); + left_sizer->Add (_content_view, 1, wxLEFT | wxRIGHT | wxBOTTOM | wxEXPAND, DCPOMATIC_SIZER_GAP); _current_spl_view = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT | wxLC_NO_HEADER); _current_spl_view->AppendColumn (wxT(""), wxLIST_FORMAT_LEFT, 500); @@ -65,17 +100,65 @@ SwaroopControls::SwaroopControls (wxWindow* parent, shared_ptr viewe _log = new wxTextCtrl (this, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(-1, 200), wxTE_READONLY | wxTE_MULTILINE); _v_sizer->Add (_log, 0, wxALL | wxEXPAND, DCPOMATIC_SIZER_GAP); - _play_button->Bind (wxEVT_BUTTON, boost::bind(&SwaroopControls::play_clicked, this)); - _pause_button->Bind (wxEVT_BUTTON, boost::bind(&SwaroopControls::pause_clicked, this)); - _stop_button->Bind (wxEVT_BUTTON, boost::bind(&SwaroopControls::stop_clicked, this)); - _spl_view->Bind (wxEVT_LIST_ITEM_SELECTED, boost::bind(&SwaroopControls::spl_selection_changed, this)); - _spl_view->Bind (wxEVT_LIST_ITEM_DESELECTED, boost::bind(&SwaroopControls::spl_selection_changed, this)); - _viewer->ImageChanged.connect (boost::bind(&SwaroopControls::image_changed, this, _1)); + _play_button->Bind (wxEVT_BUTTON, boost::bind(&SwaroopControls::play_clicked, this)); + _pause_button->Bind (wxEVT_BUTTON, boost::bind(&SwaroopControls::pause_clicked, this)); + _stop_button->Bind (wxEVT_BUTTON, boost::bind(&SwaroopControls::stop_clicked, this)); + _next_button->Bind (wxEVT_BUTTON, boost::bind(&SwaroopControls::next_clicked, this)); + _previous_button->Bind (wxEVT_BUTTON, boost::bind(&SwaroopControls::previous_clicked, this)); + _spl_view->Bind (wxEVT_LIST_ITEM_SELECTED, boost::bind(&SwaroopControls::spl_selection_changed, this)); + _spl_view->Bind (wxEVT_LIST_ITEM_DESELECTED, boost::bind(&SwaroopControls::spl_selection_changed, this)); + _viewer->Finished.connect (boost::bind(&SwaroopControls::viewer_finished, this)); + _viewer->PositionChanged.connect (boost::bind(&SwaroopControls::viewer_position_changed, this)); + _refresh_spl_view->Bind (wxEVT_BUTTON, boost::bind(&SwaroopControls::update_playlist_directory, this)); + _refresh_content_view->Bind (wxEVT_BUTTON, boost::bind(&ContentView::update, _content_view)); _content_view->update (); update_playlist_directory (); } +void +SwaroopControls::check_restart () +{ + FILE* f = fopen_boost (Config::path("position"), "r"); + if (!f) { + return; + } + + char id[64]; + int index; + int64_t time; + fscanf (f, "%63s %d %ld", id, &index, &time); + + for (size_t i = 0; i < _playlists.size(); ++i) { + if (_playlists[i].id() == id) { + _selected_playlist = i; + _selected_playlist_position = index; + update_current_content (); + _viewer->seek (DCPTime(time), false); + } + } + + fclose (f); +} + +void +SwaroopControls::viewer_position_changed () +{ + if (!_selected_playlist || !_viewer->playing() || _viewer->position().get() % DCPTime::HZ) { + return; + } + + FILE* f = fopen_boost (Config::path("position"), "w"); + if (f) { + string const p = _playlists[*_selected_playlist].id() + + " " + dcp::raw_convert(_selected_playlist_position) + + " " + dcp::raw_convert(_viewer->position().get()); + + fwrite (p.c_str(), p.length(), 1, f); + fclose (f); + } +} + void SwaroopControls::started () { @@ -105,9 +188,11 @@ SwaroopControls::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 (c && (!_current_kind || _current_kind != dcp::ADVERTISEMENT) && _viewer->playing()); - _stop_button->Enable (c && (!_current_kind || _current_kind != dcp::ADVERTISEMENT)); - _slider->Enable (c && (!_current_kind || _current_kind != dcp::ADVERTISEMENT)); + _pause_button->Enable (_viewer->playing()); + _slider->Enable (!_current_disable_timeline); + _spl_view->Enable (!_viewer->playing()); + _next_button->Enable (!_current_disable_next_previous && can_do_next()); + _previous_button->Enable (!_current_disable_next_previous && can_do_previous()); } void @@ -123,41 +208,51 @@ SwaroopControls::stop_clicked () _viewer->seek (DCPTime(), true); } -void -SwaroopControls::log (wxString s) +bool +SwaroopControls::can_do_previous () { - 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_(": "); - _log->SetValue(_log->GetValue() + ts + s + "\n"); + return _selected_playlist && (_selected_playlist_position - 1) >= 0; } void -SwaroopControls::image_changed (boost::weak_ptr weak_pv) +SwaroopControls::previous_clicked () { - shared_ptr pv = weak_pv.lock (); - if (!pv) { + if (!can_do_previous ()) { return; } - shared_ptr c = pv->content().lock(); - if (!c) { - return; - } + _selected_playlist_position--; + update_current_content (); +} - shared_ptr dc = dynamic_pointer_cast (c); - if (!dc) { +bool +SwaroopControls::can_do_next () +{ + return _selected_playlist && (_selected_playlist_position + 1) < int(_playlists[*_selected_playlist].get().size()); +} + +void +SwaroopControls::next_clicked () +{ + if (!can_do_next ()) { return; } - if (!_current_kind || *_current_kind != dc->content_kind()) { - _current_kind = dc->content_kind (); - setup_sensitivity (); - } + _selected_playlist_position++; + update_current_content (); +} + +void +SwaroopControls::log (wxString s) +{ + 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_(": "); + _log->SetValue(_log->GetValue() + ts + s + "\n"); } void @@ -168,7 +263,11 @@ SwaroopControls::add_playlist_to_list (SPL spl) wxListItem it; it.SetId(N); it.SetColumn(0); - it.SetText (std_to_wx(spl.name())); + string t = spl.name(); + if (spl.missing()) { + t += " (content missing)"; + } + it.SetText (std_to_wx(t)); _spl_view->InsertItem (it); } @@ -202,14 +301,26 @@ SwaroopControls::update_playlist_directory () void SwaroopControls::spl_selection_changed () { - _current_spl_view->DeleteAllItems (); - long int selected = _spl_view->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); if (selected == -1) { + _current_spl_view->DeleteAllItems (); + _selected_playlist = boost::none; return; } - shared_ptr film (new Film(optional())); + if (_playlists[selected].missing()) { + error_dialog (this, "This playlist cannot be loaded as some content is missing."); + _selected_playlist = boost::none; + _spl_view->SetItemState (selected, 0, wxLIST_STATE_SELECTED); + return; + } + + if (_playlists[selected].get().empty()) { + error_dialog (this, "This playlist is empty."); + return; + } + + _current_spl_view->DeleteAllItems (); int N = 0; BOOST_FOREACH (SPLEntry i, _playlists[selected].get()) { @@ -218,10 +329,21 @@ SwaroopControls::spl_selection_changed () it.SetColumn (0); it.SetText (std_to_wx(i.name)); _current_spl_view->InsertItem (it); - film->add_content (i.content); ++N; } + _selected_playlist = selected; + _selected_playlist_position = 0; + reset_film (); + update_current_content (); +} + +void +SwaroopControls::reset_film () +{ + DCPOMATIC_ASSERT (_selected_playlist); + shared_ptr film (new Film(optional())); + film->add_content (_playlists[*_selected_playlist].get()[_selected_playlist_position].content); ResetFilm (film); } @@ -241,6 +363,33 @@ void SwaroopControls::set_film (shared_ptr film) { Controls::set_film (film); - update_playlist_directory (); setup_sensitivity (); } + +void +SwaroopControls::update_current_content () +{ + DCPOMATIC_ASSERT (_selected_playlist); + + bool const was_playing = _viewer->stop (); + + SPLEntry const & e = _playlists[*_selected_playlist].get()[_selected_playlist_position]; + _current_disable_timeline = e.disable_timeline; + _current_disable_next_previous = !e.skippable; + + setup_sensitivity (); + reset_film (); + if (was_playing) { + _viewer->start (); + } +} + +void +SwaroopControls::viewer_finished () +{ + if (!_selected_playlist) { + return; + } + + next_clicked (); +}