projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Separate code for the content panel out into a separate class.
[dcpomatic.git]
/
src
/
tools
/
dcpomatic.cc
diff --git
a/src/tools/dcpomatic.cc
b/src/tools/dcpomatic.cc
index fb63ae9971c35b5839b2b2ec6ebba713115efcc5..95d0d22a57b08cd57b5a0f70a107a05cae51c1d7 100644
(file)
--- a/
src/tools/dcpomatic.cc
+++ b/
src/tools/dcpomatic.cc
@@
-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) {