DISTRHO
/
gl-examples
mirror of https://github.com/DISTRHO/gl-examples
1
0
Fork 0
Code Releases 0 Activity
Browse Source

Cleanup

pull/1/head
falkTX 10 years ago
parent
295eccbe1b
commit
ab0e791d8e
24 changed files with 40 additions and 170 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      dpf
  2. +3
    -9
      examples/app.cpp
  3. +1
    -6
      examples/color.cpp
  4. +4
    -13
      examples/demo-multi.cpp
  5. +1
    -9
      examples/demo-subwidgets.cpp
  6. +3
    -12
      examples/demo.cpp
  7. +1
    -6
      examples/file-browser.cpp
  8. +1
    -1
      examples/images.cpp
  9. +4
    -9
      examples/nanovg.cpp
  10. +4
    -12
      examples/nanovg2.cpp
  11. +1
    -1
      examples/ntk.cpp
  12. +1
    -1
      examples/ntk_res/DistrhoPluginInfo.h
  13. +2
    -8
      examples/qt-embed.cpp
  14. +1
    -6
      examples/rectangles.cpp
  15. +1
    -6
      examples/shapes.cpp
  16. +3
    -8
      examples/tests/cairo.cpp
  17. +1
    -1
      examples/tests/text.cpp
  18. +1
    -6
      examples/text.cpp
  19. +1
    -9
      examples/widgets/ExampleColorWidget.hpp
  20. +1
    -10
      examples/widgets/ExampleImagesWidget.hpp
  21. +1
    -8
      examples/widgets/ExampleRectanglesWidget.hpp
  22. +1
    -10
      examples/widgets/ExampleShapesWidget.hpp
  23. +1
    -7
      examples/widgets/ExampleTextWidget.hpp
  24. +1
    -11
      examples/widgets/NanoPerfWidget.hpp

+ 1
- 1
dpf

@@ -1 +1 @@
Subproject commit 8d66fbcd2666624a01efa5f90048d7d868064976
Subproject commit 12061de4cadc1e04572adcafe8c6cbfdb23cdb5c

+ 3
- 9
examples/app.cpp View File

@@ -1,6 +1,6 @@
/*
* DISTRHO Plugin Framework (DPF)
* Copyright (C) 2012-2014 Filipe Coelho <falktx@falktx.com>
* Copyright (C) 2012-2015 Filipe Coelho <falktx@falktx.com>
*
* Permission to use, copy, modify, and/or distribute this software for any purpose with
* or without fee is hereby granted, provided that the above copyright notice and this
@@ -17,21 +17,15 @@
// ------------------------------------------------------
// DGL Stuff

#include "App.hpp"
#include "Application.hpp"
#include "Window.hpp"

// ------------------------------------------------------
// use namespace

using DGL::App;
using DGL::Window;

// ------------------------------------------------------
// main entry point

int main()
{
App app;
Application app;
Window win(app);

win.setTitle("App");


+ 1
- 6
examples/color.cpp View File

@@ -1,6 +1,6 @@
/*
* DISTRHO Plugin Framework (DPF)
* Copyright (C) 2012-2014 Filipe Coelho <falktx@falktx.com>
* Copyright (C) 2012-2015 Filipe Coelho <falktx@falktx.com>
*
* Permission to use, copy, modify, and/or distribute this software for any purpose with
* or without fee is hereby granted, provided that the above copyright notice and this
@@ -20,11 +20,6 @@
#include "StandaloneWindow.hpp"
#include "widgets/ExampleColorWidget.hpp"

// ------------------------------------------------------
// use namespace

using DGL::StandaloneWindow;

// ------------------------------------------------------
// main entry point



+ 4
- 13
examples/demo-multi.cpp View File

@@ -1,6 +1,6 @@
/*
* DISTRHO Plugin Framework (DPF)
* Copyright (C) 2012-2014 Filipe Coelho <falktx@falktx.com>
* Copyright (C) 2012-2015 Filipe Coelho <falktx@falktx.com>
*
* Permission to use, copy, modify, and/or distribute this software for any purpose with
* or without fee is hereby granted, provided that the above copyright notice and this
@@ -17,7 +17,6 @@
// ------------------------------------------------------
// DGL Stuff

#include "ImageButton.hpp"
#include "StandaloneWindow.hpp"
#include "widgets/ExampleColorWidget.hpp"
#include "widgets/ExampleImagesWidget.hpp"
@@ -32,14 +31,6 @@
#include "demo_res/DemoArtwork.cpp"
#include "images_res/CatPics.cpp"

// ------------------------------------------------------
// use namespace

using DGL::App;
using DGL::ImageButton;
using DGL::Line;
using DGL::Size;

// ------------------------------------------------------
// Single Widget Window

@@ -49,7 +40,7 @@ template<class WIG>
class SingleWidgetWindow : public Window
{
public:
SingleWidgetWindow(App& app)
SingleWidgetWindow(Application& app)
: Window(app),
fWidget(*this),
fIsMain(true)
@@ -59,7 +50,7 @@ public:
show();
}

SingleWidgetWindow(App& app, Window& parent)
SingleWidgetWindow(Application& app, Window& parent)
: Window(app, parent),
fWidget(*this),
fIsMain(false)
@@ -95,7 +86,7 @@ private:

int main()
{
App app;
Application app;
SingleWidgetWindow<ExampleColorWidget> wColor(app);
SingleWidgetWindow<ExampleImagesWidget> wImages(app, wColor);
SingleWidgetWindow<ExampleRectanglesWidget> wRects(app, wColor);


+ 1
- 9
examples/demo-subwidgets.cpp View File

@@ -1,6 +1,6 @@
/*
* DISTRHO Plugin Framework (DPF)
* Copyright (C) 2012-2014 Filipe Coelho <falktx@falktx.com>
* Copyright (C) 2012-2015 Filipe Coelho <falktx@falktx.com>
*
* Permission to use, copy, modify, and/or distribute this software for any purpose with
* or without fee is hereby granted, provided that the above copyright notice and this
@@ -23,14 +23,6 @@
#include "widgets/ExampleShapesWidget.hpp"
#include "widgets/ExampleTextWidget.hpp"

// ------------------------------------------------------
// use namespace

using DGL::Size;
using DGL::StandaloneWindow;
using DGL::Widget;
using DGL::Window;

// ------------------------------------------------------
// SubWidgets



+ 3
- 12
examples/demo.cpp View File

@@ -1,6 +1,6 @@
/*
* DISTRHO Plugin Framework (DPF)
* Copyright (C) 2012-2014 Filipe Coelho <falktx@falktx.com>
* Copyright (C) 2012-2015 Filipe Coelho <falktx@falktx.com>
*
* Permission to use, copy, modify, and/or distribute this software for any purpose with
* or without fee is hereby granted, provided that the above copyright notice and this
@@ -17,7 +17,6 @@
// ------------------------------------------------------
// DGL Stuff

#include "ImageButton.hpp"
#include "StandaloneWindow.hpp"
#include "widgets/ExampleColorWidget.hpp"
#include "widgets/ExampleImagesWidget.hpp"
@@ -32,14 +31,6 @@
#include "demo_res/DemoArtwork.cpp"
#include "images_res/CatPics.cpp"

// ------------------------------------------------------
// use namespace

using DGL::App;
using DGL::ImageButton;
using DGL::Line;
using DGL::Size;

// ------------------------------------------------------
// Left side tab-like widget

@@ -328,7 +319,7 @@ class DemoWindow : public Window,
public LeftSideWidget::Callback
{
public:
DemoWindow(App& app)
DemoWindow(Application& app)
: Window(app),
wColor(*this),
wImages(*this),
@@ -429,7 +420,7 @@ private:

int main()
{
App app;
Application app;
DemoWindow win(app);

win.show();


+ 1
- 6
examples/file-browser.cpp View File

@@ -1,6 +1,6 @@
/*
* DISTRHO Plugin Framework (DPF)
* Copyright (C) 2012-2014 Filipe Coelho <falktx@falktx.com>
* Copyright (C) 2012-2015 Filipe Coelho <falktx@falktx.com>
*
* Permission to use, copy, modify, and/or distribute this software for any purpose with
* or without fee is hereby granted, provided that the above copyright notice and this
@@ -19,11 +19,6 @@

#include "StandaloneWindow.hpp"

// ------------------------------------------------------
// use namespace

using DGL::StandaloneWindow;

// ------------------------------------------------------
// Test class



+ 1
- 1
examples/images.cpp View File

@@ -1,6 +1,6 @@
/*
* DISTRHO Plugin Framework (DPF)
* Copyright (C) 2012-2014 Filipe Coelho <falktx@falktx.com>
* Copyright (C) 2012-2015 Filipe Coelho <falktx@falktx.com>
*
* Permission to use, copy, modify, and/or distribute this software for any purpose with
* or without fee is hereby granted, provided that the above copyright notice and this


+ 4
- 9
examples/nanovg.cpp View File

@@ -1,6 +1,6 @@
/*
* DISTRHO Plugin Framework (DPF)
* Copyright (C) 2012-2014 Filipe Coelho <falktx@falktx.com>
* Copyright (C) 2012-2015 Filipe Coelho <falktx@falktx.com>
*
* Permission to use, copy, modify, and/or distribute this software for any purpose with
* or without fee is hereby granted, provided that the above copyright notice and this
@@ -25,11 +25,6 @@
#include "widgets/NanoPerfWidget.hpp"
#include "nanovg_res/demo.h"

// ------------------------------------------------------
// use namespace

using namespace DGL;

// ------------------------------------------------------
// NanoVG Example Widget

@@ -98,7 +93,7 @@ protected:

switch (ev.key)
{
case CHAR_ESCAPE:
case kCharEscape:
getParentApp().quit();
break;
case ' ':
@@ -137,7 +132,7 @@ private:
class NanoExampleWindow : public Window
{
public:
NanoExampleWindow(App& app)
NanoExampleWindow(Application& app)
: Window(app),
fDemo(*this),
fPerf(*this, NanoPerfWidget::RENDER_FPS, "Frame Time")
@@ -168,7 +163,7 @@ private:

int main()
{
App app;
Application app;
NanoExampleWindow win(app);

win.show();


+ 4
- 12
examples/nanovg2.cpp View File

@@ -1,6 +1,6 @@
/*
* DISTRHO Plugin Framework (DPF)
* Copyright (C) 2012-2014 Filipe Coelho <falktx@falktx.com>
* Copyright (C) 2012-2015 Filipe Coelho <falktx@falktx.com>
*
* Permission to use, copy, modify, and/or distribute this software for any purpose with
* or without fee is hereby granted, provided that the above copyright notice and this
@@ -25,14 +25,6 @@
#include "NanoVG.hpp"
#include "widgets/NanoPerfWidget.hpp"

#include <cmath>

// ------------------------------------------------------
// use namespace

using namespace DGL;
using namespace DISTRHO;

// ------------------------------------------------------
// NanoVG Example Widget

@@ -98,7 +90,7 @@ protected:

switch (ev.key)
{
case CHAR_ESCAPE:
case kCharEscape:
getParentApp().quit();
break;
case ' ':
@@ -198,7 +190,7 @@ private:
class NanoExampleWindow : public Window
{
public:
NanoExampleWindow(App& app)
NanoExampleWindow(Application& app)
: Window(app),
fDemo(*this),
fPerf(*this, NanoPerfWidget::RENDER_FPS, "Frame Time")
@@ -227,7 +219,7 @@ private:

int main()
{
App app;
Application app;
NanoExampleWindow win(app);

win.show();


+ 1
- 1
examples/ntk.cpp View File

@@ -1,6 +1,6 @@
/*
* DISTRHO Plugin Framework (DPF)
* Copyright (C) 2012-2014 Filipe Coelho <falktx@falktx.com>
* Copyright (C) 2012-2015 Filipe Coelho <falktx@falktx.com>
*
* Permission to use, copy, modify, and/or distribute this software for any purpose with
* or without fee is hereby granted, provided that the above copyright notice and this


+ 1
- 1
examples/ntk_res/DistrhoPluginInfo.h View File

@@ -1,6 +1,6 @@
/*
* DISTRHO Plugin Framework (DPF)
* Copyright (C) 2012-2014 Filipe Coelho <falktx@falktx.com>
* Copyright (C) 2012-2015 Filipe Coelho <falktx@falktx.com>
*
* Permission to use, copy, modify, and/or distribute this software for any purpose with
* or without fee is hereby granted, provided that the above copyright notice and this


+ 2
- 8
examples/qt-embed.cpp View File

@@ -1,6 +1,6 @@
/*
* DISTRHO Plugin Framework (DPF)
* Copyright (C) 2012-2014 Filipe Coelho <falktx@falktx.com>
* Copyright (C) 2012-2015 Filipe Coelho <falktx@falktx.com>
*
* Permission to use, copy, modify, and/or distribute this software for any purpose with
* or without fee is hereby granted, provided that the above copyright notice and this
@@ -17,7 +17,7 @@
// ------------------------------------------------------
// DGL Stuff

#include "App.hpp"
#include "Application.hpp"
#include "Window.hpp"
#include "widgets/ExampleRectanglesWidget.hpp"

@@ -40,12 +40,6 @@ typedef QMacCocoaViewContainer QWidgetContainer;
typedef QWidget QWidgetContainer;
#endif

// ------------------------------------------------------
// use namespace

using DGL::App;
using DGL::Window;

// ------------------------------------------------------
// Qt widget



+ 1
- 6
examples/rectangles.cpp View File

@@ -1,6 +1,6 @@
/*
* DISTRHO Plugin Framework (DPF)
* Copyright (C) 2012-2014 Filipe Coelho <falktx@falktx.com>
* Copyright (C) 2012-2015 Filipe Coelho <falktx@falktx.com>
*
* Permission to use, copy, modify, and/or distribute this software for any purpose with
* or without fee is hereby granted, provided that the above copyright notice and this
@@ -20,11 +20,6 @@
#include "StandaloneWindow.hpp"
#include "widgets/ExampleRectanglesWidget.hpp"

// ------------------------------------------------------
// use namespace

using DGL::StandaloneWindow;

// ------------------------------------------------------
// main entry point



+ 1
- 6
examples/shapes.cpp View File

@@ -1,6 +1,6 @@
/*
* DISTRHO Plugin Framework (DPF)
* Copyright (C) 2012-2014 Filipe Coelho <falktx@falktx.com>
* Copyright (C) 2012-2015 Filipe Coelho <falktx@falktx.com>
*
* Permission to use, copy, modify, and/or distribute this software for any purpose with
* or without fee is hereby granted, provided that the above copyright notice and this
@@ -20,11 +20,6 @@
#include "StandaloneWindow.hpp"
#include "widgets/ExampleShapesWidget.hpp"

// ------------------------------------------------------
// use namespace

using DGL::StandaloneWindow;

// ------------------------------------------------------
// main entry point



+ 3
- 8
examples/tests/cairo.cpp View File

@@ -1,6 +1,6 @@
/*
* DISTRHO Plugin Framework (DPF)
* Copyright (C) 2012-2014 Filipe Coelho <falktx@falktx.com>
* Copyright (C) 2012-2015 Filipe Coelho <falktx@falktx.com>
*
* Permission to use, copy, modify, and/or distribute this software for any purpose with
* or without fee is hereby granted, provided that the above copyright notice and this
@@ -17,17 +17,12 @@
// ------------------------------------------------------
// DGL Stuff

#include "App.hpp"
#include "Application.hpp"
#include "CairoWidget.hpp"
#include "Window.hpp"

#include <cstdio>

// ------------------------------------------------------
// use namespace

using namespace DGL;

// ------------------------------------------------------
// Background widget (cairo will be painted on top)

@@ -199,7 +194,7 @@ private:

int main()
{
App app;
Application app;
CustomWindow win(app);

win.setSize(300, 300);


+ 1
- 1
examples/tests/text.cpp View File

@@ -1,6 +1,6 @@
/*
* DISTRHO Plugin Framework (DPF)
* Copyright (C) 2012-2014 Filipe Coelho <falktx@falktx.com>
* Copyright (C) 2012-2015 Filipe Coelho <falktx@falktx.com>
*
* Permission to use, copy, modify, and/or distribute this software for any purpose with
* or without fee is hereby granted, provided that the above copyright notice and this


+ 1
- 6
examples/text.cpp View File

@@ -1,6 +1,6 @@
/*
* DISTRHO Plugin Framework (DPF)
* Copyright (C) 2012-2014 Filipe Coelho <falktx@falktx.com>
* Copyright (C) 2012-2015 Filipe Coelho <falktx@falktx.com>
*
* Permission to use, copy, modify, and/or distribute this software for any purpose with
* or without fee is hereby granted, provided that the above copyright notice and this
@@ -20,11 +20,6 @@
#include "StandaloneWindow.hpp"
#include "widgets/ExampleTextWidget.hpp"

// ------------------------------------------------------
// use namespace

using DGL::StandaloneWindow;

// ------------------------------------------------------
// main entry point



+ 1
- 9
examples/widgets/ExampleColorWidget.hpp View File

@@ -1,6 +1,6 @@
/*
* DISTRHO Plugin Framework (DPF)
* Copyright (C) 2012-2014 Filipe Coelho <falktx@falktx.com>
* Copyright (C) 2012-2015 Filipe Coelho <falktx@falktx.com>
*
* Permission to use, copy, modify, and/or distribute this software for any purpose with
* or without fee is hereby granted, provided that the above copyright notice and this
@@ -23,14 +23,6 @@
#include "Widget.hpp"
#include "Window.hpp"

// ------------------------------------------------------
// use namespace

using DGL::IdleCallback;
using DGL::Rectangle;
using DGL::Widget;
using DGL::Window;

// ------------------------------------------------------
// our widget



+ 1
- 10
examples/widgets/ExampleImagesWidget.hpp View File

@@ -1,6 +1,6 @@
/*
* DISTRHO Plugin Framework (DPF)
* Copyright (C) 2012-2014 Filipe Coelho <falktx@falktx.com>
* Copyright (C) 2012-2015 Filipe Coelho <falktx@falktx.com>
*
* Permission to use, copy, modify, and/or distribute this software for any purpose with
* or without fee is hereby granted, provided that the above copyright notice and this
@@ -29,15 +29,6 @@

#include "../images_res/CatPics.hpp"

// ------------------------------------------------------
// use namespace

using DGL::IdleCallback;
using DGL::Image;
using DGL::Rectangle;
using DGL::Widget;
using DGL::Window;

// ------------------------------------------------------
// our widget



+ 1
- 8
examples/widgets/ExampleRectanglesWidget.hpp View File

@@ -1,6 +1,6 @@
/*
* DISTRHO Plugin Framework (DPF)
* Copyright (C) 2012-2014 Filipe Coelho <falktx@falktx.com>
* Copyright (C) 2012-2015 Filipe Coelho <falktx@falktx.com>
*
* Permission to use, copy, modify, and/or distribute this software for any purpose with
* or without fee is hereby granted, provided that the above copyright notice and this
@@ -23,13 +23,6 @@
#include "Widget.hpp"
#include "Window.hpp"

// ------------------------------------------------------
// use namespace

using DGL::Rectangle;
using DGL::Widget;
using DGL::Window;

// ------------------------------------------------------
// our widget



+ 1
- 10
examples/widgets/ExampleShapesWidget.hpp View File

@@ -1,6 +1,6 @@
/*
* DISTRHO Plugin Framework (DPF)
* Copyright (C) 2012-2014 Filipe Coelho <falktx@falktx.com>
* Copyright (C) 2012-2015 Filipe Coelho <falktx@falktx.com>
*
* Permission to use, copy, modify, and/or distribute this software for any purpose with
* or without fee is hereby granted, provided that the above copyright notice and this
@@ -23,15 +23,6 @@
#include "Widget.hpp"
#include "Window.hpp"

// ------------------------------------------------------
// use namespace

using DGL::Circle;
using DGL::Triangle;
using DGL::Rectangle;
using DGL::Widget;
using DGL::Window;

// ------------------------------------------------------
// our widget



+ 1
- 7
examples/widgets/ExampleTextWidget.hpp View File

@@ -1,6 +1,6 @@
/*
* DISTRHO Plugin Framework (DPF)
* Copyright (C) 2012-2014 Filipe Coelho <falktx@falktx.com>
* Copyright (C) 2012-2015 Filipe Coelho <falktx@falktx.com>
*
* Permission to use, copy, modify, and/or distribute this software for any purpose with
* or without fee is hereby granted, provided that the above copyright notice and this
@@ -22,12 +22,6 @@

#include "NanoVG.hpp"

// ------------------------------------------------------
// use namespace

using DGL::NanoWidget;
using DGL::Window;

// ------------------------------------------------------
// our widget



+ 1
- 11
examples/widgets/NanoPerfWidget.hpp View File

@@ -1,6 +1,6 @@
/*
* DISTRHO Plugin Framework (DPF)
* Copyright (C) 2012-2014 Filipe Coelho <falktx@falktx.com>
* Copyright (C) 2012-2015 Filipe Coelho <falktx@falktx.com>
*
* Permission to use, copy, modify, and/or distribute this software for any purpose with
* or without fee is hereby granted, provided that the above copyright notice and this
@@ -23,16 +23,6 @@
#include "NanoVG.hpp"
#include "../../dpf/distrho/extra/String.hpp"

// ------------------------------------------------------
// use namespace

using DISTRHO::String;
using DGL::IdleCallback;
using DGL::NanoVG;
using DGL::NanoWidget;
using DGL::Widget;
using DGL::Window;

// ------------------------------------------------------
// get time



Write Preview
Loading…
Cancel
Save