Skip to content

Commit

Permalink
Adjust for new DPF
Browse files Browse the repository at this point in the history
Signed-off-by: falkTX <falktx@falktx.com>
  • Loading branch information
falkTX committed Jul 3, 2021
1 parent 5f17737 commit d81890b
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
2 changes: 1 addition & 1 deletion dpf
Submodule dpf updated 47 files
+3 −3 .travis.yml
+2 −7 .travis/before_install.sh
+26 −2 Makefile.base.mk
+27 −3 Makefile.plugins.mk
+9 −0 cmake/DPF-plugin.cmake
+5 −1 dgl/Application.hpp
+5 −0 dgl/Color.hpp
+154 −0 dgl/EventHandlers.hpp
+11 −22 dgl/ImageBaseWidgets.hpp
+1 −1 dgl/Makefile
+16 −0 dgl/SubWidget.hpp
+9 −9 dgl/Widget.hpp
+40 −16 dgl/Window.hpp
+2 −2 dgl/src/ApplicationPrivateData.cpp
+1 −3 dgl/src/Cairo.cpp
+7 −0 dgl/src/Color.cpp
+0 −188 dgl/src/Common.hpp
+632 −0 dgl/src/EventHandlers.cpp
+163 −311 dgl/src/ImageBaseWidgets.cpp
+4 −1 dgl/src/NanoVG.cpp
+1 −3 dgl/src/OpenGL.cpp
+20 −5 dgl/src/SubWidget.cpp
+1 −0 dgl/src/SubWidgetPrivateData.cpp
+1 −0 dgl/src/SubWidgetPrivateData.hpp
+6 −6 dgl/src/WidgetPrivateData.cpp
+14 −5 dgl/src/Window.cpp
+11 −13 dgl/src/WindowPrivateData.cpp
+3 −3 dgl/src/WindowPrivateData.hpp
+1 −1 dgl/src/pugl-upstream
+9 −1 dgl/src/pugl.cpp
+4 −0 dgl/src/pugl.hpp
+3 −3 distrho/DistrhoPlugin.hpp
+5 −1 distrho/DistrhoUI.hpp
+1 −0 distrho/src/DistrhoPluginInternal.hpp
+16 −0 distrho/src/DistrhoPluginJACK.cpp
+53 −6 distrho/src/DistrhoPluginLV2export.cpp
+32 −2 distrho/src/DistrhoPluginVST2.cpp
+1 −1 distrho/src/DistrhoUI.cpp
+148 −110 distrho/src/DistrhoUIPrivateData.hpp
+290 −153 distrho/src/jackbridge/JackBridge.cpp
+6 −2 distrho/src/jackbridge/JackBridge.hpp
+211 −0 distrho/src/jackbridge/RtAudioBridge.hpp
+27 −0 distrho/src/jackbridge/rtaudio/LICENSE
+10,911 −0 distrho/src/jackbridge/rtaudio/RtAudio.cpp
+1,185 −0 distrho/src/jackbridge/rtaudio/RtAudio.h
+42 −40 tests/Demo.cpp
+1 −1 utils/generate-ttl.sh
9 changes: 7 additions & 2 deletions plugins/MVerb/DistrhoUIMVerb.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ using DGL::Color;

DistrhoUIMVerb::DistrhoUIMVerb()
: UI(Art::backgroundWidth, Art::backgroundHeight),
fImgBackground(Art::backgroundData, Art::backgroundWidth, Art::backgroundHeight, GL_BGR)
fImgBackground(Art::backgroundData, Art::backgroundWidth, Art::backgroundHeight, kImageFormatBGR)
{
// text
fNanoText.loadSharedResources();
Expand Down Expand Up @@ -122,6 +122,9 @@ DistrhoUIMVerb::DistrhoUIMVerb()

// set initial values
programLoaded(0);

// TODO auto-scale but non-resizable
// setGeometryConstraints(Art::backgroundWidth, Art::backgroundHeight, true, true);
}

DistrhoUIMVerb::~DistrhoUIMVerb()
Expand Down Expand Up @@ -225,7 +228,9 @@ void DistrhoUIMVerb::imageKnobValueChanged(ImageKnob* knob, float value)

void DistrhoUIMVerb::onDisplay()
{
fImgBackground.draw();
const GraphicsContext& context(getGraphicsContext());

fImgBackground.draw(context);

// text display
fNanoText.beginFrame(this);
Expand Down

0 comments on commit d81890b

Please sign in to comment.