/*
- Copyright (C) 2018 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2018-2019 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
#include "lib/cross.h"
#include "lib/scoped_temporary.h"
#include "lib/internet.h"
+#include "lib/ffmpeg_content.h"
#include <dcp/raw_convert.h>
#include <dcp/exceptions.h>
#include <wx/listctrl.h>
using boost::shared_ptr;
using boost::dynamic_pointer_cast;
using boost::optional;
+using namespace dcpomatic;
SwaroopControls::SwaroopControls (wxWindow* parent, shared_ptr<FilmViewer> viewer)
: Controls (parent, viewer, false)
checked_fwrite (p.c_str(), p.length(), f, Config::path("position"));
#ifdef DCPOMATIC_LINUX
+ fflush (f);
fsync (fileno(f));
#endif
fclose (f);
wxString ts = std_to_wx(string(buffer)) + N_(": ");
_log->SetValue(_log->GetValue() + ts + s + "\n");
- optional<boost::filesystem::path> log = Config::instance()->player_log_file();
+ optional<boost::filesystem::path> log = Config::instance()->player_activity_log_file();
if (!log) {
return;
}
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)) {
+ if (dcp->cpl() && !get_from_url(url, false, false, temp)) {
try {
kdm = dcp::EncryptedKDM (dcp::file_to_string(temp.file()));
if (kdm->cpl_id() != dcp->cpl()) {
return optional<dcp::EncryptedKDM>();
}
+optional<EncryptedECinemaKDM>
+SwaroopControls::get_kdm_from_directory (shared_ptr<FFmpegContent> ffmpeg)
+{
+ using namespace boost::filesystem;
+ optional<path> kdm_dir = Config::instance()->player_kdm_directory();
+ if (!kdm_dir) {
+ return optional<EncryptedECinemaKDM>();
+ }
+ for (directory_iterator i = directory_iterator(*kdm_dir); i != directory_iterator(); ++i) {
+ try {
+ if (file_size(i->path()) < MAX_KDM_SIZE) {
+ EncryptedECinemaKDM kdm (dcp::file_to_string(i->path()));
+ if (kdm.id() == ffmpeg->id().get_value_or("")) {
+ return kdm;
+ }
+ }
+ } catch (std::exception& e) {
+ /* Hey well */
+ }
+ }
+ return optional<EncryptedECinemaKDM>();
+}
void
SwaroopControls::spl_selection_changed ()
{
return;
}
}
+ shared_ptr<FFmpegContent> ffmpeg = dynamic_pointer_cast<FFmpegContent> (i.content);
+ if (ffmpeg && ffmpeg->encrypted()) {
+ optional<EncryptedECinemaKDM> kdm = get_kdm_from_directory (ffmpeg);
+ if (kdm) {
+ try {
+ ffmpeg->add_kdm (*kdm);
+ ffmpeg->examine (_film, shared_ptr<Job>());
+ } catch (KDMError& e) {
+ error_dialog (this, "Could not load KDM.");
+ }
+ } else {
+ 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 ();