#include "lib/dcp_content_type.h"
#include "lib/sound_processor.h"
#include "lib/scaler.h"
+#include "lib/playlist.h"
+#include "lib/content.h"
+#include "lib/content_factory.h"
#include "timecode.h"
#include "wx_util.h"
#include "film_editor.h"
_content_add_file->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&FilmEditor::content_add_file_clicked, this));
_content_add_folder->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&FilmEditor::content_add_folder_clicked, this));
_content_remove->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&FilmEditor::content_remove_clicked, this));
+ _content_earlier->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&FilmEditor::content_earlier_clicked, this));
+ _content_later->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&FilmEditor::content_later_clicked, this));
_content_timeline->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&FilmEditor::content_timeline_clicked, this));
_scaler->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&FilmEditor::scaler_changed, this));
_dcp_content_type->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&FilmEditor::dcp_content_type_changed, this));
{
wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
- _content = new wxListCtrl (_content_panel, wxID_ANY, wxDefaultPosition, wxSize (320, 160), wxLC_REPORT | wxLC_NO_HEADER | wxLC_SINGLE_SEL);
+ _content = new wxListCtrl (_content_panel, wxID_ANY, wxDefaultPosition, wxSize (320, 160), wxLC_REPORT | wxLC_NO_HEADER);
s->Add (_content, 1, wxEXPAND | wxTOP | wxBOTTOM, 6);
_content->InsertColumn (0, wxT(""));
b->Add (_content_add_folder, 1, wxEXPAND | wxLEFT | wxRIGHT);
_content_remove = new wxButton (_content_panel, wxID_ANY, _("Remove"));
b->Add (_content_remove, 1, wxEXPAND | wxLEFT | wxRIGHT);
+ _content_earlier = new wxButton (_content_panel, wxID_UP);
+ b->Add (_content_earlier, 1, wxEXPAND);
+ _content_later = new wxButton (_content_panel, wxID_DOWN);
+ b->Add (_content_later, 1, wxEXPAND);
_content_timeline = new wxButton (_content_panel, wxID_ANY, _("Timeline..."));
b->Add (_content_timeline, 1, wxEXPAND | wxLEFT | wxRIGHT);
return;
}
- _film->set_j2k_bandwidth (_j2k_bandwidth->GetValue() * 1e6);
+ _film->set_j2k_bandwidth (_j2k_bandwidth->GetValue() * 1000000);
}
void
setup_dcp_name ();
break;
case Film::J2K_BANDWIDTH:
- checked_set (_j2k_bandwidth, double (_film->j2k_bandwidth()) / 1e6);
+ checked_set (_j2k_bandwidth, _film->j2k_bandwidth() / 1000000);
break;
case Film::USE_DCI_NAME:
checked_set (_use_dci_name, _film->use_dci_name ());
}
void
-FilmEditor::film_content_changed (weak_ptr<Content> weak_content, int property)
+FilmEditor::film_content_changed (int property)
{
ensure_ui_thread ();
return;
}
- shared_ptr<Content> content = weak_content.lock ();
- if (!content || content != selected_content ()) {
- return;
- }
-
for (list<FilmEditorPanel*>::iterator i = _panels.begin(); i != _panels.end(); ++i) {
- (*i)->film_content_changed (content, property);
+ (*i)->film_content_changed (property);
}
if (property == FFmpegContentProperty::AUDIO_STREAM) {
setup_dcp_name ();
+ } else if (property == ContentProperty::PATH) {
+ setup_content ();
}
}
if (_film) {
_film->Changed.connect (bind (&FilmEditor::film_changed, this, _1));
- _film->ContentChanged.connect (bind (&FilmEditor::film_content_changed, this, _1, _2));
+ _film->ContentChanged.connect (bind (&FilmEditor::film_content_changed, this, _2));
}
if (_film) {
_content_add_file->Enable (s);
_content_add_folder->Enable (s);
_content_remove->Enable (s);
+ _content_earlier->Enable (s);
+ _content_later->Enable (s);
_content_timeline->Enable (s);
_dcp_content_type->Enable (s);
_encrypted->Enable (s);
ContentList content = _film->content ();
for (ContentList::iterator i = content.begin(); i != content.end(); ++i) {
int const t = _content->GetItemCount ();
- _content->InsertItem (t, std_to_wx ((*i)->summary ()));
+ bool const valid = (*i)->path_valid ();
+
+ string s = (*i)->summary ();
+ if (!valid) {
+ s = _("MISSING: ") + s;
+ }
+
+ _content->InsertItem (t, std_to_wx (s));
+
if ((*i)->summary() == selected_summary) {
_content->SetItemState (t, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
}
+
+ if (!valid) {
+ _content->SetItemTextColour (t, *wxRED);
+ }
}
if (selected_summary.empty () && !content.empty ()) {
/* XXX: check for lots of files here and do something */
for (unsigned int i = 0; i < paths.GetCount(); ++i) {
- boost::filesystem::path p (wx_to_std (paths[i]));
-
- shared_ptr<Content> c;
-
- if (valid_image_file (p)) {
- c.reset (new StillImageContent (_film, p));
- } else if (SndfileContent::valid_file (p)) {
- c.reset (new SndfileContent (_film, p));
- } else {
- c.reset (new FFmpegContent (_film, p));
- }
-
- _film->examine_and_add_content (c);
+ _film->examine_and_add_content (content_factory (_film, wx_to_std (paths[i])));
}
}
void
FilmEditor::content_remove_clicked ()
{
- shared_ptr<Content> c = selected_content ();
- if (c) {
- _film->remove_content (c);
+ ContentList c = selected_content ();
+ if (c.size() == 1) {
+ _film->remove_content (c.front ());
}
content_selection_changed ();
FilmEditor::content_selection_changed ()
{
setup_content_sensitivity ();
- shared_ptr<Content> s = selected_content ();
-
- /* All other sensitivity in content panels should be triggered by
- one of these.
- */
- film_content_changed (s, ContentProperty::POSITION);
- film_content_changed (s, ContentProperty::LENGTH);
- film_content_changed (s, ContentProperty::TRIM_START);
- film_content_changed (s, ContentProperty::TRIM_END);
- film_content_changed (s, VideoContentProperty::VIDEO_CROP);
- film_content_changed (s, VideoContentProperty::VIDEO_RATIO);
- film_content_changed (s, VideoContentProperty::VIDEO_FRAME_TYPE);
- film_content_changed (s, VideoContentProperty::COLOUR_CONVERSION);
- film_content_changed (s, AudioContentProperty::AUDIO_GAIN);
- film_content_changed (s, AudioContentProperty::AUDIO_DELAY);
- film_content_changed (s, AudioContentProperty::AUDIO_MAPPING);
- film_content_changed (s, FFmpegContentProperty::AUDIO_STREAM);
- film_content_changed (s, FFmpegContentProperty::AUDIO_STREAMS);
- film_content_changed (s, FFmpegContentProperty::SUBTITLE_STREAM);
- film_content_changed (s, FFmpegContentProperty::SUBTITLE_STREAMS);
- film_content_changed (s, FFmpegContentProperty::FILTERS);
- film_content_changed (s, SubtitleContentProperty::SUBTITLE_OFFSET);
- film_content_changed (s, SubtitleContentProperty::SUBTITLE_SCALE);
+
+ for (list<FilmEditorPanel*>::iterator i = _panels.begin(); i != _panels.end(); ++i) {
+ (*i)->content_selection_changed ();
+ }
}
/** Set up broad sensitivity based on the type of content that is selected */
_content_add_file->Enable (_generally_sensitive);
_content_add_folder->Enable (_generally_sensitive);
- shared_ptr<Content> selection = selected_content ();
+ ContentList selection = selected_content ();
+ VideoContentList video_selection = selected_video_content ();
+ AudioContentList audio_selection = selected_audio_content ();
- _content_remove->Enable (selection && _generally_sensitive);
+ _content_remove->Enable (selection.size() == 1 && _generally_sensitive);
+ _content_earlier->Enable (selection.size() == 1 && _generally_sensitive);
+ _content_later->Enable (selection.size() == 1 && _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);
- _timing_panel->Enable (selection && _generally_sensitive);
+ _video_panel->Enable (video_selection.size() > 0 && _generally_sensitive);
+ _audio_panel->Enable (audio_selection.size() > 0 && _generally_sensitive);
+ _subtitle_panel->Enable (selection.size() == 1 && dynamic_pointer_cast<FFmpegContent> (selection.front()) && _generally_sensitive);
+ _timing_panel->Enable (selection.size() == 1 && _generally_sensitive);
}
-shared_ptr<Content>
+ContentList
FilmEditor::selected_content ()
{
- int const s = _content->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
- if (s == -1) {
- return shared_ptr<Content> ();
- }
+ ContentList sel;
+ long int s = -1;
+ while (1) {
+ s = _content->GetNextItem (s, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+ if (s == -1) {
+ break;
+ }
- ContentList c = _film->content ();
- if (s < 0 || size_t (s) >= c.size ()) {
- return shared_ptr<Content> ();
+ sel.push_back (_film->content()[s]);
}
-
- return c[s];
+
+ return sel;
}
-shared_ptr<VideoContent>
+VideoContentList
FilmEditor::selected_video_content ()
{
- shared_ptr<Content> c = selected_content ();
- if (!c) {
- return shared_ptr<VideoContent> ();
+ ContentList c = selected_content ();
+ VideoContentList vc;
+
+ for (ContentList::iterator i = c.begin(); i != c.end(); ++i) {
+ shared_ptr<VideoContent> t = dynamic_pointer_cast<VideoContent> (*i);
+ if (t) {
+ vc.push_back (t);
+ }
}
- return dynamic_pointer_cast<VideoContent> (c);
+ return vc;
}
-shared_ptr<AudioContent>
+AudioContentList
FilmEditor::selected_audio_content ()
{
- shared_ptr<Content> c = selected_content ();
- if (!c) {
- return shared_ptr<AudioContent> ();
+ ContentList c = selected_content ();
+ AudioContentList ac;
+
+ for (ContentList::iterator i = c.begin(); i != c.end(); ++i) {
+ shared_ptr<AudioContent> t = dynamic_pointer_cast<AudioContent> (*i);
+ if (t) {
+ ac.push_back (t);
+ }
}
- return dynamic_pointer_cast<AudioContent> (c);
+ return ac;
}
-shared_ptr<SubtitleContent>
+SubtitleContentList
FilmEditor::selected_subtitle_content ()
{
- shared_ptr<Content> c = selected_content ();
- if (!c) {
- return shared_ptr<SubtitleContent> ();
+ ContentList c = selected_content ();
+ SubtitleContentList sc;
+
+ for (ContentList::iterator i = c.begin(); i != c.end(); ++i) {
+ shared_ptr<SubtitleContent> t = dynamic_pointer_cast<SubtitleContent> (*i);
+ if (t) {
+ sc.push_back (t);
+ }
+ }
+
+ return sc;
+}
+
+FFmpegContentList
+FilmEditor::selected_ffmpeg_content ()
+{
+ ContentList c = selected_content ();
+ FFmpegContentList sc;
+
+ for (ContentList::iterator i = c.begin(); i != c.end(); ++i) {
+ shared_ptr<FFmpegContent> t = dynamic_pointer_cast<FFmpegContent> (*i);
+ if (t) {
+ sc.push_back (t);
+ }
}
- return dynamic_pointer_cast<SubtitleContent> (c);
+ return sc;
}
void
void
FilmEditor::content_right_click (wxListEvent& ev)
{
- ContentList cl;
- cl.push_back (selected_content ());
- _menu.popup (cl, ev.GetPoint ());
+ _menu.popup (selected_content (), ev.GetPoint ());
}
void
_film->set_three_d (_three_d->GetValue ());
}
+
+void
+FilmEditor::content_earlier_clicked ()
+{
+ ContentList sel = selected_content ();
+ if (sel.size() == 1) {
+ _film->move_content_earlier (sel.front ());
+ content_selection_changed ();
+ }
+}
+
+void
+FilmEditor::content_later_clicked ()
+{
+ ContentList sel = selected_content ();
+ if (sel.size() == 1) {
+ _film->move_content_later (sel.front ());
+ content_selection_changed ();
+ }
+}