#include "lib/player_video.h"
#include "lib/dcp_content.h"
#include "lib/cross.h"
+#include "lib/scoped_temporary.h"
+#include "lib/internet.h"
#include <dcp/raw_convert.h>
#include <wx/listctrl.h>
#include <wx/progdlg.h>
using std::string;
using std::cout;
using std::exception;
+using std::sort;
using boost::shared_ptr;
using boost::dynamic_pointer_cast;
using boost::optional;
, _next_button (new Button(this, "Next"))
, _previous_button (new Button(this, "Previous"))
, _current_disable_timeline (false)
- , _current_disable_next_previous (false)
+ , _current_disable_next (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);
- _button_sizer->Add (_previous_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);
_current_spl_view = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT | wxLC_NO_HEADER);
_current_spl_view->AppendColumn (wxT(""), wxLIST_FORMAT_LEFT, 500);
_current_spl_view->AppendColumn (wxT(""), wxLIST_FORMAT_LEFT, 80);
- e_sizer->Add (left_sizer, 0, wxALL | wxEXPAND, DCPOMATIC_SIZER_GAP);
+ e_sizer->Add (left_sizer, 1, wxALL | wxEXPAND, DCPOMATIC_SIZER_GAP);
e_sizer->Add (_current_spl_view, 1, wxALL | wxEXPAND, DCPOMATIC_SIZER_GAP);
_v_sizer->Add (e_sizer, 1, wxEXPAND);
_selected_playlist_position = index;
update_current_content ();
_viewer->seek (DCPTime(time), false);
+ _viewer->start ();
}
}
+ " " + dcp::raw_convert<string>(_selected_playlist_position)
+ " " + dcp::raw_convert<string>(_viewer->position().get());
- fwrite (p.c_str(), p.length(), 1, f);
+ checked_fwrite (p.c_str(), p.length(), f, Config::path("position"));
fclose (f);
}
}
_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());
+ _next_button->Enable (!_current_disable_next && can_do_next());
+ _previous_button->Enable (can_do_previous());
}
void
{
_viewer->stop ();
_viewer->seek (DCPTime(), true);
+ if (_selected_playlist) {
+ _selected_playlist_position = 0;
+ update_current_content ();
+ }
}
bool
_spl_view->InsertItem (it);
}
+struct SPLComparator
+{
+ bool operator() (SPL const & a, SPL const & b) {
+ return a.name() < b.name();
+ }
+};
+
void
SwaroopControls::update_playlist_directory ()
{
SPL spl;
spl.read (i->path(), _content_view);
_playlists.push_back (spl);
- add_playlist_to_list (spl);
}
} catch (exception& e) {
/* Never mind */
}
}
+
+ sort (_playlists.begin(), _playlists.end(), SPLComparator());
+ BOOST_FOREACH (SPL i, _playlists) {
+ add_playlist_to_list (i);
+ }
+
+ _selected_playlist = boost::none;
+}
+
+optional<dcp::EncryptedKDM>
+SwaroopControls::get_kdm_from_url (shared_ptr<DCPContent> dcp)
+{
+ ScopedTemporary temp;
+ string url = Config::instance()->kdm_server_url();
+ boost::algorithm::replace_all (url, "{CPL}", *dcp->cpl());
+ optional<dcp::EncryptedKDM> kdm;
+ if (dcp->cpl() && !get_from_url(url, false, temp)) {
+ try {
+ kdm = dcp::EncryptedKDM (dcp::file_to_string(temp.file()));
+ if (kdm->cpl_id() != dcp->cpl()) {
+ kdm = boost::none;
+ }
+ } catch (std::exception& e) {
+ /* Hey well */
+ }
+ }
+ return kdm;
+}
+
+optional<dcp::EncryptedKDM>
+SwaroopControls::get_kdm_from_directory (shared_ptr<DCPContent> dcp)
+{
+ using namespace boost::filesystem;
+ optional<path> kdm_dir = Config::instance()->player_kdm_directory();
+ if (!kdm_dir) {
+ return optional<dcp::EncryptedKDM>();
+ }
+ for (directory_iterator i = directory_iterator(*kdm_dir); i != directory_iterator(); ++i) {
+ try {
+ if (file_size(i->path()) < MAX_KDM_SIZE) {
+ dcp::EncryptedKDM kdm (dcp::file_to_string(i->path()));
+ if (kdm.cpl_id() == dcp->cpl()) {
+ return kdm;
+ }
+ }
+ } catch (std::exception& e) {
+ /* Hey well */
+ }
+ }
+ return optional<dcp::EncryptedKDM>();
}
void
return;
}
+ wxProgressDialog dialog (_("DCP-o-matic"), "Loading playlist and KDMs");
+
+ BOOST_FOREACH (SPLEntry const & i, _playlists[selected].get()) {
+ dialog.Pulse ();
+ shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent> (i.content);
+ if (dcp && dcp->needs_kdm()) {
+ optional<dcp::EncryptedKDM> kdm;
+ kdm = get_kdm_from_url (dcp);
+ if (!kdm) {
+ kdm = get_kdm_from_directory (dcp);
+ }
+ if (kdm) {
+ dcp->add_kdm (*kdm);
+ dcp->examine (_film, shared_ptr<Job>());
+ }
+ if (dcp->needs_kdm()) {
+ /* We didn't get a KDM for this */
+ error_dialog (this, "This playlist cannot be loaded as a KDM is missing.");
+ _selected_playlist = boost::none;
+ _spl_view->SetItemState (selected, 0, wxLIST_STATE_SELECTED);
+ return;
+ }
+ }
+ }
+
_current_spl_view->DeleteAllItems ();
int N = 0;
_selected_playlist = selected;
_selected_playlist_position = 0;
+ dialog.Pulse ();
reset_film ();
+ dialog.Pulse ();
update_current_content ();
}
{
DCPOMATIC_ASSERT (_selected_playlist);
- bool const was_playing = _viewer->stop ();
+ wxProgressDialog dialog (_("DCP-o-matic"), "Loading content");
SPLEntry const & e = _playlists[*_selected_playlist].get()[_selected_playlist_position];
_current_disable_timeline = e.disable_timeline;
- _current_disable_next_previous = !e.skippable;
+ _current_disable_next = !e.skippable;
setup_sensitivity ();
+ dialog.Pulse ();
reset_film ();
- if (was_playing) {
- _viewer->start ();
- }
}
void
return;
}
- next_clicked ();
+ bool const stop = _playlists[*_selected_playlist].get()[_selected_playlist_position].stop_after_play;
+
+ _selected_playlist_position++;
+ if (_selected_playlist_position < int(_playlists[*_selected_playlist].get().size())) {
+ update_current_content ();
+ if (!stop) {
+ _viewer->start ();
+ }
+ } else {
+ ResetFilm (shared_ptr<Film>(new Film(optional<boost::filesystem::path>())));
+ }
}
projects / dcpomatic.git / blobdiff