00cc8646894f6519d1e2726f3e7a4fbc1e11d8f3 from master; make the config dialog update...

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

diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc
index 3e3c462b2e6981267283186ae2ecc0566db72210..23767bbe75e4a20a866b93f50243b348293195a4 100644 (file)
--- a/src/wx/content_menu.cc
+++ b/src/wx/content_menu.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -30,6 +30,8 @@
 #include "content_menu.h"
 #include "repeat_dialog.h"
 #include "wx_util.h"
+#include "timeline_video_content_view.h"
+#include "timeline_audio_content_view.h"
 
 using std::cout;
 using std::vector;
@@ -72,10 +74,11 @@ ContentMenu::~ContentMenu ()
 }
 
 void
-ContentMenu::popup (weak_ptr<Film> f, ContentList c, wxPoint p)
+ContentMenu::popup (weak_ptr<Film> f, ContentList c, TimelineContentViewList v, wxPoint p)
 {
        _film = f;
        _content = c;
+       _views = v;
        _repeat->Enable (!_content.empty ());
 
        int n = 0;
@@ -123,6 +126,7 @@ ContentMenu::repeat ()
        d->Destroy ();
 
        _content.clear ();
+       _views.clear ();
 }
 
 void
@@ -136,7 +140,7 @@ ContentMenu::join ()
                }
        }
 
-       assert (fc.size() > 1);
+       DCPOMATIC_ASSERT (fc.size() > 1);
 
        shared_ptr<Film> film = _film.lock ();
        if (!film) {
@@ -166,9 +170,46 @@ ContentMenu::remove ()
                return;
        }
 
-       film->playlist()->remove (_content);
+       /* We are removing from the timeline if _views is not empty */
+       bool handled = false;
+       if (!_views.empty ()) {
+               /* Special case: we only remove FFmpegContent if its video view is selected;
+                  if not, and its audio view is selected, we unmap the audio.
+               */
+               for (ContentList::iterator i = _content.begin(); i != _content.end(); ++i) {
+                       shared_ptr<FFmpegContent> fc = dynamic_pointer_cast<FFmpegContent> (*i);
+                       if (!fc) {
+                               continue;
+                       }
+                       
+                       shared_ptr<TimelineVideoContentView> video;
+                       shared_ptr<TimelineAudioContentView> audio;
+
+                       for (TimelineContentViewList::iterator i = _views.begin(); i != _views.end(); ++i) {
+                               shared_ptr<TimelineVideoContentView> v = dynamic_pointer_cast<TimelineVideoContentView> (*i);
+                               shared_ptr<TimelineAudioContentView> a = dynamic_pointer_cast<TimelineAudioContentView> (*i);
+                               if (v && v->content() == fc) {
+                                       video = v;
+                               } else if (a && a->content() == fc) {
+                                       audio = a;
+                               }
+                       }
+
+                       if (!video && audio) {
+                               AudioMapping m = fc->audio_mapping ();
+                               m.unmap_all ();
+                               fc->set_audio_mapping (m);
+                               handled = true;
+                       }
+               }
+       }
+
+       if (!handled) {
+               film->playlist()->remove (_content);
+       }
 
        _content.clear ();
+       _views.clear ();
 }
 
 void
@@ -209,7 +250,7 @@ ContentMenu::find_missing ()
 
        shared_ptr<Job> j (new ExamineContentJob (film, content));
        
-       j->Finished.connect (
+       _job_connection = j->Finished.connect (
                bind (
                        &ContentMenu::maybe_found_missing,
                        this,
@@ -245,8 +286,8 @@ ContentMenu::maybe_found_missing (weak_ptr<Job> j, weak_ptr<Content> oc, weak_pt
 
        shared_ptr<Content> old_content = oc.lock ();
        shared_ptr<Content> new_content = nc.lock ();
-       assert (old_content);
-       assert (new_content);
+       DCPOMATIC_ASSERT (old_content);
+       DCPOMATIC_ASSERT (new_content);
 
        if (new_content->digest() != old_content->digest()) {
                error_dialog (0, _("The content file(s) you specified are not the same as those that are missing.  Either try again with the correct content file or remove the missing content."));
@@ -259,16 +300,16 @@ ContentMenu::maybe_found_missing (weak_ptr<Job> j, weak_ptr<Content> oc, weak_pt
 void
 ContentMenu::kdm ()
 {
-       assert (!_content.empty ());
+       DCPOMATIC_ASSERT (!_content.empty ());
        shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent> (_content.front ());
-       assert (dcp);
+       DCPOMATIC_ASSERT (dcp);
        
        wxFileDialog* d = new wxFileDialog (_parent, _("Select KDM"));
                
        if (d->ShowModal() == wxID_OK) {
                dcp->add_kdm (dcp::EncryptedKDM (dcp::file_to_string (wx_to_std (d->GetPath ()))));
                shared_ptr<Film> film = _film.lock ();
-               assert (film);
+               DCPOMATIC_ASSERT (film);
                film->examine_content (dcp);
        }