From acef99eb17cf35c975acb9509dcc1120aed2a2e4 Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Sat, 25 Apr 2020 14:46:30 +1000 Subject: [PATCH] renamed viewerglwidget to viewerdisplaywidget Initially this class was named to provide the possibility of supporting other APIs, however this abstraction has been done with a base class instead. --- app/widget/viewer/CMakeLists.txt | 4 +- app/widget/viewer/footageviewer.cpp | 2 +- app/widget/viewer/viewer.cpp | 40 +++++++++---------- app/widget/viewer/viewer.h | 12 +++--- .../{viewerglwidget.cpp => viewerdisplay.cpp} | 40 +++++++++---------- .../{viewerglwidget.h => viewerdisplay.h} | 8 ++-- app/widget/viewer/viewerwindow.cpp | 4 +- app/widget/viewer/viewerwindow.h | 6 +-- 8 files changed, 58 insertions(+), 58 deletions(-) rename app/widget/viewer/{viewerglwidget.cpp => viewerdisplay.cpp} (88%) rename app/widget/viewer/{viewerglwidget.h => viewerdisplay.h} (97%) diff --git a/app/widget/viewer/CMakeLists.txt b/app/widget/viewer/CMakeLists.txt index 5b457a802..e96b9e639 100644 --- a/app/widget/viewer/CMakeLists.txt +++ b/app/widget/viewer/CMakeLists.txt @@ -24,8 +24,8 @@ set(OLIVE_SOURCES widget/viewer/pixelsamplerwidget.cpp widget/viewer/viewer.h widget/viewer/viewer.cpp - widget/viewer/viewerglwidget.h - widget/viewer/viewerglwidget.cpp + widget/viewer/viewerdisplay.h + widget/viewer/viewerdisplay.cpp widget/viewer/viewersafemargininfo.h widget/viewer/viewersizer.h widget/viewer/viewersizer.cpp diff --git a/app/widget/viewer/footageviewer.cpp b/app/widget/viewer/footageviewer.cpp index 08f1c4b71..3ee2569b0 100644 --- a/app/widget/viewer/footageviewer.cpp +++ b/app/widget/viewer/footageviewer.cpp @@ -35,7 +35,7 @@ FootageViewerWidget::FootageViewerWidget(QWidget *parent) : audio_node_ = new AudioInput(); viewer_node_ = new ViewerOutput(); - connect(main_gl_widget(), &ViewerGLWidget::DragStarted, this, &FootageViewerWidget::StartFootageDrag); + connect(main_gl_widget(), &ViewerDisplayWidget::DragStarted, this, &FootageViewerWidget::StartFootageDrag); controls_->SetAudioVideoDragButtonsVisible(true); connect(controls_, &PlaybackControls::VideoPressed, this, &FootageViewerWidget::StartVideoDrag); diff --git a/app/widget/viewer/viewer.cpp b/app/widget/viewer/viewer.cpp index e56ef59ac..f25e1084b 100644 --- a/app/widget/viewer/viewer.cpp +++ b/app/widget/viewer/viewer.cpp @@ -62,15 +62,15 @@ ViewerWidget::ViewerWidget(QWidget *parent) : sizer_ = new ViewerSizer(); stack_->addWidget(sizer_); - ViewerGLWidget* main_widget = new ViewerGLWidget(); - connect(main_widget, &ViewerGLWidget::customContextMenuRequested, this, &ViewerWidget::ShowContextMenu); - connect(main_widget, &ViewerGLWidget::CursorColor, this, &ViewerWidget::CursorColor); - connect(main_widget, &ViewerGLWidget::LoadedBuffer, this, &ViewerWidget::LoadedBuffer); - connect(main_widget, &ViewerGLWidget::LoadedTexture, this, &ViewerWidget::LoadedTexture); - connect(main_widget, &ViewerGLWidget::DrewManagedTexture, this, &ViewerWidget::DrewManagedTexture); - connect(main_widget, &ViewerGLWidget::ColorProcessorChanged, this, &ViewerWidget::ColorProcessorChanged); - connect(main_widget, &ViewerGLWidget::ColorManagerChanged, this, &ViewerWidget::ColorManagerChanged); - connect(sizer_, &ViewerSizer::RequestMatrix, main_widget, &ViewerGLWidget::SetMatrix); + ViewerDisplayWidget* main_widget = new ViewerDisplayWidget(); + connect(main_widget, &ViewerDisplayWidget::customContextMenuRequested, this, &ViewerWidget::ShowContextMenu); + connect(main_widget, &ViewerDisplayWidget::CursorColor, this, &ViewerWidget::CursorColor); + connect(main_widget, &ViewerDisplayWidget::LoadedBuffer, this, &ViewerWidget::LoadedBuffer); + connect(main_widget, &ViewerDisplayWidget::LoadedTexture, this, &ViewerWidget::LoadedTexture); + connect(main_widget, &ViewerDisplayWidget::DrewManagedTexture, this, &ViewerWidget::DrewManagedTexture); + connect(main_widget, &ViewerDisplayWidget::ColorProcessorChanged, this, &ViewerWidget::ColorProcessorChanged); + connect(main_widget, &ViewerDisplayWidget::ColorManagerChanged, this, &ViewerWidget::ColorManagerChanged); + connect(sizer_, &ViewerSizer::RequestMatrix, main_widget, &ViewerDisplayWidget::SetMatrix); sizer_->SetWidget(main_widget); gl_widgets_.append(main_widget); @@ -168,7 +168,7 @@ void ViewerWidget::ConnectNodeInternal(ViewerOutput *n) using_manager = nullptr; } - foreach (ViewerGLWidget* glw, gl_widgets_) { + foreach (ViewerDisplayWidget* glw, gl_widgets_) { glw->ConnectColorManager(using_manager); } @@ -200,7 +200,7 @@ void ViewerWidget::DisconnectNodeInternal(ViewerOutput *n) // Effectively disables the viewer and clears the state SizeChangedSlot(0, 0); - foreach (ViewerGLWidget* glw, gl_widgets_) { + foreach (ViewerDisplayWidget* glw, gl_widgets_) { glw->DisconnectColorManager(); } @@ -234,12 +234,12 @@ void ViewerWidget::resizeEvent(QResizeEvent *event) UpdateMinimumScale(); } -const QList &ViewerWidget::gl_widgets() const +const QList &ViewerWidget::gl_widgets() const { return gl_widgets_; } -ViewerGLWidget *ViewerWidget::main_gl_widget() const +ViewerDisplayWidget *ViewerWidget::main_gl_widget() const { return gl_widgets_.first(); } @@ -280,7 +280,7 @@ void ViewerWidget::SetOverrideSize(int width, int height) void ViewerWidget::SetMatrix(const QMatrix4x4 &mat) { - foreach (ViewerGLWidget* glw, gl_widgets_) { + foreach (ViewerDisplayWidget* glw, gl_widgets_) { glw->SetMatrix(mat); } } @@ -309,7 +309,7 @@ void ViewerWidget::SetFullScreen(QScreen *screen) vw->gl_widget()->ConnectColorManager(main_gl_widget()->color_manager()); main_gl_widget()->ConnectSibling(vw->gl_widget()); connect(vw, &ViewerWindow::destroyed, this, &ViewerWidget::WindowAboutToClose); - connect(vw->gl_widget(), &ViewerGLWidget::customContextMenuRequested, this, &ViewerWidget::ShowContextMenu); + connect(vw->gl_widget(), &ViewerDisplayWidget::customContextMenuRequested, this, &ViewerWidget::ShowContextMenu); if (GetConnectedNode()) { vw->SetResolution(GetConnectedNode()->video_params().width(), GetConnectedNode()->video_params().height()); @@ -373,7 +373,7 @@ void ViewerWidget::PlayInternal(int speed, bool in_to_out_only) controls_->ShowPauseButton(); if (stack_->currentWidget() == sizer_) { - connect(main_gl_widget(), &ViewerGLWidget::frameSwapped, this, &ViewerWidget::PlaybackTimerUpdate); + connect(main_gl_widget(), &ViewerDisplayWidget::frameSwapped, this, &ViewerWidget::PlaybackTimerUpdate); } else { connect(AudioManager::instance(), &AudioManager::OutputNotified, this, &ViewerWidget::PlaybackTimerUpdate); } @@ -427,7 +427,7 @@ void ViewerWidget::UpdateMinimumScale() } } -void ViewerWidget::SetColorTransform(const ColorTransform &transform, ViewerGLWidget *sender) +void ViewerWidget::SetColorTransform(const ColorTransform &transform, ViewerDisplayWidget *sender) { sender->SetColorTransform(transform); } @@ -543,7 +543,7 @@ void ViewerWidget::ShowContextMenu(const QPoint &pos) { Menu menu(static_cast(sender())); - context_menu_widget_ = static_cast(sender()); + context_menu_widget_ = static_cast(sender()); // Color options if (context_menu_widget_->color_manager() && color_menu_enabled_) { @@ -683,7 +683,7 @@ void ViewerWidget::Pause() controls_->ShowPlayButton(); if (stack_->currentWidget() == sizer_) { - disconnect(main_gl_widget(), &ViewerGLWidget::frameSwapped, this, &ViewerWidget::PlaybackTimerUpdate); + disconnect(main_gl_widget(), &ViewerDisplayWidget::frameSwapped, this, &ViewerWidget::PlaybackTimerUpdate); } else { disconnect(AudioManager::instance(), &AudioManager::OutputNotified, this, &ViewerWidget::PlaybackTimerUpdate); } @@ -736,7 +736,7 @@ void ViewerWidget::SetColorTransform(const ColorTransform &transform) void ViewerWidget::SetSignalCursorColorEnabled(bool e) { - foreach (ViewerGLWidget* glw, gl_widgets_) { + foreach (ViewerDisplayWidget* glw, gl_widgets_) { glw->SetSignalCursorColorEnabled(e); } } diff --git a/app/widget/viewer/viewer.h b/app/widget/viewer/viewer.h index c1fbf6481..ec638238a 100644 --- a/app/widget/viewer/viewer.h +++ b/app/widget/viewer/viewer.h @@ -35,7 +35,7 @@ #include "render/backend/opengl/openglbackend.h" #include "render/backend/opengl/opengltexture.h" #include "render/backend/audio/audiobackend.h" -#include "viewerglwidget.h" +#include "viewerdisplay.h" #include "viewersizer.h" #include "viewerwindow.h" #include "widget/playbackcontrols/playbackcontrols.h" @@ -167,8 +167,8 @@ protected: PlaybackControls* controls_; - const QList &gl_widgets() const; - ViewerGLWidget* main_gl_widget() const; + const QList &gl_widgets() const; + ViewerDisplayWidget* main_gl_widget() const; private: void UpdateTimeInternal(int64_t i); @@ -183,7 +183,7 @@ private: void UpdateMinimumScale(); - void SetColorTransform(const ColorTransform& transform, ViewerGLWidget* sender); + void SetColorTransform(const ColorTransform& transform, ViewerDisplayWidget* sender); QStackedWidget* stack_; @@ -212,9 +212,9 @@ private: QList windows_; - QList gl_widgets_; + QList gl_widgets_; - ViewerGLWidget* context_menu_widget_; + ViewerDisplayWidget* context_menu_widget_; private slots: void PlaybackTimerUpdate(); diff --git a/app/widget/viewer/viewerglwidget.cpp b/app/widget/viewer/viewerdisplay.cpp similarity index 88% rename from app/widget/viewer/viewerglwidget.cpp rename to app/widget/viewer/viewerdisplay.cpp index 5edd99ec1..640539a61 100644 --- a/app/widget/viewer/viewerglwidget.cpp +++ b/app/widget/viewer/viewerdisplay.cpp @@ -18,7 +18,7 @@ ***/ -#include "viewerglwidget.h" +#include "viewerdisplay.h" #include #include @@ -37,10 +37,10 @@ OLIVE_NAMESPACE_ENTER #ifdef Q_OS_LINUX -bool ViewerGLWidget::nouveau_check_done_ = false; +bool ViewerDisplayWidget::nouveau_check_done_ = false; #endif -ViewerGLWidget::ViewerGLWidget(QWidget *parent) : +ViewerDisplayWidget::ViewerDisplayWidget(QWidget *parent) : ManagedDisplayWidget(parent), managed_copy_pipeline_(nullptr), has_image_(false), @@ -49,18 +49,18 @@ ViewerGLWidget::ViewerGLWidget(QWidget *parent) : { } -ViewerGLWidget::~ViewerGLWidget() +ViewerDisplayWidget::~ViewerDisplayWidget() { ContextCleanup(); } -void ViewerGLWidget::SetMatrix(const QMatrix4x4 &mat) +void ViewerDisplayWidget::SetMatrix(const QMatrix4x4 &mat) { matrix_ = mat; update(); } -void ViewerGLWidget::SetImage(const QString &fn) +void ViewerDisplayWidget::SetImage(const QString &fn) { has_image_ = false; @@ -119,13 +119,13 @@ void ViewerGLWidget::SetImage(const QString &fn) } } -void ViewerGLWidget::SetSignalCursorColorEnabled(bool e) +void ViewerDisplayWidget::SetSignalCursorColorEnabled(bool e) { signal_cursor_color_ = e; setMouseTracking(e); } -void ViewerGLWidget::SetImageFromLoadBuffer(Frame *in_buffer) +void ViewerDisplayWidget::SetImageFromLoadBuffer(Frame *in_buffer) { has_image_ = in_buffer; @@ -147,7 +147,7 @@ void ViewerGLWidget::SetImageFromLoadBuffer(Frame *in_buffer) update(); } -void ViewerGLWidget::SetEmitDrewManagedTextureEnabled(bool e) +void ViewerDisplayWidget::SetEmitDrewManagedTextureEnabled(bool e) { enable_display_referred_signal_ = e; @@ -159,32 +159,32 @@ void ViewerGLWidget::SetEmitDrewManagedTextureEnabled(bool e) } } -void ViewerGLWidget::ConnectSibling(ViewerGLWidget *sibling) +void ViewerDisplayWidget::ConnectSibling(ViewerDisplayWidget *sibling) { - connect(this, &ViewerGLWidget::LoadedBuffer, sibling, &ViewerGLWidget::SetImageFromLoadBuffer, Qt::QueuedConnection); + connect(this, &ViewerDisplayWidget::LoadedBuffer, sibling, &ViewerDisplayWidget::SetImageFromLoadBuffer, Qt::QueuedConnection); sibling->SetImageFromLoadBuffer(&load_buffer_); } -const ViewerSafeMarginInfo &ViewerGLWidget::GetSafeMargin() const +const ViewerSafeMarginInfo &ViewerDisplayWidget::GetSafeMargin() const { return safe_margin_; } -void ViewerGLWidget::SetSafeMargins(const ViewerSafeMarginInfo &safe_margin) +void ViewerDisplayWidget::SetSafeMargins(const ViewerSafeMarginInfo &safe_margin) { safe_margin_ = safe_margin; update(); } -void ViewerGLWidget::mousePressEvent(QMouseEvent *event) +void ViewerDisplayWidget::mousePressEvent(QMouseEvent *event) { QOpenGLWidget::mousePressEvent(event); emit DragStarted(); } -void ViewerGLWidget::mouseMoveEvent(QMouseEvent *event) +void ViewerDisplayWidget::mouseMoveEvent(QMouseEvent *event) { QOpenGLWidget::mouseMoveEvent(event); @@ -209,11 +209,11 @@ void ViewerGLWidget::mouseMoveEvent(QMouseEvent *event) } } -void ViewerGLWidget::initializeGL() +void ViewerDisplayWidget::initializeGL() { ManagedDisplayWidget::initializeGL(); - connect(context(), &QOpenGLContext::aboutToBeDestroyed, this, &ViewerGLWidget::ContextCleanup, Qt::DirectConnection); + connect(context(), &QOpenGLContext::aboutToBeDestroyed, this, &ViewerDisplayWidget::ContextCleanup, Qt::DirectConnection); #ifdef Q_OS_LINUX if (!nouveau_check_done_) { @@ -231,7 +231,7 @@ void ViewerGLWidget::initializeGL() #endif } -void ViewerGLWidget::paintGL() +void ViewerDisplayWidget::paintGL() { // Get functions attached to this context (they will already be initialized) QOpenGLFunctions* f = context()->functions(); @@ -333,7 +333,7 @@ void ViewerGLWidget::paintGL() } #ifdef Q_OS_LINUX -void ViewerGLWidget::ShowNouveauWarning() +void ViewerDisplayWidget::ShowNouveauWarning() { QMessageBox::warning(this, tr("Driver Warning"), @@ -344,7 +344,7 @@ void ViewerGLWidget::ShowNouveauWarning() } #endif -void ViewerGLWidget::ContextCleanup() +void ViewerDisplayWidget::ContextCleanup() { makeCurrent(); diff --git a/app/widget/viewer/viewerglwidget.h b/app/widget/viewer/viewerdisplay.h similarity index 97% rename from app/widget/viewer/viewerglwidget.h rename to app/widget/viewer/viewerdisplay.h index 496456405..6289433a4 100644 --- a/app/widget/viewer/viewerglwidget.h +++ b/app/widget/viewer/viewerdisplay.h @@ -49,7 +49,7 @@ OLIVE_NAMESPACE_ENTER * the same texture object, use SetTexture() since it will nearly always be faster to just set it than to check *and* * set it. */ -class ViewerGLWidget : public ManagedDisplayWidget +class ViewerDisplayWidget : public ManagedDisplayWidget { Q_OBJECT public: @@ -60,9 +60,9 @@ public: * * QWidget parent. */ - ViewerGLWidget(QWidget* parent = nullptr); + ViewerDisplayWidget(QWidget* parent = nullptr); - virtual ~ViewerGLWidget() override; + virtual ~ViewerDisplayWidget() override; /** * @brief Set an image to load and display on screen @@ -71,7 +71,7 @@ public: const QMatrix4x4& GetMatrix(); - void ConnectSibling(ViewerGLWidget* sibling); + void ConnectSibling(ViewerDisplayWidget* sibling); const ViewerSafeMarginInfo& GetSafeMargin() const; void SetSafeMargins(const ViewerSafeMarginInfo& safe_margin); diff --git a/app/widget/viewer/viewerwindow.cpp b/app/widget/viewer/viewerwindow.cpp index f05961e4a..3f92f997d 100644 --- a/app/widget/viewer/viewerwindow.cpp +++ b/app/widget/viewer/viewerwindow.cpp @@ -32,11 +32,11 @@ ViewerWindow::ViewerWindow(QWidget *parent) : layout->setMargin(0); layout->setSpacing(0); - gl_widget_ = new ViewerGLWidget(); + gl_widget_ = new ViewerDisplayWidget(); layout->addWidget(gl_widget_); } -ViewerGLWidget *ViewerWindow::gl_widget() const +ViewerDisplayWidget *ViewerWindow::gl_widget() const { return gl_widget_; } diff --git a/app/widget/viewer/viewerwindow.h b/app/widget/viewer/viewerwindow.h index 19c1676a4..8baa30c9c 100644 --- a/app/widget/viewer/viewerwindow.h +++ b/app/widget/viewer/viewerwindow.h @@ -23,7 +23,7 @@ #include -#include "viewerglwidget.h" +#include "viewerdisplay.h" OLIVE_NAMESPACE_ENTER @@ -32,7 +32,7 @@ class ViewerWindow : public QWidget public: ViewerWindow(QWidget* parent = nullptr); - ViewerGLWidget* gl_widget() const; + ViewerDisplayWidget* gl_widget() const; /** * @brief Used to adjust resulting picture to be the right aspect ratio @@ -45,7 +45,7 @@ protected: virtual void closeEvent(QCloseEvent* e) override; private: - ViewerGLWidget* gl_widget_; + ViewerDisplayWidget* gl_widget_; };