Updated ru_RU translation from Igor Voytovich.

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

diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc
index 56504c9920c8eabc94b63d23a9e621dcec5d511b..70fc766ac9c14135590b9b9b15225eda8031dfe1 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,9 +33,11 @@
 #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>
+#include <iostream>
 
 using std::cout;
 using std::vector;
@@ -157,10 +160,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 ()));
        }
@@ -204,9 +205,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;
                        }
                }