Various bits and pieces.

4 files changed, 10 insertions, 4 deletions

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 71c29072f..50dd08245 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -312,7 +312,8 @@ private:
 			}
 			
 			maybe_save_then_delete_film ();
-			film.reset (new Film (d->get_path (), false));
+			film.reset (new Film (d->get_path ()));
+			film->write_metadata ();
 			film->log()->set_level (log_level);
 			film->set_name (boost::filesystem::path (d->get_path()).filename().generic_string());
 			set_film ();
@@ -497,6 +498,7 @@ class App : public wxApp
 		if (!film_to_load.empty() && boost::filesystem::is_directory (film_to_load)) {
 			try {
 				film.reset (new Film (film_to_load));
+				film->read_metadata ();
 				film->log()->set_level (log_level);
 			} catch (exception& e) {
 				error_dialog (0, std_to_wx (String::compose (wx_to_std (_("Could not load film %1 (%2)")), film_to_load, e.what())));
@@ -504,7 +506,8 @@ class App : public wxApp
 		}
 
 		if (!film_to_create.empty ()) {
-			film.reset (new Film (film_to_create, false));
+			film.reset (new Film (film_to_create));
+			film->write_metadata ();
 			film->log()->set_level (log_level);
 			film->set_name (boost::filesystem::path (film_to_create).filename().generic_string ());
 		}
diff --git a/src/tools/dcpomatic_batch.cc b/src/tools/dcpomatic_batch.cc
index 2b0826bc1..403c1c21b 100644
--- a/src/tools/dcpomatic_batch.cc
+++ b/src/tools/dcpomatic_batch.cc
@@ -177,6 +177,7 @@ private:
 		if (r == wxID_OK) {
 			try {
 				shared_ptr<Film> film (new Film (wx_to_std (c->GetPath ())));
+				film->read_metadata ();
 				film->make_dcp ();
 			} catch (std::exception& e) {
 				wxString p = c->GetPath ();
diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc
index d4a4210de..bc95f622d 100644
--- a/src/tools/dcpomatic_cli.cc
+++ b/src/tools/dcpomatic_cli.cc
@@ -125,7 +125,8 @@ main (int argc, char* argv[])
 
 	shared_ptr<Film> film;
 	try {
-		film.reset (new Film (film_dir, true));
+		film.reset (new Film (film_dir));
+		film->read_metadata ();
 	} catch (std::exception& e) {
 		cerr << argv[0] << ": error reading film `" << film_dir << "' (" << e.what() << ")\n";
 		exit (EXIT_FAILURE);
diff --git a/src/tools/servomatictest.cc b/src/tools/servomatictest.cc
index af176ac18..88974eed7 100644
--- a/src/tools/servomatictest.cc
+++ b/src/tools/servomatictest.cc
@@ -148,7 +148,8 @@ main (int argc, char* argv[])
 	dcpomatic_setup ();
 
 	server = new ServerDescription (server_host, 1);
-	shared_ptr<Film> film (new Film (film_dir, true));
+	shared_ptr<Film> film (new Film (film_dir));
+	film->read_metadata ();
 
 	shared_ptr<Player> player = film->player ();
 	player->disable_audio ();