From 06bd088999bc650aa0a8998743e6fb0d47b410bb Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Thu, 18 Oct 2018 20:11:00 +1100 Subject: [PATCH] slightly more footage viewer progress --- io/media.h | 4 ++++ panels/viewer.cpp | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/io/media.h b/io/media.h index 722bddcab..3e16410a7 100644 --- a/io/media.h +++ b/io/media.h @@ -54,6 +54,10 @@ struct Media { PreviewGenerator* preview_gen; + bool using_inout; + long in; + long out; + long get_length_in_frames(double frame_rate); MediaStream* get_stream_from_file_index(bool video, int index); void reset(); diff --git a/panels/viewer.cpp b/panels/viewer.cpp index fb1089c72..5c39fb50c 100644 --- a/panels/viewer.cpp +++ b/panels/viewer.cpp @@ -56,7 +56,13 @@ Viewer::~Viewer() { } bool Viewer::is_focused() { - return ui->headers->hasFocus() || ui->openGLWidget->hasFocus(); + return ui->headers->hasFocus() + || ui->openGLWidget->hasFocus() + || ui->pushButton->hasFocus() + || ui->pushButton_2->hasFocus() + || ui->pushButton_3->hasFocus() + || ui->pushButton_4->hasFocus() + || ui->pushButton_5->hasFocus(); } void Viewer::set_main_sequence() {