Browse Source

Rename a file to prevent conflicts

Signed-off-by: falkTX <falktx@falktx.com>
tags/24.05
parent
commit
df0f1ac1db
10 changed files with 21 additions and 19 deletions
  1. +6
    -4
      src/CardinalCommon.cpp
  2. +1
    -1
      src/CardinalPlugin.cpp
  3. +0
    -0
      src/CardinalPluginContext.hpp
  4. +2
    -2
      src/CardinalRemote.cpp
  5. +2
    -2
      src/CardinalRemote/RemoteUI.hpp
  6. +2
    -2
      src/CardinalRemote/main.cpp
  7. +2
    -2
      src/CardinalUI.cpp
  8. +2
    -2
      src/custom/glfw.cpp
  9. +2
    -2
      src/override/MenuBar.cpp
  10. +2
    -2
      src/override/Window.cpp

+ 6
- 4
src/CardinalCommon.cpp View File

@@ -17,7 +17,7 @@
#include "CardinalCommon.hpp" #include "CardinalCommon.hpp"


#include "AsyncDialog.hpp" #include "AsyncDialog.hpp"
#include "PluginContext.hpp"
#include "CardinalPluginContext.hpp"
#include "DistrhoPluginUtils.hpp" #include "DistrhoPluginUtils.hpp"


#include <asset.hpp> #include <asset.hpp>
@@ -162,9 +162,11 @@ CardinalPluginContext::CardinalPluginContext(Plugin* const p)
dataOuts(nullptr), dataOuts(nullptr),
midiEvents(nullptr), midiEvents(nullptr),
midiEventCount(0), midiEventCount(0),
plugin(p),
tlw(nullptr),
ui(nullptr)
plugin(p)
#ifndef HEADLESS
, tlw(nullptr)
, ui(nullptr)
#endif
{ {
std::memset(parameters, 0, sizeof(parameters)); std::memset(parameters, 0, sizeof(parameters));
} }


+ 1
- 1
src/CardinalPlugin.cpp View File

@@ -32,7 +32,7 @@
#include "CardinalCommon.hpp" #include "CardinalCommon.hpp"
#include "DistrhoPluginUtils.hpp" #include "DistrhoPluginUtils.hpp"
#include "PluginContext.hpp"
#include "CardinalPluginContext.hpp"
#include "extra/Base64.hpp" #include "extra/Base64.hpp"
#include "extra/ScopedDenormalDisable.hpp" #include "extra/ScopedDenormalDisable.hpp"
#include "extra/ScopedSafeLocale.hpp" #include "extra/ScopedSafeLocale.hpp"


src/PluginContext.hpp → src/CardinalPluginContext.hpp View File


+ 2
- 2
src/CardinalRemote.cpp View File

@@ -1,6 +1,6 @@
/* /*
* DISTRHO Cardinal Plugin * DISTRHO Cardinal Plugin
* Copyright (C) 2021-2022 Filipe Coelho <falktx@falktx.com>
* Copyright (C) 2021-2024 Filipe Coelho <falktx@falktx.com>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as * modify it under the terms of the GNU General Public License as
@@ -24,7 +24,7 @@
#endif #endif


#include "CardinalRemote.hpp" #include "CardinalRemote.hpp"
#include "PluginContext.hpp"
#include "CardinalPluginContext.hpp"
#include "extra/Base64.hpp" #include "extra/Base64.hpp"
#include "extra/ScopedSafeLocale.hpp" #include "extra/ScopedSafeLocale.hpp"




+ 2
- 2
src/CardinalRemote/RemoteUI.hpp View File

@@ -1,6 +1,6 @@
/* /*
* DISTRHO Cardinal Plugin * DISTRHO Cardinal Plugin
* Copyright (C) 2021-2022 Filipe Coelho <falktx@falktx.com>
* Copyright (C) 2021-2024 Filipe Coelho <falktx@falktx.com>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as * modify it under the terms of the GNU General Public License as
@@ -18,7 +18,7 @@
#pragma once #pragma once


#include "NanoVG.hpp" #include "NanoVG.hpp"
#include "PluginContext.hpp"
#include "CardinalPluginContext.hpp"
#include "WindowParameters.hpp" #include "WindowParameters.hpp"


#include <widget/Widget.hpp> #include <widget/Widget.hpp>


+ 2
- 2
src/CardinalRemote/main.cpp View File

@@ -1,6 +1,6 @@
/* /*
* DISTRHO Cardinal Plugin * DISTRHO Cardinal Plugin
* Copyright (C) 2021-2022 Filipe Coelho <falktx@falktx.com>
* Copyright (C) 2021-2024 Filipe Coelho <falktx@falktx.com>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as * modify it under the terms of the GNU General Public License as
@@ -30,7 +30,7 @@
#include <engine/Engine.hpp> #include <engine/Engine.hpp>
#include <ui/common.hpp> #include <ui/common.hpp>


#include "PluginContext.hpp"
#include "CardinalPluginContext.hpp"
#include "extra/ScopedValueSetter.hpp" #include "extra/ScopedValueSetter.hpp"


#define CARDINAL_TEMPLATE_NAME "init/main.vcv" #define CARDINAL_TEMPLATE_NAME "init/main.vcv"


+ 2
- 2
src/CardinalUI.cpp View File

@@ -1,6 +1,6 @@
/* /*
* DISTRHO Cardinal Plugin * DISTRHO Cardinal Plugin
* Copyright (C) 2021-2023 Filipe Coelho <falktx@falktx.com>
* Copyright (C) 2021-2024 Filipe Coelho <falktx@falktx.com>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as * modify it under the terms of the GNU General Public License as
@@ -49,7 +49,7 @@
#include "Application.hpp" #include "Application.hpp"
#include "AsyncDialog.hpp" #include "AsyncDialog.hpp"
#include "CardinalCommon.hpp" #include "CardinalCommon.hpp"
#include "PluginContext.hpp"
#include "CardinalPluginContext.hpp"
#include "WindowParameters.hpp" #include "WindowParameters.hpp"
#include "extra/Base64.hpp" #include "extra/Base64.hpp"




+ 2
- 2
src/custom/glfw.cpp View File

@@ -1,6 +1,6 @@
/* /*
* DISTRHO Cardinal Plugin * DISTRHO Cardinal Plugin
* Copyright (C) 2021-2023 Filipe Coelho <falktx@falktx.com>
* Copyright (C) 2021-2024 Filipe Coelho <falktx@falktx.com>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as * modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
*/ */


#include "Application.hpp" #include "Application.hpp"
#include "PluginContext.hpp"
#include "CardinalPluginContext.hpp"


#include <GLFW/glfw3.h> #include <GLFW/glfw3.h>




+ 2
- 2
src/override/MenuBar.cpp View File

@@ -1,6 +1,6 @@
/* /*
* DISTRHO Cardinal Plugin * DISTRHO Cardinal Plugin
* Copyright (C) 2021-2023 Filipe Coelho <falktx@falktx.com>
* Copyright (C) 2021-2024 Filipe Coelho <falktx@falktx.com>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as * modify it under the terms of the GNU General Public License as
@@ -53,7 +53,7 @@


#include "../CardinalCommon.hpp" #include "../CardinalCommon.hpp"
#include "../CardinalRemote.hpp" #include "../CardinalRemote.hpp"
#include "../PluginContext.hpp"
#include "../CardinalPluginContext.hpp"
#include "DistrhoPlugin.hpp" #include "DistrhoPlugin.hpp"
#include "DistrhoStandaloneUtils.hpp" #include "DistrhoStandaloneUtils.hpp"




+ 2
- 2
src/override/Window.cpp View File

@@ -1,6 +1,6 @@
/* /*
* DISTRHO Cardinal Plugin * DISTRHO Cardinal Plugin
* Copyright (C) 2021-2023 Filipe Coelho <falktx@falktx.com>
* Copyright (C) 2021-2024 Filipe Coelho <falktx@falktx.com>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as * modify it under the terms of the GNU General Public License as
@@ -46,7 +46,7 @@
#include "Application.hpp" #include "Application.hpp"
#include "extra/String.hpp" #include "extra/String.hpp"
#include "../CardinalCommon.hpp" #include "../CardinalCommon.hpp"
#include "../PluginContext.hpp"
#include "../CardinalPluginContext.hpp"
#include "../WindowParameters.hpp" #include "../WindowParameters.hpp"


#ifndef DGL_NO_SHARED_RESOURCES #ifndef DGL_NO_SHARED_RESOURCES


Loading…
Cancel
Save