projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add missing file=f so that all desktop shortcuts are uninstalled.
[dcpomatic.git]
/
src
/
wx
/
timing_panel.cc
diff --git
a/src/wx/timing_panel.cc
b/src/wx/timing_panel.cc
index a78e3bdd4fe04f82bf027360cb13074b6777d48b..98060bb87322c0a64122d4587a469917fbf67e08 100644
(file)
--- a/
src/wx/timing_panel.cc
+++ b/
src/wx/timing_panel.cc
@@
-32,7
+32,9
@@
#include "lib/dcp_content.h"
#include "lib/dcp_subtitle_content.h"
#include "lib/ffmpeg_content.h"
#include "lib/dcp_content.h"
#include "lib/dcp_subtitle_content.h"
#include "lib/ffmpeg_content.h"
+#include "lib/film.h"
#include "lib/image_content.h"
#include "lib/image_content.h"
+#include "lib/scope_guard.h"
#include "lib/string_text_file_content.h"
#include "lib/text_content.h"
#include "lib/video_content.h"
#include "lib/string_text_file_content.h"
#include "lib/text_content.h"
#include "lib/video_content.h"
@@
-365,7
+367,7
@@
TimingPanel::trim_start_changed ()
}
ContentTime const trim = _trim_start->get (i->video_frame_rate().get_value_or(_parent->film()->video_frame_rate()));
}
ContentTime const trim = _trim_start->get (i->video_frame_rate().get_value_or(_parent->film()->video_frame_rate()));
- i->set_trim_start
(
trim);
+ i->set_trim_start
(_parent->film(),
trim);
}
if (ref) {
}
if (ref) {
@@
-420,9
+422,9
@@
TimingPanel::content_selection_changed ()
}
void
}
void
-TimingPanel::film_changed
(Film::
Property p)
+TimingPanel::film_changed
(Film
Property p)
{
{
- if (p == Film
::
Property::VIDEO_FRAME_RATE) {
+ if (p == FilmProperty::VIDEO_FRAME_RATE) {
update_full_length ();
update_play_length ();
}
update_full_length ();
update_play_length ();
}
@@
-440,7
+442,7
@@
TimingPanel::trim_start_to_playhead_clicked ()
for (auto i: _parent->selected()) {
if (i->position() < ph && ph < i->end(film)) {
FrameRateChange const frc = film->active_frame_rate_change (i->position());
for (auto i: _parent->selected()) {
if (i->position() < ph && ph < i->end(film)) {
FrameRateChange const frc = film->active_frame_rate_change (i->position());
- i->set_trim_start
(i->trim_start() + ContentTime
(ph - i->position(), frc));
+ i->set_trim_start
(film, i->trim_start() + ContentTime
(ph - i->position(), frc));
new_ph = i->position ();
}
}
new_ph = i->position ();
}
}
@@
-506,12
+508,11
@@
TimingPanel::move_to_start_of_reel_clicked ()
}
}
}
}
- auto d =
new MoveToDialog
(this, position, _parent->film());
+ auto d =
make_wx<MoveToDialog>
(this, position, _parent->film());
if (d->ShowModal() == wxID_OK) {
for (auto i: _parent->selected()) {
i->set_position (_parent->film(), d->position());
}
}
if (d->ShowModal() == wxID_OK) {
for (auto i: _parent->selected()) {
i->set_position (_parent->film(), d->position());
}
}
- d->Destroy ();
}
}