#include "wx_util.h"
#include "playhead_to_timecode_dialog.h"
#include "playhead_to_frame_dialog.h"
+#include "content_view.h"
#include "lib/job_manager.h"
+#include "lib/player_video.h"
+#include "lib/dcp_content.h"
+#include "lib/job.h"
+#include "lib/examine_content_job.h"
+#include "lib/content_factory.h"
+#include "lib/cross.h"
+#include <dcp/dcp.h>
+#include <dcp/cpl.h>
+#include <dcp/reel.h>
+#include <dcp/reel_picture_asset.h>
#include <wx/wx.h>
#include <wx/tglbtn.h>
#include <wx/listctrl.h>
+#include <wx/progdlg.h>
using std::string;
+using std::list;
+using std::cout;
+using std::make_pair;
+using std::exception;
using boost::optional;
using boost::shared_ptr;
using boost::weak_ptr;
+using boost::dynamic_pointer_cast;
-/** @param outline_content true if viewer should present an "outline content" checkbox.
- * @param jump_to_selected true if viewer should present a "jump to selected" checkbox.
- */
-Controls::Controls (wxWindow* parent, shared_ptr<FilmViewer> viewer, bool outline_content, bool jump_to_selected, bool eye, bool dcp_directory)
+Controls::Controls (wxWindow* parent, shared_ptr<FilmViewer> viewer, bool editor_controls)
: wxPanel (parent)
, _viewer (viewer)
, _slider_being_moved (false)
, _forward_button (new wxButton (this, wxID_ANY, wxT(">")))
, _frame_number (new wxStaticText (this, wxID_ANY, wxT("")))
, _timecode (new wxStaticText (this, wxID_ANY, wxT("")))
- , _play_button (new wxToggleButton (this, wxID_ANY, _("Play")))
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+ , _play_button (new wxButton(this, wxID_ANY, _("Play")))
+ , _pause_button (new wxButton(this, wxID_ANY, _("Pause")))
+ , _stop_button (new wxButton(this, wxID_ANY, _("Stop")))
+#else
+ , _play_button (new wxToggleButton(this, wxID_ANY, _("Play")))
+#endif
{
_v_sizer = new wxBoxSizer (wxVERTICAL);
SetSizer (_v_sizer);
wxBoxSizer* view_options = new wxBoxSizer (wxHORIZONTAL);
- if (outline_content) {
+ if (editor_controls) {
_outline_content = new wxCheckBox (this, wxID_ANY, _("Outline content"));
view_options->Add (_outline_content, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_GAP);
- }
-
- if (eye) {
_eye = new wxChoice (this, wxID_ANY);
_eye->Append (_("Left"));
_eye->Append (_("Right"));
_eye->SetSelection (0);
view_options->Add (_eye, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_GAP);
- }
-
- if (jump_to_selected) {
_jump_to_selected = new wxCheckBox (this, wxID_ANY, _("Jump to selected content"));
view_options->Add (_jump_to_selected, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_GAP);
}
_v_sizer->Add (view_options, 0, wxALL, DCPOMATIC_SIZER_GAP);
- _dcp_directory = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxSize(600, -1), wxLC_REPORT | wxLC_NO_HEADER);
- _dcp_directory->AppendColumn (wxT(""), wxLIST_FORMAT_LEFT, 580);
- _v_sizer->Add (_dcp_directory, 0, wxALL, DCPOMATIC_SIZER_GAP);
- _dcp_directory->Show (dcp_directory);
+ wxBoxSizer* left_sizer = new wxBoxSizer (wxVERTICAL);
+
+ _spl_view = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT | wxLC_NO_HEADER);
+ _spl_view->AppendColumn (wxT(""), wxLIST_FORMAT_LEFT, 740);
+ left_sizer->Add (_spl_view, 1, wxALL | wxEXPAND, DCPOMATIC_SIZER_GAP);
+
+ _content_view = new ContentView (this, _film);
+ left_sizer->Add (_content_view, 1, wxALL | wxEXPAND, DCPOMATIC_SIZER_GAP);
+
+ wxBoxSizer* e_sizer = new wxBoxSizer (wxHORIZONTAL);
+ e_sizer->Add (left_sizer, 1, wxALL | 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, 80);
+ _current_spl_view->AppendColumn (wxT(""), wxLIST_FORMAT_LEFT, 80);
+ _current_spl_view->AppendColumn (wxT(""), wxLIST_FORMAT_LEFT, 580);
+ e_sizer->Add (_current_spl_view, 1, wxALL | wxEXPAND, DCPOMATIC_SIZER_GAP);
+
+ _v_sizer->Add (e_sizer, 1, wxEXPAND);
+
+ _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);
+
+ _content_view->Show (false);
+ _spl_view->Show (false);
+ _current_spl_view->Show (false);
+ _log->Show (false);
wxBoxSizer* h_sizer = new wxBoxSizer (wxHORIZONTAL);
h_sizer->Add (time_sizer, 0, wxEXPAND);
h_sizer->Add (_forward_button, 0, wxALL, 2);
h_sizer->Add (_play_button, 0, wxEXPAND);
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+ h_sizer->Add (_pause_button, 0, wxEXPAND);
+ h_sizer->Add (_stop_button, 0, wxEXPAND);
+#endif
h_sizer->Add (_slider, 1, wxEXPAND);
_v_sizer->Add (h_sizer, 0, wxEXPAND | wxALL, 6);
_outline_content->Bind (wxEVT_CHECKBOX, boost::bind (&Controls::outline_content_changed, this));
}
- _slider->Bind (wxEVT_SCROLL_THUMBTRACK, boost::bind (&Controls::slider_moved, this, false));
- _slider->Bind (wxEVT_SCROLL_PAGEUP, boost::bind (&Controls::slider_moved, this, true));
- _slider->Bind (wxEVT_SCROLL_PAGEDOWN, boost::bind (&Controls::slider_moved, this, true));
- _slider->Bind (wxEVT_SCROLL_THUMBRELEASE, boost::bind (&Controls::slider_released, this));
- _play_button->Bind (wxEVT_TOGGLEBUTTON, boost::bind (&Controls::play_clicked, this));
- _rewind_button->Bind (wxEVT_LEFT_DOWN, boost::bind (&Controls::rewind_clicked, this, _1));
- _back_button->Bind (wxEVT_LEFT_DOWN, boost::bind (&Controls::back_clicked, this, _1));
- _forward_button->Bind (wxEVT_LEFT_DOWN, boost::bind (&Controls::forward_clicked, this, _1));
- _frame_number->Bind (wxEVT_LEFT_DOWN, boost::bind (&Controls::frame_number_clicked, this));
- _timecode->Bind (wxEVT_LEFT_DOWN, boost::bind (&Controls::timecode_clicked, this));
- _dcp_directory->Bind (wxEVT_LIST_ITEM_SELECTED, boost::bind (&Controls::dcp_directory_selected, this));
+ _slider->Bind (wxEVT_SCROLL_THUMBTRACK, boost::bind(&Controls::slider_moved, this, false));
+ _slider->Bind (wxEVT_SCROLL_PAGEUP, boost::bind(&Controls::slider_moved, this, true));
+ _slider->Bind (wxEVT_SCROLL_PAGEDOWN, boost::bind(&Controls::slider_moved, this, true));
+ _slider->Bind (wxEVT_SCROLL_CHANGED, boost::bind(&Controls::slider_released, this));
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+ _play_button->Bind (wxEVT_BUTTON, boost::bind(&Controls::play_clicked, this));
+ _pause_button->Bind (wxEVT_BUTTON, boost::bind(&Controls::pause_clicked, this));
+ _stop_button->Bind (wxEVT_BUTTON, boost::bind(&Controls::stop_clicked, this));
+#else
+ _play_button->Bind (wxEVT_TOGGLEBUTTON, boost::bind(&Controls::play_clicked, this));
+#endif
+ _rewind_button->Bind (wxEVT_LEFT_DOWN, boost::bind(&Controls::rewind_clicked, this, _1));
+ _back_button->Bind (wxEVT_LEFT_DOWN, boost::bind(&Controls::back_clicked, this, _1));
+ _forward_button->Bind (wxEVT_LEFT_DOWN, boost::bind(&Controls::forward_clicked, this, _1));
+ _frame_number->Bind (wxEVT_LEFT_DOWN, boost::bind(&Controls::frame_number_clicked, this));
+ _timecode->Bind (wxEVT_LEFT_DOWN, boost::bind(&Controls::timecode_clicked, this));
+ _content_view->Bind (wxEVT_LIST_ITEM_SELECTED, boost::bind(&Controls::setup_sensitivity, this));
+ _content_view->Bind (wxEVT_LIST_ITEM_DESELECTED, boost::bind(&Controls::setup_sensitivity, this));
if (_jump_to_selected) {
_jump_to_selected->Bind (wxEVT_CHECKBOX, boost::bind (&Controls::jump_to_selected_clicked, this));
_jump_to_selected->SetValue (Config::instance()->jump_to_selected ());
_viewer->Started.connect (boost::bind(&Controls::started, this));
_viewer->Stopped.connect (boost::bind(&Controls::stopped, this));
_viewer->FilmChanged.connect (boost::bind(&Controls::film_changed, this));
+ _viewer->ImageChanged.connect (boost::bind(&Controls::image_changed, this, _1));
film_changed ();
setup_sensitivity ();
- update_dcp_directory ();
+ update_playlist_directory ();
JobManager::instance()->ActiveJobsChanged.connect (
bind (&Controls::active_jobs_changed, this, _2)
);
_config_changed_connection = Config::instance()->Changed.connect (bind(&Controls::config_changed, this, _1));
+ config_changed (Config::OTHER);
}
void
Controls::config_changed (int property)
{
- if (property == Config::PLAYER_DCP_DIRECTORY) {
- update_dcp_directory ();
+ if (property == Config::PLAYER_CONTENT_DIRECTORY) {
+ _content_view->update ();
+ } else if (property == Config::PLAYER_PLAYLIST_DIRECTORY) {
+ update_playlist_directory ();
+ } else {
+ setup_sensitivity ();
}
}
void
Controls::started ()
{
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+ _play_button->Enable (false);
+ _pause_button->Enable (true);
+#else
_play_button->SetValue (true);
+#endif
+ setup_sensitivity ();
}
void
Controls::stopped ()
{
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+ _play_button->Enable (true);
+ _pause_button->Enable (false);
+#else
_play_button->SetValue (false);
+#endif
+ setup_sensitivity ();
}
void
void
Controls::play_clicked ()
{
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+ _viewer->start ();
+#else
check_play_state ();
+#endif
}
+
+#ifndef DCPOMATIC_VARIANT_SWAROOP
void
Controls::check_play_state ()
{
_viewer->stop ();
}
}
+#endif
void
Controls::update_position_slider ()
void
Controls::active_jobs_changed (optional<string> j)
{
- /* examine content is the only job which stops the viewer working */
- bool const a = !j || *j != "examine_content";
- _slider->Enable (a);
- _play_button->Enable (a);
+ _active_job = j;
+ setup_sensitivity ();
}
DCPTime
void
Controls::setup_sensitivity ()
{
- bool const c = _film && !_film->content().empty ();
+ /* examine content is the only job which stops the viewer working */
+ bool const active_job = _active_job && *_active_job != "examine_content";
+ bool const c = _film && !_film->content().empty() && !active_job;
_slider->Enable (c);
_rewind_button->Enable (c);
_back_button->Enable (c);
_forward_button->Enable (c);
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+ _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));
+#else
_play_button->Enable (c);
+#endif
if (_outline_content) {
_outline_content->Enable (c);
}
if (_film) {
_film->Change.connect (boost::bind (&Controls::film_change, this, _1, _2));
}
+
+ _content_view->set_film (film);
+ _content_view->update ();
}
shared_ptr<Film>
}
void
-Controls::show_dcp_directory (bool s)
+Controls::show_extended_player_controls (bool s)
+{
+ _content_view->Show (s);
+ _spl_view->Show (s);
+ if (s) {
+ _content_view->update ();
+ update_playlist_directory ();
+ }
+ _current_spl_view->Show (s);
+ _log->Show (s);
+ _v_sizer->Layout ();
+}
+
+void
+Controls::add_playlist_to_list (shared_ptr<Film> film)
{
- _dcp_directory->Show (s);
+ int const N = _spl_view->GetItemCount();
+
+ wxListItem it;
+ it.SetId(N);
+ it.SetColumn(0);
+ it.SetText (std_to_wx(film->name()));
+ _spl_view->InsertItem (it);
}
void
-Controls::update_dcp_directory ()
+Controls::update_playlist_directory ()
{
+ if (!_spl_view->IsShown()) {
+ return;
+ }
+
using namespace boost::filesystem;
- _dcp_directory->DeleteAllItems ();
- _dcp_directories.clear ();
- optional<path> dir = Config::instance()->player_dcp_directory();
+ _spl_view->DeleteAllItems ();
+ optional<path> dir = Config::instance()->player_playlist_directory();
if (!dir) {
return;
}
for (directory_iterator i = directory_iterator(*dir); i != directory_iterator(); ++i) {
try {
- if (is_directory(*i) && (is_regular_file(*i / "ASSETMAP") || is_regular_file(*i / "ASSETMAP.xml"))) {
- string const x = i->path().string().substr(dir->string().length() + 1);
- _dcp_directory->InsertItem(_dcp_directory->GetItemCount(), std_to_wx(x));
- _dcp_directories.push_back(x);
- }
- } catch (boost::filesystem::filesystem_error& e) {
+ shared_ptr<Film> film (new Film(optional<path>()));
+ film->read_metadata (i->path());
+ _playlists.push_back (film);
+ add_playlist_to_list (film);
+ } catch (exception& e) {
/* Never mind */
}
}
}
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+void
+Controls::pause_clicked ()
+{
+ _viewer->stop ();
+}
+
+void
+Controls::stop_clicked ()
+{
+ _viewer->stop ();
+ _viewer->seek (DCPTime(), true);
+}
+#endif
+
void
-Controls::dcp_directory_selected ()
+Controls::log (wxString s)
{
- long int s = _dcp_directory->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
- if (s == -1) {
+ 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
+Controls::image_changed (boost::weak_ptr<PlayerVideo> weak_pv)
+{
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+ shared_ptr<PlayerVideo> pv = weak_pv.lock ();
+ if (!pv) {
+ return;
+ }
+
+ shared_ptr<Content> c = pv->content().lock();
+ if (!c) {
+ return;
+ }
+
+ shared_ptr<DCPContent> dc = dynamic_pointer_cast<DCPContent> (c);
+ if (!dc) {
return;
}
- DCPOMATIC_ASSERT (s < int(_dcp_directories.size()));
- DCPDirectorySelected (*Config::instance()->player_dcp_directory() / _dcp_directories[s]);
+ if (!_current_kind || *_current_kind != dc->content_kind()) {
+ _current_kind = dc->content_kind ();
+ setup_sensitivity ();
+ }
+#endif
}
projects / dcpomatic.git / blobdiff