began work setting several timings to use rational rather than long/double
This commit is contained in:
@@ -87,7 +87,8 @@ void EffectControls::set_zoom(bool in) {
|
||||
update_keyframes();
|
||||
|
||||
if (!selected_clips_.isEmpty()) {
|
||||
scroll_to_frame(selected_clips_.first()->track()->sequence()->playhead);
|
||||
// FIXME
|
||||
//scroll_to_frame(selected_clips_.first()->track()->sequence()->playhead);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+3
-2
@@ -129,6 +129,7 @@ bool Viewer::focused() {
|
||||
}
|
||||
|
||||
void Viewer::reset_all_audio() {
|
||||
/* FIXME: Entire audio system is being rewritten
|
||||
// reset all clip audio
|
||||
if (seq != nullptr) {
|
||||
long last_frame = 0;
|
||||
@@ -150,6 +151,7 @@ void Viewer::reset_all_audio() {
|
||||
audio_ibuffer_timecode = double(audio_ibuffer_frame) / seq->frame_rate();
|
||||
}
|
||||
clear_audio_ibuffer();
|
||||
*/
|
||||
}
|
||||
|
||||
void Viewer::seek(long p) {
|
||||
@@ -174,7 +176,6 @@ void Viewer::seek(long p) {
|
||||
|
||||
reset_all_audio();
|
||||
audio_scrub = true;
|
||||
last_playhead = seq->playhead;
|
||||
update_parents(update_fx);
|
||||
}
|
||||
|
||||
@@ -382,7 +383,7 @@ void Viewer::update_playhead_timecode(long p) {
|
||||
}
|
||||
|
||||
void Viewer::update_end_timecode() {
|
||||
end_timecode->setText((seq == nullptr) ? frame_to_timecode(0, olive::config.timecode_view, 30) : frame_to_timecode(seq->GetEndFrame(), olive::config.timecode_view, seq->frame_rate()));
|
||||
end_timecode->setText((seq == nullptr) ? TimeToSMPTE(0, olive::config.timecode_view, 30) : TimeToSMPTE(seq->GetEndFrame(), olive::config.timecode_view, seq->frame_rate()));
|
||||
}
|
||||
|
||||
void Viewer::update_header_zoom() {
|
||||
|
||||
@@ -144,7 +144,6 @@ private:
|
||||
QString panel_name;
|
||||
double minimum_zoom;
|
||||
bool playing_in_to_out;
|
||||
long last_playhead;
|
||||
void set_zoom_value(double d);
|
||||
void set_sb_max();
|
||||
void set_playback_speed(int s);
|
||||
|
||||
Reference in New Issue
Block a user