From 51bc2a25a0dccb79309fcc8077ae8956b5b984de Mon Sep 17 00:00:00 2001 From: falkTX Date: Sun, 17 Aug 2014 21:55:43 +0100 Subject: [PATCH] More NTK tests --- dpf | 2 +- examples/Makefile | 2 +- examples/ntk.cpp | 34 +++++++++++++++++++++++++++------- 3 files changed, 29 insertions(+), 9 deletions(-) diff --git a/dpf b/dpf index 7364190..c9cd0b1 160000 --- a/dpf +++ b/dpf @@ -1 +1 @@ -Subproject commit 73641904f7e63ad46f5d936b40631234de84f2ed +Subproject commit c9cd0b1a1f70354f4e7dcc22cdf8da4e1d60758d diff --git a/examples/Makefile b/examples/Makefile index fbc91fb..3859f72 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -72,7 +72,7 @@ cairo: cairo.cpp ../dpf/dgl/* $(CXX) $< $(BUILD_CXX_FLAGS) $(shell pkg-config --cflags --libs cairo) $(LINK_FLAGS) -o $@ ntk: ntk.cpp ../dpf/dgl/* - $(CXX) $< $(BUILD_CXX_FLAGS) -I../dpf/distrho -Intk_res $(shell pkg-config --cflags --libs ntk_images ntk) $(LINK_FLAGS) -o $@ + $(CXX) $< $(BUILD_CXX_FLAGS) -I../dpf/distrho -Intk_res $(shell pkg-config --cflags --libs ntk_images ntk liblo jack) $(LINK_FLAGS) -o $@ qt-embed: qt-embed.cpp ../dpf/dgl/* $(CXX) $< $(BUILD_CXX_FLAGS) $(shell pkg-config --cflags --libs QtCore QtGui) $(LINK_FLAGS) -o $@ diff --git a/examples/ntk.cpp b/examples/ntk.cpp index 5d87b3c..e0bdb0b 100644 --- a/examples/ntk.cpp +++ b/examples/ntk.cpp @@ -21,13 +21,21 @@ #include "ntk/NtkWidget.hpp" #include "ntk/NtkWindow.hpp" +#include + // ------------------------------------------------------ +#define DISTRHO_PLUGIN_TARGET_DSSI + +#include "DistrhoPlugin.hpp" #include "DistrhoUI.hpp" +//#include "DistrhoPluginMain.cpp" #include "DistrhoUIMain.cpp" START_NAMESPACE_DISTRHO +using DGL::NtkWindow; + // ------------------------------------------------------ // NTK UI Test @@ -35,8 +43,17 @@ class NtkUiTest : public UI { public: NtkUiTest() - : UI() + : UI(), + but1(10,10,140,25,"Button 1"), + but2(10,40,140,25,"Button 2") { + box(FL_BORDER_BOX); + color(46); + + add(but1); + add(but2); + + end(); } ~NtkUiTest() @@ -59,11 +76,16 @@ protected: } private: - // + Fl_Button but1, but2; }; // ------------------------------------------------------ +Plugin* createPlugin() +{ + return nullptr; +} + UI* createUI() { return new NtkUiTest(); @@ -75,18 +97,16 @@ END_NAMESPACE_DISTRHO // ------------------------------------------------------ -int main() +int main2() { USE_NAMESPACE_DISTRHO; USE_NAMESPACE_DGL; - d_lastUiSampleRate = 44100.0; - UI* const ui(createUI()); - delete ui; - NtkApp app; NtkWindow window(app); + window.setSize(300, 300); + window.setTitle("NTK UI Test"); window.show(); app.exec();