swaroop: fix up restart-after-crash.v2.13.84

1 files changed, 1 insertions, 36 deletions

diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index 550b89ed4..d61c8a5e0 100644
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -186,9 +186,6 @@ public:
 		_viewer->Started.connect (bind(&DOMFrame::playback_started, this, _1));
 		_viewer->Seeked.connect (bind(&DOMFrame::playback_seeked, this, _1));
 		_viewer->Stopped.connect (bind(&DOMFrame::playback_stopped, this, _1));
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-		_viewer->PositionChanged.connect (bind(&DOMFrame::position_changed, this));
-#endif
 		_info = new PlayerInformation (_overall_panel, _viewer);
 		setup_main_sizer (Config::instance()->player_mode());
 #ifdef __WXOSX__
@@ -224,40 +221,10 @@ public:
 		setup_screen ();
 
 #ifdef DCPOMATIC_VARIANT_SWAROOP
-		if (
-			boost::filesystem::is_regular_file(Config::path("position")) &&
-			boost::filesystem::is_regular_file(Config::path("spl.xml"))) {
-
-			shared_ptr<Film> film (new Film(boost::optional<boost::filesystem::path>()));
-			film->read_metadata (Config::path("spl.xml"));
-			reset_film (film);
-			FILE* f = fopen_boost (Config::path("position"), "r");
-			if (f) {
-				char buffer[64];
-				fscanf (f, "%63s", buffer);
-				_viewer->seek (DCPTime(atoi(buffer)), true);
-				_viewer->start ();
-				fclose (f);
-			}
-		}
-
+		sc->check_restart ();
 #endif
 	}
 
-	void position_changed ()
-	{
-		if (!_viewer->playing() || _viewer->position().get() % DCPTime::HZ) {
-			return;
-		}
-
-		FILE* f = fopen_boost (Config::path("position"), "w");
-		if (f) {
-			string const p = dcp::raw_convert<string> (_viewer->position().get());
-			fwrite (p.c_str(), p.length(), 1, f);
-			fclose (f);
-		}
-	}
-
 #ifdef DCPOMATIC_VARIANT_SWAROOP
 	void monitor_checker_state_changed ()
 	{
@@ -488,8 +455,6 @@ public:
 			return;
 		}
 
-		_film->write_metadata (Config::path("spl.xml"));
-
 		if (_viewer->playing ()) {
 			_viewer->stop ();
 		}