Add a basic management dialogue for templates.

[dcpomatic.git] / src / wx / content_menu.cc

diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc
index c643602bdca548828e4719145119092d1ded8ccc..3b1fd31897dc32054408c837bcd280f71bdfe699 100644 (file)
--- a/src/wx/content_menu.cc
+++ b/src/wx/content_menu.cc
@@ -1,19 +1,20 @@
 /*
-    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -32,6 +33,7 @@
 #include "lib/exceptions.h"
 #include "lib/dcp_content.h"
 #include "lib/ffmpeg_content.h"
+#include "lib/audio_content.h"
 #include <wx/wx.h>
 #include <wx/dirdlg.h>
 #include <boost/foreach.hpp>
@@ -51,6 +53,7 @@ enum {
        ID_properties,
        ID_re_examine,
        ID_kdm,
+       ID_ov,
        ID_remove
 };
 
@@ -63,7 +66,9 @@ ContentMenu::ContentMenu (wxWindow* p)
        _find_missing = _menu->Append (ID_find_missing, _("Find missing..."));
        _properties = _menu->Append (ID_properties, _("Properties..."));
        _re_examine = _menu->Append (ID_re_examine, _("Re-examine..."));
+       _menu->AppendSeparator ();
        _kdm = _menu->Append (ID_kdm, _("Add KDM..."));
+       _ov = _menu->Append (ID_ov, _("Add OV..."));
        _menu->AppendSeparator ();
        _remove = _menu->Append (ID_remove, _("Remove"));
 
@@ -73,6 +78,7 @@ ContentMenu::ContentMenu (wxWindow* p)
        _parent->Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&ContentMenu::properties, this), ID_properties);
        _parent->Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&ContentMenu::re_examine, this), ID_re_examine);
        _parent->Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&ContentMenu::kdm, this), ID_kdm);
+       _parent->Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&ContentMenu::ov, this), ID_ov);
        _parent->Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&ContentMenu::remove, this), ID_remove);
 }
 
@@ -158,10 +164,8 @@ ContentMenu::join ()
 
        try {
                shared_ptr<FFmpegContent> joined (new FFmpegContent (film, fc));
-               BOOST_FOREACH (shared_ptr<Content> i, _content) {
-                       film->remove_content (i);
-               }
-               film->add_content (joined);
+               film->remove_content (_content);
+               film->examine_and_add_content (joined);
        } catch (JoinError& e) {
                error_dialog (_parent, std_to_wx (e.what ()));
        }
@@ -205,9 +209,9 @@ ContentMenu::remove ()
                        }
 
                        if (!video && audio) {
-                               AudioMapping m = fc->audio_mapping ();
+                               AudioMapping m = fc->audio->mapping ();
                                m.unmap_all ();
-                               fc->set_audio_mapping (m);
+                               fc->audio->set_mapping (m);
                                handled = true;
                        }
                }
@@ -337,6 +341,25 @@ ContentMenu::kdm ()
        d->Destroy ();
 }
 
+void
+ContentMenu::ov ()
+{
+       DCPOMATIC_ASSERT (!_content.empty ());
+       shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent> (_content.front ());
+       DCPOMATIC_ASSERT (dcp);
+
+       wxDirDialog* d = new wxDirDialog (_parent, _("Select OV"));
+
+       if (d->ShowModal() == wxID_OK) {
+               dcp->add_ov (wx_to_std (d->GetPath ()));
+               shared_ptr<Film> film = _film.lock ();
+               DCPOMATIC_ASSERT (film);
+               film->examine_content (dcp);
+       }
+
+       d->Destroy ();
+}
+
 void
 ContentMenu::properties ()
 {