/*
- Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
- This program is distributed in the hope that it will be useful,
+ DCP-o-matic is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
#include "timing_panel.h"
#include "timeline_dialog.h"
#include "image_sequence_dialog.h"
+#include "film_viewer.h"
#include "lib/audio_content.h"
#include "lib/subtitle_content.h"
#include "lib/video_content.h"
#include "lib/content_factory.h"
#include "lib/image_content.h"
#include "lib/dcp_content.h"
+#include "lib/case_insensitive_sorter.h"
#include "lib/playlist.h"
#include <wx/wx.h>
#include <wx/notebook.h>
using std::string;
using std::cout;
using std::vector;
+using std::exception;
using boost::shared_ptr;
using boost::weak_ptr;
using boost::dynamic_pointer_cast;
+using boost::optional;
ContentPanel::ContentPanel (wxNotebook* n, boost::shared_ptr<Film> film, FilmViewer* viewer)
: _timeline_dialog (0)
, _parent (n)
, _film (film)
+ , _film_viewer (viewer)
, _generally_sensitive (true)
{
_panel = new wxPanel (n);
_panels.push_back (_audio_panel);
_subtitle_panel = new SubtitlePanel (this);
_panels.push_back (_subtitle_panel);
- _timing_panel = new TimingPanel (this, viewer);
+ _timing_panel = new TimingPanel (this, _film_viewer);
_panels.push_back (_timing_panel);
_content->Bind (wxEVT_COMMAND_LIST_ITEM_SELECTED, boost::bind (&ContentPanel::selection_changed, this));
_content->Bind (wxEVT_DROP_FILES, boost::bind (&ContentPanel::files_dropped, this, _1));
_add_file->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ContentPanel::add_file_clicked, this));
_add_folder->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ContentPanel::add_folder_clicked, this));
- _remove->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ContentPanel::remove_clicked, this));
+ _remove->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ContentPanel::remove_clicked, this, false));
_earlier->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ContentPanel::earlier_clicked, this));
_later->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ContentPanel::later_clicked, this));
_timeline->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ContentPanel::timeline_clicked, this));
return sel;
}
-VideoContentList
+ContentList
ContentPanel::selected_video ()
{
- VideoContentList vc;
+ ContentList vc;
BOOST_FOREACH (shared_ptr<Content> i, selected ()) {
- shared_ptr<VideoContent> t = dynamic_pointer_cast<VideoContent> (i);
- if (t) {
- vc.push_back (t);
+ if (i->video) {
+ vc.push_back (i);
}
}
return vc;
}
-AudioContentList
+ContentList
ContentPanel::selected_audio ()
{
- AudioContentList ac;
+ ContentList ac;
BOOST_FOREACH (shared_ptr<Content> i, selected ()) {
- shared_ptr<AudioContent> t = dynamic_pointer_cast<AudioContent> (i);
- if (t) {
- ac.push_back (t);
+ if (i->audio) {
+ ac.push_back (i);
}
}
return ac;
}
-SubtitleContentList
+ContentList
ContentPanel::selected_subtitle ()
{
- SubtitleContentList sc;
+ ContentList sc;
BOOST_FOREACH (shared_ptr<Content> i, selected ()) {
- shared_ptr<SubtitleContent> t = dynamic_pointer_cast<SubtitleContent> (i);
- if (t) {
- sc.push_back (t);
+ if (i->subtitle) {
+ sc.push_back (i);
}
}
{
switch (p) {
case Film::CONTENT:
+ case Film::CONTENT_ORDER:
setup ();
break;
default:
void
ContentPanel::selection_changed ()
{
+ if (_last_selected == selected()) {
+ /* This was triggered by a re-build of the view but the selection
+ did not really change.
+ */
+ return;
+ }
+
+ _last_selected = selected ();
+
setup_sensitivity ();
BOOST_FOREACH (ContentSubPanel* i, _panels) {
i->content_selection_changed ();
}
+
+ optional<DCPTime> go_to;
+ BOOST_FOREACH (shared_ptr<Content> i, selected ()) {
+ if (!go_to || i->position() < go_to.get()) {
+ go_to = i->position ();
+ }
+ }
+
+ if (go_to) {
+ _film_viewer->set_position (go_to.get ());
+ }
+
+ if (_timeline_dialog) {
+ _timeline_dialog->set_selection (selected ());
+ }
}
void
/* The wxFD_CHANGE_DIR here prevents a `could not set working directory' error 123 on Windows when using
non-Latin filenames or paths.
*/
- wxFileDialog* d = new wxFileDialog (_panel, _("Choose a file or files"), wxT (""), wxT (""), wxT ("All files|*.*|Subtitle files|*.srt;*.xml|Audio files|*.wav;*.w64;*.flac;*.aif;*.aiff"), wxFD_MULTIPLE | wxFD_CHANGE_DIR);
+ wxFileDialog* d = new wxFileDialog (
+ _panel,
+ _("Choose a file or files"),
+ wxT (""),
+ wxT (""),
+ wxT ("All files|*.*|Subtitle files|*.srt;*.xml|Audio files|*.wav;*.w64;*.flac;*.aif;*.aiff"),
+ wxFD_MULTIPLE | wxFD_CHANGE_DIR
+ );
+
int const r = d->ShowModal ();
if (r != wxID_OK) {
return;
}
- shared_ptr<Content> content = content_factory (_film, path);
+ shared_ptr<Content> content;
+
+ try {
+ content = content_factory (_film, path);
+ } catch (exception& e) {
+ error_dialog (_parent, e.what());
+ return;
+ }
+
if (!content) {
error_dialog (_parent, _("No content found in this folder."));
return;
_film->examine_and_add_content (content);
}
-void
-ContentPanel::remove_clicked ()
+/** @return true if this remove "click" should be ignored */
+bool
+ContentPanel::remove_clicked (bool hotkey)
{
- ContentList c = selected ();
- if (c.size() == 1) {
- _film->remove_content (c.front ());
+ /* If the method was called because Delete was pressed check that our notebook page
+ is visible and that the content list is focussed.
+ */
+ if (hotkey && (_parent->GetCurrentPage() != _panel || !_content->HasFocus())) {
+ return true;
+ }
+
+ BOOST_FOREACH (shared_ptr<Content> i, selected ()) {
+ _film->remove_content (i);
}
selection_changed ();
+ return false;
}
void
_add_folder->Enable (_generally_sensitive);
ContentList selection = selected ();
- VideoContentList video_selection = selected_video ();
- AudioContentList audio_selection = selected_audio ();
+ ContentList video_selection = selected_video ();
+ ContentList audio_selection = selected_audio ();
- _remove->Enable (selection.size() == 1 && _generally_sensitive);
+ _remove->Enable (!selection.empty() && _generally_sensitive);
_earlier->Enable (selection.size() == 1 && _generally_sensitive);
_later->Enable (selection.size() == 1 && _generally_sensitive);
_timeline->Enable (!_film->content().empty() && _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<SubtitleContent> (selection.front()) && _generally_sensitive);
+ _subtitle_panel->Enable (selection.size() == 1 && selection.front()->subtitle && _generally_sensitive);
_timing_panel->Enable (selection.size() == 1 && _generally_sensitive);
}
void
ContentPanel::film_content_changed (int property)
{
- if (property == ContentProperty::PATH || property == ContentProperty::POSITION || property == DCPContentProperty::CAN_BE_PLAYED) {
+ if (property == ContentProperty::PATH || property == DCPContentProperty::CAN_BE_PLAYED) {
setup ();
}
ContentPanel::setup ()
{
ContentList content = _film->content ();
- sort (content.begin(), content.end(), ContentSorter ());
-
- /* First, check to see if anything has changed and bail if not; this avoids
- flickering on OS X.
- */
-
- vector<string> existing;
- for (int i = 0; i < _content->GetItemCount(); ++i) {
- existing.push_back (wx_to_std (_content->GetItemText (i)));
- }
-
- vector<string> proposed;
- BOOST_FOREACH (shared_ptr<Content> i, content) {
- bool const valid = i->paths_valid ();
-
- string s = i->summary ();
- if (!valid) {
- s = _("MISSING: ") + s;
- }
-
- proposed.push_back (s);
- }
-
- if (existing == proposed) {
- return;
- }
-
- /* Something has changed: set up the control */
- string selected_summary;
+ Content* selected_content = 0;
int const s = _content->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
if (s != -1) {
- selected_summary = wx_to_std (_content->GetItemText (s));
+ wxListItem item;
+ item.SetId (s);
+ item.SetMask (wxLIST_MASK_DATA);
+ _content->GetItem (item);
+ selected_content = reinterpret_cast<Content*> (item.GetData ());
}
_content->DeleteAllItems ();
s = _("NEEDS KDM: ") + s;
}
- _content->InsertItem (t, std_to_wx (s));
+ wxListItem item;
+ item.SetId (t);
+ item.SetText (std_to_wx (s));
+ item.SetData (i.get ());
+ _content->InsertItem (item);
- if (i->summary() == selected_summary) {
+ if (i.get() == selected_content) {
_content->SetItemState (t, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
}
}
}
- if (selected_summary.empty () && !content.empty ()) {
+ if (!selected_content && !content.empty ()) {
/* Select the item of content if none was selected before */
_content->SetItemState (0, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
}
alphabetical sort is expected here.
*/
- paths.sort ();
+ paths.sort (CaseInsensitiveSorter ());
/* XXX: check for lots of files here and do something */
projects / dcpomatic.git / blobdiff