#include "lib/scoped_temporary.h"
#include "lib/internet.h"
#include <dcp/raw_convert.h>
+#include <dcp/exceptions.h>
#include <wx/listctrl.h>
#include <wx/progdlg.h>
_content_view->update ();
update_playlist_directory ();
+
+ _viewer->set_background_image (true);
}
void
SwaroopControls::check_restart ()
{
+ cout << "check_restart called\n";
FILE* f = fopen_boost (Config::path("position"), "r");
if (!f) {
+ cout << "could not open position file (" << errno << ")\n";
return;
}
int64_t time;
fscanf (f, "%63s %d %ld", id, &index, &time);
+ cout << "Looking for playlist " << id << " to restart.\n";
+
for (size_t i = 0; i < _playlists.size(); ++i) {
if (_playlists[i].id() == id) {
- _selected_playlist = i;
- _selected_playlist_position = index;
+ cout << "Found playlist " << id << "\n";
+ select_playlist (i, 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"));
+#ifdef DCPOMATIC_LINUX
+ fflush (f);
+ fsync (fileno(f));
+#endif
fclose (f);
}
}
Controls::started ();
_play_button->Enable (false);
_pause_button->Enable (true);
+ _viewer->set_background_image (false);
}
void
_selected_playlist_position = 0;
update_current_content ();
}
+ _viewer->set_background_image (true);
}
bool
strftime (buffer, 64, "%c", t);
wxString ts = std_to_wx(string(buffer)) + N_(": ");
_log->SetValue(_log->GetValue() + ts + s + "\n");
+
+ optional<boost::filesystem::path> log = Config::instance()->player_activity_log_file();
+ if (!log) {
+ return;
+ }
+
+ FILE* f = fopen_boost (*log, "a");
+ fprintf (f, "%s%s\n", wx_to_std(ts).c_str(), wx_to_std(s).c_str());
+ fclose (f);
}
void
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;
}
+ select_playlist (selected, 0);
+}
+
+void
+SwaroopControls::select_playlist (int selected, int position)
+{
+ log (wxString::Format("load-playlist %s", std_to_wx(_playlists[selected].name()).data()));
+
wxProgressDialog dialog (_("DCP-o-matic"), "Loading playlist and KDMs");
BOOST_FOREACH (SPLEntry const & i, _playlists[selected].get()) {
kdm = get_kdm_from_directory (dcp);
}
if (kdm) {
- dcp->add_kdm (*kdm);
- dcp->examine (_film, shared_ptr<Job>());
+ try {
+ dcp->add_kdm (*kdm);
+ dcp->examine (_film, shared_ptr<Job>());
+ } catch (KDMError& e) {
+ error_dialog (this, "Could not load KDM.");
+ }
}
if (dcp->needs_kdm()) {
/* We didn't get a KDM for this */
}
_selected_playlist = selected;
- _selected_playlist_position = 0;
+ _selected_playlist_position = position;
dialog.Pulse ();
reset_film ();
dialog.Pulse ();
_viewer->start ();
}
} else {
+ _selected_playlist_position = 0;
+ _viewer->set_background_image (true);
ResetFilm (shared_ptr<Film>(new Film(optional<boost::filesystem::path>())));
}
}