Skip to content

Commit

Permalink
Remove juce completely, cleanup
Browse files Browse the repository at this point in the history 
Signed-off-by: falkTX <falktx@falktx.com>
  • Loading branch information
@falkTX
falkTX committed Apr 21, 2024
1 parent dfc7a12 commit 6f61b89
Show file tree
Hide file tree
Showing 1,538 changed files with 98 additions and 610,802 deletions.
15 changes: 0 additions & 15 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,21 +82,6 @@ ifeq ($(HAVE_YSFX),true)
3RD_LIBS += $(MODULEDIR)/ysfx.a
endif

ifeq ($(USING_JUCE),true)
3RD_LIBS += $(MODULEDIR)/carla_juce.a
3RD_LIBS += $(MODULEDIR)/juce_audio_basics.a
ifeq ($(USING_JUCE_AUDIO_DEVICES),true)
3RD_LIBS += $(MODULEDIR)/juce_audio_devices.a
endif
3RD_LIBS += $(MODULEDIR)/juce_audio_processors.a
3RD_LIBS += $(MODULEDIR)/juce_core.a
3RD_LIBS += $(MODULEDIR)/juce_data_structures.a
3RD_LIBS += $(MODULEDIR)/juce_events.a
3RD_LIBS += $(MODULEDIR)/juce_graphics.a
3RD_LIBS += $(MODULEDIR)/juce_gui_basics.a
3RD_LIBS += $(MODULEDIR)/juce_gui_extra.a
endif

ifeq ($(USING_RTAUDIO),true)
3RD_LIBS += $(MODULEDIR)/rtaudio.a
3RD_LIBS += $(MODULEDIR)/rtmidi.a
Expand Down
28 changes: 6 additions & 22 deletions Makefile.print.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,26 +41,20 @@ else
endif
ifeq ($(HAVE_HYLIA),true)
@printf -- "Link support: $(ANS_YES)\n"
else
ifeq ($(MACOS_OLD),true)
@printf -- "Link support: $(ANS_NO) $(mZ)MacOS >= 10.8 only$(mE)\n"
else
@printf -- "Link support: $(ANS_NO) $(mZ)Linux, MacOS and Windows only$(mE)\n"
endif
endif
ifeq ($(HAVE_LIBLO),true)
@printf -- "OSC support: $(ANS_YES)\n"
else
@printf -- "OSC support: $(ANS_NO) $(mS)Missing liblo$(mE)\n"
endif
ifeq ($(WINDOWS),true)
@printf -- "Binary detect: $(ANS_YES)\n"
else
ifeq ($(HAVE_LIBMAGIC),true)
else ifeq ($(HAVE_LIBMAGIC),true)
@printf -- "Binary detect: $(ANS_YES)\n"
else
@printf -- "Binary detect: $(ANS_NO) $(mS)Missing libmagic/file$(mE)\n"
endif
endif
@printf -- "\n"

Expand Down Expand Up @@ -94,11 +88,9 @@ else
@printf -- "CoreAudio: $(ANS_NO) $(mZ)MacOS only$(mE)\n"
endif
ifeq ($(WINDOWS),true)
@printf -- "ASIO: $(ANS_YES)\n"
@printf -- "DirectSound: $(ANS_YES)\n"
@printf -- "WASAPI: $(ANS_YES)\n"
else
@printf -- "ASIO: $(ANS_NO) $(mZ)Windows only$(mE)\n"
@printf -- "DirectSound: $(ANS_NO) $(mZ)Windows only$(mE)\n"
@printf -- "WASAPI: $(ANS_NO) $(mZ)Windows only$(mE)\n"
endif
Expand All @@ -118,26 +110,18 @@ endif
ifeq ($(MACOS_OR_WINDOWS),true)
@printf -- "VST2: $(ANS_YES) (with UI)\n"
@printf -- "VST3: $(ANS_YES) (with UI)\n"
else # MACOS_OR_WINDOWS
ifeq ($(HAIKU),true)
else ifeq ($(HAIKU),true)
@printf -- "VST2: $(ANS_YES) (without UI)\n"
@printf -- "VST3: $(ANS_YES) (without UI)\n"
else # HAIKU
ifeq ($(HAVE_X11),true)
else ifeq ($(HAVE_X11),true)
@printf -- "VST2: $(ANS_YES) (with UI)\n"
@printf -- "VST3: $(ANS_YES) (with UI)\n"
else # HAVE_X11
else
@printf -- "VST2: $(ANS_YES) (without UI) $(mS)Missing X11$(mE)\n"
@printf -- "VST3: $(ANS_YES) (without UI) $(mS)Missing X11$(mE)\n"
endif # HAVE_X11
endif # HAIKU
endif # MACOS_OR_WINDOWS
endif
ifeq ($(MACOS),true)
ifeq ($(USING_JUCE),true)
@printf -- "AU: $(ANS_YES) (with UI, using JUCE)\n"
else # USING_JUCE
@printf -- "AU: $(ANS_NO)\n"
endif # USING_JUCE
@printf -- "AU: $(ANS_YES) (with UI)\n"
else # MACOS
@printf -- "AU: $(ANS_NO) $(mZ)MacOS only$(mE)\n"
endif # MACOS
Expand Down
60 changes: 6 additions & 54 deletions source/Makefile.deps.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,7 @@ HAVE_QT4 = $(shell $(PKG_CONFIG) --exists QtCore QtGui && echo true)
HAVE_QT5 = $(shell $(PKG_CONFIG) --exists Qt5Core Qt5Gui Qt5Widgets && \
$(PKG_CONFIG) --variable=qt_config Qt5Core | grep -q -v "static" && echo true)
HAVE_QT5PKG = $(shell $(PKG_CONFIG) --silence-errors --variable=prefix Qt5OpenGLExtensions 1>/dev/null && echo true)
HAVE_QT5BREW = $(shell test -e /usr/local/opt/qt5/bin/uic && echo true)
HAVE_SNDFILE = $(shell $(PKG_CONFIG) --exists sndfile && echo true)

ifeq ($(HAVE_FLUIDSYNTH),true)
Expand Down Expand Up @@ -276,6 +277,8 @@ ifeq ($(HAVE_QT5),true)
QT5_HOSTBINS = $(shell $(PKG_CONFIG) --variable=host_bins Qt5Core)
else ifeq ($(HAVE_QT5PKG),true)
QT5_HOSTBINS = $(shell $(PKG_CONFIG) --variable=prefix Qt5OpenGLExtensions)/bin
else ifeq ($(HAVE_QT5BREW),true)
QT5_HOSTBINS = /usr/local/opt/qt5/bin
endif

MOC_QT5 ?= $(QT5_HOSTBINS)/moc
Expand All @@ -301,7 +304,7 @@ else ifeq ($(WINDOWS),true)
HAVE_QT = true
endif

ifneq (,$(findstring true,$(HAVE_QT5)$(HAVE_QT5PKG)))
ifneq (,$(findstring true,$(HAVE_QT5)$(HAVE_QT5PKG)$(HAVE_QT5BREW)))
HAVE_THEME = true
endif

Expand All @@ -314,7 +317,7 @@ PYUIC5 ?= $(shell which pyuic5 2>/dev/null)
ifneq ($(PYUIC5),)
ifneq ($(PYRCC5),)
HAVE_PYQT = true
ifneq (,$(findstring true,$(HAVE_QT5)$(HAVE_QT5PKG)))
ifneq (,$(findstring true,$(HAVE_QT5)$(HAVE_QT5PKG)$(HAVE_QT5BREW)))
HAVE_FRONTEND = true
endif
endif
Expand All @@ -326,24 +329,14 @@ endif
PYRCC ?= $(PYRCC5)
PYUIC ?= $(PYUIC5)

# ---------------------------------------------------------------------------------------------------------------------
# Set USING_JUCE

ifeq ($(MACOS_OR_WINDOWS),true)
USING_JUCE = true
USING_JUCE_AUDIO_DEVICES = true
endif

# ---------------------------------------------------------------------------------------------------------------------
# Set USING_RTAUDIO

ifneq ($(HAIKU),true)
ifneq ($(WASM),true)
ifneq ($(USING_JUCE_AUDIO_DEVICES),true)
USING_RTAUDIO = true
endif
endif
endif

# ---------------------------------------------------------------------------------------------------------------------
# Disable features for static plugin target
Expand All @@ -360,11 +353,10 @@ HAVE_PYQT = false
HAVE_QT4 = false
HAVE_QT5 = false
HAVE_QT5PKG = false
HAVE_QT5BREW = false
HAVE_SDL = false
HAVE_SDL1 = false
HAVE_SDL2 = false
USING_JUCE = false
USING_JUCE_AUDIO_DEVICES = false
USING_RTAUDIO = false
endif

Expand Down Expand Up @@ -488,35 +480,6 @@ endif

endif

# ---------------------------------------------------------------------------------------------------------------------
# Set libs stuff (juce)

ifeq ($(USING_JUCE),true)

ifeq ($(MACOS),true)
JUCE_AUDIO_BASICS_LIBS = -framework Accelerate
JUCE_AUDIO_DEVICES_LIBS = -framework AppKit -framework AudioToolbox -framework CoreAudio -framework CoreMIDI
JUCE_AUDIO_FORMATS_LIBS = -framework AudioToolbox -framework CoreFoundation
JUCE_AUDIO_PROCESSORS_LIBS = -framework AudioToolbox -framework AudioUnit -framework CoreAudio -framework CoreAudioKit -framework Cocoa
JUCE_CORE_LIBS = -framework AppKit
JUCE_EVENTS_LIBS = -framework AppKit
JUCE_GRAPHICS_LIBS = -framework Cocoa -framework QuartzCore
JUCE_GUI_BASICS_LIBS = -framework Cocoa
JUCE_GUI_EXTRA_LIBS = -framework IOKit
else ifeq ($(WINDOWS),true)
JUCE_AUDIO_BASICS_LIBS =
JUCE_AUDIO_DEVICES_LIBS = -lwinmm -lole32
JUCE_AUDIO_FORMATS_LIBS =
JUCE_AUDIO_PROCESSORS_LIBS =
JUCE_CORE_LIBS = -luuid -lwsock32 -lwininet -lversion -lole32 -lws2_32 -loleaut32 -limm32 -lcomdlg32 -lshlwapi -lrpcrt4 -lwinmm
JUCE_EVENTS_LIBS = -lole32
JUCE_GRAPHICS_LIBS = -lgdi32
JUCE_GUI_BASICS_LIBS = -lgdi32 -limm32 -lcomdlg32 -lole32
JUCE_GUI_EXTRA_LIBS =
endif

endif

# ---------------------------------------------------------------------------------------------------------------------
# Set libs stuff (rtaudio)

Expand Down Expand Up @@ -650,17 +613,6 @@ STATIC_CARLA_PLUGIN_LIBS += $(RTMEMPOOL_LIBS)
STATIC_CARLA_PLUGIN_LIBS += $(WATER_LIBS)
STATIC_CARLA_PLUGIN_LIBS += $(YSFX_LIBS)

ifeq ($(USING_JUCE),true)
STATIC_CARLA_PLUGIN_LIBS += $(JUCE_AUDIO_BASICS_LIBS)
STATIC_CARLA_PLUGIN_LIBS += $(JUCE_AUDIO_FORMATS_LIBS)
STATIC_CARLA_PLUGIN_LIBS += $(JUCE_AUDIO_PROCESSORS_LIBS)
STATIC_CARLA_PLUGIN_LIBS += $(JUCE_CORE_LIBS)
STATIC_CARLA_PLUGIN_LIBS += $(JUCE_EVENTS_LIBS)
STATIC_CARLA_PLUGIN_LIBS += $(JUCE_GRAPHICS_LIBS)
STATIC_CARLA_PLUGIN_LIBS += $(JUCE_GUI_BASICS_LIBS)
STATIC_CARLA_PLUGIN_LIBS += $(JUCE_GUI_EXTRA_LIBS)
endif

ifeq ($(EXTERNAL_PLUGINS),true)
ifneq ($(DEBUG),true)
ifneq ($(TESTBUILD),true)
Expand Down
12 changes: 0 additions & 12 deletions source/Makefile.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -237,18 +237,6 @@ ifeq ($(HAVE_YSFX),true)
BASE_FLAGS += -DHAVE_YSFX
endif

ifeq ($(USING_JUCE),true)
BASE_FLAGS += -DUSING_JUCE
BASE_FLAGS += -DJUCE_APP_CONFIG_HEADER='"AppConfig.h"'
ifeq ($(WINDOWS),true)
BASE_FLAGS += -D_WIN32_WINNT=0x0600
endif
endif

ifeq ($(USING_JUCE_AUDIO_DEVICES),true)
BASE_FLAGS += -DUSING_JUCE_AUDIO_DEVICES
endif

ifeq ($(USING_RTAUDIO),true)
BASE_FLAGS += -DUSING_RTAUDIO
endif
Expand Down
33 changes: 7 additions & 26 deletions source/backend/CarlaEngine.hpp
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,5 @@
/*
* Carla Plugin Host
* Copyright (C) 2011-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 2 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 doc/GPL.txt file.
*/
// SPDX-FileCopyrightText: 2011-2024 Filipe Coelho <falktx@falktx.com>
// SPDX-License-Identifier: GPL-2.0-or-later

#ifndef CARLA_ENGINE_HPP_INCLUDED
#define CARLA_ENGINE_HPP_INCLUDED
Expand Down Expand Up @@ -52,35 +38,30 @@ enum EngineType {
*/
kEngineTypeJack = 1,

/*!
* JUCE engine type, used to provide Native Audio and MIDI support.
*/
kEngineTypeJuce = 2,

/*!
* RtAudio engine type, used to provide Native Audio and MIDI support.
*/
kEngineTypeRtAudio = 3,
kEngineTypeRtAudio = 2,

/*!
* SDL engine type, used to provide Native Audio support.
*/
kEngineTypeSDL = 4,
kEngineTypeSDL = 3,

/*!
* Plugin engine type, used to export the engine as a plugin.
*/
kEngineTypePlugin = 5,
kEngineTypePlugin = 4,

/*!
* Bridge engine type, used in BridgePlugin class.
*/
kEngineTypeBridge = 6,
kEngineTypeBridge = 5,

/*!
* Dummy engine type, does not send audio or MIDI anywhere.
*/
kEngineTypeDummy = 7
kEngineTypeDummy = 6
};

/*!
Expand Down
26 changes: 2 additions & 24 deletions source/backend/CarlaEngineInit.hpp
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,5 @@
/*
* Carla Plugin Host
* Copyright (C) 2011-2020 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 2 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 doc/GPL.txt file.
*/
// SPDX-FileCopyrightText: 2011-2024 Filipe Coelho <falktx@falktx.com>
// SPDX-License-Identifier: GPL-2.0-or-later

#ifndef CARLA_ENGINE_INIT_HPP_INCLUDED
#define CARLA_ENGINE_INIT_HPP_INCLUDED
Expand Down Expand Up @@ -60,14 +46,6 @@ CarlaEngine* newBridge(const char* audioPoolBaseName,
const char* nonRtClientBaseName,
const char* nonRtServerBaseName);

// Juce
CarlaEngine* newJuce(AudioApi api);
uint getJuceApiCount();
const char* getJuceApiName(uint index);
const char* const* getJuceApiDeviceNames(uint index);
const EngineDriverDeviceInfo* getJuceDeviceInfo(uint index, const char* deviceName);
bool showJuceDeviceControlPanel(uint index, const char* deviceName);

// RtAudio
CarlaEngine* newRtAudio(AudioApi api);
uint getRtAudioApiCount();
Expand Down
23 changes: 2 additions & 21 deletions source/backend/CarlaHost.h
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,5 @@
/*
* Carla Plugin Host
* Copyright (C) 2011-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 2 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 doc/GPL.txt file.
*/
// SPDX-FileCopyrightText: 2011-2024 Filipe Coelho <falktx@falktx.com>
// SPDX-License-Identifier: GPL-2.0-or-later

#ifndef CARLA_HOST_H_INCLUDED
#define CARLA_HOST_H_INCLUDED
Expand Down Expand Up @@ -1173,11 +1159,6 @@ CARLA_API_EXPORT void carla_nsm_ready(CarlaHostHandle handle, NsmCallbackOpcode
*/
CARLA_API_EXPORT const char* carla_get_complete_license_text(void);

/*!
* Get the juce version used in the current Carla build.
*/
CARLA_API_EXPORT const char* carla_get_juce_version(void);

/*!
* Get the list of supported file extensions in carla_load_file().
*/
Expand Down
Loading

0 comments on commit 6f61b89

Please sign in to comment.