better support for various bit rates
This commit is contained in:
+2
-2
@@ -93,9 +93,9 @@ void FocusFilter::go_to_end() {
|
||||
|
||||
void FocusFilter::set_viewer_fullscreen() {
|
||||
if (get_focused_panel() == panel_footage_viewer) {
|
||||
panel_footage_viewer->viewer_widget->set_fullscreen();
|
||||
panel_footage_viewer->viewer_widget()->set_fullscreen();
|
||||
} else {
|
||||
panel_sequence_viewer->viewer_widget->set_fullscreen();
|
||||
panel_sequence_viewer->viewer_widget()->set_fullscreen();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -26,7 +26,7 @@
|
||||
#include <QMenu>
|
||||
|
||||
#include "undo/undo.h"
|
||||
#include "panels/viewer.h"
|
||||
#include "global/timing.h"
|
||||
#include "global/config.h"
|
||||
#include "global/math.h"
|
||||
#include "global/debug.h"
|
||||
|
||||
+2
-4
@@ -271,7 +271,6 @@ MainWindow::MainWindow(QWidget *parent) :
|
||||
|
||||
olive::icon::Initialize();
|
||||
|
||||
#ifndef NO_OCIO
|
||||
// Load OpenColorIO configuration if set
|
||||
if (olive::CurrentConfig.enable_color_management && !olive::CurrentConfig.ocio_config_path.isEmpty()) {
|
||||
try {
|
||||
@@ -283,7 +282,6 @@ MainWindow::MainWindow(QWidget *parent) :
|
||||
QMessageBox::Ok);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
alloc_panels(this);
|
||||
|
||||
@@ -971,8 +969,8 @@ void MainWindow::closeEvent(QCloseEvent *e) {
|
||||
|
||||
olive::Global->set_sequence(nullptr);
|
||||
|
||||
panel_footage_viewer->viewer_widget->close_window();
|
||||
panel_sequence_viewer->viewer_widget->close_window();
|
||||
panel_footage_viewer->viewer_widget()->close_window();
|
||||
panel_sequence_viewer->viewer_widget()->close_window();
|
||||
|
||||
panel_footage_viewer->set_main_sequence();
|
||||
|
||||
|
||||
+1
-1
@@ -242,7 +242,7 @@ void MenuHelper::set_titlesafe_from_menu() {
|
||||
|
||||
}
|
||||
|
||||
panel_sequence_viewer->viewer_widget->update();
|
||||
panel_sequence_viewer->viewer_widget()->update();
|
||||
}
|
||||
|
||||
void MenuHelper::set_autoscroll() {
|
||||
|
||||
@@ -28,11 +28,10 @@
|
||||
|
||||
#include "mainwindow.h"
|
||||
#include "panels/panels.h"
|
||||
#include "panels/timeline.h"
|
||||
#include "timeline/sequence.h"
|
||||
#include "undo/undo.h"
|
||||
#include "project/media.h"
|
||||
#include "panels/viewer.h"
|
||||
#include "global/timing.h"
|
||||
#include "global/config.h"
|
||||
#include "global/global.h"
|
||||
#include "ui/menu.h"
|
||||
|
||||
@@ -39,6 +39,7 @@
|
||||
#include "project/projectelements.h"
|
||||
#include "rendering/audio.h"
|
||||
#include "global/config.h"
|
||||
#include "global/timing.h"
|
||||
#include "ui/sourcetable.h"
|
||||
#include "ui/sourceiconview.h"
|
||||
#include "undo/undo.h"
|
||||
|
||||
+1
-4
@@ -49,6 +49,7 @@ extern "C" {
|
||||
#include "global/config.h"
|
||||
#include "global/debug.h"
|
||||
#include "global/math.h"
|
||||
#include "global/timing.h"
|
||||
#include "ui/collapsiblewidget.h"
|
||||
#include "undo/undo.h"
|
||||
#include "project/media.h"
|
||||
@@ -278,10 +279,6 @@ QMatrix4x4 ViewerWidget::get_matrix()
|
||||
void ViewerWidget::context_destroy() {
|
||||
makeCurrent();
|
||||
|
||||
if (viewer->seq != nullptr) {
|
||||
close_active_clips(viewer->seq.get());
|
||||
}
|
||||
|
||||
renderer.delete_ctx();
|
||||
|
||||
title_safe_area_buffer_.destroy();
|
||||
|
||||
Reference in New Issue
Block a user