#include "audio_panel.h"
#include "content_panel.h"
+#include "cucumber_bridge.h"
+#include "cucumber_registry.h"
#include "dcpomatic_button.h"
#include "dir_dialog.h"
#include "file_dialog.h"
#include "lib/dcp_subtitle_decoder.h"
#include "lib/dcpomatic_log.h"
#include "lib/ffmpeg_content.h"
+#include "lib/film.h"
+#include "lib/film_util.h"
#include "lib/image_content.h"
+#include "lib/job_manager.h"
#include "lib/log.h"
#include "lib/playlist.h"
#include "lib/scope_guard.h"
#include "lib/string_text_file_content.h"
#include "lib/text_content.h"
#include "lib/video_content.h"
+#include <dcp/filesystem.h>
#include <dcp/warnings.h>
LIBDCP_DISABLE_WARNINGS
#include <wx/display.h>
vector<boost::filesystem::path> folders;
for (size_t i = 0; i < filenames.GetCount(); ++i) {
auto path = boost::filesystem::path(wx_to_std(filenames[i]));
- if (boost::filesystem::is_regular_file(path)) {
+ if (dcp::filesystem::is_regular_file(path)) {
files.push_back(path);
- } else if (boost::filesystem::is_directory(path)) {
+ } else if (dcp::filesystem::is_directory(path)) {
if (contains_assetmap(path)) {
dcps.push_back(path);
} else {
void
-ContentPanel::film_changed (Film::Property p)
+ContentPanel::film_changed(FilmProperty p)
{
switch (p) {
- case Film::Property::CONTENT:
- case Film::Property::CONTENT_ORDER:
+ case FilmProperty::CONTENT:
+ case FilmProperty::CONTENT_ORDER:
setup ();
break;
default:
_video_panel->create ();
} else if (!have_video && _video_panel) {
_notebook->DeletePage (off);
- _video_panel = 0;
+ _video_panel = nullptr;
}
if (have_video) {
_audio_panel->create ();
} else if (!have_audio && _audio_panel) {
_notebook->DeletePage (off);
- _audio_panel = 0;
+ _audio_panel = nullptr;
}
if (have_audio) {
}
-optional<boost::filesystem::path>
-ContentPanel::add_files_override_path() const
-{
- DCPOMATIC_ASSERT(_film->directory());
- return Config::instance()->default_add_file_location() == Config::DefaultAddFileLocation::SAME_AS_PROJECT
- ? _film->directory()->parent_path()
- : boost::optional<boost::filesystem::path>();
-
-}
-
-
void
ContentPanel::add_file_clicked ()
{
wxT("All files|*.*|Subtitle files|*.srt;*.xml|Audio files|*.wav;*.w64;*.flac;*.aif;*.aiff"),
wxFD_MULTIPLE | wxFD_CHANGE_DIR,
"AddFilesPath",
- add_files_override_path()
+ add_files_override_path(_film)
);
if (dialog.show()) {
void
ContentPanel::add_folder_clicked ()
{
- DirDialog dialog(_splitter, _("Choose a folder"), wxDD_DIR_MUST_EXIST, "AddFilesPath", add_files_override_path());
+ DirDialog dialog(_splitter, _("Choose a folder"), wxDD_DIR_MUST_EXIST, "AddFilesPath", add_files_override_path(_film));
if (dialog.show()) {
add_folder(dialog.path());
}
void
ContentPanel::add_dcp_clicked ()
{
- DirDialog dialog(_splitter, _("Choose a DCP folder"), wxDD_DIR_MUST_EXIST, "AddFilesPath", add_files_override_path());
+ DirDialog dialog(_splitter, _("Choose a DCP folder"), wxDD_DIR_MUST_EXIST, "AddFilesPath", add_files_override_path(_film));
if (dialog.show()) {
add_dcp(dialog.path());
}
_film = film;
- film_changed (Film::Property::CONTENT);
- film_changed (Film::Property::AUDIO_CHANNELS);
+ film_changed(FilmProperty::CONTENT);
+ film_changed(FilmProperty::AUDIO_CHANNELS);
if (_film) {
check_selection ();
}
+static
+wxString
+text_for_content(shared_ptr<Content> content, bool& alert)
+{
+ bool const valid = content->paths_valid();
+
+ auto dcp = dynamic_pointer_cast<DCPContent>(content);
+ bool const needs_kdm = dcp && dcp->needs_kdm();
+ bool const needs_assets = dcp && dcp->needs_assets();
+
+ auto s = std_to_wx(content->summary());
+
+ if (!valid) {
+ s = _("MISSING: ") + s;
+ }
+
+ if (needs_kdm) {
+ s = _("NEEDS KDM: ") + s;
+ }
+
+ if (needs_assets) {
+ s = _("NEEDS OV: ") + s;
+ }
+
+ alert = !valid || needs_kdm || needs_assets;
+
+ return s;
+}
+
+
void
ContentPanel::setup ()
{
vector<ContentListCtrl::Item> items;
for (auto i: content) {
- bool const valid = i->paths_valid ();
-
- auto dcp = dynamic_pointer_cast<DCPContent> (i);
- bool const needs_kdm = dcp && dcp->needs_kdm ();
- bool const needs_assets = dcp && dcp->needs_assets ();
-
- auto s = std_to_wx (i->summary ());
-
- if (!valid) {
- s = _("MISSING: ") + s;
- }
-
- if (needs_kdm) {
- s = _("NEEDS KDM: ") + s;
+ int const t = _content->GetItemCount ();
+ bool alert = false;
+ wxString const s = text_for_content(i, alert);
+ items.push_back({s, i, alert});
+
+ wxListItem item;
+ item.SetId (t);
+ item.SetText (s);
+ item.SetData (i.get ());
+ _content->InsertItem (item);
+
+ if (alert) {
+ _content->SetItemTextColour (t, *wxRED);
}
-
- if (needs_assets) {
- s = _("NEEDS OV: ") + s;
- }
-
- items.push_back({s, i, !valid || needs_kdm || needs_assets});
}
_content->set(items);
try {
for (auto i: paths) {
+ std::cout << "here I am adding " << i << "\n";
for (auto j: content_factory(i)) {
+ std::cout << "add " << j << "\n";
_film->examine_and_add_content (j);
+ std::cout << "add done.\n";
}
+ std::cout << "that's done.\n";
}
} catch (exception& e) {
+ std::cout << "that threw.\n";
error_dialog (_parent, e.what());
}
}
{
return _splitter;
}
+
+
+#ifdef DCPOMATIC_CUCUMBER
+void
+ContentPanel::cucumber_add_content_file (string filename)
+{
+ std::cout << "CP::cucumber_add_content_file\n";
+ add_files ({filename});
+ auto jm = JobManager::instance ();
+ while (jm->work_to_do()) {
+ std::cout << "work to do.\n";
+ while (signal_manager->ui_idle()) {}
+ dcpomatic_sleep_seconds (1);
+ }
+ while (signal_manager->ui_idle()) {
+ std::cout << "ui idle.\n";
+ }
+ std::cout << "CP::cucumber_add_content_file done\n";
+}
+
+
+/** This may not be called from the GUI thread */
+std::string
+ContentPanel::cucumber_get_content_list ()
+{
+ /* The playlist method that we end up calling has a mutex, so this should be ok */
+ std::string s;
+ for (auto content: _film->content()) {
+ bool alert;
+ s += wx_to_std (text_for_content(content, alert)) + "\n";
+ }
+ return s;
+}
+#endif
projects / dcpomatic.git / blobdiff