projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
tools
/
dcpomatic.cc
diff --git
a/src/tools/dcpomatic.cc
b/src/tools/dcpomatic.cc
index 237fa4e58ee311f1882d4bbe46ade60b707ceac4..8c7f09ae77de6fd4e8344ca12f3a528617991a6a 100644
(file)
--- a/
src/tools/dcpomatic.cc
+++ b/
src/tools/dcpomatic.cc
@@
-45,6
+45,7
@@
#include "wx/servers_list_dialog.h"
#include "wx/hints_dialog.h"
#include "wx/update_dialog.h"
#include "wx/servers_list_dialog.h"
#include "wx/hints_dialog.h"
#include "wx/update_dialog.h"
+#include "wx/content_panel.h"
#include "lib/film.h"
#include "lib/config.h"
#include "lib/util.h"
#include "lib/film.h"
#include "lib/config.h"
#include "lib/util.h"
@@
-337,13
+338,12
@@
private:
void file_changed (boost::filesystem::path f)
{
void file_changed (boost::filesystem::path f)
{
- stringstream s;
- s << wx_to_std (_("DCP-o-matic"));
+ string s = wx_to_std (_("DCP-o-matic"));
if (!f.empty ()) {
if (!f.empty ()) {
- s
<< " - " <<
f.string ();
+ s
+= " - " +
f.string ();
}
}
- SetTitle (std_to_wx (s
.str()
));
+ SetTitle (std_to_wx (s));
}
void file_new ()
}
void file_new ()
@@
-392,7
+392,7
@@
private:
);
int r;
);
int r;
- while (
1
) {
+ while (
true
) {
r = c->ShowModal ();
if (r == wxID_OK && c->GetPath() == wxStandardPaths::Get().GetDocumentsDir()) {
error_dialog (this, _("You did not select a folder. Make sure that you select a folder before clicking Open."));
r = c->ShowModal ();
if (r == wxID_OK && c->GetPath() == wxStandardPaths::Get().GetDocumentsDir()) {
error_dialog (this, _("You did not select a folder. Make sure that you select a folder before clicking Open."));
@@
-470,10
+470,10
@@
private:
try {
if (d->write_to ()) {
try {
if (d->write_to ()) {
- write_kdm_files (film, d->screens (), d->cpl (), d->from (), d->until (), d->directory ());
+ write_kdm_files (film, d->screens (), d->cpl (), d->from (), d->until (), d->
formulation (), d->
directory ());
} else {
JobManager::instance()->add (
} else {
JobManager::instance()->add (
- shared_ptr<Job> (new SendKDMEmailJob (film, d->screens (), d->cpl (), d->from (), d->until ()))
+ shared_ptr<Job> (new SendKDMEmailJob (film, d->screens (), d->cpl (), d->from (), d->until ()
, d->formulation ()
))
);
}
} catch (dcp::NotEncryptedError& e) {
);
}
} catch (dcp::NotEncryptedError& e) {
@@
-489,7
+489,7
@@
private:
void content_scale_to_fit_width ()
{
void content_scale_to_fit_width ()
{
- VideoContentList vc = _film_editor->
selected_video_content
();
+ VideoContentList vc = _film_editor->
content_panel()->selected_video
();
for (VideoContentList::iterator i = vc.begin(); i != vc.end(); ++i) {
(*i)->scale_and_crop_to_fit_width ();
}
for (VideoContentList::iterator i = vc.begin(); i != vc.end(); ++i) {
(*i)->scale_and_crop_to_fit_width ();
}
@@
-497,7
+497,7
@@
private:
void content_scale_to_fit_height ()
{
void content_scale_to_fit_height ()
{
- VideoContentList vc = _film_editor->
selected_video_content
();
+ VideoContentList vc = _film_editor->
content_panel()->selected_video
();
for (VideoContentList::iterator i = vc.begin(); i != vc.end(); ++i) {
(*i)->scale_and_crop_to_fit_height ();
}
for (VideoContentList::iterator i = vc.begin(); i != vc.end(); ++i) {
(*i)->scale_and_crop_to_fit_height ();
}
@@
-603,7
+603,7
@@
private:
}
bool const dcp_creation = (i != jobs.end ()) && !(*i)->finished ();
bool const have_cpl = film && !film->cpls().empty ();
}
bool const dcp_creation = (i != jobs.end ()) && !(*i)->finished ();
bool const have_cpl = film && !film->cpls().empty ();
- bool const have_selected_video_content = !_film_editor->
selected_video_content
().empty();
+ bool const have_selected_video_content = !_film_editor->
content_panel()->selected_video
().empty();
for (map<wxMenuItem*, int>::iterator j = menu_items.begin(); j != menu_items.end(); ++j) {
for (map<wxMenuItem*, int>::iterator j = menu_items.begin(); j != menu_items.end(); ++j) {