Add option to analyse audio automatically when content is added (#673).

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

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 6a743baa8ff407762021063eed39905187dc100b..5abf47182a89a46e44dc131256c4678b062cffcb 100644 (file)
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -21,21 +21,6 @@
  *  @brief The main DCP-o-matic GUI.
  */
 
-#include "lib/film.h"
-#include "lib/config.h"
-#include "lib/util.h"
-#include "lib/version.h"
-#include "lib/signal_manager.h"
-#include "lib/log.h"
-#include "lib/job_manager.h"
-#include "lib/transcode_job.h"
-#include "lib/exceptions.h"
-#include "lib/cinema.h"
-#include "lib/kdm.h"
-#include "lib/send_kdm_email_job.h"
-#include "lib/server_finder.h"
-#include "lib/update.h"
-#include "lib/content_factory.h"
 #include "wx/film_viewer.h"
 #include "wx/film_editor.h"
 #include "wx/job_manager_view.h"
@@ -50,11 +35,30 @@
 #include "wx/update_dialog.h"
 #include "wx/content_panel.h"
 #include "wx/report_problem_dialog.h"
+#include "wx/video_waveform_dialog.h"
+#include "lib/film.h"
+#include "lib/config.h"
+#include "lib/util.h"
+#include "lib/video_content.h"
+#include "lib/version.h"
+#include "lib/signal_manager.h"
+#include "lib/log.h"
+#include "lib/job_manager.h"
+#include "lib/exceptions.h"
+#include "lib/cinema.h"
+#include "lib/kdm.h"
+#include "lib/send_kdm_email_job.h"
+#include "lib/server_finder.h"
+#include "lib/update_checker.h"
+#include "lib/cross.h"
+#include "lib/content_factory.h"
+#include "lib/compose.hpp"
 #include <dcp/exceptions.h>
 #include <wx/generic/aboutdlgg.h>
 #include <wx/stdpaths.h>
 #include <wx/cmdline.h>
 #include <wx/preferences.h>
+#include <wx/splash.h>
 #ifdef __WXMSW__
 #include <shellapi.h>
 #endif
@@ -135,6 +139,7 @@ enum {
        ID_jobs_make_kdms,
        ID_jobs_send_dcp_to_tms,
        ID_jobs_show_dcp,
+       ID_tools_video_waveform,
        ID_tools_hints,
        ID_tools_encoding_servers,
        ID_tools_check_for_updates,
@@ -149,6 +154,7 @@ class DOMFrame : public wxFrame
 public:
        DOMFrame (wxString const & title)
                : wxFrame (NULL, -1, title)
+               , _video_waveform_dialog (0)
                , _hints_dialog (0)
                , _servers_list_dialog (0)
                , _config_dialog (0)
@@ -196,6 +202,7 @@ public:
                Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::jobs_make_kdms, this),          ID_jobs_make_kdms);
                Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::jobs_send_dcp_to_tms, this),    ID_jobs_send_dcp_to_tms);
                Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::jobs_show_dcp, this),           ID_jobs_show_dcp);
+               Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::tools_video_waveform, this),    ID_tools_video_waveform);
                Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::tools_hints, this),             ID_tools_hints);
                Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::tools_encoding_servers, this),  ID_tools_encoding_servers);
                Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::tools_check_for_updates, this), ID_tools_check_for_updates);
@@ -511,6 +518,15 @@ private:
 #endif
        }
 
+       void tools_video_waveform ()
+       {
+               if (!_video_waveform_dialog) {
+                       _video_waveform_dialog = new VideoWaveformDialog (this, _film_viewer);
+               }
+
+               _video_waveform_dialog->Show ();
+       }
+
        void tools_hints ()
        {
                if (!_hints_dialog) {
@@ -589,7 +605,7 @@ private:
        {
                list<shared_ptr<Job> > jobs = JobManager::instance()->get ();
                list<shared_ptr<Job> >::iterator i = jobs.begin();
-               while (i != jobs.end() && dynamic_pointer_cast<TranscodeJob> (*i) == 0) {
+               while (i != jobs.end() && (*i)->json_name() != "transcode") {
                        ++i;
                }
                bool const dcp_creation = (i != jobs.end ()) && !(*i)->finished ();
@@ -684,6 +700,7 @@ private:
                add_item (jobs_menu, _("S&how DCP"), ID_jobs_show_dcp, NEEDS_FILM | NOT_DURING_DCP_CREATION | NEEDS_CPL);
 
                wxMenu* tools = new wxMenu;
+               add_item (tools, _("Video waveform..."), ID_tools_video_waveform, NEEDS_FILM);
                add_item (tools, _("Hints..."), ID_tools_hints, 0);
                add_item (tools, _("Encoding servers..."), ID_tools_encoding_servers, 0);
                add_item (tools, _("Check for updates"), ID_tools_check_for_updates, 0);
@@ -742,6 +759,7 @@ private:
 
        FilmEditor* _film_editor;
        FilmViewer* _film_viewer;
+       VideoWaveformDialog* _video_waveform_dialog;
        HintsDialog* _hints_dialog;
        ServersListDialog* _servers_list_dialog;
        wxPreferencesEditor* _config_dialog;
@@ -776,6 +794,22 @@ private:
        bool OnInit ()
        try
        {
+               wxInitAllImageHandlers ();
+
+               wxSplashScreen* splash = 0;
+               try {
+                       if (!Config::have_existing ()) {
+                               wxBitmap bitmap;
+                               boost::filesystem::path p = shared_path () / "splash.png";
+                               if (bitmap.LoadFile (std_to_wx (p.string ()), wxBITMAP_TYPE_PNG)) {
+                                       splash = new wxSplashScreen (bitmap, wxSPLASH_CENTRE_ON_SCREEN | wxSPLASH_NO_TIMEOUT, 0, 0, -1);
+                                       wxYield ();
+                               }
+                       }
+               } catch (boost::filesystem::filesystem_error& e) {
+                       /* Maybe we couldn't find the splash image; never mind */
+               }
+
                SetAppName (_("DCP-o-matic"));
 
                if (!wxApp::OnInit()) {
@@ -792,7 +826,7 @@ private:
                TransformProcessType (&serial, kProcessTransformToForegroundApplication);
 #endif
 
-               wxInitAllImageHandlers ();
+               dcpomatic_setup_path_encoding ();
 
                /* Enable i18n; this will create a Config object
                   to look for a force-configured language.  This Config
@@ -815,6 +849,9 @@ private:
                _frame = new DOMFrame (_("DCP-o-matic"));
                SetTopWindow (_frame);
                _frame->Maximize ();
+               if (splash) {
+                       splash->Destroy ();
+               }
                _frame->Show ();
 
                if (!_film_to_load.empty() && boost::filesystem::is_directory (_film_to_load)) {