projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Give 'wrong target' KDM errors in a dialogue box rather than in the job manager ...
[dcpomatic.git]
/
src
/
wx
/
controls.cc
diff --git
a/src/wx/controls.cc
b/src/wx/controls.cc
index 0c12ba4634cd06c69a6bd2a095883fd842deb70a..e3f476c05e35530dc28a473bb133d4cd160987d4 100644
(file)
--- a/
src/wx/controls.cc
+++ b/
src/wx/controls.cc
@@
-170,7
+170,7
@@
Controls::stopped ()
void
Controls::update_position ()
{
void
Controls::update_position ()
{
- if (!_slider_being_moved) {
+ if (!_slider_being_moved
&& !_viewer->pending_idle_get()
) {
update_position_label ();
update_position_slider ();
}
update_position_label ();
update_position_slider ();
}
@@
-345,7
+345,7
@@
Controls::setup_sensitivity ()
void
Controls::timecode_clicked ()
{
void
Controls::timecode_clicked ()
{
- PlayheadToTimecodeDialog* dialog = new PlayheadToTimecodeDialog (this, _
film->video_frame_rate
());
+ PlayheadToTimecodeDialog* dialog = new PlayheadToTimecodeDialog (this, _
viewer->position(), _film->video_frame_rate
());
if (dialog->ShowModal() == wxID_OK) {
_viewer->seek (dialog->get(), true);
}
if (dialog->ShowModal() == wxID_OK) {
_viewer->seek (dialog->get(), true);
}
@@
-355,7
+355,7
@@
Controls::timecode_clicked ()
void
Controls::frame_number_clicked ()
{
void
Controls::frame_number_clicked ()
{
- PlayheadToFrameDialog* dialog = new PlayheadToFrameDialog (this, _
film->video_frame_rate
());
+ PlayheadToFrameDialog* dialog = new PlayheadToFrameDialog (this, _
viewer->position(), _film->video_frame_rate
());
if (dialog->ShowModal() == wxID_OK) {
_viewer->seek (dialog->get(), true);
}
if (dialog->ShowModal() == wxID_OK) {
_viewer->seek (dialog->get(), true);
}
@@
-406,3
+406,11
@@
Controls::film_change (ChangeType type, Film::Property p)
}
}
}
}
}
}
+
+void
+Controls::seek (int slider)
+{
+ _slider->SetValue (slider);
+ slider_moved (false);
+ slider_released ();
+}