Merge master and multifarious hackery.
[dcpomatic.git] / src / wx / film_editor.cc
index a21782a6f9da188530d9e4b472461e8cf363f19e..36d63b8055a4b7de144c8facdc1ac40f5d37cc8a 100644 (file)
@@ -1,3 +1,5 @@
+/* -*- c-basic-offset: 8; default-tab-width: 8; -*- */
+
 /*
     Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
 
@@ -25,6 +27,7 @@
 #include <iomanip>
 #include <wx/wx.h>
 #include <wx/notebook.h>
+#include <wx/listctrl.h>
 #include <boost/thread.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/lexical_cast.hpp>
@@ -37,6 +40,9 @@
 #include "lib/filter.h"
 #include "lib/config.h"
 #include "lib/ffmpeg_decoder.h"
+#include "lib/imagemagick_content.h"
+#include "lib/sndfile_content.h"
+#include "lib/dcp_content_type.h"
 #include "filter_dialog.h"
 #include "wx_util.h"
 #include "film_editor.h"
 #include "dci_metadata_dialog.h"
 #include "scaler.h"
 #include "audio_dialog.h"
+#include "imagemagick_content_dialog.h"
+#include "timeline_dialog.h"
+#include "audio_mapping_view.h"
+#include "container.h"
 
 using std::string;
 using std::cout;
@@ -54,150 +64,114 @@ using std::fixed;
 using std::setprecision;
 using std::list;
 using std::vector;
+using std::max;
 using boost::shared_ptr;
+using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
+using boost::lexical_cast;
 
 /** @param f Film to edit */
 FilmEditor::FilmEditor (shared_ptr<Film> f, wxWindow* parent)
        : wxPanel (parent)
-       , _film (f)
        , _generally_sensitive (true)
        , _audio_dialog (0)
+       , _timeline_dialog (0)
 {
        wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
-       SetSizer (s);
-       _notebook = new wxNotebook (this, wxID_ANY);
-       s->Add (_notebook, 1);
 
-       make_film_panel ();
-       _notebook->AddPage (_film_panel, _("Film"), true);
-       make_video_panel ();
-       _notebook->AddPage (_video_panel, _("Video"), false);
-       make_audio_panel ();
-       _notebook->AddPage (_audio_panel, _("Audio"), false);
-       make_subtitle_panel ();
-       _notebook->AddPage (_subtitle_panel, _("Subtitles"), false);
+       _main_notebook = new wxNotebook (this, wxID_ANY);
+       s->Add (_main_notebook, 1);
+
+       make_content_panel ();
+       _main_notebook->AddPage (_content_panel, _("Content"), true);
+       make_dcp_panel ();
+       _main_notebook->AddPage (_dcp_panel, _("DCP"), false);
+       
+       setup_formats ();
 
-       set_film (_film);
+       set_film (f);
        connect_to_widgets ();
 
        JobManager::instance()->ActiveJobsChanged.connect (
                bind (&FilmEditor::active_jobs_changed, this, _1)
                );
        
-       setup_visibility ();
-       setup_formats ();
+       SetSizerAndFit (s);
 }
 
 void
-FilmEditor::make_film_panel ()
+FilmEditor::make_dcp_panel ()
 {
-       _film_panel = new wxPanel (_notebook);
-       _film_sizer = new wxBoxSizer (wxVERTICAL);
-       _film_panel->SetSizer (_film_sizer);
+       _dcp_panel = new wxPanel (_main_notebook);
+       _dcp_sizer = new wxBoxSizer (wxVERTICAL);
+       _dcp_panel->SetSizer (_dcp_sizer);
 
        wxGridBagSizer* grid = new wxGridBagSizer (4, 4);
-       _film_sizer->Add (grid, 0, wxALL, 8);
+       _dcp_sizer->Add (grid, 0, wxEXPAND | wxALL, 8);
 
        int r = 0;
        
-       add_label_to_grid_bag_sizer (grid, _film_panel, _("Name"), wxGBPosition (r, 0));
-       _name = new wxTextCtrl (_film_panel, wxID_ANY);
+       add_label_to_grid_bag_sizer (grid, _dcp_panel, _("Name"), wxGBPosition (r, 0));
+       _name = new wxTextCtrl (_dcp_panel, wxID_ANY);
        grid->Add (_name, wxGBPosition(r, 1), wxDefaultSpan, wxEXPAND);
        ++r;
        
-       add_label_to_grid_bag_sizer (grid, _film_panel, _("DCP Name"), wxGBPosition (r, 0));
-       _dcp_name = new wxStaticText (_film_panel, wxID_ANY, wxT (""));
+       add_label_to_grid_bag_sizer (grid, _dcp_panel, _("DCP Name"), wxGBPosition (r, 0));
+       _dcp_name = new wxStaticText (_dcp_panel, wxID_ANY, wxT (""));
        grid->Add (_dcp_name, wxGBPosition(r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
        ++r;
 
-       _use_dci_name = new wxCheckBox (_film_panel, wxID_ANY, _("Use DCI name"));
+       _use_dci_name = new wxCheckBox (_dcp_panel, wxID_ANY, _("Use DCI name"));
        grid->Add (_use_dci_name, wxGBPosition (r, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
-       _edit_dci_button = new wxButton (_film_panel, wxID_ANY, _("Details..."));
+       _edit_dci_button = new wxButton (_dcp_panel, wxID_ANY, _("Details..."));
        grid->Add (_edit_dci_button, wxGBPosition (r, 1), wxDefaultSpan);
        ++r;
 
-       add_label_to_grid_bag_sizer (grid, _film_panel, _("Content"), wxGBPosition (r, 0));
-       _content = new wxFilePickerCtrl (_film_panel, wxID_ANY, wxT (""), _("Select Content File"), wxT("*.*"));
-       grid->Add (_content, wxGBPosition (r, 1), wxDefaultSpan, wxEXPAND);
-       ++r;
-
-       _trust_content_header = new wxCheckBox (_film_panel, wxID_ANY, _("Trust content's header"));
-       video_control (_trust_content_header);
-       grid->Add (_trust_content_header, wxGBPosition (r, 0), wxGBSpan(1, 2));
+       add_label_to_grid_bag_sizer (grid, _dcp_panel, _("Container"), wxGBPosition (r, 0));
+       _container = new wxChoice (_dcp_panel, wxID_ANY);
+       grid->Add (_container, wxGBPosition (r, 1));
        ++r;
 
-       add_label_to_grid_bag_sizer (grid, _film_panel, _("Content Type"), wxGBPosition (r, 0));
-       _dcp_content_type = new wxChoice (_film_panel, wxID_ANY);
+       add_label_to_grid_bag_sizer (grid, _dcp_panel, _("Content Type"), wxGBPosition (r, 0));
+       _dcp_content_type = new wxChoice (_dcp_panel, wxID_ANY);
        grid->Add (_dcp_content_type, wxGBPosition (r, 1));
        ++r;
 
-       video_control (add_label_to_grid_bag_sizer (grid, _film_panel, _("Original Frame Rate"), wxGBPosition (r, 0)));
-       _source_frame_rate = new wxStaticText (_film_panel, wxID_ANY, wxT (""));
-       grid->Add (video_control (_source_frame_rate), wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
-       ++r;
-
        {
-               add_label_to_grid_bag_sizer (grid, _film_panel, _("DCP Frame Rate"), wxGBPosition (r, 0));
+               add_label_to_grid_bag_sizer (grid, _dcp_panel, _("DCP Frame Rate"), wxGBPosition (r, 0));
                wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-               _dcp_frame_rate = new wxChoice (_film_panel, wxID_ANY);
+               _dcp_frame_rate = new wxChoice (_dcp_panel, wxID_ANY);
                s->Add (_dcp_frame_rate, 1, wxALIGN_CENTER_VERTICAL);
-               _best_dcp_frame_rate = new wxButton (_film_panel, wxID_ANY, _("Use best"));
-               s->Add (_best_dcp_frame_rate, 1, wxALIGN_CENTER_VERTICAL | wxALL | wxEXPAND, 6);
+               _best_dcp_frame_rate = new wxButton (_dcp_panel, wxID_ANY, _("Use best"));
+               s->Add (_best_dcp_frame_rate, 1, wxALIGN_CENTER_VERTICAL | wxEXPAND);
                grid->Add (s, wxGBPosition (r, 1));
        }
        ++r;
 
-       _frame_rate_description = new wxStaticText (_film_panel, wxID_ANY, wxT ("\n \n "), wxDefaultPosition, wxDefaultSize);
-       grid->Add (video_control (_frame_rate_description), wxGBPosition (r, 0), wxGBSpan (1, 2), wxEXPAND | wxALIGN_CENTER_VERTICAL | wxALL, 6);
-       wxFont font = _frame_rate_description->GetFont();
-       font.SetStyle(wxFONTSTYLE_ITALIC);
-       font.SetPointSize(font.GetPointSize() - 1);
-       _frame_rate_description->SetFont(font);
-       ++r;
-       
-       video_control (add_label_to_grid_bag_sizer (grid, _film_panel, _("Length"), wxGBPosition (r, 0)));
-       _length = new wxStaticText (_film_panel, wxID_ANY, wxT (""));
-       grid->Add (video_control (_length), wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
-       ++r;
-
-
        {
-               video_control (add_label_to_grid_bag_sizer (grid, _film_panel, _("Trim frames"), wxGBPosition (r, 0)));
-               wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-               video_control (add_label_to_sizer (s, _film_panel, _("Start")));
-               _trim_start = new wxSpinCtrl (_film_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1));
-               s->Add (video_control (_trim_start));
-               video_control (add_label_to_sizer (s, _film_panel, _("End")));
-               _trim_end = new wxSpinCtrl (_film_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1));
-               s->Add (video_control (_trim_end));
-
+               add_label_to_grid_bag_sizer (grid, _dcp_panel, _("JPEG2000 bandwidth"), wxGBPosition (r, 0));
+               wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+               _j2k_bandwidth = new wxSpinCtrl (_dcp_panel, wxID_ANY);
+               s->Add (_j2k_bandwidth, 1);
+               add_label_to_sizer (s, _dcp_panel, _("MBps"));
                grid->Add (s, wxGBPosition (r, 1));
        }
        ++r;
 
-       video_control (add_label_to_grid_bag_sizer (grid, _film_panel, _("Trim method"), wxGBPosition (r, 0)));
-       _trim_type = new wxChoice (_film_panel, wxID_ANY);
-       grid->Add (video_control (_trim_type), wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+       add_label_to_grid_bag_sizer (grid, _dcp_panel, _("Scaler"), wxGBPosition (r, 0));
+       _scaler = new wxChoice (_dcp_panel, wxID_ANY);
+       grid->Add (_scaler, wxGBPosition (r, 1));
        ++r;
 
-       _dcp_ab = new wxCheckBox (_film_panel, wxID_ANY, _("A/B"));
-       video_control (_dcp_ab);
-       grid->Add (_dcp_ab, wxGBPosition (r, 0));
-       ++r;
+       vector<Scaler const *> const sc = Scaler::all ();
+       for (vector<Scaler const *>::const_iterator i = sc.begin(); i != sc.end(); ++i) {
+               _scaler->Append (std_to_wx ((*i)->name()));
+       }
 
-       /* STILL-only stuff */
-       {
-               still_control (add_label_to_grid_bag_sizer (grid, _film_panel, _("Duration"), wxGBPosition (r, 0)));
-               wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-               _still_duration = new wxSpinCtrl (_film_panel);
-               still_control (_still_duration);
-               s->Add (_still_duration, 1, wxEXPAND);
-               /// TRANSLATORS: `s' here is an abbreviation for seconds, the unit of time
-               still_control (add_label_to_sizer (s, _film_panel, _("s")));
-               grid->Add (s, wxGBPosition (r, 1));
+       vector<Container const *> const co = Container::all ();
+       for (vector<Container const *>::const_iterator i = co.begin(); i != co.end(); ++i) {
+               _container->Append (std_to_wx ((*i)->name ()));
        }
-       ++r;
 
        vector<DCPContentType const *> const ct = DCPContentType::all ();
        for (vector<DCPContentType const *>::const_iterator i = ct.begin(); i != ct.end(); ++i) {
@@ -209,59 +183,53 @@ FilmEditor::make_film_panel ()
                _dcp_frame_rate->Append (std_to_wx (boost::lexical_cast<string> (*i)));
        }
 
-       _trim_type->Append (_("encode all frames and play the subset"));
-       _trim_type->Append (_("encode only the subset"));
+       _j2k_bandwidth->SetRange (50, 250);
 }
 
 void
 FilmEditor::connect_to_widgets ()
 {
-       _name->Connect                 (wxID_ANY, wxEVT_COMMAND_TEXT_UPDATED,         wxCommandEventHandler (FilmEditor::name_changed), 0, this);
-       _use_dci_name->Connect         (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED,     wxCommandEventHandler (FilmEditor::use_dci_name_toggled), 0, this);
-       _edit_dci_button->Connect      (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED,       wxCommandEventHandler (FilmEditor::edit_dci_button_clicked), 0, this);
-       _format->Connect               (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED,      wxCommandEventHandler (FilmEditor::format_changed), 0, this);
-       _content->Connect              (wxID_ANY, wxEVT_COMMAND_FILEPICKER_CHANGED,   wxCommandEventHandler (FilmEditor::content_changed), 0, this);
-       _trust_content_header->Connect (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED,     wxCommandEventHandler (FilmEditor::trust_content_header_changed), 0, this);
-       _left_crop->Connect            (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,     wxCommandEventHandler (FilmEditor::left_crop_changed), 0, this);
-       _right_crop->Connect           (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,     wxCommandEventHandler (FilmEditor::right_crop_changed), 0, this);
-       _top_crop->Connect             (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,     wxCommandEventHandler (FilmEditor::top_crop_changed), 0, this);
-       _bottom_crop->Connect          (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,     wxCommandEventHandler (FilmEditor::bottom_crop_changed), 0, this);
-       _filters_button->Connect       (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED,       wxCommandEventHandler (FilmEditor::edit_filters_clicked), 0, this);
-       _scaler->Connect               (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED,      wxCommandEventHandler (FilmEditor::scaler_changed), 0, this);
-       _dcp_content_type->Connect     (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED,      wxCommandEventHandler (FilmEditor::dcp_content_type_changed), 0, this);
-       _dcp_frame_rate->Connect       (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED,      wxCommandEventHandler (FilmEditor::dcp_frame_rate_changed), 0, this);
-       _best_dcp_frame_rate->Connect  (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED,       wxCommandEventHandler (FilmEditor::best_dcp_frame_rate_clicked), 0, this);
-       _dcp_ab->Connect               (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED,     wxCommandEventHandler (FilmEditor::dcp_ab_toggled), 0, this);
-       _still_duration->Connect       (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,     wxCommandEventHandler (FilmEditor::still_duration_changed), 0, this);
-       _trim_start->Connect           (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,     wxCommandEventHandler (FilmEditor::trim_start_changed), 0, this);
-       _trim_end->Connect             (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,     wxCommandEventHandler (FilmEditor::trim_end_changed), 0, this);
-       _trim_type->Connect            (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED,      wxCommandEventHandler (FilmEditor::trim_type_changed), 0, this);
-       _with_subtitles->Connect       (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED,     wxCommandEventHandler (FilmEditor::with_subtitles_toggled), 0, this);
-       _subtitle_offset->Connect      (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,     wxCommandEventHandler (FilmEditor::subtitle_offset_changed), 0, this);
-       _subtitle_scale->Connect       (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,     wxCommandEventHandler (FilmEditor::subtitle_scale_changed), 0, this);
-       _colour_lut->Connect           (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED,      wxCommandEventHandler (FilmEditor::colour_lut_changed), 0, this);
-       _j2k_bandwidth->Connect        (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,     wxCommandEventHandler (FilmEditor::j2k_bandwidth_changed), 0, this);
-       _subtitle_stream->Connect      (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED,      wxCommandEventHandler (FilmEditor::subtitle_stream_changed), 0, this);
-       _audio_stream->Connect         (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED,      wxCommandEventHandler (FilmEditor::audio_stream_changed), 0, this);
-       _audio_gain->Connect           (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,     wxCommandEventHandler (FilmEditor::audio_gain_changed), 0, this);
+       _name->Connect                   (wxID_ANY, wxEVT_COMMAND_TEXT_UPDATED,         wxCommandEventHandler (FilmEditor::name_changed), 0, this);
+       _use_dci_name->Connect           (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED,     wxCommandEventHandler (FilmEditor::use_dci_name_toggled), 0, this);
+       _edit_dci_button->Connect        (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED,       wxCommandEventHandler (FilmEditor::edit_dci_button_clicked), 0, this);
+       _container->Connect              (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED,      wxCommandEventHandler (FilmEditor::container_changed), 0, this);
+//     _format->Connect                 (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED,      wxCommandEventHandler (FilmEditor::format_changed), 0, this);
+       _content->Connect                (wxID_ANY, wxEVT_COMMAND_LIST_ITEM_SELECTED,   wxListEventHandler    (FilmEditor::content_selection_changed), 0, this);
+       _content->Connect                (wxID_ANY, wxEVT_COMMAND_LIST_ITEM_DESELECTED, wxListEventHandler    (FilmEditor::content_selection_changed), 0, this);
+       _content_add->Connect            (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED,       wxCommandEventHandler (FilmEditor::content_add_clicked), 0, this);
+       _content_remove->Connect         (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED,       wxCommandEventHandler (FilmEditor::content_remove_clicked), 0, this);
+       _content_timeline->Connect       (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED,       wxCommandEventHandler (FilmEditor::content_timeline_clicked), 0, this);
+       _loop_content->Connect           (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED,     wxCommandEventHandler (FilmEditor::loop_content_toggled), 0, this);
+       _loop_count->Connect             (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,     wxCommandEventHandler (FilmEditor::loop_count_changed), 0, this);
+       _left_crop->Connect              (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,     wxCommandEventHandler (FilmEditor::left_crop_changed), 0, this);
+       _right_crop->Connect             (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,     wxCommandEventHandler (FilmEditor::right_crop_changed), 0, this);
+       _top_crop->Connect               (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,     wxCommandEventHandler (FilmEditor::top_crop_changed), 0, this);
+       _bottom_crop->Connect            (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,     wxCommandEventHandler (FilmEditor::bottom_crop_changed), 0, this);
+       _filters_button->Connect         (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED,       wxCommandEventHandler (FilmEditor::edit_filters_clicked), 0, this);
+       _scaler->Connect                 (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED,      wxCommandEventHandler (FilmEditor::scaler_changed), 0, this);
+       _dcp_content_type->Connect       (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED,      wxCommandEventHandler (FilmEditor::dcp_content_type_changed), 0, this);
+       _dcp_frame_rate->Connect         (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED,      wxCommandEventHandler (FilmEditor::dcp_frame_rate_changed), 0, this);
+       _best_dcp_frame_rate->Connect    (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED,       wxCommandEventHandler (FilmEditor::best_dcp_frame_rate_clicked), 0, this);
+       _with_subtitles->Connect         (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED,     wxCommandEventHandler (FilmEditor::with_subtitles_toggled), 0, this);
+       _subtitle_offset->Connect        (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,     wxCommandEventHandler (FilmEditor::subtitle_offset_changed), 0, this);
+       _subtitle_scale->Connect         (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,     wxCommandEventHandler (FilmEditor::subtitle_scale_changed), 0, this);
+       _colour_lut->Connect             (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED,      wxCommandEventHandler (FilmEditor::colour_lut_changed), 0, this);
+       _j2k_bandwidth->Connect          (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,     wxCommandEventHandler (FilmEditor::j2k_bandwidth_changed), 0, this);
+       _audio_gain->Connect             (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,     wxCommandEventHandler (FilmEditor::audio_gain_changed), 0, this);
        _audio_gain_calculate_button->Connect (
                wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (FilmEditor::audio_gain_calculate_button_clicked), 0, this
                );
-       _show_audio->Connect           (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED,       wxCommandEventHandler (FilmEditor::show_audio_clicked), 0, this);
-       _audio_delay->Connect          (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,     wxCommandEventHandler (FilmEditor::audio_delay_changed), 0, this);
-       _use_content_audio->Connect    (wxID_ANY, wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler (FilmEditor::use_audio_changed), 0, this);
-       _use_external_audio->Connect   (wxID_ANY, wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler (FilmEditor::use_audio_changed), 0, this);
-       for (int i = 0; i < MAX_AUDIO_CHANNELS; ++i) {
-               _external_audio[i]->Connect (
-                       wxID_ANY, wxEVT_COMMAND_FILEPICKER_CHANGED, wxCommandEventHandler (FilmEditor::external_audio_changed), 0, this
-                       );
-       }
+       _show_audio->Connect             (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED,       wxCommandEventHandler (FilmEditor::show_audio_clicked), 0, this);
+       _audio_delay->Connect            (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED,     wxCommandEventHandler (FilmEditor::audio_delay_changed), 0, this);
+       _audio_stream->Connect           (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED,      wxCommandEventHandler (FilmEditor::audio_stream_changed), 0, this);
+       _subtitle_stream->Connect        (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED,      wxCommandEventHandler (FilmEditor::subtitle_stream_changed), 0, this);
+       _audio_mapping->Changed.connect  (bind (&FilmEditor::audio_mapping_changed, this, _1));
 }
 
 void
 FilmEditor::make_video_panel ()
 {
-       _video_panel = new wxPanel (_notebook);
+       _video_panel = new wxPanel (_content_notebook);
        _video_sizer = new wxBoxSizer (wxVERTICAL);
        _video_panel->SetSizer (_video_sizer);
        
@@ -269,11 +237,6 @@ FilmEditor::make_video_panel ()
        _video_sizer->Add (grid, 0, wxALL, 8);
 
        int r = 0;
-       add_label_to_grid_bag_sizer (grid, _video_panel, _("Format"), wxGBPosition (r, 0));
-       _format = new wxChoice (_video_panel, wxID_ANY);
-       grid->Add (_format, wxGBPosition (r, 1));
-       ++r;
-
        add_label_to_grid_bag_sizer (grid, _video_panel, _("Left crop"), wxGBPosition (r, 0));
        _left_crop = new wxSpinCtrl (_video_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1));
        grid->Add (_left_crop, wxGBPosition (r, 1));
@@ -294,6 +257,11 @@ FilmEditor::make_video_panel ()
        grid->Add (_bottom_crop, wxGBPosition (r, 1));
        ++r;
 
+       add_label_to_grid_bag_sizer (grid, _video_panel, _("Scale to"), wxGBPosition (r, 0));
+       _format = new wxChoice (_video_panel, wxID_ANY);
+       grid->Add (_format, wxGBPosition (r, 1));
+       ++r;
+
        _scaling_description = new wxStaticText (_video_panel, wxID_ANY, wxT ("\n \n \n \n"), wxDefaultPosition, wxDefaultSize);
        grid->Add (_scaling_description, wxGBPosition (r, 0), wxGBSpan (1, 2), wxEXPAND | wxALIGN_CENTER_VERTICAL | wxALL, 6);
        wxFont font = _scaling_description->GetFont();
@@ -304,28 +272,16 @@ FilmEditor::make_video_panel ()
 
        /* VIDEO-only stuff */
        {
-               video_control (add_label_to_grid_bag_sizer (grid, _video_panel, _("Filters"), wxGBPosition (r, 0)));
+               add_label_to_grid_bag_sizer (grid, _video_panel, _("Filters"), wxGBPosition (r, 0));
                wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
                _filters = new wxStaticText (_video_panel, wxID_ANY, _("None"));
-               video_control (_filters);
                s->Add (_filters, 1, wxEXPAND | wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6);
                _filters_button = new wxButton (_video_panel, wxID_ANY, _("Edit..."));
-               video_control (_filters_button);
                s->Add (_filters_button, 0);
                grid->Add (s, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
        }
        ++r;
 
-       video_control (add_label_to_grid_bag_sizer (grid, _video_panel, _("Scaler"), wxGBPosition (r, 0)));
-       _scaler = new wxChoice (_video_panel, wxID_ANY);
-       grid->Add (video_control (_scaler), wxGBPosition (r, 1));
-       ++r;
-
-       vector<Scaler const *> const sc = Scaler::all ();
-       for (vector<Scaler const *>::const_iterator i = sc.begin(); i != sc.end(); ++i) {
-               _scaler->Append (std_to_wx ((*i)->name()));
-       }
-
        add_label_to_grid_bag_sizer (grid, _video_panel, _("Colour look-up table"), wxGBPosition (r, 0));
        _colour_lut = new wxChoice (_video_panel, wxID_ANY);
        for (int i = 0; i < 2; ++i) {
@@ -335,82 +291,113 @@ FilmEditor::make_video_panel ()
        grid->Add (_colour_lut, wxGBPosition (r, 1), wxDefaultSpan, wxEXPAND);
        ++r;
 
-       {
-               add_label_to_grid_bag_sizer (grid, _video_panel, _("JPEG2000 bandwidth"), wxGBPosition (r, 0));
-               wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-               _j2k_bandwidth = new wxSpinCtrl (_video_panel, wxID_ANY);
-               s->Add (_j2k_bandwidth, 1);
-               add_label_to_sizer (s, _video_panel, _("MBps"));
-               grid->Add (s, wxGBPosition (r, 1));
-       }
-       ++r;
-
        _left_crop->SetRange (0, 1024);
        _top_crop->SetRange (0, 1024);
        _right_crop->SetRange (0, 1024);
        _bottom_crop->SetRange (0, 1024);
-       _still_duration->SetRange (1, 60 * 60);
-       _trim_start->SetRange (0, 100);
-       _trim_end->SetRange (0, 100);
-       _j2k_bandwidth->SetRange (50, 250);
+}
+
+void
+FilmEditor::make_content_panel ()
+{
+       _content_panel = new wxPanel (_main_notebook);
+       _content_sizer = new wxBoxSizer (wxVERTICAL);
+       _content_panel->SetSizer (_content_sizer);
+
+        {
+                wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+                
+                _content = new wxListCtrl (_content_panel, wxID_ANY, wxDefaultPosition, wxSize (320, 160), wxLC_REPORT | wxLC_NO_HEADER | wxLC_SINGLE_SEL);
+                s->Add (_content, 1, wxEXPAND | wxTOP | wxBOTTOM, 6);
+
+                _content->InsertColumn (0, wxT(""));
+               _content->SetColumnWidth (0, 512);
+
+                wxBoxSizer* b = new wxBoxSizer (wxVERTICAL);
+                _content_add = new wxButton (_content_panel, wxID_ANY, _("Add..."));
+                b->Add (_content_add, 1, wxEXPAND | wxLEFT | wxRIGHT);
+                _content_remove = new wxButton (_content_panel, wxID_ANY, _("Remove"));
+                b->Add (_content_remove, 1, wxEXPAND | wxLEFT | wxRIGHT);
+               _content_timeline = new wxButton (_content_panel, wxID_ANY, _("Timeline..."));
+               b->Add (_content_timeline, 1, wxEXPAND | wxLEFT | wxRIGHT);
+
+                s->Add (b, 0, wxALL, 4);
+
+                _content_sizer->Add (s, 0.75, wxEXPAND | wxALL, 6);
+        }
+
+       wxBoxSizer* h = new wxBoxSizer (wxHORIZONTAL);
+       _loop_content = new wxCheckBox (_content_panel, wxID_ANY, _("Loop everything"));
+       h->Add (_loop_content, 0, wxALL, 6);
+       _loop_count = new wxSpinCtrl (_content_panel, wxID_ANY);
+       h->Add (_loop_count, 0, wxALL, 6);
+       add_label_to_sizer (h, _content_panel, _("times"));
+       _content_sizer->Add (h, 0, wxALL, 6);
+
+       _content_notebook = new wxNotebook (_content_panel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNB_LEFT);
+       _content_sizer->Add (_content_notebook, 1, wxEXPAND | wxTOP, 6);
+       
+       make_video_panel ();
+       _content_notebook->AddPage (_video_panel, _("Video"), false);
+       make_audio_panel ();
+       _content_notebook->AddPage (_audio_panel, _("Audio"), false);
+       make_subtitle_panel ();
+       _content_notebook->AddPage (_subtitle_panel, _("Subtitles"), false);
+
+       _loop_count->SetRange (2, 1024);
 }
 
 void
 FilmEditor::make_audio_panel ()
 {
-       _audio_panel = new wxPanel (_notebook);
+       _audio_panel = new wxPanel (_content_notebook);
        _audio_sizer = new wxBoxSizer (wxVERTICAL);
        _audio_panel->SetSizer (_audio_sizer);
        
-       wxFlexGridSizer* grid = new wxFlexGridSizer (2, 4, 4);
+       wxFlexGridSizer* grid = new wxFlexGridSizer (3, 4, 4);
        _audio_sizer->Add (grid, 0, wxALL, 8);
 
        _show_audio = new wxButton (_audio_panel, wxID_ANY, _("Show Audio..."));
        grid->Add (_show_audio, 1);
        grid->AddSpacer (0);
+       grid->AddSpacer (0);
 
+       add_label_to_sizer (grid, _audio_panel, _("Audio Gain"));
        {
-               video_control (add_label_to_sizer (grid, _audio_panel, _("Audio Gain")));
                wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
                _audio_gain = new wxSpinCtrl (_audio_panel);
-               s->Add (video_control (_audio_gain), 1);
-               video_control (add_label_to_sizer (s, _audio_panel, _("dB")));
-               _audio_gain_calculate_button = new wxButton (_audio_panel, wxID_ANY, _("Calculate..."));
-               video_control (_audio_gain_calculate_button);
-               s->Add (_audio_gain_calculate_button, 1, wxEXPAND);
-               grid->Add (s);
+               s->Add (_audio_gain, 1);
+               add_label_to_sizer (s, _audio_panel, _("dB"));
+               grid->Add (s, 1);
        }
+       
+       _audio_gain_calculate_button = new wxButton (_audio_panel, wxID_ANY, _("Calculate..."));
+       grid->Add (_audio_gain_calculate_button);
 
+       add_label_to_sizer (grid, _audio_panel, _("Audio Delay"));
        {
-               video_control (add_label_to_sizer (grid, _audio_panel, _("Audio Delay")));
                wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
                _audio_delay = new wxSpinCtrl (_audio_panel);
-               s->Add (video_control (_audio_delay), 1);
+               s->Add (_audio_delay, 1);
                /// TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
-               video_control (add_label_to_sizer (s, _audio_panel, _("ms")));
+               add_label_to_sizer (s, _audio_panel, _("ms"));
                grid->Add (s);
        }
 
-       {
-               _use_content_audio = new wxRadioButton (_audio_panel, wxID_ANY, _("Use content's audio"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP);
-               grid->Add (video_control (_use_content_audio));
-               wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-               _audio_stream = new wxChoice (_audio_panel, wxID_ANY);
-               s->Add (video_control (_audio_stream), 1);
-               _audio = new wxStaticText (_audio_panel, wxID_ANY, wxT (""));
-               s->Add (video_control (_audio), 1, wxALIGN_CENTER_VERTICAL | wxLEFT, 8);
-               grid->Add (s, 1, wxEXPAND);
-       }
-
-       _use_external_audio = new wxRadioButton (_audio_panel, wxID_ANY, _("Use external audio"));
-       grid->Add (_use_external_audio);
        grid->AddSpacer (0);
 
-       for (int i = 0; i < MAX_AUDIO_CHANNELS; ++i) {
-               add_label_to_sizer (grid, _audio_panel, std_to_wx (audio_channel_name (i)));
-               _external_audio[i] = new wxFilePickerCtrl (_audio_panel, wxID_ANY, wxT (""), _("Select Audio File"), wxT ("*.wav"));
-               grid->Add (_external_audio[i], 1, wxEXPAND);
-       }
+       add_label_to_sizer (grid, _audio_panel, _("Audio Stream"));
+       _audio_stream = new wxChoice (_audio_panel, wxID_ANY);
+       grid->Add (_audio_stream, 1);
+       _audio_description = new wxStaticText (_audio_panel, wxID_ANY, wxT (""));
+       grid->AddSpacer (0);
+       
+       grid->Add (_audio_description, 1, wxALIGN_CENTER_VERTICAL | wxLEFT, 8);
+       grid->AddSpacer (0);
+       grid->AddSpacer (0);
+       
+       _audio_mapping = new AudioMappingView (_audio_panel);
+       _audio_sizer->Add (_audio_mapping, 1, wxEXPAND | wxALL, 6);
 
        _audio_gain->SetRange (-60, 60);
        _audio_delay->SetRange (-1000, 1000);
@@ -419,37 +406,39 @@ FilmEditor::make_audio_panel ()
 void
 FilmEditor::make_subtitle_panel ()
 {
-       _subtitle_panel = new wxPanel (_notebook);
+       _subtitle_panel = new wxPanel (_content_notebook);
        _subtitle_sizer = new wxBoxSizer (wxVERTICAL);
        _subtitle_panel->SetSizer (_subtitle_sizer);
        wxFlexGridSizer* grid = new wxFlexGridSizer (2, 4, 4);
        _subtitle_sizer->Add (grid, 0, wxALL, 8);
 
        _with_subtitles = new wxCheckBox (_subtitle_panel, wxID_ANY, _("With Subtitles"));
-       video_control (_with_subtitles);
        grid->Add (_with_subtitles, 1);
+       grid->AddSpacer (0);
        
-       _subtitle_stream = new wxChoice (_subtitle_panel, wxID_ANY);
-       grid->Add (video_control (_subtitle_stream));
-
        {
-               video_control (add_label_to_sizer (grid, _subtitle_panel, _("Subtitle Offset")));
+               add_label_to_sizer (grid, _subtitle_panel, _("Subtitle Offset"));
                wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
                _subtitle_offset = new wxSpinCtrl (_subtitle_panel);
                s->Add (_subtitle_offset);
-               video_control (add_label_to_sizer (s, _subtitle_panel, _("pixels")));
+               add_label_to_sizer (s, _subtitle_panel, _("pixels"));
                grid->Add (s);
        }
 
        {
-               video_control (add_label_to_sizer (grid, _subtitle_panel, _("Subtitle Scale")));
+               add_label_to_sizer (grid, _subtitle_panel, _("Subtitle Scale"));
                wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
                _subtitle_scale = new wxSpinCtrl (_subtitle_panel);
-               s->Add (video_control (_subtitle_scale));
-               video_control (add_label_to_sizer (s, _subtitle_panel, _("%")));
+               s->Add (_subtitle_scale);
+               add_label_to_sizer (s, _subtitle_panel, _("%"));
                grid->Add (s);
        }
 
+       add_label_to_sizer (grid, _subtitle_panel, _("Subtitle Stream"));
+       _subtitle_stream = new wxChoice (_subtitle_panel, wxID_ANY);
+       grid->Add (_subtitle_stream, 1, wxEXPAND | wxALL, 6);
+       grid->AddSpacer (0);
+       
        _subtitle_offset->SetRange (-1024, 1024);
        _subtitle_scale->SetRange (1, 1000);
 }
@@ -458,81 +447,48 @@ FilmEditor::make_subtitle_panel ()
 void
 FilmEditor::left_crop_changed (wxCommandEvent &)
 {
-       if (!_film) {
+       shared_ptr<VideoContent> c = selected_video_content ();
+       if (!c) {
                return;
        }
 
-       _film->set_left_crop (_left_crop->GetValue ());
+       c->set_left_crop (_left_crop->GetValue ());
 }
 
 /** Called when the right crop widget has been changed */
 void
 FilmEditor::right_crop_changed (wxCommandEvent &)
 {
-       if (!_film) {
+       shared_ptr<VideoContent> c = selected_video_content ();
+       if (!c) {
                return;
        }
 
-       _film->set_right_crop (_right_crop->GetValue ());
+       c->set_right_crop (_right_crop->GetValue ());
 }
 
 /** Called when the top crop widget has been changed */
 void
 FilmEditor::top_crop_changed (wxCommandEvent &)
 {
-       if (!_film) {
+       shared_ptr<VideoContent> c = selected_video_content ();
+       if (!c) {
                return;
        }
 
-       _film->set_top_crop (_top_crop->GetValue ());
+       c->set_top_crop (_top_crop->GetValue ());
 }
 
 /** Called when the bottom crop value has been changed */
 void
 FilmEditor::bottom_crop_changed (wxCommandEvent &)
 {
-       if (!_film) {
-               return;
-       }
-
-       _film->set_bottom_crop (_bottom_crop->GetValue ());
-}
-
-/** Called when the content filename has been changed */
-void
-FilmEditor::content_changed (wxCommandEvent &)
-{
-       if (!_film) {
-               return;
-       }
-
-       try {
-               _film->set_content (wx_to_std (_content->GetPath ()));
-       } catch (std::exception& e) {
-               _content->SetPath (std_to_wx (_film->directory ()));
-               error_dialog (this, wxString::Format (_("Could not set content: %s"), std_to_wx (e.what()).data()));
-       }
-}
-
-void
-FilmEditor::trust_content_header_changed (wxCommandEvent &)
-{
-       if (!_film) {
+       shared_ptr<VideoContent> c = selected_video_content ();
+       if (!c) {
                return;
        }
 
-       _film->set_trust_content_header (_trust_content_header->GetValue ());
-}
-
-/** Called when the DCP A/B switch has been toggled */
-void
-FilmEditor::dcp_ab_toggled (wxCommandEvent &)
-{
-       if (!_film) {
-               return;
-       }
-       
-       _film->set_dcp_ab (_dcp_ab->GetValue ());
+       c->set_bottom_crop (_bottom_crop->GetValue ());
 }
 
 /** Called when the name widget has been changed */
@@ -593,7 +549,7 @@ FilmEditor::dcp_frame_rate_changed (wxCommandEvent &)
                return;
        }
 
-       _film->set_dcp_frame_rate (
+       _film->set_dcp_video_frame_rate (
                boost::lexical_cast<int> (
                        wx_to_std (_dcp_frame_rate->GetString (_dcp_frame_rate->GetSelection ()))
                        )
@@ -620,116 +576,31 @@ FilmEditor::film_changed (Film::Property p)
        case Film::NONE:
                break;
        case Film::CONTENT:
-               checked_set (_content, _film->content ());
-               setup_visibility ();
+               setup_content ();
                setup_formats ();
+//             setup_format ();
                setup_subtitle_control_sensitivity ();
-               setup_streams ();
                setup_show_audio_sensitivity ();
-               setup_frame_rate_description ();
                break;
-       case Film::TRUST_CONTENT_HEADER:
-               checked_set (_trust_content_header, _film->trust_content_header ());
+       case Film::LOOP:
+               checked_set (_loop_content, _film->loop() > 1);
+               checked_set (_loop_count, _film->loop());
+               setup_loop_sensitivity ();
                break;
-       case Film::SUBTITLE_STREAMS:
-               setup_subtitle_control_sensitivity ();
-               setup_streams ();
-               break;
-       case Film::CONTENT_AUDIO_STREAMS:
-               setup_streams ();
-               setup_show_audio_sensitivity ();
-               setup_frame_rate_description ();
+       case Film::CONTAINER:
+               setup_container ();
                break;
-       case Film::FORMAT:
-       {
-               int n = 0;
-               vector<Format const *>::iterator i = _formats.begin ();
-               while (i != _formats.end() && *i != _film->format ()) {
-                       ++i;
-                       ++n;
-               }
-               if (i == _formats.end()) {
-                       checked_set (_format, -1);
-               } else {
-                       checked_set (_format, n);
-               }
-               setup_dcp_name ();
-               setup_scaling_description ();
-               break;
-       }
-       case Film::CROP:
-               checked_set (_left_crop, _film->crop().left);
-               checked_set (_right_crop, _film->crop().right);
-               checked_set (_top_crop, _film->crop().top);
-               checked_set (_bottom_crop, _film->crop().bottom);
-               setup_scaling_description ();
-               break;
-       case Film::FILTERS:
-       {
-               pair<string, string> p = Filter::ffmpeg_strings (_film->filters ());
-               if (p.first.empty () && p.second.empty ()) {
-                       _filters->SetLabel (_("None"));
-               } else {
-                       string const b = p.first + " " + p.second;
-                       _filters->SetLabel (std_to_wx (b));
-               }
-               _film_sizer->Layout ();
-               break;
-       }
        case Film::NAME:
                checked_set (_name, _film->name());
                setup_dcp_name ();
                break;
-       case Film::SOURCE_FRAME_RATE:
-               s << fixed << setprecision(2) << _film->source_frame_rate();
-               _source_frame_rate->SetLabel (std_to_wx (s.str ()));
-               setup_frame_rate_description ();
-               break;
-       case Film::SIZE:
-               setup_scaling_description ();
-               break;
-       case Film::LENGTH:
-               if (_film->source_frame_rate() > 0 && _film->length()) {
-                       s << _film->length().get() << " "
-                         << wx_to_std (_("frames")) << "; " << seconds_to_hms (_film->length().get() / _film->source_frame_rate());
-               } else if (_film->length()) {
-                       s << _film->length().get() << " "
-                         << wx_to_std (_("frames"));
-               } 
-               _length->SetLabel (std_to_wx (s.str ()));
-               if (_film->length()) {
-                       _trim_start->SetRange (0, _film->length().get());
-                       _trim_end->SetRange (0, _film->length().get());
-               }
-               break;
        case Film::DCP_CONTENT_TYPE:
                checked_set (_dcp_content_type, DCPContentType::as_index (_film->dcp_content_type ()));
                setup_dcp_name ();
                break;
-       case Film::DCP_AB:
-               checked_set (_dcp_ab, _film->dcp_ab ());
-               break;
        case Film::SCALER:
                checked_set (_scaler, Scaler::as_index (_film->scaler ()));
                break;
-       case Film::TRIM_START:
-               checked_set (_trim_start, _film->trim_start());
-               break;
-       case Film::TRIM_END:
-               checked_set (_trim_end, _film->trim_end());
-               break;
-       case Film::TRIM_TYPE:
-               checked_set (_trim_type, _film->trim_type() == Film::CPL ? 0 : 1);
-               break;
-       case Film::AUDIO_GAIN:
-               checked_set (_audio_gain, _film->audio_gain ());
-               break;
-       case Film::AUDIO_DELAY:
-               checked_set (_audio_delay, _film->audio_delay ());
-               break;
-       case Film::STILL_DURATION:
-               checked_set (_still_duration, _film->still_duration ());
-               break;
        case Film::WITH_SUBTITLES:
                checked_set (_with_subtitles, _film->with_subtitles ());
                setup_subtitle_control_sensitivity ();
@@ -754,101 +625,139 @@ FilmEditor::film_changed (Film::Property p)
        case Film::DCI_METADATA:
                setup_dcp_name ();
                break;
-       case Film::CONTENT_AUDIO_STREAM:
-               if (_film->content_audio_stream()) {
-                       checked_set (_audio_stream, _film->content_audio_stream()->to_string());
-               }
-               setup_dcp_name ();
-               setup_audio_details ();
-               setup_audio_control_sensitivity ();
-               setup_show_audio_sensitivity ();
-               setup_frame_rate_description ();
-               break;
-       case Film::USE_CONTENT_AUDIO:
-               checked_set (_use_content_audio, _film->use_content_audio());
-               checked_set (_use_external_audio, !_film->use_content_audio());
-               setup_dcp_name ();
-               setup_audio_details ();
-               setup_audio_control_sensitivity ();
-               setup_show_audio_sensitivity ();
-               setup_frame_rate_description ();
-               break;
-       case Film::SUBTITLE_STREAM:
-               if (_film->subtitle_stream()) {
-                       checked_set (_subtitle_stream, _film->subtitle_stream()->to_string());
-               }
-               break;
-       case Film::EXTERNAL_AUDIO:
+       case Film::DCP_VIDEO_FRAME_RATE:
        {
-               vector<string> a = _film->external_audio ();
-               for (size_t i = 0; i < a.size() && i < MAX_AUDIO_CHANNELS; ++i) {
-                       checked_set (_external_audio[i], a[i]);
-               }
-               setup_audio_details ();
-               setup_show_audio_sensitivity ();
-               setup_frame_rate_description ();
-               break;
-       }
-       case Film::DCP_FRAME_RATE:
+               bool done = false;
                for (unsigned int i = 0; i < _dcp_frame_rate->GetCount(); ++i) {
-                       if (wx_to_std (_dcp_frame_rate->GetString(i)) == boost::lexical_cast<string> (_film->dcp_frame_rate())) {
-                               if (_dcp_frame_rate->GetSelection() != int(i)) {
-                                       _dcp_frame_rate->SetSelection (i);
-                                       break;
-                               }
+                       if (wx_to_std (_dcp_frame_rate->GetString(i)) == boost::lexical_cast<string> (_film->dcp_video_frame_rate())) {
+                               checked_set (_dcp_frame_rate, i);
+                               done = true;
+                               break;
                        }
                }
 
-               if (_film->source_frame_rate()) {
-                       _best_dcp_frame_rate->Enable (best_dcp_frame_rate (_film->source_frame_rate ()) != _film->dcp_frame_rate ());
-               } else {
-                       _best_dcp_frame_rate->Disable ();
+               if (!done) {
+                       checked_set (_dcp_frame_rate, -1);
                }
 
-               setup_frame_rate_description ();
+               _best_dcp_frame_rate->Enable (_film->best_dcp_video_frame_rate () != _film->dcp_video_frame_rate ());
+               break;
+       }
        }
 }
 
 void
-FilmEditor::setup_frame_rate_description ()
+FilmEditor::film_content_changed (weak_ptr<Content> weak_content, int property)
 {
-       wxString d;
-       int lines = 0;
-       
-       if (_film->source_frame_rate()) {
-               d << std_to_wx (FrameRateConversion (_film->source_frame_rate(), _film->dcp_frame_rate()).description);
-               ++lines;
-#ifdef HAVE_SWRESAMPLE
-               if (_film->audio_stream() && _film->audio_stream()->sample_rate() != _film->target_audio_sample_rate ()) {
-                       d << wxString::Format (
-                               _("Audio will be resampled from %dHz to %dHz\n"),
-                               _film->audio_stream()->sample_rate(),
-                               _film->target_audio_sample_rate()
-                               );
-                       ++lines;
-               }
-#endif         
+       if (!_film) {
+               /* We call this method ourselves (as well as using it as a signal handler)
+                  so _film can be 0.
+               */
+               return;
        }
 
-       for (int i = lines; i < 2; ++i) {
-               d << wxT ("\n ");
+       shared_ptr<Content> content = weak_content.lock ();
+       shared_ptr<VideoContent> video_content;
+       shared_ptr<AudioContent> audio_content;
+       shared_ptr<FFmpegContent> ffmpeg_content;
+       if (content) {
+               video_content = dynamic_pointer_cast<VideoContent> (content);
+               audio_content = dynamic_pointer_cast<AudioContent> (content);
+               ffmpeg_content = dynamic_pointer_cast<FFmpegContent> (content);
        }
 
-       _frame_rate_description->SetLabel (d);
+       if (property == VideoContentProperty::VIDEO_CROP) {
+               checked_set (_left_crop,   video_content ? video_content->crop().left :   0);
+               checked_set (_right_crop,  video_content ? video_content->crop().right :  0);
+               checked_set (_top_crop,    video_content ? video_content->crop().top :    0);
+               checked_set (_bottom_crop, video_content ? video_content->crop().bottom : 0);
+               setup_scaling_description ();
+       } else if (property == AudioContentProperty::AUDIO_GAIN) {
+               checked_set (_audio_gain, audio_content ? audio_content->audio_gain() : 0);
+       } else if (property == AudioContentProperty::AUDIO_DELAY) {
+               checked_set (_audio_delay, audio_content ? audio_content->audio_delay() : 0);
+       } else if (property == FFmpegContentProperty::SUBTITLE_STREAMS) {
+               _subtitle_stream->Clear ();
+               if (ffmpeg_content) {
+                       vector<shared_ptr<FFmpegSubtitleStream> > s = ffmpeg_content->subtitle_streams ();
+                       if (s.empty ()) {
+                               _subtitle_stream->Enable (false);
+                       }
+                       for (vector<shared_ptr<FFmpegSubtitleStream> >::iterator i = s.begin(); i != s.end(); ++i) {
+                               _subtitle_stream->Append (std_to_wx ((*i)->name), new wxStringClientData (std_to_wx (lexical_cast<string> ((*i)->id))));
+                       }
+                       
+                       if (ffmpeg_content->subtitle_stream()) {
+                               checked_set (_subtitle_stream, lexical_cast<string> (ffmpeg_content->subtitle_stream()->id));
+                       } else {
+                               _subtitle_stream->SetSelection (wxNOT_FOUND);
+                       }
+               }
+               setup_subtitle_control_sensitivity ();
+       } else if (property == FFmpegContentProperty::AUDIO_STREAMS) {
+               _audio_stream->Clear ();
+               if (ffmpeg_content) {
+                       vector<shared_ptr<FFmpegAudioStream> > a = ffmpeg_content->audio_streams ();
+                       for (vector<shared_ptr<FFmpegAudioStream> >::iterator i = a.begin(); i != a.end(); ++i) {
+                               _audio_stream->Append (std_to_wx ((*i)->name), new wxStringClientData (std_to_wx (lexical_cast<string> ((*i)->id))));
+                       }
+                       
+                       if (ffmpeg_content->audio_stream()) {
+                               checked_set (_audio_stream, lexical_cast<string> (ffmpeg_content->audio_stream()->id));
+                       }
+               }
+               setup_show_audio_sensitivity ();
+       } else if (property == FFmpegContentProperty::AUDIO_STREAM) {
+               setup_dcp_name ();
+               setup_show_audio_sensitivity ();
+       } else if (property == FFmpegContentProperty::FILTERS) {
+               if (ffmpeg_content) {
+                       pair<string, string> p = Filter::ffmpeg_strings (ffmpeg_content->filters ());
+                       if (p.first.empty () && p.second.empty ()) {
+                               _filters->SetLabel (_("None"));
+                       } else {
+                               string const b = p.first + " " + p.second;
+                               _filters->SetLabel (std_to_wx (b));
+                       }
+                       _dcp_sizer->Layout ();
+               }
+       }
 }
 
-/** Called when the format widget has been changed */
 void
-FilmEditor::format_changed (wxCommandEvent &)
+FilmEditor::setup_container ()
+{
+       int n = 0;
+       vector<Container const *> containers = Container::all ();
+       vector<Container const *>::iterator i = containers.begin ();
+       while (i != containers.end() && *i != _film->container ()) {
+               ++i;
+               ++n;
+       }
+       
+       if (i == containers.end()) {
+               checked_set (_container, -1);
+       } else {
+               checked_set (_container, n);
+       }
+       
+       setup_dcp_name ();
+       setup_scaling_description ();
+}      
+
+/** Called when the container widget has been changed */
+void
+FilmEditor::container_changed (wxCommandEvent &)
 {
        if (!_film) {
                return;
        }
 
-       int const n = _format->GetSelection ();
+       int const n = _container->GetSelection ();
        if (n >= 0) {
-               assert (n < int (_formats.size()));
-               _film->set_format (_formats[n]);
+               vector<Container const *> containers = Container::all ();
+               assert (n < int (containers.size()));
+               _film->set_container (containers[n]);
        }
 }
 
@@ -870,12 +779,17 @@ FilmEditor::dcp_content_type_changed (wxCommandEvent &)
 void
 FilmEditor::set_film (shared_ptr<Film> f)
 {
-       _film = f;
+       set_things_sensitive (f != 0);
 
-       set_things_sensitive (_film != 0);
+       if (_film == f) {
+               return;
+       }
+       
+       _film = f;
 
        if (_film) {
                _film->Changed.connect (bind (&FilmEditor::film_changed, this, _1));
+               _film->ContentChanged.connect (bind (&FilmEditor::film_content_changed, this, _1, _2));
        }
 
        if (_film) {
@@ -891,34 +805,26 @@ FilmEditor::set_film (shared_ptr<Film> f)
        film_changed (Film::NAME);
        film_changed (Film::USE_DCI_NAME);
        film_changed (Film::CONTENT);
-       film_changed (Film::TRUST_CONTENT_HEADER);
+       film_changed (Film::LOOP);
        film_changed (Film::DCP_CONTENT_TYPE);
-       film_changed (Film::FORMAT);
-       film_changed (Film::CROP);
-       film_changed (Film::FILTERS);
+       film_changed (Film::CONTAINER);
        film_changed (Film::SCALER);
-       film_changed (Film::TRIM_START);
-       film_changed (Film::TRIM_END);
-       film_changed (Film::TRIM_TYPE);
-       film_changed (Film::DCP_AB);
-       film_changed (Film::CONTENT_AUDIO_STREAM);
-       film_changed (Film::EXTERNAL_AUDIO);
-       film_changed (Film::USE_CONTENT_AUDIO);
-       film_changed (Film::AUDIO_GAIN);
-       film_changed (Film::AUDIO_DELAY);
-       film_changed (Film::STILL_DURATION);
        film_changed (Film::WITH_SUBTITLES);
        film_changed (Film::SUBTITLE_OFFSET);
        film_changed (Film::SUBTITLE_SCALE);
        film_changed (Film::COLOUR_LUT);
        film_changed (Film::J2K_BANDWIDTH);
        film_changed (Film::DCI_METADATA);
-       film_changed (Film::SIZE);
-       film_changed (Film::LENGTH);
-       film_changed (Film::CONTENT_AUDIO_STREAMS);
-       film_changed (Film::SUBTITLE_STREAMS);
-       film_changed (Film::SOURCE_FRAME_RATE);
-       film_changed (Film::DCP_FRAME_RATE);
+       film_changed (Film::DCP_VIDEO_FRAME_RATE);
+
+       film_content_changed (boost::shared_ptr<Content> (), VideoContentProperty::VIDEO_CROP);
+       film_content_changed (boost::shared_ptr<Content> (), AudioContentProperty::AUDIO_GAIN);
+       film_content_changed (boost::shared_ptr<Content> (), AudioContentProperty::AUDIO_DELAY);
+       film_content_changed (boost::shared_ptr<Content> (), FFmpegContentProperty::SUBTITLE_STREAMS);
+       film_content_changed (boost::shared_ptr<Content> (), FFmpegContentProperty::SUBTITLE_STREAM);
+       film_content_changed (boost::shared_ptr<Content> (), FFmpegContentProperty::AUDIO_STREAMS);
+       film_content_changed (boost::shared_ptr<Content> (), FFmpegContentProperty::AUDIO_STREAM);
+       film_content_changed (boost::shared_ptr<Content> (), FFmpegContentProperty::FILTERS);
 }
 
 /** Updates the sensitivity of lots of widgets to a given value.
@@ -934,39 +840,44 @@ FilmEditor::set_things_sensitive (bool s)
        _edit_dci_button->Enable (s);
        _format->Enable (s);
        _content->Enable (s);
-       _trust_content_header->Enable (s);
+       _content->Enable (s);
        _left_crop->Enable (s);
        _right_crop->Enable (s);
        _top_crop->Enable (s);
        _bottom_crop->Enable (s);
        _filters_button->Enable (s);
        _scaler->Enable (s);
-       _audio_stream->Enable (s);
        _dcp_content_type->Enable (s);
+       _best_dcp_frame_rate->Enable (s);
        _dcp_frame_rate->Enable (s);
-       _trim_start->Enable (s);
-       _trim_end->Enable (s);
-       _trim_type->Enable (s);
-       _dcp_ab->Enable (s);
        _colour_lut->Enable (s);
        _j2k_bandwidth->Enable (s);
        _audio_gain->Enable (s);
        _audio_gain_calculate_button->Enable (s);
        _show_audio->Enable (s);
        _audio_delay->Enable (s);
-       _still_duration->Enable (s);
 
        setup_subtitle_control_sensitivity ();
-       setup_audio_control_sensitivity ();
        setup_show_audio_sensitivity ();
+       setup_content_sensitivity ();
 }
 
 /** Called when the `Edit filters' button has been clicked */
 void
 FilmEditor::edit_filters_clicked (wxCommandEvent &)
 {
-       FilterDialog* d = new FilterDialog (this, _film->filters());
-       d->ActiveChanged.connect (bind (&Film::set_filters, _film, _1));
+       shared_ptr<Content> c = selected_content ();
+       if (!c) {
+               return;
+       }
+
+       shared_ptr<FFmpegContent> fc = dynamic_pointer_cast<FFmpegContent> (c);
+       if (!fc) {
+               return;
+       }
+       
+       FilterDialog* d = new FilterDialog (this, fc->filters());
+       d->ActiveChanged.connect (bind (&FFmpegContent::set_filters, fc, _1));
        d->ShowModal ();
        d->Destroy ();
 }
@@ -988,105 +899,39 @@ FilmEditor::scaler_changed (wxCommandEvent &)
 void
 FilmEditor::audio_gain_changed (wxCommandEvent &)
 {
-       if (!_film) {
+       shared_ptr<AudioContent> ac = selected_audio_content ();
+       if (!ac) {
                return;
        }
 
-       _film->set_audio_gain (_audio_gain->GetValue ());
+       ac->set_audio_gain (_audio_gain->GetValue ());
 }
 
 void
 FilmEditor::audio_delay_changed (wxCommandEvent &)
 {
-       if (!_film) {
+       shared_ptr<AudioContent> ac = selected_audio_content ();
+       if (!ac) {
                return;
        }
 
-       _film->set_audio_delay (_audio_delay->GetValue ());
-}
-
-wxControl *
-FilmEditor::video_control (wxControl* c)
-{
-       _video_controls.push_back (c);
-       return c;
-}
-
-wxControl *
-FilmEditor::still_control (wxControl* c)
-{
-       _still_controls.push_back (c);
-       return c;
+       ac->set_audio_delay (_audio_delay->GetValue ());
 }
 
 void
-FilmEditor::setup_visibility ()
+FilmEditor::setup_main_notebook_size ()
 {
-       ContentType c = VIDEO;
-
-       if (_film) {
-               c = _film->content_type ();
-       }
-
-       for (list<wxControl*>::iterator i = _video_controls.begin(); i != _video_controls.end(); ++i) {
-               (*i)->Show (c == VIDEO);
-       }
+       _main_notebook->InvalidateBestSize ();
 
-       for (list<wxControl*>::iterator i = _still_controls.begin(); i != _still_controls.end(); ++i) {
-               (*i)->Show (c == STILL);
-       }
-
-       setup_notebook_size ();
-}
+       _content_sizer->Layout ();
+       _content_sizer->SetSizeHints (_content_panel);
+       _dcp_sizer->Layout ();
+       _dcp_sizer->SetSizeHints (_dcp_panel);
 
-void
-FilmEditor::setup_notebook_size ()
-{
-       _notebook->InvalidateBestSize ();
-       
-       _film_sizer->Layout ();
-       _film_sizer->SetSizeHints (_film_panel);
-       _video_sizer->Layout ();
-       _video_sizer->SetSizeHints (_video_panel);
-       _audio_sizer->Layout ();
-       _audio_sizer->SetSizeHints (_audio_panel);
-       _subtitle_sizer->Layout ();
-       _subtitle_sizer->SetSizeHints (_subtitle_panel);
-
-       _notebook->Fit ();
+       _main_notebook->Fit ();
        Fit ();
 }
 
-void
-FilmEditor::still_duration_changed (wxCommandEvent &)
-{
-       if (!_film) {
-               return;
-       }
-
-       _film->set_still_duration (_still_duration->GetValue ());
-}
-
-void
-FilmEditor::trim_start_changed (wxCommandEvent &)
-{
-       if (!_film) {
-               return;
-       }
-
-       _film->set_trim_start (_trim_start->GetValue ());
-}
-
-void
-FilmEditor::trim_end_changed (wxCommandEvent &)
-{
-       if (!_film) {
-               return;
-       }
-
-       _film->set_trim_end (_trim_end->GetValue ());
-}
-
 void
 FilmEditor::audio_gain_calculate_button_clicked (wxCommandEvent &)
 {
@@ -1117,27 +962,14 @@ FilmEditor::audio_gain_calculate_button_clicked (wxCommandEvent &)
 void
 FilmEditor::setup_formats ()
 {
-       ContentType c = VIDEO;
-
-       if (_film) {
-               c = _film->content_type ();
-       }
-       
-       _formats.clear ();
-
-       vector<Format const *> fmt = Format::all ();
-       for (vector<Format const *>::iterator i = fmt.begin(); i != fmt.end(); ++i) {
-               if (c == VIDEO || (c == STILL && dynamic_cast<VariableFormat const *> (*i))) {
-                       _formats.push_back (*i);
-               }
-       }
+       _formats = Format::all ();
 
        _format->Clear ();
        for (vector<Format const *>::iterator i = _formats.begin(); i != _formats.end(); ++i) {
                _format->Append (std_to_wx ((*i)->name ()));
        }
 
-       _film_sizer->Layout ();
+       _dcp_sizer->Layout ();
 }
 
 void
@@ -1155,7 +987,7 @@ FilmEditor::setup_subtitle_control_sensitivity ()
 {
        bool h = false;
        if (_generally_sensitive && _film) {
-               h = !_film->subtitle_streams().empty();
+               h = _film->has_subtitles ();
        }
        
        _with_subtitles->Enable (h);
@@ -1165,26 +997,10 @@ FilmEditor::setup_subtitle_control_sensitivity ()
                j = _film->with_subtitles ();
        }
        
-       _subtitle_stream->Enable (j);
        _subtitle_offset->Enable (j);
        _subtitle_scale->Enable (j);
 }
 
-void
-FilmEditor::setup_audio_control_sensitivity ()
-{
-       _use_content_audio->Enable (_generally_sensitive && _film && !_film->content_audio_streams().empty());
-       _use_external_audio->Enable (_generally_sensitive);
-       
-       bool const source = _generally_sensitive && _use_content_audio->GetValue();
-       bool const external = _generally_sensitive && _use_external_audio->GetValue();
-
-       _audio_stream->Enable (source);
-       for (int i = 0; i < MAX_AUDIO_CHANNELS; ++i) {
-               _external_audio[i]->Enable (external);
-       }
-}
-
 void
 FilmEditor::use_dci_name_toggled (wxCommandEvent &)
 {
@@ -1209,143 +1025,178 @@ FilmEditor::edit_dci_button_clicked (wxCommandEvent &)
 }
 
 void
-FilmEditor::setup_streams ()
+FilmEditor::active_jobs_changed (bool a)
 {
-       _audio_stream->Clear ();
-       vector<shared_ptr<AudioStream> > a = _film->content_audio_streams ();
-       for (vector<shared_ptr<AudioStream> >::iterator i = a.begin(); i != a.end(); ++i) {
-               shared_ptr<FFmpegAudioStream> ffa = dynamic_pointer_cast<FFmpegAudioStream> (*i);
-               assert (ffa);
-               _audio_stream->Append (std_to_wx (ffa->name()), new wxStringClientData (std_to_wx (ffa->to_string ())));
-       }
-       
-       if (_film->use_content_audio() && _film->audio_stream()) {
-               checked_set (_audio_stream, _film->audio_stream()->to_string());
-       }
+       set_things_sensitive (!a);
+}
 
-       _subtitle_stream->Clear ();
-       vector<shared_ptr<SubtitleStream> > s = _film->subtitle_streams ();
-       for (vector<shared_ptr<SubtitleStream> >::iterator i = s.begin(); i != s.end(); ++i) {
-               _subtitle_stream->Append (std_to_wx ((*i)->name()), new wxStringClientData (std_to_wx ((*i)->to_string ())));
-       }
-       if (_film->subtitle_stream()) {
-               checked_set (_subtitle_stream, _film->subtitle_stream()->to_string());
+void
+FilmEditor::setup_dcp_name ()
+{
+       string s = _film->dcp_name (true);
+       if (s.length() > 28) {
+               _dcp_name->SetLabel (std_to_wx (s.substr (0, 28)) + N_("..."));
+               _dcp_name->SetToolTip (std_to_wx (s));
        } else {
-               _subtitle_stream->SetSelection (wxNOT_FOUND);
+               _dcp_name->SetLabel (std_to_wx (s));
        }
 }
 
 void
-FilmEditor::audio_stream_changed (wxCommandEvent &)
+FilmEditor::show_audio_clicked (wxCommandEvent &)
 {
-       if (!_film) {
-               return;
+       if (_audio_dialog) {
+               _audio_dialog->Destroy ();
+               _audio_dialog = 0;
        }
-
-       _film->set_content_audio_stream (
-               audio_stream_factory (
-                       string_client_data (_audio_stream->GetClientObject (_audio_stream->GetSelection ())),
-                       Film::state_version
-                       )
-               );
+       
+       _audio_dialog = new AudioDialog (this);
+       _audio_dialog->Show ();
+       _audio_dialog->set_film (_film);
 }
 
 void
-FilmEditor::subtitle_stream_changed (wxCommandEvent &)
+FilmEditor::best_dcp_frame_rate_clicked (wxCommandEvent &)
 {
        if (!_film) {
                return;
        }
+       
+       _film->set_dcp_video_frame_rate (_film->best_dcp_video_frame_rate ());
+}
 
-       _film->set_subtitle_stream (
-               subtitle_stream_factory (
-                       string_client_data (_subtitle_stream->GetClientObject (_subtitle_stream->GetSelection ())),
-                       Film::state_version
-                       )
-               );
+void
+FilmEditor::setup_show_audio_sensitivity ()
+{
+       _show_audio->Enable (_film);
 }
 
 void
-FilmEditor::setup_audio_details ()
+FilmEditor::setup_content ()
 {
-       if (!_film->content_audio_stream()) {
-               _audio->SetLabel (wxT (""));
-       } else {
-               wxString s;
-               if (_film->audio_stream()->channels() == 1) {
-                       s << _("1 channel");
-               } else {
-                       s << _film->audio_stream()->channels () << wxT (" ") << _("channels");
+       string selected_summary;
+       int const s = _content->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+       if (s != -1) {
+               selected_summary = wx_to_std (_content->GetItemText (s));
+       }
+       
+       _content->DeleteAllItems ();
+
+       Playlist::ContentList content = _film->content ();
+       for (Playlist::ContentList::iterator i = content.begin(); i != content.end(); ++i) {
+               int const t = _content->GetItemCount ();
+               _content->InsertItem (t, std_to_wx ((*i)->summary ()));
+               if ((*i)->summary() == selected_summary) {
+                       _content->SetItemState (t, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
                }
-               s << wxT (", ") << _film->audio_stream()->sample_rate() << _("Hz");
-               _audio->SetLabel (s);
        }
 
-       setup_notebook_size ();
+       if (selected_summary.empty () && !content.empty ()) {
+               /* Select the item of content if non was selected before */
+               _content->SetItemState (0, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
+       }
 }
 
 void
-FilmEditor::active_jobs_changed (bool a)
+FilmEditor::content_add_clicked (wxCommandEvent &)
 {
-       set_things_sensitive (!a);
+       wxFileDialog* d = new wxFileDialog (this, _("Choose a file or files"), wxT (""), wxT (""), wxT ("*.*"), wxFD_MULTIPLE);
+       int const r = d->ShowModal ();
+       d->Destroy ();
+
+       if (r != wxID_OK) {
+               return;
+       }
+
+       wxArrayString paths;
+       d->GetPaths (paths);
+
+       for (unsigned int i = 0; i < paths.GetCount(); ++i) {
+               boost::filesystem::path p (wx_to_std (paths[i]));
+
+               if (ImageMagickContent::valid_file (p)) {
+                       _film->add_content (shared_ptr<ImageMagickContent> (new ImageMagickContent (_film, p)));
+               } else if (SndfileContent::valid_file (p)) {
+                       _film->add_content (shared_ptr<SndfileContent> (new SndfileContent (_film, p)));
+               } else {
+                       _film->add_content (shared_ptr<FFmpegContent> (new FFmpegContent (_film, p)));
+               }
+       }
 }
 
 void
-FilmEditor::use_audio_changed (wxCommandEvent &)
+FilmEditor::content_remove_clicked (wxCommandEvent &)
 {
-       _film->set_use_content_audio (_use_content_audio->GetValue());
+       shared_ptr<Content> c = selected_content ();
+       if (c) {
+               _film->remove_content (c);
+       }
 }
 
 void
-FilmEditor::external_audio_changed (wxCommandEvent &)
+FilmEditor::content_selection_changed (wxListEvent &)
 {
-       vector<string> a;
-       for (int i = 0; i < MAX_AUDIO_CHANNELS; ++i) {
-               a.push_back (wx_to_std (_external_audio[i]->GetPath()));
-       }
-
-       _film->set_external_audio (a);
+        setup_content_sensitivity ();
+       shared_ptr<Content> s = selected_content ();
+       film_content_changed (s, VideoContentProperty::VIDEO_CROP);
+       film_content_changed (s, AudioContentProperty::AUDIO_GAIN);
+       film_content_changed (s, AudioContentProperty::AUDIO_DELAY);
+       film_content_changed (s, FFmpegContentProperty::AUDIO_STREAM);
+       film_content_changed (s, FFmpegContentProperty::AUDIO_STREAMS);
+       film_content_changed (s, FFmpegContentProperty::SUBTITLE_STREAM);
 }
 
 void
-FilmEditor::setup_dcp_name ()
+FilmEditor::setup_content_sensitivity ()
 {
-       string s = _film->dcp_name (true);
-       if (s.length() > 28) {
-               _dcp_name->SetLabel (std_to_wx (s.substr (0, 28)) + N_("..."));
-               _dcp_name->SetToolTip (std_to_wx (s));
-       } else {
-               _dcp_name->SetLabel (std_to_wx (s));
-       }
+        _content_add->Enable (_generally_sensitive);
+
+       shared_ptr<Content> selection = selected_content ();
+
+        _content_remove->Enable (selection && _generally_sensitive);
+       _content_timeline->Enable (_generally_sensitive);
+
+       _video_panel->Enable    (selection && dynamic_pointer_cast<VideoContent>  (selection) && _generally_sensitive);
+       _audio_panel->Enable    (selection && dynamic_pointer_cast<AudioContent>  (selection) && _generally_sensitive);
+       _subtitle_panel->Enable (selection && dynamic_pointer_cast<FFmpegContent> (selection) && _generally_sensitive);
 }
 
-void
-FilmEditor::show_audio_clicked (wxCommandEvent &)
+shared_ptr<Content>
+FilmEditor::selected_content ()
 {
-       if (_audio_dialog) {
-               _audio_dialog->Destroy ();
-               _audio_dialog = 0;
+       int const s = _content->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+       if (s == -1) {
+               return shared_ptr<Content> ();
+       }
+
+       Playlist::ContentList c = _film->content ();
+       if (s < 0 || size_t (s) >= c.size ()) {
+               return shared_ptr<Content> ();
        }
        
-       _audio_dialog = new AudioDialog (this);
-       _audio_dialog->Show ();
-       _audio_dialog->set_film (_film);
+       return c[s];
 }
 
-void
-FilmEditor::best_dcp_frame_rate_clicked (wxCommandEvent &)
+shared_ptr<VideoContent>
+FilmEditor::selected_video_content ()
 {
-       if (!_film) {
-               return;
+       shared_ptr<Content> c = selected_content ();
+       if (!c) {
+               return shared_ptr<VideoContent> ();
        }
-       
-       _film->set_dcp_frame_rate (best_dcp_frame_rate (_film->source_frame_rate ()));
+
+       return dynamic_pointer_cast<VideoContent> (c);
 }
 
-void
-FilmEditor::setup_show_audio_sensitivity ()
+shared_ptr<AudioContent>
+FilmEditor::selected_audio_content ()
 {
-       _show_audio->Enable (_film && _film->has_audio ());
+       shared_ptr<Content> c = selected_content ();
+       if (!c) {
+               return shared_ptr<AudioContent> ();
+       }
+
+       return dynamic_pointer_cast<AudioContent> (c);
 }
 
 void
@@ -1353,20 +1204,22 @@ FilmEditor::setup_scaling_description ()
 {
        wxString d;
 
+#if 0  
+XXX
        int lines = 0;
 
-       if (_film->size().width && _film->size().height) {
+       if (_film->video_size().width && _film->video_size().height) {
                d << wxString::Format (
                        _("Original video is %dx%d (%.2f:1)\n"),
-                       _film->size().width, _film->size().height,
-                       float (_film->size().width) / _film->size().height
+                       _film->video_size().width, _film->video_size().height,
+                       float (_film->video_size().width) / _film->video_size().height
                        );
                ++lines;
        }
 
        Crop const crop = _film->crop ();
        if (crop.left || crop.right || crop.top || crop.bottom) {
-               libdcp::Size const cropped = _film->cropped_size (_film->size ());
+               libdcp::Size const cropped = _film->cropped_size (_film->video_size ());
                d << wxString::Format (
                        _("Cropped to %dx%d (%.2f:1)\n"),
                        cropped.width, cropped.height,
@@ -1401,11 +1254,124 @@ FilmEditor::setup_scaling_description ()
                d << wxT ("\n ");
        }
 
+#endif 
        _scaling_description->SetLabel (d);
 }
 
 void
-FilmEditor::trim_type_changed (wxCommandEvent &)
+FilmEditor::loop_content_toggled (wxCommandEvent &)
 {
-       _film->set_trim_type (_trim_type->GetSelection () == 0 ? Film::CPL : Film::ENCODE);
+       if (_loop_content->GetValue ()) {
+               _film->set_loop (_loop_count->GetValue ());
+       } else {
+               _film->set_loop (1);
+       }
+               
+       setup_loop_sensitivity ();
+}
+
+void
+FilmEditor::loop_count_changed (wxCommandEvent &)
+{
+       _film->set_loop (_loop_count->GetValue ());
+}
+
+void
+FilmEditor::setup_loop_sensitivity ()
+{
+       _loop_count->Enable (_loop_content->GetValue ());
+}
+
+void
+FilmEditor::content_timeline_clicked (wxCommandEvent &)
+{
+       if (_timeline_dialog) {
+               _timeline_dialog->Destroy ();
+               _timeline_dialog = 0;
+       }
+       
+       _timeline_dialog = new TimelineDialog (this, _film);
+       _timeline_dialog->Show ();
+}
+
+void
+FilmEditor::audio_stream_changed (wxCommandEvent &)
+{
+       shared_ptr<Content> c = selected_content ();
+       if (!c) {
+               return;
+       }
+       
+       shared_ptr<FFmpegContent> fc = dynamic_pointer_cast<FFmpegContent> (c);
+       if (!fc) {
+               return;
+       }
+       
+       vector<shared_ptr<FFmpegAudioStream> > a = fc->audio_streams ();
+       vector<shared_ptr<FFmpegAudioStream> >::iterator i = a.begin ();
+       string const s = string_client_data (_audio_stream->GetClientObject (_audio_stream->GetSelection ()));
+       while (i != a.end() && lexical_cast<string> ((*i)->id) != s) {
+               ++i;
+       }
+
+       if (i != a.end ()) {
+               fc->set_audio_stream (*i);
+       }
+
+       if (!fc->audio_stream ()) {
+               _audio_description->SetLabel (wxT (""));
+       } else {
+               wxString s;
+               if (fc->audio_channels() == 1) {
+                       s << _("1 channel");
+               } else {
+                       s << fc->audio_channels() << wxT (" ") << _("channels");
+               }
+               s << wxT (", ") << fc->content_audio_frame_rate() << _("Hz");
+               _audio_description->SetLabel (s);
+       }
+}
+
+
+
+void
+FilmEditor::subtitle_stream_changed (wxCommandEvent &)
+{
+       shared_ptr<Content> c = selected_content ();
+       if (!c) {
+               return;
+       }
+       
+       shared_ptr<FFmpegContent> fc = dynamic_pointer_cast<FFmpegContent> (c);
+       if (!fc) {
+               return;
+       }
+       
+       vector<shared_ptr<FFmpegSubtitleStream> > a = fc->subtitle_streams ();
+       vector<shared_ptr<FFmpegSubtitleStream> >::iterator i = a.begin ();
+       string const s = string_client_data (_subtitle_stream->GetClientObject (_subtitle_stream->GetSelection ()));
+       while (i != a.end() && lexical_cast<string> ((*i)->id) != s) {
+               ++i;
+       }
+
+       if (i != a.end ()) {
+               fc->set_subtitle_stream (*i);
+       }
+}
+
+void
+FilmEditor::audio_mapping_changed (AudioMapping m)
+{
+       shared_ptr<Content> c = selected_content ();
+       if (!c) {
+               return;
+       }
+       
+       shared_ptr<FFmpegContent> fc = dynamic_pointer_cast<FFmpegContent> (c);
+       if (!fc) {
+               return;
+       }
+
+       /* XXX: should be general to audiocontent */
+       fc->audio_stream()->mapping = m;
 }