X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic.cc;h=572a5be40adf0b20e74fa5c56502ae77f5275225;hb=bf19399f8c009ff211d5c7b45b0941417d963c4e;hp=820289825057dc64ec7ee78fa75cdf66a8b3e8e8;hpb=58cd57db37f1460a899aaf92b8c7e7564f55e50d;p=dcpomatic.git

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 820289825..572a5be40 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -757,7 +757,7 @@ private:
 			   a long time, and crashes/power failures are moderately likely.
 			*/
 			_film->write_metadata ();
-			_film->make_dcp ();
+			_film->make_dcp (true);
 		} catch (BadSettingError& e) {
 			error_dialog (this, wxString::Format (_("Bad setting for %s."), std_to_wx(e.setting()).data()), std_to_wx(e.what()));
 		} catch (std::exception& e) {
@@ -913,7 +913,11 @@ private:
 			shared_ptr<TranscodeJob> job (new TranscodeJob (_film));
 			job->set_encoder (
 				shared_ptr<FFmpegEncoder> (
-					new FFmpegEncoder (_film, job, d->path(), d->format(), d->mixdown_to_stereo(), d->split_reels(), d->x264_crf())
+					new FFmpegEncoder (_film, job, d->path(), d->format(), d->mixdown_to_stereo(), d->split_reels(), d->x264_crf()
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+							   , optional<dcp::Key>(), optional<string>()
+#endif
+						)
 					)
 				);
 			JobManager::instance()->add (job);
@@ -1539,6 +1543,13 @@ private:
 				Config::instance()->set_nagged(Config::NAG_INITIAL_SETUP, true);
 			}
 
+			if (running_32_on_64 ()) {
+				NagDialog::maybe_nag (
+					_frame, Config::NAG_32_ON_64,
+					_("You are running the 32-bit version of DCP-o-matic on a 64-bit version of Windows.  This will limit the memory available to DCP-o-matic and may cause errors.  You are strongly advised to install the 64-bit version of DCP-o-matic."),
+					false);
+			}
+
 			_frame->Show ();
 
 			if (!_film_to_load.empty() && boost::filesystem::is_directory (_film_to_load)) {