Browse Source

More of the same

tags/1.9.4
falkTX 12 years ago
parent
commit
b23672ab12
31 changed files with 404 additions and 377 deletions
  1. +1
    -9
      Makefile
  2. +14
    -14
      source/modules/distrho/dgl/App.hpp
  3. +18
    -16
      source/modules/distrho/dgl/Base.hpp
  4. +16
    -16
      source/modules/distrho/dgl/Geometry.hpp
  5. +14
    -14
      source/modules/distrho/dgl/Image.hpp
  6. +14
    -14
      source/modules/distrho/dgl/ImageAboutWindow.hpp
  7. +14
    -14
      source/modules/distrho/dgl/ImageButton.hpp
  8. +14
    -14
      source/modules/distrho/dgl/ImageKnob.hpp
  9. +14
    -14
      source/modules/distrho/dgl/ImageSlider.hpp
  10. +7
    -7
      source/modules/distrho/dgl/Makefile
  11. +15
    -15
      source/modules/distrho/dgl/StandaloneWindow.hpp
  12. +14
    -14
      source/modules/distrho/dgl/Widget.hpp
  13. +14
    -14
      source/modules/distrho/dgl/Window.hpp
  14. +11
    -11
      source/modules/distrho/dgl/src/App.cpp
  15. +14
    -14
      source/modules/distrho/dgl/src/AppPrivate.hpp
  16. +14
    -14
      source/modules/distrho/dgl/src/Geometry.cpp
  17. +11
    -11
      source/modules/distrho/dgl/src/Image.cpp
  18. +11
    -11
      source/modules/distrho/dgl/src/ImageAboutWindow.cpp
  19. +11
    -11
      source/modules/distrho/dgl/src/ImageButton.cpp
  20. +11
    -11
      source/modules/distrho/dgl/src/ImageKnob.cpp
  21. +11
    -11
      source/modules/distrho/dgl/src/ImageSlider.cpp
  22. +11
    -11
      source/modules/distrho/dgl/src/Widget.cpp
  23. +12
    -12
      source/modules/distrho/dgl/src/Window.cpp
  24. +1
    -1
      source/modules/distrho/dgl/src/pugl/pugl_osx_extended.h
  25. +21
    -22
      source/modules/distrho/dgl/src/pugl/pugl_osx_extended.m
  26. +9
    -9
      source/modules/lilv/lilv.c
  27. +9
    -9
      source/modules/lilv/serd.c
  28. +9
    -9
      source/modules/lilv/sord.c
  29. +9
    -9
      source/modules/lilv/sratom.c
  30. +1
    -1
      source/modules/rtmempool/rtmempool.c
  31. +59
    -25
      source/modules/theme/Makefile

+ 1
- 9
Makefile View File

@@ -38,12 +38,6 @@ discovery:
plugin:
$(MAKE) -C source/plugin

theme:
$(MAKE) -C source/theme

widgets:
$(MAKE) -C source/widgets

posix32:
$(MAKE) -C source/bridges posix32
$(MAKE) -C source/discovery posix32
@@ -122,10 +116,8 @@ clean:
$(MAKE) clean -C source/backend
$(MAKE) clean -C source/bridges
$(MAKE) clean -C source/discovery
$(MAKE) clean -C source/libs
$(MAKE) clean -C source/modules
$(MAKE) clean -C source/plugin
$(MAKE) clean -C source/theme
$(MAKE) clean -C source/widgets
rm -f $(RES)
rm -f $(UIs)
rm -f $(WIDGETS)


+ 14
- 14
source/modules/distrho/dgl/App.hpp View File

@@ -2,26 +2,26 @@
* DISTRHO Plugin Toolkit (DPT)
* Copyright (C) 2012-2013 Filipe Coelho <falktx@falktx.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation.
* 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
* permission notice appear in all copies.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* For a full copy of the license see the LGPL.txt file
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD
* TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN
* NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
* DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
* IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/

#ifndef __DGL_APP_HPP__
#define __DGL_APP_HPP__
#ifndef DGL_APP_HPP_INCLUDED
#define DGL_APP_HPP_INCLUDED

#include "Base.hpp"

START_NAMESPACE_DGL

// -------------------------------------------------
// -----------------------------------------------------------------------

class App
{
@@ -40,8 +40,8 @@ private:
friend class Window;
};

// -------------------------------------------------
// -----------------------------------------------------------------------

END_NAMESPACE_DGL

#endif // __DGL_APP_HPP__
#endif // DGL_APP_HPP_INCLUDED

+ 18
- 16
source/modules/distrho/dgl/Base.hpp View File

@@ -2,20 +2,20 @@
* DISTRHO Plugin Toolkit (DPT)
* Copyright (C) 2012-2013 Filipe Coelho <falktx@falktx.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation.
* 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
* permission notice appear in all copies.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* For a full copy of the license see the LGPL.txt file
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD
* TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN
* NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
* DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
* IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/

#ifndef __DGL_BASE_HPP__
#define __DGL_BASE_HPP__
#ifndef DGL_BASE_HPP_INCLUDED
#define DGL_BASE_HPP_INCLUDED

#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__)
# define DGL_OS_WINDOWS 1
@@ -74,10 +74,10 @@
# define GL_CLAMP_TO_BORDER 0x812D
#endif

// -------------------------------------------------

START_NAMESPACE_DGL

// -----------------------------------------------------------------------

enum Char {
DGL_CHAR_BACKSPACE = 0x08,
DGL_CHAR_ESCAPE = 0x1B,
@@ -119,9 +119,9 @@ enum Modifier {
DGL_MODIFIER_SUPER = 1 << 3 /**< Mod4/Command/Windows key */
};

END_NAMESPACE_DGL
// -----------------------------------------------------------------------

// -------------------------------------------------
END_NAMESPACE_DGL

static inline
void dgl_sleep(unsigned int secs)
@@ -143,4 +143,6 @@ void dgl_msleep(unsigned int msecs)
#endif
}

#endif // __DGL_BASE_HPP__
// -----------------------------------------------------------------------

#endif // DGL_BASE_HPP_INCLUDED

+ 16
- 16
source/modules/distrho/dgl/Geometry.hpp View File

@@ -2,26 +2,26 @@
* DISTRHO Plugin Toolkit (DPT)
* Copyright (C) 2012-2013 Filipe Coelho <falktx@falktx.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation.
* 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
* permission notice appear in all copies.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* For a full copy of the license see the LGPL.txt file
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD
* TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN
* NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
* DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
* IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/

#ifndef __DGL_GEOMETRY_HPP__
#define __DGL_GEOMETRY_HPP__
#ifndef DGL_GEOMETRY_HPP_INCLUDED
#define DGL_GEOMETRY_HPP_INCLUDED

#include "Base.hpp"

START_NAMESPACE_DGL

// -------------------------------------------------
// -----------------------------------------------------------------------

template<typename T>
class Point
@@ -51,7 +51,7 @@ private:
template<typename> friend class Rectangle;
};

// -------------------------------------------------
// -----------------------------------------------------------------------

template<typename T>
class Size
@@ -80,7 +80,7 @@ private:
template<typename> friend class Rectangle;
};

// -------------------------------------------------
// -----------------------------------------------------------------------

template<typename T>
class Rectangle
@@ -126,8 +126,8 @@ private:
Size<T> fSize;
};

// -------------------------------------------------
// -----------------------------------------------------------------------

END_NAMESPACE_DGL

#endif // __DGL_GEOMETRY_HPP__
#endif // DGL_GEOMETRY_HPP_INCLUDED

+ 14
- 14
source/modules/distrho/dgl/Image.hpp View File

@@ -2,26 +2,26 @@
* DISTRHO Plugin Toolkit (DPT)
* Copyright (C) 2012-2013 Filipe Coelho <falktx@falktx.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation.
* 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
* permission notice appear in all copies.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* For a full copy of the license see the LGPL.txt file
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD
* TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN
* NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
* DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
* IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/

#ifndef __DGL_IMAGE_HPP__
#define __DGL_IMAGE_HPP__
#ifndef DGL_IMAGE_HPP_INCLUDED
#define DGL_IMAGE_HPP_INCLUDED

#include "Geometry.hpp"

START_NAMESPACE_DGL

// -------------------------------------------------
// -----------------------------------------------------------------------

class Image
{
@@ -59,8 +59,8 @@ private:
GLenum fType;
};

// -------------------------------------------------
// -----------------------------------------------------------------------

END_NAMESPACE_DGL

#endif // __DGL_IMAGE_HPP__
#endif // DGL_IMAGE_HPP_INCLUDED

+ 14
- 14
source/modules/distrho/dgl/ImageAboutWindow.hpp View File

@@ -2,20 +2,20 @@
* DISTRHO Plugin Toolkit (DPT)
* Copyright (C) 2012-2013 Filipe Coelho <falktx@falktx.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation.
* 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
* permission notice appear in all copies.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* For a full copy of the license see the LGPL.txt file
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD
* TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN
* NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
* DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
* IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/

#ifndef __DGL_IMAGE_ABOUT_WINDOW_HPP__
#define __DGL_IMAGE_ABOUT_WINDOW_HPP__
#ifndef DGL_IMAGE_ABOUT_WINDOW_HPP_INCLUDED
#define DGL_IMAGE_ABOUT_WINDOW_HPP_INCLUDED

#include "Image.hpp"
#include "Widget.hpp"
@@ -29,7 +29,7 @@

START_NAMESPACE_DGL

// -------------------------------------------------
// -----------------------------------------------------------------------

class ImageAboutWindow : public Window,
public Widget
@@ -49,8 +49,8 @@ private:
Image fImgBackground;
};

// -------------------------------------------------
// -----------------------------------------------------------------------

END_NAMESPACE_DGL

#endif // __DGL_IMAGE_ABOUT_WINDOW_HPP__
#endif // DGL_IMAGE_ABOUT_WINDOW_HPP_INCLUDED

+ 14
- 14
source/modules/distrho/dgl/ImageButton.hpp View File

@@ -2,27 +2,27 @@
* DISTRHO Plugin Toolkit (DPT)
* Copyright (C) 2012-2013 Filipe Coelho <falktx@falktx.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation.
* 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
* permission notice appear in all copies.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* For a full copy of the license see the LGPL.txt file
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD
* TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN
* NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
* DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
* IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/

#ifndef __DGL_IMAGE_BUTTON_HPP__
#define __DGL_IMAGE_BUTTON_HPP__
#ifndef DGL_IMAGE_BUTTON_HPP_INCLUDED
#define DGL_IMAGE_BUTTON_HPP_INCLUDED

#include "Image.hpp"
#include "Widget.hpp"

START_NAMESPACE_DGL

// -------------------------------------------------
// -----------------------------------------------------------------------

class ImageButton : public Widget
{
@@ -57,8 +57,8 @@ private:
Callback* fCallback;
};

// -------------------------------------------------
// -----------------------------------------------------------------------

END_NAMESPACE_DGL

#endif // __DGL_IMAGE_BUTTON_HPP__
#endif // DGL_IMAGE_BUTTON_HPP_INCLUDED

+ 14
- 14
source/modules/distrho/dgl/ImageKnob.hpp View File

@@ -2,27 +2,27 @@
* DISTRHO Plugin Toolkit (DPT)
* Copyright (C) 2012-2013 Filipe Coelho <falktx@falktx.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation.
* 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
* permission notice appear in all copies.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* For a full copy of the license see the LGPL.txt file
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD
* TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN
* NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
* DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
* IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/

#ifndef __DGL_IMAGE_KNOB_HPP__
#define __DGL_IMAGE_KNOB_HPP__
#ifndef DGL_IMAGE_KNOB_HPP_INCLUDED
#define DGL_IMAGE_KNOB_HPP_INCLUDED

#include "Image.hpp"
#include "Widget.hpp"

START_NAMESPACE_DGL

// -------------------------------------------------
// -----------------------------------------------------------------------

class ImageKnob : public Widget
{
@@ -82,8 +82,8 @@ private:
GLuint fTextureId;
};

// -------------------------------------------------
// -----------------------------------------------------------------------

END_NAMESPACE_DGL

#endif // __DGL_IMAGE_KNOB_HPP__
#endif // DGL_IMAGE_KNOB_HPP_INCLUDED

+ 14
- 14
source/modules/distrho/dgl/ImageSlider.hpp View File

@@ -2,27 +2,27 @@
* DISTRHO Plugin Toolkit (DPT)
* Copyright (C) 2012-2013 Filipe Coelho <falktx@falktx.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation.
* 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
* permission notice appear in all copies.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* For a full copy of the license see the LGPL.txt file
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD
* TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN
* NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
* DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
* IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/

#ifndef __DGL_IMAGE_SLIDER_HPP__
#define __DGL_IMAGE_SLIDER_HPP__
#ifndef DGL_IMAGE_SLIDER_HPP_INCLUDED
#define DGL_IMAGE_SLIDER_HPP_INCLUDED

#include "Image.hpp"
#include "Widget.hpp"

START_NAMESPACE_DGL

// -------------------------------------------------
// -----------------------------------------------------------------------

class ImageSlider : public Widget
{
@@ -78,8 +78,8 @@ private:
void _recheckArea();
};

// -------------------------------------------------
// -----------------------------------------------------------------------

END_NAMESPACE_DGL

#endif // __DGL_IMAGE_SLIDER_HPP__
#endif // DGL_IMAGE_SLIDER_HPP_INCLUDED

+ 7
- 7
source/modules/distrho/dgl/Makefile View File

@@ -11,7 +11,7 @@ include ../../../Makefile.mk
BUILD_C_FLAGS += -I.
BUILD_CXX_FLAGS += -I.

OBJS = \
OBJS = \
src/App.cpp.o \
src/Image.cpp.o \
src/ImageAboutWindow.cpp.o \
@@ -44,7 +44,7 @@ OBJS_posix64 = \
src/Widget.cpp.posix64.o \
src/Window.cpp.posix64.o

OBJS_win32 = \
OBJS_win32 = \
src/App.cpp.win32.o \
src/Image.cpp.win32.o \
src/ImageAboutWindow.cpp.win32.o \
@@ -55,7 +55,7 @@ OBJS_win32 = \
src/Widget.cpp.win32.o \
src/Window.cpp.win32.o

OBJS_win64 = \
OBJS_win64 = \
src/App.cpp.win64.o \
src/Image.cpp.win64.o \
src/ImageAboutWindow.cpp.win64.o \
@@ -67,7 +67,7 @@ OBJS_win64 = \
src/Window.cpp.win64.o

ifeq ($(MACOS),true)
OBJS += src/pugl/pugl_osx_extended.m.o
OBJS += src/pugl/pugl_osx_extended.m.o
OBJS_posix32 += src/pugl/pugl_osx_extended.m.posix32.o
OBJS_posix64 += src/pugl/pugl_osx_extended.m.posix64.o
endif
@@ -99,13 +99,13 @@ win64: ../../dgl.win64.a
$(AR) rs $@ $^

../../dgl.dll: $(OBJS)
$(CXX) $^ -shared $(LINK_FLAGS) -lopengl32 -lgdi32 -o $@
$(CXX) $^ -shared $(LINK_FLAGS) -lopengl32 -lgdi32 -o $@ $(CMD_STRIP) $@

../../dgl.dylib: $(OBJS)
$(CXX) $^ -shared $(LINK_FLAGS) -framework OpenGL -framework Cocoa -o $@
$(CXX) $^ -dynamiclib $(LINK_FLAGS) -framework OpenGL -framework Cocoa -o $@ $(CMD_STRIP) $@

../../dgl.so: $(OBJS)
$(CXX) $^ -shared $(LINK_FLAGS) -lGL -lX11 -o $@
$(CXX) $^ -shared $(LINK_FLAGS) -lGL -lX11 -o $@ $(CMD_STRIP) $@

# --------------------------------------------------------------



+ 15
- 15
source/modules/distrho/dgl/StandaloneWindow.hpp View File

@@ -2,20 +2,20 @@
* DISTRHO Plugin Toolkit (DPT)
* Copyright (C) 2012-2013 Filipe Coelho <falktx@falktx.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation.
* 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
* permission notice appear in all copies.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* For a full copy of the license see the LGPL.txt file
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD
* TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN
* NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
* DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
* IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/

#ifndef __DGL_STANDALONE_WINDOW_HPP__
#define __DGL_STANDALONE_WINDOW_HPP__
#ifndef DGL_STANDALONE_WINDOW_HPP_INCLUDED
#define DGL_STANDALONE_WINDOW_HPP_INCLUDED

#include "App.hpp"
#include "Widget.hpp"
@@ -23,7 +23,7 @@

START_NAMESPACE_DGL

// -------------------------------------------------
// -----------------------------------------------------------------------

class StandaloneWindow
{
@@ -50,7 +50,7 @@ public:
fApp.exec();
}

// ----------------------------------------------------
// -------------------------------------------------------------------
// helpers

void setSize(unsigned int width, unsigned int height)
@@ -68,8 +68,8 @@ private:
Window fWindow;
};

// -------------------------------------------------
// -----------------------------------------------------------------------

END_NAMESPACE_DGL

#endif // __DGL_STANDALONE_WINDOW_HPP__
#endif // DGL_STANDALONE_WINDOW_HPP_INCLUDED

+ 14
- 14
source/modules/distrho/dgl/Widget.hpp View File

@@ -2,20 +2,20 @@
* DISTRHO Plugin Toolkit (DPT)
* Copyright (C) 2012-2013 Filipe Coelho <falktx@falktx.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation.
* 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
* permission notice appear in all copies.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* For a full copy of the license see the LGPL.txt file
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD
* TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN
* NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
* DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
* IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/

#ifndef __DGL_WIDGET_HPP__
#define __DGL_WIDGET_HPP__
#ifndef DGL_WIDGET_HPP_INCLUDED
#define DGL_WIDGET_HPP_INCLUDED

#include "Geometry.hpp"

@@ -27,7 +27,7 @@

START_NAMESPACE_DGL

// -------------------------------------------------
// -----------------------------------------------------------------------

class App;
class Window;
@@ -98,8 +98,8 @@ private:
friend class Window;
};

// -------------------------------------------------
// -----------------------------------------------------------------------

END_NAMESPACE_DGL

#endif // __DGL_WIDGET_HPP__
#endif // DGL_WIDGET_HPP_INCLUDED

+ 14
- 14
source/modules/distrho/dgl/Window.hpp View File

@@ -2,26 +2,26 @@
* DISTRHO Plugin Toolkit (DPT)
* Copyright (C) 2012-2013 Filipe Coelho <falktx@falktx.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation.
* 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
* permission notice appear in all copies.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* For a full copy of the license see the LGPL.txt file
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD
* TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN
* NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
* DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
* IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/

#ifndef __DGL_WINDOW_HPP__
#define __DGL_WINDOW_HPP__
#ifndef DGL_WINDOW_HPP_INCLUDED
#define DGL_WINDOW_HPP_INCLUDED

#include "Base.hpp"

START_NAMESPACE_DGL

// -------------------------------------------------
// -----------------------------------------------------------------------

class App;
class Widget;
@@ -60,8 +60,8 @@ private:
Private* const kPrivate;
};

// -------------------------------------------------
// -----------------------------------------------------------------------

END_NAMESPACE_DGL

#endif // __DGL_WINDOW_HPP__
#endif // DGL_WINDOW_HPP_INCLUDED

+ 11
- 11
source/modules/distrho/dgl/src/App.cpp View File

@@ -2,16 +2,16 @@
* DISTRHO Plugin Toolkit (DPT)
* Copyright (C) 2012-2013 Filipe Coelho <falktx@falktx.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation.
* 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
* permission notice appear in all copies.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* For a full copy of the license see the LGPL.txt file
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD
* TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN
* NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
* DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
* IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/

#include "AppPrivate.hpp"
@@ -20,7 +20,7 @@

START_NAMESPACE_DGL

// -------------------------------------------------
// -----------------------------------------------------------------------

App::App()
: kPrivate(new Private)
@@ -66,6 +66,6 @@ bool App::isQuiting() const
return !kPrivate->fDoLoop;
}

// -------------------------------------------------
// -----------------------------------------------------------------------

END_NAMESPACE_DGL

+ 14
- 14
source/modules/distrho/dgl/src/AppPrivate.hpp View File

@@ -2,20 +2,20 @@
* DISTRHO Plugin Toolkit (DPT)
* Copyright (C) 2012-2013 Filipe Coelho <falktx@falktx.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation.
* 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
* permission notice appear in all copies.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* For a full copy of the license see the LGPL.txt file
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD
* TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN
* NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
* DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
* IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/

#ifndef __APP_PRIVATE_HPP__
#define __APP_PRIVATE_HPP__
#ifndef APP_PRIVATE_HPP_INCLUDED
#define APP_PRIVATE_HPP_INCLUDED

#include "../App.hpp"

@@ -23,7 +23,7 @@

START_NAMESPACE_DGL

// -------------------------------------------------
// -----------------------------------------------------------------------

class Window;

@@ -78,8 +78,8 @@ private:
friend class App;
};

// -------------------------------------------------
// -----------------------------------------------------------------------

END_NAMESPACE_DGL

#endif // __APP_PRIVATE_HPP__
#endif // APP_PRIVATE_HPP_INCLUDED

+ 14
- 14
source/modules/distrho/dgl/src/Geometry.cpp View File

@@ -2,23 +2,23 @@
* DISTRHO Plugin Toolkit (DPT)
* Copyright (C) 2012-2013 Filipe Coelho <falktx@falktx.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation.
* 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
* permission notice appear in all copies.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* For a full copy of the license see the LGPL.txt file
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD
* TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN
* NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
* DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
* IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/

#include "../Geometry.hpp"

START_NAMESPACE_DGL

// -------------------------------------------------
// -----------------------------------------------------------------------
// Point

template<typename T>
@@ -116,7 +116,7 @@ bool Point<T>::operator!=(const Point<T>& pos) const
return !operator==(pos);
}

// -------------------------------------------------
// -----------------------------------------------------------------------
// Size

template<typename T>
@@ -216,7 +216,7 @@ bool Size<T>::operator!=(const Size<T>& size) const
return !operator==(size);
}

// -------------------------------------------------
// -----------------------------------------------------------------------
// Rectangle

template<typename T>
@@ -392,7 +392,7 @@ Rectangle<T>& Rectangle<T>::operator=(const Rectangle<T>& rect)
return *this;
}

// -------------------------------------------------
// -----------------------------------------------------------------------
// Possible template data types

template class Point<int>;
@@ -410,7 +410,7 @@ template class Rectangle<long>;
template class Rectangle<float>;
template class Rectangle<double>;

// -------------------------------------------------
// -----------------------------------------------------------------------

END_NAMESPACE_DGL


+ 11
- 11
source/modules/distrho/dgl/src/Image.cpp View File

@@ -2,23 +2,23 @@
* DISTRHO Plugin Toolkit (DPT)
* Copyright (C) 2012-2013 Filipe Coelho <falktx@falktx.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation.
* 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
* permission notice appear in all copies.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* For a full copy of the license see the LGPL.txt file
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD
* TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN
* NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
* DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
* IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/

#include "../Image.hpp"

START_NAMESPACE_DGL

// -------------------------------------------------
// -----------------------------------------------------------------------

Image::Image()
: fRawData(nullptr),
@@ -140,6 +140,6 @@ bool Image::operator!=(const Image& image) const
return (fRawData != image.fRawData);
}

// -------------------------------------------------
// -----------------------------------------------------------------------

END_NAMESPACE_DGL

+ 11
- 11
source/modules/distrho/dgl/src/ImageAboutWindow.cpp View File

@@ -2,16 +2,16 @@
* DISTRHO Plugin Toolkit (DPT)
* Copyright (C) 2012-2013 Filipe Coelho <falktx@falktx.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation.
* 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
* permission notice appear in all copies.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* For a full copy of the license see the LGPL.txt file
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD
* TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN
* NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
* DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
* IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/

#include "../ImageAboutWindow.hpp"
@@ -25,7 +25,7 @@

START_NAMESPACE_DGL

// -------------------------------------------------
// -----------------------------------------------------------------------

ImageAboutWindow::ImageAboutWindow(App* app, Window* parent, const Image& image)
: Window(app, parent),
@@ -78,6 +78,6 @@ bool ImageAboutWindow::onKeyboard(bool press, uint32_t key)
return false;
}

// -------------------------------------------------
// -----------------------------------------------------------------------

END_NAMESPACE_DGL

+ 11
- 11
source/modules/distrho/dgl/src/ImageButton.cpp View File

@@ -2,16 +2,16 @@
* DISTRHO Plugin Toolkit (DPT)
* Copyright (C) 2012-2013 Filipe Coelho <falktx@falktx.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation.
* 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
* permission notice appear in all copies.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* For a full copy of the license see the LGPL.txt file
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD
* TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN
* NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
* DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
* IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/

#include "../ImageButton.hpp"
@@ -20,7 +20,7 @@

START_NAMESPACE_DGL

// -------------------------------------------------
// -----------------------------------------------------------------------

ImageButton::ImageButton(Window* parent, const Image& image)
: Widget(parent),
@@ -168,6 +168,6 @@ bool ImageButton::onMotion(int x, int y)
}
}

// -------------------------------------------------
// -----------------------------------------------------------------------

END_NAMESPACE_DGL

+ 11
- 11
source/modules/distrho/dgl/src/ImageKnob.cpp View File

@@ -2,16 +2,16 @@
* DISTRHO Plugin Toolkit (DPT)
* Copyright (C) 2012-2013 Filipe Coelho <falktx@falktx.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation.
* 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
* permission notice appear in all copies.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* For a full copy of the license see the LGPL.txt file
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD
* TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN
* NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
* DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
* IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/

#include "../ImageKnob.hpp"
@@ -21,7 +21,7 @@

START_NAMESPACE_DGL

// -------------------------------------------------
// -----------------------------------------------------------------------

ImageKnob::ImageKnob(Window* parent, const Image& image, Orientation orientation)
: Widget(parent),
@@ -335,6 +335,6 @@ void ImageKnob::onClose()
setRotationAngle(0);
}

// -------------------------------------------------
// -----------------------------------------------------------------------

END_NAMESPACE_DGL

+ 11
- 11
source/modules/distrho/dgl/src/ImageSlider.cpp View File

@@ -2,23 +2,23 @@
* DISTRHO Plugin Toolkit (DPT)
* Copyright (C) 2012-2013 Filipe Coelho <falktx@falktx.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation.
* 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
* permission notice appear in all copies.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* For a full copy of the license see the LGPL.txt file
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD
* TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN
* NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
* DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
* IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/

#include "../ImageSlider.hpp"

START_NAMESPACE_DGL

// -------------------------------------------------
// -----------------------------------------------------------------------

ImageSlider::ImageSlider(Window* parent, const Image& image)
: Widget(parent),
@@ -311,6 +311,6 @@ void ImageSlider::_recheckArea()
}
}

// -------------------------------------------------
// -----------------------------------------------------------------------

END_NAMESPACE_DGL

+ 11
- 11
source/modules/distrho/dgl/src/Widget.cpp View File

@@ -2,16 +2,16 @@
* DISTRHO Plugin Toolkit (DPT)
* Copyright (C) 2012-2013 Filipe Coelho <falktx@falktx.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation.
* 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
* permission notice appear in all copies.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* For a full copy of the license see the LGPL.txt file
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD
* TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN
* NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
* DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
* IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/

#include "../App.hpp"
@@ -22,7 +22,7 @@

START_NAMESPACE_DGL

// -------------------------------------------------
// -----------------------------------------------------------------------
// Widget

Widget::Widget(Window* parent)
@@ -229,6 +229,6 @@ void Widget::onClose()
{
}

// -------------------------------------------------
// -----------------------------------------------------------------------

END_NAMESPACE_DGL

+ 12
- 12
source/modules/distrho/dgl/src/Window.cpp View File

@@ -2,16 +2,16 @@
* DISTRHO Plugin Toolkit (DPT)
* Copyright (C) 2012-2013 Filipe Coelho <falktx@falktx.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation.
* 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
* permission notice appear in all copies.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* For a full copy of the license see the LGPL.txt file
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD
* TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN
* NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
* DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
* IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/

#include "AppPrivate.hpp"
@@ -47,7 +47,7 @@ START_NAMESPACE_DGL

Window* dgl_lastUiParent = nullptr;

// -------------------------------------------------
// -----------------------------------------------------------------------
// Window Private

class Window::Private
@@ -563,7 +563,7 @@ private:
#undef handlePtr
};

// -------------------------------------------------
// -----------------------------------------------------------------------
// Window

Window::Window(App* app, Window* parent)
@@ -668,6 +668,6 @@ void Window::close()
kPrivate->close();
}

// -------------------------------------------------
// -----------------------------------------------------------------------

END_NAMESPACE_DGL

+ 1
- 1
source/modules/distrho/dgl/src/pugl/pugl_osx_extended.h View File

@@ -1,6 +1,6 @@
/*
Copyright 2012 David Robillard <http://drobilla.net>
Copyright 2013 Fil...
Copyright 2013 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


+ 21
- 22
source/modules/distrho/dgl/src/pugl/pugl_osx_extended.m View File

@@ -1,6 +1,6 @@
/*
Copyright 2012 David Robillard <http://drobilla.net>
Copyright 2013 Fil...
Copyright 2013 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
@@ -25,41 +25,40 @@

void puglImplFocus(PuglView* view)
{
// TODO
// TODO
}

void puglImplSetSize(PuglView* view, unsigned int width, unsigned int height)
{
id window = view->impl->window;
//id window = view->impl->window;

// TODO
// NSRect frame = [window frame];
// frame.size.width = width;
// frame.size.height = height;
// TODO
//NSRect frame = [window frame];
//frame.size.width = width;
//frame.size.height = height;

// display:NO ?
// [window setFrame:frame display:YES animate:NO];
// display:NO ?
//[window setFrame:frame display:YES animate:NO];
}

void puglImplSetTitle(PuglView* view, const char* title)
{
id window = view->impl->window;
NSString* titleString = [[NSString alloc]
initWithBytes:title
length:strlen(title)
encoding:NSUTF8StringEncoding];
id window = view->impl->window;

[window setTitle:titleString];
NSString* titleString = [[NSString alloc]
initWithBytes:title
length:strlen(title)
encoding:NSUTF8StringEncoding];

[window setTitle:titleString];
}

void puglImplSetVisible(PuglView* view, bool yesNo)
{
id window = view->impl->window;
id window = view->impl->window;

if (yesNo) {
[window setIsVisible:YES];
} else {
[window setIsVisible:NO];
}
if (yesNo)
[window setIsVisible:YES];
else
[window setIsVisible:NO];
}

+ 9
- 9
source/modules/lilv/lilv.c View File

@@ -2,16 +2,16 @@
* Carla static lilv code
* Copyright (C) 2012-2013 Filipe Coelho <falktx@falktx.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation.
* 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
* permission notice appear in all copies.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* For a full copy of the license see the LGPL.txt file
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD
* TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN
* NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
* DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
* IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/

#include "src/collections.c"


+ 9
- 9
source/modules/lilv/serd.c View File

@@ -2,16 +2,16 @@
* Carla static lilv code
* Copyright (C) 2012-2013 Filipe Coelho <falktx@falktx.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation.
* 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
* permission notice appear in all copies.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* For a full copy of the license see the LGPL.txt file
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD
* TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN
* NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
* DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
* IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/

#include "src/env.c"


+ 9
- 9
source/modules/lilv/sord.c View File

@@ -2,16 +2,16 @@
* Carla static lilv code
* Copyright (C) 2012-2013 Filipe Coelho <falktx@falktx.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation.
* 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
* permission notice appear in all copies.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* For a full copy of the license see the LGPL.txt file
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD
* TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN
* NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
* DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
* IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/

#include "src/sord.c"


+ 9
- 9
source/modules/lilv/sratom.c View File

@@ -2,16 +2,16 @@
* Carla static lilv code
* Copyright (C) 2012-2013 Filipe Coelho <falktx@falktx.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation.
* 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
* permission notice appear in all copies.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* For a full copy of the license see the LGPL.txt file
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD
* TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN
* NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
* DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
* IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/

#include "src/sratom.c"

+ 1
- 1
source/modules/rtmempool/rtmempool.c View File

@@ -366,7 +366,7 @@ void rtsafe_memory_pool_deallocate(RtMemPool_Handle handle, void* memoryPtr)
}

#ifdef WANT_LV2
#include "lv2/lv2_rtmempool.h"
# include "lv2/lv2_rtmempool.h"

void lv2_rtmempool_init(LV2_RtMemPool_Pool* poolPtr)
{


+ 59
- 25
source/modules/theme/Makefile View File

@@ -9,6 +9,7 @@ include ../Makefile.mk
# --------------------------------------------------------------

BUILD_CXX_FLAGS += -I. -I../includes -I../utils
QT5_CXX_FLAGS = $(BUILD_CXX_FLAGS)

ifeq ($(HAVE_QT4),true)
BUILD_CXX_FLAGS += $(shell pkg-config --cflags QtCore QtGui)
@@ -18,6 +19,10 @@ BUILD_CXX_FLAGS += $(shell pkg-config --cflags Qt5Core Qt5Gui Qt5Widgets)
LINK_FLAGS += $(shell pkg-config --libs Qt5Core Qt5Gui Qt5Widgets)
endif

ifeq ($(HAVE_QT5),true)
QT5_CXX_FLAGS += $(shell pkg-config --cflags Qt5Core Qt5Gui Qt5Widgets)
endif

# --------------------------------------------------------------

FILES = \
@@ -26,11 +31,23 @@ FILES = \
moc_CarlaStyleAnimations.cpp \
resources.cpp

OBJS = \
OBJS = \
moc_CarlaStyle.cpp.o \
moc_CarlaStyleAnimations.cpp.o \
moc_CarlaStylePrivate.cpp.o

OBJS_static = $(OBJS) \
CarlaStyle.cpp.o

OBJS_shared = $(OBJS) \
CarlaStyle.cpp.export.o

OBJS_qt5 = \
moc_CarlaStyle.cpp.qt5.o \
moc_CarlaStyleAnimations.cpp.qt5.o \
moc_CarlaStylePrivate.cpp.qt5.o \
CarlaStyle.cpp.qt5.o

OBJS_posix32 = \
moc_CarlaStyle.cpp.posix32.o \
moc_CarlaStyleAnimations.cpp.posix32.o \
@@ -55,56 +72,65 @@ OBJS_win64 = \
moc_CarlaStylePrivate.cpp.win64.o \
CarlaStyle.cpp.win64.o

OBJS_shared = $(OBJS) \
CarlaStyle.export.cpp.o
# --------------------------------------------------------------

OBJS_static = $(OBJS) \
CarlaStyle.cpp.o
all: ../theme.a

TARGET = ../libs/theme.a
posix32: ../rtmempool.posix32.a
posix64: ../rtmempool.posix64.a
win32: ../rtmempool.win32.a
win64: ../rtmempool.win64.a

# --------------------------------------------------------------

all: $(TARGET)
../theme.a: $(FILES) $(OBJS_static)
$(AR) rs $@ $(OBJS_static)

clean:
rm -f $(FILES) $(TARGET) *.o
../theme.qt5.a: $(FILES) $(OBJS_qt5)
$(AR) rs $@ $(OBJS_qt5)

debug:
$(MAKE) DEBUG=true
../theme.posix32.a: $(FILES) $(OBJS_posix32)
$(AR) rs $@ $(OBJS_posix32)

# --------------------------------------------------------------
../theme.posix64.a: $(FILES) $(OBJS_posix64)
$(AR) rs $@ $(OBJS_posix64)

$(TARGET): $(FILES) $(OBJS_static)
$(AR) rs $@ $(OBJS_static)
../theme.win32.a: $(FILES) $(OBJS_win32)
$(AR) rs $@ $(OBJS_win32)

carlastyle.dll: $(FILES) $(OBJS_shared)
$(CXX) $(OBJS_shared) $(LINK_FLAGS) -shared -o $@ $(CMD_STRIP) $@
../theme.win64.a: $(FILES) $(OBJS_win64)
$(AR) rs $@ $(OBJS_win64)

carlastyle.dynlib: $(FILES) $(OBJS_shared)
$(CXX) $(OBJS_shared) $(LINK_FLAGS) -dynamiclib -o $@ $(CMD_STRIP) $@
../carlastyle.dll: $(FILES) $(OBJS_shared)
$(CXX) $(OBJS_shared) -shared $(LINK_FLAGS) -o $@ $(CMD_STRIP) $@

carlastyle.so: $(FILES) $(OBJS_shared)
$(CXX) $(OBJS_shared) $(LINK_FLAGS) -shared -o $@ $(CMD_STRIP) $@
../carlastyle.dynlib: $(FILES) $(OBJS_shared)
$(CXX) $(OBJS_shared) -dynamiclib $(LINK_FLAGS) -o $@ $(CMD_STRIP) $@

../carlastyle.so: $(FILES) $(OBJS_shared)
$(CXX) $(OBJS_shared) -shared $(LINK_FLAGS) -o $@ $(CMD_STRIP) $@

# --------------------------------------------------------------

%.cpp.o: %.cpp CarlaStyle.hpp moc_CarlaStyle.cpp
$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@

%.export.cpp.o: %.cpp CarlaStyle.hpp moc_CarlaStyle.cpp
%.cpp.qt5.o: %.cpp CarlaStyle.hpp moc_CarlaStyle.cpp
$(CXX) $< $(QT5_CXX_FLAGS) -c -o $@

%.cpp.export.o: %.cpp CarlaStyle.hpp moc_CarlaStyle.cpp
$(CXX) $< $(BUILD_CXX_FLAGS) -DCARLA_EXPORT_STYLE -c -o $@

%.cpp.posix32.o: %.cpp
%.cpp.posix32.o: %.cpp CarlaStyle.hpp moc_CarlaStyle.cpp
$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -c -o $@

%.cpp.posix64.o: %.cpp
%.cpp.posix64.o: %.cpp CarlaStyle.hpp moc_CarlaStyle.cpp
$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@

%.cpp.win32.o: %.cpp
%.cpp.win32.o: %.cpp CarlaStyle.hpp moc_CarlaStyle.cpp
$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -c -o $@

%.cpp.win64.o: %.cpp
%.cpp.win64.o: %.cpp CarlaStyle.hpp moc_CarlaStyle.cpp
$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@

moc_%.cpp: %.hpp
@@ -112,3 +138,11 @@ moc_%.cpp: %.hpp

resources.cpp: ../../resources/resources-theme.qrc
$(RCC) $< -o $@

# --------------------------------------------------------------

clean:
rm -f *.o ../theme.* $(FILES)

debug:
$(MAKE) DEBUG=true

Loading…
Cancel
Save