started porting renderer to new portable form

This commit is contained in:
itsmattkc
2019-10-31 19:14:58 +11:00
parent d96395ea27
commit 77bcb70dac
77 changed files with 789 additions and 2237 deletions
+1 -1
View File
@@ -78,7 +78,7 @@ void AudioMonitor::paintEvent(QPaintEvent *)
qreal log_val = QAudio::convertVolume(i, QAudio::DecibelVolumeScale, QAudio::LogarithmicVolumeScale);
QRect db_marking_rect = db_labels_rect;
db_marking_rect.adjust(0, db_labels_rect.y() + db_labels_rect.height() - qRound(log_val * db_labels_rect.height()), 0, 0);
db_marking_rect.adjust(0, db_labels_rect.height() - qRound(log_val * db_labels_rect.height()), 0, 0);
db_marking_rect.setHeight(fm.height());
// Prevent any dB markings overlapping
+1
View File
@@ -161,6 +161,7 @@ void ViewerWidget::ConnectViewerNode(ViewerOutput *node)
}
video_renderer_->SetViewerNode(viewer_node_);
opengl_backend_.SetViewerNode(viewer_node_);
}
void ViewerWidget::DisconnectViewerNode()
+2 -8
View File
@@ -30,9 +30,7 @@
#include "common/rational.h"
#include "node/output/viewer/viewer.h"
#include "render/audio/audiorenderer.h"
#include "render/video/videorenderer.h"
#include "render/backend/openclbackend.h"
#include "render/backend/opengl/openglbackend.h"
#include "viewerglwidget.h"
#include "viewersizer.h"
#include "widget/playbackcontrols/playbackcontrols.h"
@@ -112,12 +110,8 @@ private:
void PushScrubbedAudio();
VideoRendererProcessor* video_renderer_;
AudioRendererProcessor* audio_renderer_;
// FIXME: Test code only
OpenCLBackend opencl_backend_;
OpenGLBackend opengl_backend_;
// End test code
ViewerSizer* sizer_;
+2 -2
View File
@@ -24,7 +24,7 @@
#include <QOpenGLWidget>
#include "render/colormanager.h"
#include "render/gl/shaderptr.h"
#include "render/backend/opengl/openglshader.h"
/**
* @brief The inner display/rendering widget of a Viewer class.
@@ -143,7 +143,7 @@ private:
*
* Retrieved every initializeGL() in order to stay up to date when new contexts are generated.
*/
ShaderPtr pipeline_;
OpenGLShaderPtr pipeline_;
/**
* @brief OCIO LUT texture used for conversions