Remove some vestigial stuff.

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 289a8c3480ff0c445e3f62f0a59a531302e18713..1cf161259a92e6f5e66b8f4128af396e2a7f9886 100644 (file)
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -237,11 +237,9 @@ Film::video_mxf_filename () const
        return video_state_identifier() + ".mxf";
 }
 
-/** Add suitable Jobs to the JobManager to create a DCP for this Film.
- *  @param true to transcode, false to use the WAV and J2K files that are already there.
- */
+/** Add suitable Jobs to the JobManager to create a DCP for this Film */
 void
-Film::make_dcp (bool transcode)
+Film::make_dcp ()
 {
        set_dci_date_today ();
        
@@ -298,12 +296,10 @@ Film::make_dcp (bool transcode)
 
        shared_ptr<Job> r;
 
-       if (transcode) {
-               if (dcp_ab()) {
-                       r = JobManager::instance()->add (shared_ptr<Job> (new ABTranscodeJob (shared_from_this(), od)));
-               } else {
-                       r = JobManager::instance()->add (shared_ptr<Job> (new TranscodeJob (shared_from_this(), od)));
-               }
+       if (dcp_ab()) {
+               r = JobManager::instance()->add (shared_ptr<Job> (new ABTranscodeJob (shared_from_this(), od)));
+       } else {
+               r = JobManager::instance()->add (shared_ptr<Job> (new TranscodeJob (shared_from_this(), od)));
        }
 }
 

diff --git a/src/lib/film.h b/src/lib/film.h
index cc77460db5f874dd5a9e07913b9936089352a5b8..04a483998fe20eee2e26f3047d79471c07e7e7b4 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -69,7 +69,7 @@ public:
        void examine_content ();
        void send_dcp_to_tms ();
 
-       void make_dcp (bool);
+       void make_dcp ();
 
        /** @return Logger.
         *  It is safe to call this from any thread.

diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc
index e4f582472e150e525e5b58f61adb01a50e4b8433..9efe3f545775e3ca9092bb05a4c090e2c71f3767 100644 (file)
--- a/src/tools/dvdomatic.cc
+++ b/src/tools/dvdomatic.cc
@@ -347,7 +347,7 @@ private:
 
        void jobs_make_dcp (wxCommandEvent &)
        {
-               JobWrapper::make_dcp (this, film, true);
+               JobWrapper::make_dcp (this, film);
        }
        
        void jobs_send_dcp_to_tms (wxCommandEvent &)

diff --git a/src/tools/makedcp.cc b/src/tools/makedcp.cc
index 892bed3b81d0368582bec7ecf6aedc22c14d39bf..0c639077162250cb31b11fa58e9a84f7b5f347d8 100644 (file)
--- a/src/tools/makedcp.cc
+++ b/src/tools/makedcp.cc
@@ -155,7 +155,7 @@ main (int argc, char* argv[])
        pair<string, string> const f = Filter::ffmpeg_strings (film->filters ());
        cout << "Filters: " << f.first << " " << f.second << "\n";
 
-       film->make_dcp (true);
+       film->make_dcp ();
 
        bool should_stop = false;
        bool first = true;

diff --git a/src/wx/job_wrapper.cc b/src/wx/job_wrapper.cc
index cb02ecd0257dbddd771e80d131d2cc9f799d4a49..8ddd3a3484cab9aad1492555beba1f4ed55d0728 100644 (file)
--- a/src/wx/job_wrapper.cc
+++ b/src/wx/job_wrapper.cc
@@ -26,14 +26,14 @@
 using boost::shared_ptr;
 
 void
-JobWrapper::make_dcp (wxWindow* parent, shared_ptr<Film> film, bool transcode)
+JobWrapper::make_dcp (wxWindow* parent, shared_ptr<Film> film)
 {
        if (!film) {
                return;
        }
 
        try {
-               film->make_dcp (transcode);
+               film->make_dcp ();
        } catch (BadSettingError& e) {
                error_dialog (parent, wxString::Format (_("Bad setting for %s (%s)"), e.setting().c_str(), e.what()));
        } catch (std::exception& e) {

diff --git a/src/wx/job_wrapper.h b/src/wx/job_wrapper.h
index 7120e9f106ec0acc8acb0ad397b1e19d7baf514a..b0a4693dd07359d77777425f2b9823a601885e37 100644 (file)
--- a/src/wx/job_wrapper.h
+++ b/src/wx/job_wrapper.h
@@ -24,6 +24,6 @@ class Film;
 namespace JobWrapper
 {
 
-void make_dcp (wxWindow *, boost::shared_ptr<Film>, bool);
+void make_dcp (wxWindow *, boost::shared_ptr<Film>);
        
 }

diff --git a/test/test.cc b/test/test.cc
index 771325d2977ee75680fafab61d1fad5caef892bd..386aead2eca463f2b9671fcd112f6291acd5223e 100644 (file)
--- a/test/test.cc
+++ b/test/test.cc
@@ -480,7 +480,7 @@ BOOST_AUTO_TEST_CASE (make_dcp_test)
        film->set_content ("../../../test/test.mp4");
        film->set_format (Format::from_nickname ("Flat"));
        film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test"));
-       film->make_dcp (true);
+       film->make_dcp ();
        film->write_metadata ();
 
        while (JobManager::instance()->work_to_do ()) {
@@ -512,7 +512,7 @@ BOOST_AUTO_TEST_CASE (make_dcp_with_range_test)
        film->set_format (Format::from_nickname ("Flat"));
        film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test"));
        film->set_trim_end (42);
-       film->make_dcp (true);
+       film->make_dcp ();
 
        while (JobManager::instance()->work_to_do() && !JobManager::instance()->errors()) {
                dvdomatic_sleep (1);