#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 <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;
_v_sizer->Add (view_options, 0, wxALL, DCPOMATIC_SIZER_GAP);
- wxBoxSizer* e_sizer = new wxBoxSizer (wxHORIZONTAL);
-
- _cpl = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT | wxLC_NO_HEADER);
- /* time */
- _cpl->AppendColumn (wxT(""), wxLIST_FORMAT_LEFT, 80);
- /* type */
- _cpl->AppendColumn (wxT(""), wxLIST_FORMAT_LEFT, 80);
- /* annotation text */
- _cpl->AppendColumn (wxT(""), wxLIST_FORMAT_LEFT, 580);
- e_sizer->Add (_cpl, 1, wxALL | wxEXPAND, DCPOMATIC_SIZER_GAP);
+ 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, 80);
- _spl_view->AppendColumn (wxT(""), wxLIST_FORMAT_LEFT, 80);
- _spl_view->AppendColumn (wxT(""), wxLIST_FORMAT_LEFT, 580);
- e_sizer->Add (_spl_view, 1, wxALL | wxEXPAND, DCPOMATIC_SIZER_GAP);
+ _spl_view->AppendColumn (wxT(""), wxLIST_FORMAT_LEFT, 740);
+ left_sizer->Add (_spl_view, 1, wxALL | wxEXPAND, DCPOMATIC_SIZER_GAP);
- wxBoxSizer* buttons_sizer = new wxBoxSizer (wxVERTICAL);
- _add_button = new wxButton(this, wxID_ANY, _("Add"));
- buttons_sizer->Add (_add_button);
- e_sizer->Add (buttons_sizer, 0, 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);
- _cpl->Show (false);
+ _content_view->Show (false);
_spl_view->Show (false);
- _add_button->Show (false);
+ _current_spl_view->Show (false);
_log->Show (false);
wxBoxSizer* h_sizer = new wxBoxSizer (wxHORIZONTAL);
_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));
- _cpl->Bind (wxEVT_LIST_ITEM_SELECTED, boost::bind(&Controls::setup_sensitivity, this));
- _cpl->Bind (wxEVT_LIST_ITEM_DESELECTED, boost::bind(&Controls::setup_sensitivity, 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 ());
}
- _add_button->Bind (wxEVT_BUTTON, boost::bind(&Controls::add_clicked, this));
_viewer->PositionChanged.connect (boost::bind(&Controls::position_changed, this));
_viewer->Started.connect (boost::bind(&Controls::started, this));
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));
-}
-
-void
-Controls::add_clicked ()
-{
- optional<CPL> sel = selected_cpl ();
- DCPOMATIC_ASSERT (sel);
- _spl.push_back (SPLEntry(sel->first, sel->second));
- add_cpl_to_list (sel->first, _spl_view);
- SPLChanged (_spl);
- setup_sensitivity ();
+ 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 ();
}
}
{
/* 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()) || !_spl.empty()) && !active_job;
+ bool const c = _film && !_film->content().empty() && !active_job;
_slider->Enable (c);
_rewind_button->Enable (c);
if (_eye) {
_eye->Enable (c && _film->three_d ());
}
-
- _add_button->Enable (static_cast<bool>(selected_cpl()));
-}
-
-optional<Controls::CPL>
-Controls::selected_cpl () const
-{
- long int s = _cpl->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
- if (s == -1) {
- return optional<CPL>();
- }
-
- DCPOMATIC_ASSERT (s < int(_cpls.size()));
- return _cpls[s];
}
void
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_extended_player_controls (bool s)
{
- _cpl->Show (s);
+ _content_view->Show (s);
+ _spl_view->Show (s);
if (s) {
- update_dcp_directory ();
+ _content_view->update ();
+ update_playlist_directory ();
}
- _spl_view->Show (s);
+ _current_spl_view->Show (s);
_log->Show (s);
- _add_button->Show (s);
_v_sizer->Layout ();
}
void
-Controls::add_cpl_to_list (shared_ptr<dcp::CPL> cpl, wxListCtrl* ctrl)
+Controls::add_playlist_to_list (shared_ptr<Film> film)
{
- list<shared_ptr<dcp::Reel> > reels = cpl->reels ();
-
- int const N = ctrl->GetItemCount();
+ int const N = _spl_view->GetItemCount();
wxListItem it;
- if (!reels.empty() && reels.front()->main_picture()) {
- it.SetId(N);
- it.SetColumn(0);
- int seconds = rint(double(cpl->duration()) / reels.front()->main_picture()->frame_rate().as_float());
- int minutes = seconds / 60;
- seconds -= minutes * 60;
- int hours = minutes / 60;
- minutes -= hours * 60;
- it.SetText(wxString::Format("%02d:%02d:%02d", hours, minutes, seconds));
- ctrl->InsertItem(it);
- }
-
- it.SetId(N);
- it.SetColumn(1);
- it.SetText(std_to_wx(dcp::content_kind_to_string(cpl->content_kind())));
- ctrl->SetItem(it);
-
it.SetId(N);
- it.SetColumn(2);
- it.SetText(std_to_wx(cpl->annotation_text()));
- ctrl->SetItem(it);
+ it.SetColumn(0);
+ it.SetText (std_to_wx(film->name()));
+ _spl_view->InsertItem (it);
}
void
-Controls::update_dcp_directory ()
+Controls::update_playlist_directory ()
{
- if (!_cpl->IsShown()) {
+ if (!_spl_view->IsShown()) {
return;
}
using namespace boost::filesystem;
- _cpl->DeleteAllItems ();
- _cpls.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::DCP dcp (*i);
- dcp.read ();
- BOOST_FOREACH (shared_ptr<dcp::CPL> j, dcp.cpls()) {
- add_cpl_to_list (j, _cpl);
- _cpls.push_back (make_pair(j, *i));
- }
- }
- } 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 */
}
}
projects / dcpomatic.git / blobdiff