Browse Source

Make sure plugins do not use osdialog, add Lilac implementation

Signed-off-by: falkTX <falktx@falktx.com>
tags/22.06
falkTX 2 weeks ago
parent
commit
83ba2ca091
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
4 changed files with 62 additions and 6 deletions
  1. +51
    -0
      include/osdialog-stub/osdialog.h
  2. +1
    -1
      plugins/LilacLoop
  3. +4
    -4
      plugins/Makefile
  4. +6
    -1
      src/custom/osdialog.cpp

+ 51
- 0
include/osdialog-stub/osdialog.h View File

@@ -0,0 +1,51 @@
/*
* DISTRHO Cardinal Plugin
* Copyright (C) 2021-2022 Filipe Coelho <falktx@falktx.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 3 of
* the License, or any later version.
*
* 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 General Public License for more details.
*
* For a full copy of the GNU General Public License see the LICENSE file.
*/

/**
* This file is an edited version of osdialog.h
* Originally licensed under CC0 1.0 Universal.
*/

#pragma once

#ifdef __cplusplus
extern "C" {
#endif

#include <stdint.h>
#include <stddef.h>

/** Linked list of patterns. */
typedef struct osdialog_filter_patterns {
char* pattern;
struct osdialog_filter_patterns* next;
} osdialog_filter_patterns;

/** Linked list of file filters. */
typedef struct osdialog_filters {
char* name;
osdialog_filter_patterns* patterns;
struct osdialog_filters* next;
} osdialog_filters;

/** Parses a filter string. */
static inline osdialog_filters* osdialog_filters_parse(const char* str) { return NULL; }
static inline void osdialog_filters_free(osdialog_filters* filters) {}

#ifdef __cplusplus
}
#endif

+ 1
- 1
plugins/LilacLoop

@@ -1 +1 @@
Subproject commit 69d8d66521175cd561d53e65728d460b398950c9
Subproject commit bc9d468cccb0031e74166a5fc53479fcdc1c9f95

+ 4
- 4
plugins/Makefile View File

@@ -908,9 +908,9 @@ PLUGIN_FILES += $(filter-out ZetaCarinaeModules/src/plugin.cpp,$(wildcard ZetaCa
# --------------------------------------------------------------
# ZZC

PLUGIN_FILES += $(filter-out ZZC/src/ZZC.cpp,$(wildcard ZZC/src/*.cpp))
PLUGIN_FILES += ZZC/src/dsp/Wavetable.cpp
PLUGIN_FILES += ZZC/src/filetypes/WavSupport.cpp
PLUGIN_FILES += $(filter-out ZZC/src/ZZC.cpp ZZC/src/WavetablePlayer.cpp,$(wildcard ZZC/src/*.cpp))
# PLUGIN_FILES += ZZC/src/dsp/Wavetable.cpp
# PLUGIN_FILES += ZZC/src/filetypes/WavSupport.cpp

# modules/types which are present in other plugins
ZZC_CUSTOM = Clock LowFrequencyOscillator
@@ -938,6 +938,7 @@ BASE_FLAGS += -I../dpf/distrho

BASE_FLAGS += -I../include
BASE_FLAGS += -I../include/neon-compat
BASE_FLAGS += -I../include/osdialog-stub

ifeq ($(HAVE_X11),true)
BASE_FLAGS += -DHAVE_X11
@@ -959,7 +960,6 @@ BASE_FLAGS += -I../src/Rack/dep/filesystem/include
# # BASE_FLAGS += -I../src/Rack/dep/fuzzysearchdatabase/src
BASE_FLAGS += -I../src/Rack/dep/glfw/include
BASE_FLAGS += -I../src/Rack/dep/nanosvg/src
BASE_FLAGS += -I../src/Rack/dep/osdialog
BASE_FLAGS += -I../src/Rack/dep/oui-blendish
BASE_FLAGS += -I../src/Rack/dep/pffft



+ 6
- 1
src/custom/osdialog.cpp View File

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

#include <osdialog.h>

#include "DistrhoUtils.hpp"

char* osdialog_file(osdialog_file_action action, const char* path, const char* filename, osdialog_filters* filters)
{
d_stderr2("[Cardinal] osdialog_file called %d %s %s", action, path, filename);
return nullptr;
}

int osdialog_message(osdialog_message_level level, osdialog_message_buttons buttons, const char* message)
{
d_stderr2("[Cardinal] osdialog_message called %d %d %s", level, buttons, message);
return 0;
}

char* osdialog_prompt(osdialog_message_level level, const char* message, const char* text)
{
d_stderr2("[Cardinal] osdialog_prompt called %d %s %s", level, message, text);
return nullptr;
}

Loading…
Cancel
Save