Insist on boost 1.45 and hence filesystem v3 now that libdcp requires it.

[dcpomatic.git] / src / tools / dvdomatic.cc

diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc
index 993c41563ba1be47dcfbfcf7e38460e3fac5756e..9a1db3fedd50c64c8b402e83b681bccc7af4289b 100644 (file)
--- a/src/tools/dvdomatic.cc
+++ b/src/tools/dvdomatic.cc
@@ -226,7 +226,6 @@ public:
 
                /* XXX: calling these here is a bit of a hack */
                film_editor->setup_visibility ();
-               film_viewer->setup_visibility ();
                
                film_editor->FileChanged.connect (bind (&Frame::file_changed, this, _1));
                if (film) {
@@ -271,11 +270,7 @@ public:
                        maybe_save_then_delete_film ();
                        film.reset (new Film (d->get_path (), false));
                        film->log()->set_level (log_level);
-#if BOOST_FILESYSTEM_VERSION == 3              
                        film->set_name (boost::filesystem::path (d->get_path()).filename().generic_string());
-#else          
-                       film->set_name (boost::filesystem::path (d->get_path()).filename());
-#endif
                        set_film ();
                }
                
@@ -289,9 +284,13 @@ public:
                
                if (r == wxID_OK) {
                        maybe_save_then_delete_film ();
-                       film.reset (new Film (wx_to_std (c->GetPath ())));
-                       film->log()->set_level (log_level);
-                       set_film ();
+                       try {
+                               film.reset (new Film (wx_to_std (c->GetPath ())));
+                               film->log()->set_level (log_level);
+                               set_film ();
+                       } catch (std::exception& e) {
+                               error_dialog (this, String::compose ("Could not open film at %1 (%2)", wx_to_std (c->GetPath()), e.what()));
+                       }
                }
 
                c->Destroy ();
@@ -347,7 +346,11 @@ public:
        {
                wxAboutDialogInfo info;
                info.SetName (_("DVD-o-matic"));
-               info.SetVersion (std_to_wx (String::compose ("version %1 git %2", dvdomatic_version, dvdomatic_git_commit)));
+               if (strcmp (dvdomatic_git_commit, "release") == 0) {
+                       info.SetVersion (std_to_wx (String::compose ("version %1", dvdomatic_version)));
+               } else {
+                       info.SetVersion (std_to_wx (String::compose ("version %1 git %2", dvdomatic_version, dvdomatic_git_commit)));
+               }
                info.SetDescription (_("Free, open-source DCP generation from almost anything."));
                info.SetCopyright (_("(C) Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"));
                wxArrayString authors;
@@ -365,13 +368,13 @@ public:
 static const wxCmdLineEntryDesc command_line_description[] = {
        { wxCMD_LINE_OPTION, "l", "log", "set log level (silent, verbose or timing)", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },
         { wxCMD_LINE_PARAM, 0, 0, "film to load", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_MULTIPLE | wxCMD_LINE_PARAM_OPTIONAL },
-       { wxCMD_LINE_NONE }
+       { wxCMD_LINE_NONE, "", "", "", wxCmdLineParamType (0), 0 }
 };
 #else
 static const wxCmdLineEntryDesc command_line_description[] = {
        { wxCMD_LINE_OPTION, wxT("l"), wxT("log"), wxT("set log level (silent, verbose or timing)"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },
         { wxCMD_LINE_PARAM, 0, 0, wxT("film to load"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_MULTIPLE | wxCMD_LINE_PARAM_OPTIONAL },
-       { wxCMD_LINE_NONE }
+       { wxCMD_LINE_NONE, wxT(""), wxT(""), wxT(""), wxCmdLineParamType (0), 0 }
 };
 #endif