No-op; fix GPL address and use the explicit-program-name version.

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

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index bbfafa8c5595900a15df507036cfa88ec9c6e454..822ae286a8f2989cc96db377fa9125eefcb8efff 100644 (file)
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2012-2015 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/>.
 
 */
 
@@ -34,7 +35,9 @@
 #include <iostream>
 
 using std::cout;
+using std::string;
 using boost::shared_ptr;
+using boost::optional;
 
 /** @param f Film to edit */
 FilmEditor::FilmEditor (wxWindow* parent, FilmViewer* viewer)
@@ -49,9 +52,9 @@ FilmEditor::FilmEditor (wxWindow* parent, FilmViewer* viewer)
        _main_notebook->AddPage (_content_panel->panel (), _("Content"), true);
        _dcp_panel = new DCPPanel (_main_notebook, _film);
        _main_notebook->AddPage (_dcp_panel->panel (), _("DCP"), false);
-       
+
        JobManager::instance()->ActiveJobsChanged.connect (
-               bind (&FilmEditor::active_jobs_changed, this, _1)
+               bind (&FilmEditor::active_jobs_changed, this, _2)
                );
 
        set_film (shared_ptr<Film> ());
@@ -67,20 +70,25 @@ void
 FilmEditor::film_changed (Film::Property p)
 {
        ensure_ui_thread ();
-       
+
        if (!_film) {
                return;
        }
 
        _content_panel->film_changed (p);
        _dcp_panel->film_changed (p);
+
+       if (p == Film::CONTENT && !_film->content().empty ()) {
+               /* Select newly-added content */
+               _content_panel->set_selection (_film->content().back ());
+       }
 }
 
 void
 FilmEditor::film_content_changed (int property)
 {
        ensure_ui_thread ();
-       
+
        if (!_film) {
                /* We call this method ourselves (as well as using it as a signal handler)
                   so _film can be 0.
@@ -94,15 +102,15 @@ FilmEditor::film_content_changed (int property)
 
 /** Sets the Film that we are editing */
 void
-FilmEditor::set_film (shared_ptr<Film> f)
+FilmEditor::set_film (shared_ptr<Film> film)
 {
-       set_general_sensitivity (f != 0);
+       set_general_sensitivity (film != 0);
 
-       if (_film == f) {
+       if (_film == film) {
                return;
        }
-       
-       _film = f;
+
+       _film = film;
 
        _content_panel->set_film (_film);
        _dcp_panel->set_film (_film);
@@ -131,7 +139,7 @@ FilmEditor::set_general_sensitivity (bool s)
 }
 
 void
-FilmEditor::active_jobs_changed (bool a)
+FilmEditor::active_jobs_changed (optional<string> j)
 {
-       set_general_sensitivity (!a);
+       set_general_sensitivity (!j || *j == "analyse_audio");
 }