diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-04-16 01:19:38 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-05-18 11:50:29 +0100 |
| commit | 8008b81c0ccee843263e2a648707b71cc3ae081f (patch) | |
| tree | c91a8fa3363645ed39dccf1bc8c5bd944e7b80a3 /src/wx/timing_panel.cc | |
| parent | 8109f84306e024cbbe3e386db178ce00f0a32401 (diff) | |
Fix rebase onto master.
Diffstat (limited to 'src/wx/timing_panel.cc')
| -rw-r--r-- | src/wx/timing_panel.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc index 191106471..8e253c070 100644 --- a/src/wx/timing_panel.cc +++ b/src/wx/timing_panel.cc @@ -270,10 +270,9 @@ TimingPanel::film_content_changed (int property) check_vc.insert (i->video->frame_rate ()); vc = i; } - shared_ptr<const AudioContent> at = dynamic_pointer_cast<const AudioContent> (i); if (i->audio) { ++count_ac; - ac = at; + ac = i; } if (i->subtitle) { ++count_sc; @@ -286,7 +285,7 @@ TimingPanel::film_content_changed (int property) if ((check_vc.size() == 1 || count_ac == 1 || count_sc == 1) && !single_frame_image_content) { if (vc) { - checked_set (_video_frame_rate, raw_convert<string> (vc->video->video_frame_rate (), 5)); + checked_set (_video_frame_rate, raw_convert<string> (vc->video->frame_rate (), 5)); } else if (ac) { checked_set (_video_frame_rate, raw_convert<string> (ac->audio->video_frame_rate (), 5)); } else if (sc) { @@ -410,7 +409,7 @@ TimingPanel::set_video_frame_rate () i->video->set_frame_rate (fr); } else if (i->audio) { /* Audio but not video, i.e. SndfileContent */ - i->audio->set_audio_video_frame_rate (fr); + i->audio->set_video_frame_rate (fr); } else if (dsc) { dsc->subtitle->set_video_frame_rate (fr); } else if (tsc) { |