X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fswaroop_controls.cc;h=d557d09e9b8fe9190c7d7882fd455ccbcfaa8f2d;hb=c4403784febdbdd42e9c32e67fadb147f11fe566;hp=b2b1a2bdaef79039b4c1ddd213e98bd1e7341df7;hpb=4a06789c26867e783cadad8ed57fa987d48980f0;p=dcpomatic.git

diff --git a/src/wx/swaroop_controls.cc b/src/wx/swaroop_controls.cc
index b2b1a2bda..d557d09e9 100644
--- a/src/wx/swaroop_controls.cc
+++ b/src/wx/swaroop_controls.cc
@@ -41,6 +41,7 @@ using std::sort;
 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)
@@ -125,8 +126,10 @@ SwaroopControls::SwaroopControls (wxWindow* parent, shared_ptr<FilmViewer> viewe
 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;
 	}
 
@@ -135,8 +138,11 @@ SwaroopControls::check_restart ()
 	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) {
+			cout << "Found playlist " << id << "\n";
 			select_playlist (i, index);
 			update_current_content ();
 			_viewer->seek (DCPTime(time), false);
@@ -144,9 +150,6 @@ SwaroopControls::check_restart ()
 		}
 	}
 
-#ifdef DCPOMATIC_LINUX
-	fsync (fileno(f));
-#endif
 	fclose (f);
 }
 
@@ -164,6 +167,10 @@ SwaroopControls::viewer_position_changed ()
 			+ " " + dcp::raw_convert<string>(_viewer->position().get());
 
 		checked_fwrite (p.c_str(), p.length(), f, Config::path("position"));
+#ifdef DCPOMATIC_LINUX
+		fflush (f);
+		fsync (fileno(f));
+#endif
 		fclose (f);
 	}
 }
@@ -269,7 +276,7 @@ SwaroopControls::log (wxString s)
 	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;
 	}
@@ -342,7 +349,7 @@ SwaroopControls::get_kdm_from_url (shared_ptr<DCPContent> dcp)
 	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()) {