pot/merge.

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

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index ae0c25591d642c99b247b04ab5a7dc83d7584be3..6d27a4248cda0f2b3cb07fc031c1f24620d11eb7 100644 (file)
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -61,15 +61,18 @@
 #include <boost/filesystem.hpp>
 #include <iostream>
 #include <fstream>
+#include <sstream>
 
 #ifdef check
 #undef check
 #endif
 
 using std::cout;
+using std::wcout;
 using std::string;
 using std::vector;
 using std::wstring;
+using std::wstringstream;
 using std::map;
 using std::make_pair;
 using std::list;
@@ -400,6 +403,10 @@ private:
                }
 
                try {
+                       /* It seems to make sense to auto-save metadata here, since the make DCP may last
+                          a long time, and crashes/power failures are moderately likely.
+                       */
+                       _film->write_metadata ();
                        _film->make_dcp ();
                } catch (BadSettingError& e) {
                        error_dialog (this, wxString::Format (_("Bad setting for %s (%s)"), std_to_wx(e.setting()).data(), std_to_wx(e.what()).data()));
@@ -462,12 +469,13 @@ private:
 
        void jobs_show_dcp ()
        {
-#ifdef __WXMSW__
-               string d = _film->directory().string ();
-               wstring w;
-               w.assign (d.begin(), d.end());
-               ShellExecute (0, L"open", w.c_str(), 0, 0, SW_SHOWDEFAULT);
-#else
+#ifdef DCPOMATIC_WINDOWS
+               wstringstream args;
+               args << "/select," << _film->dir (_film->dcp_name(false));
+               ShellExecute (0, L"open", L"explorer.exe", args.str().c_str(), 0, SW_SHOWDEFAULT);
+#endif
+
+#ifdef DCPOMATIC_LINUX
                int r = system ("which nautilus");
                if (WEXITSTATUS (r) == 0) {
                        r = system (string ("nautilus " + _film->directory().string()).c_str ());
@@ -484,6 +492,13 @@ private:
                        }
                }
 #endif         
+
+#ifdef DCPOMATIC_OSX
+               int r = system (string ("open -R " + _film->dir (_film->dcp_name (false)).string ()).c_str ());
+               if (WEXITSTATUS (r)) {
+                       error_dialog (this, _("Could not show DCP"));
+               }
+#endif                
        }
 
        void tools_hints ()