summaryrefslogtreecommitdiff
path: root/src/wx/video_panel.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-10-03 20:53:44 +0200
committerCarl Hetherington <cth@carlh.net>2021-10-03 23:41:02 +0200
commit70b72b53eab0f247eb4dc605a2d669d4adb4e469 (patch)
treeaf117017f084fc2fedf0e2eaad667cda7d832b64 /src/wx/video_panel.cc
parentc2a17a87868eba87072fc369102b2b3cd8905e5a (diff)
Differentiate requested and actual crop.
This is so we limit cropping to what is possible considering chroma subsampling.
Diffstat (limited to 'src/wx/video_panel.cc')
-rw-r--r--src/wx/video_panel.cc17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index 33961ea1d..52c3b9229 100644
--- a/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@ -118,7 +118,7 @@ VideoPanel::create ()
new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(crop_width, -1)),
VideoContentProperty::CROP,
&Content::video,
- boost::mem_fn (&VideoContent::left_crop),
+ boost::mem_fn (&VideoContent::requested_left_crop),
boost::mem_fn (&VideoContent::set_left_crop),
boost::bind (&VideoPanel::left_crop_changed, this)
);
@@ -132,7 +132,7 @@ VideoPanel::create ()
new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(crop_width, -1)),
VideoContentProperty::CROP,
&Content::video,
- boost::mem_fn (&VideoContent::right_crop),
+ boost::mem_fn (&VideoContent::requested_right_crop),
boost::mem_fn (&VideoContent::set_right_crop),
boost::bind (&VideoPanel::right_crop_changed, this)
);
@@ -143,7 +143,7 @@ VideoPanel::create ()
new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(crop_width, -1)),
VideoContentProperty::CROP,
&Content::video,
- boost::mem_fn (&VideoContent::top_crop),
+ boost::mem_fn (&VideoContent::requested_top_crop),
boost::mem_fn (&VideoContent::set_top_crop),
boost::bind (&VideoPanel::top_crop_changed, this)
);
@@ -157,7 +157,7 @@ VideoPanel::create ()
new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(crop_width, -1)),
VideoContentProperty::CROP,
&Content::video,
- boost::mem_fn (&VideoContent::bottom_crop),
+ boost::mem_fn (&VideoContent::requested_bottom_crop),
boost::mem_fn (&VideoContent::set_bottom_crop),
boost::bind (&VideoPanel::bottom_crop_changed, this)
);
@@ -759,7 +759,7 @@ VideoPanel::left_crop_changed ()
_left_changed_last = true;
if (_left_right_link->GetValue()) {
for (auto i: _parent->selected_video()) {
- i->video->set_right_crop (i->video->left_crop());
+ i->video->set_right_crop (i->video->requested_left_crop());
}
}
}
@@ -771,7 +771,7 @@ VideoPanel::right_crop_changed ()
_left_changed_last = false;
if (_left_right_link->GetValue()) {
for (auto i: _parent->selected_video()) {
- i->video->set_left_crop (i->video->right_crop());
+ i->video->set_left_crop (i->video->requested_right_crop());
}
}
}
@@ -783,7 +783,7 @@ VideoPanel::top_crop_changed ()
_top_changed_last = true;
if (_top_bottom_link->GetValue()) {
for (auto i: _parent->selected_video()) {
- i->video->set_bottom_crop (i->video->top_crop());
+ i->video->set_bottom_crop (i->video->requested_top_crop());
}
}
}
@@ -795,10 +795,9 @@ VideoPanel::bottom_crop_changed ()
_top_changed_last = false;
if (_top_bottom_link->GetValue()) {
for (auto i: _parent->selected_video()) {
- i->video->set_top_crop (i->video->bottom_crop());
+ i->video->set_top_crop (i->video->requested_bottom_crop());
}
}
}
-