Peak value of audio into the audio tab.

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

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 3e6dddb9261e41b13b1494dbc7024468a99061e2..6d60772be0f2dc805ff88ca565a3114f3f90f602 100644 (file)
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-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
@@ -17,8 +17,8 @@
 
 */
 
-/** @file src/film_editor.cc
- *  @brief A wx widget to edit a film's metadata, and perform various functions.
+/** @file src/wx/film_editor.cc
+ *  @brief FilmEditor class.
  */
 
 #include "lib/film.h"
@@ -34,10 +34,12 @@
 #include <iostream>
 
 using std::cout;
+using std::string;
 using boost::shared_ptr;
+using boost::optional;
 
 /** @param f Film to edit */
-FilmEditor::FilmEditor (wxWindow* parent)
+FilmEditor::FilmEditor (wxWindow* parent, FilmViewer* viewer)
        : wxPanel (parent)
 {
        wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
@@ -45,13 +47,13 @@ FilmEditor::FilmEditor (wxWindow* parent)
        _main_notebook = new wxNotebook (this, wxID_ANY);
        s->Add (_main_notebook, 1);
 
-       _content_panel = new ContentPanel (_main_notebook, _film);
+       _content_panel = new ContentPanel (_main_notebook, _film, 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 +69,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 +101,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 +138,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");
 }