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
/
wx
/
timing_panel.cc
diff --git
a/src/wx/timing_panel.cc
b/src/wx/timing_panel.cc
index 34702463cd80cf7efac1436ebccfe5732868cd5e..9a4551193e9672dfe2ed4468fe01678f5af556c5 100644
(file)
--- a/
src/wx/timing_panel.cc
+++ b/
src/wx/timing_panel.cc
@@
-31,7
+31,8
@@
using boost::dynamic_pointer_cast;
using boost::lexical_cast;
TimingPanel::TimingPanel (FilmEditor* e)
using boost::lexical_cast;
TimingPanel::TimingPanel (FilmEditor* e)
- : FilmEditorPanel (e, _("Timing"))
+ /* horrid hack for apparent lack of context support with wxWidgets i18n code */
+ : FilmEditorPanel (e, S_("Timing|Timing"))
{
wxFlexGridSizer* grid = new wxFlexGridSizer (2, 4, 4);
_sizer->Add (grid, 0, wxALL, 8);
{
wxFlexGridSizer* grid = new wxFlexGridSizer (2, 4, 4);
_sizer->Add (grid, 0, wxALL, 8);
@@
-80,36
+81,42
@@
TimingPanel::film_content_changed (int property)
if (cl.size() == 1) {
content = cl.front ();
}
if (cl.size() == 1) {
content = cl.front ();
}
+
+ int const film_video_frame_rate = _editor->film()->video_frame_rate ();
if (property == ContentProperty::POSITION) {
if (content) {
if (property == ContentProperty::POSITION) {
if (content) {
- _position->set (content->position (),
_editor->film()->video_frame_rate ()
);
+ _position->set (content->position (),
film_video_frame_rate
);
} else {
} else {
- _position->set (
0
, 24);
+ _position->set (
DCPTime ()
, 24);
}
}
- } else if (property == ContentProperty::LENGTH || property == VideoContentProperty::VIDEO_FRAME_RATE) {
+ } else if (
+ property == ContentProperty::LENGTH ||
+ property == VideoContentProperty::VIDEO_FRAME_RATE ||
+ property == VideoContentProperty::VIDEO_FRAME_TYPE
+ ) {
if (content) {
if (content) {
- _full_length->set (content->full_length (),
_editor->film()->video_frame_rate ()
);
- _play_length->set (content->length_after_trim (),
_editor->film()->video_frame_rate ()
);
+ _full_length->set (content->full_length (),
film_video_frame_rate
);
+ _play_length->set (content->length_after_trim (),
film_video_frame_rate
);
} else {
} else {
- _full_length->set (
0
, 24);
- _play_length->set (
0
, 24);
+ _full_length->set (
DCPTime ()
, 24);
+ _play_length->set (
DCPTime ()
, 24);
}
} else if (property == ContentProperty::TRIM_START) {
if (content) {
}
} else if (property == ContentProperty::TRIM_START) {
if (content) {
- _trim_start->set (content->trim_start (),
_editor->film()->video_frame_rate ()
);
- _play_length->set (content->length_after_trim (),
_editor->film()->video_frame_rate ()
);
+ _trim_start->set (content->trim_start (),
film_video_frame_rate
);
+ _play_length->set (content->length_after_trim (),
film_video_frame_rate
);
} else {
} else {
- _trim_start->set (
0
, 24);
- _play_length->set (
0
, 24);
+ _trim_start->set (
DCPTime ()
, 24);
+ _play_length->set (
DCPTime ()
, 24);
}
} else if (property == ContentProperty::TRIM_END) {
if (content) {
}
} else if (property == ContentProperty::TRIM_END) {
if (content) {
- _trim_end->set (content->trim_end (),
_editor->film()->video_frame_rate ()
);
- _play_length->set (content->length_after_trim (),
_editor->film()->video_frame_rate ()
);
+ _trim_end->set (content->trim_end (),
film_video_frame_rate
);
+ _play_length->set (content->length_after_trim (),
film_video_frame_rate
);
} else {
} else {
- _trim_end->set (
0
, 24);
- _play_length->set (
0
, 24);
+ _trim_end->set (
DCPTime ()
, 24);
+ _play_length->set (
DCPTime ()
, 24);
}
}
}
}
@@
-149,7
+156,8
@@
TimingPanel::full_length_changed ()
if (c.size() == 1) {
shared_ptr<ImageContent> ic = dynamic_pointer_cast<ImageContent> (c.front ());
if (ic && ic->still ()) {
if (c.size() == 1) {
shared_ptr<ImageContent> ic = dynamic_pointer_cast<ImageContent> (c.front ());
if (ic && ic->still ()) {
- ic->set_video_length (rint (_full_length->get (_editor->film()->video_frame_rate()) * ic->video_frame_rate() / TIME_HZ));
+ /* XXX: No effective FRC here... is this right? */
+ ic->set_video_length (ContentTime (_full_length->get (_editor->film()->video_frame_rate()), FrameRateChange (1, 1)));
}
}
}
}
}
}
@@
-196,8
+204,8
@@
TimingPanel::set_video_frame_rate ()
shared_ptr<ImageContent> ic = dynamic_pointer_cast<ImageContent> (c.front ());
if (ic) {
ic->set_video_frame_rate (lexical_cast<float> (wx_to_std (_video_frame_rate->GetValue ())));
shared_ptr<ImageContent> ic = dynamic_pointer_cast<ImageContent> (c.front ());
if (ic) {
ic->set_video_frame_rate (lexical_cast<float> (wx_to_std (_video_frame_rate->GetValue ())));
- _set_video_frame_rate->Enable (false);
}
}
+ _set_video_frame_rate->Enable (false);
}
}
}
}