Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix deprecation warnings, force xcb usage on linux
Signed-off-by: falkTX <falktx@falktx.com>
  • Loading branch information
falkTX committed Sep 3, 2023
1 parent ada98a6 commit 3c5793b
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
2 changes: 1 addition & 1 deletion carla
Submodule carla updated 73 files
+2 −7 .github/workflows/build.yml
+42 −10 .github/workflows/cmake.yml
+1 −7 .github/workflows/dpf.yml
+1 −7 .github/workflows/release.yml
+2 −7 .github/workflows/wine.yml.disabled
+1 −1 Makefile
+396 −63 cmake/CMakeLists.txt
+35 −0 cmake/Info-framework.plist.in
+3 −3 cmake/carla-utils.pc.in
+2 −2 source/Makefile.mk
+0 −1 source/backend/CarlaBackend.h
+10 −8 source/backend/CarlaStandaloneNSM.cpp
+137 −114 source/backend/CarlaUtils.h
+24 −1 source/backend/Makefile
+1 −1 source/backend/engine/CarlaEngine.cpp
+27 −27 source/backend/engine/CarlaEngineNative.cpp
+2 −2 source/backend/engine/Makefile
+27 −25 source/backend/plugin/CarlaPluginBridge.cpp
+29 −11 source/backend/plugin/CarlaPluginCLAP.cpp
+42 −36 source/backend/plugin/CarlaPluginLADSPADSSI.cpp
+8 −6 source/backend/plugin/CarlaPluginLV2.cpp
+8 −4 source/backend/plugin/CarlaPluginVST2.cpp
+228 −62 source/backend/plugin/CarlaPluginVST3.cpp
+1 −0 source/backend/utils/Makefile
+17 −5 source/backend/utils/PipeClient.cpp
+206 −31 source/backend/utils/PluginDiscovery.cpp
+10 −5 source/discovery/Makefile
+45 −2 source/discovery/carla-discovery.cpp
+25 −7 source/frontend/CarlaFrontend.h
+33 −10 source/frontend/carla_frontend.py
+180 −86 source/frontend/carla_host.py
+4 −0 source/frontend/carla_shared.py
+220 −84 source/frontend/pluginlist/pluginlistdialog.cpp
+5 −7 source/frontend/pluginlist/pluginlistdialog.hpp
+4 −1 source/includes/CarlaDefines.h
+1 −1 source/includes/CarlaNativeExtUI.hpp
+9 −0 source/jackbridge/JackBridge.hpp
+70 −5 source/jackbridge/JackBridge2.cpp
+7 −4 source/jackbridge/JackBridge3.cpp
+32 −10 source/jackbridge/JackBridgeExport.cpp
+9 −1 source/jackbridge/JackBridgeExport.hpp
+8 −1 source/jackbridge/Makefile
+2 −2 source/modules/audio_decoder/ad_dr_mp3.c
+2 −2 source/modules/audio_decoder/ad_minimp3.c
+1 −0 source/modules/zita-resampler/.kdev_include_paths
+59 −59 source/modules/zita-resampler/cresampler.cc
+50 −35 source/modules/zita-resampler/resampler-table.cc
+1 −1 source/modules/zita-resampler/resampler-table.h
+183 −100 source/modules/zita-resampler/resampler.cc
+13 −12 source/modules/zita-resampler/resampler.h
+237 −126 source/modules/zita-resampler/vresampler.cc
+13 −12 source/modules/zita-resampler/vresampler.h
+3 −0 source/native-plugins/.kdev_include_paths
+8 −1 source/native-plugins/_data.cpp
+595 −612 source/native-plugins/audio-base.hpp
+308 −331 source/native-plugins/audio-file.cpp
+1 −1 source/native-plugins/midi-pattern.cpp
+12 −1 source/plugin/Makefile
+1 −0 source/plugin/carla-host-plugin.cpp
+1 −1 source/plugin/carla-native-plugin.cpp
+4 −3 source/plugin/carla-vst.cpp
+6 −1 source/plugin/carla-vst.hpp
+3 −3 source/plugin/symbols/carla-native-plugin.def
+18 −1 source/plugin/ui_launcher.cpp
+1 −0 source/utils/.kdev_include_paths
+1 −1 source/utils/CarlaBinaryUtils.hpp
+4 −4 source/utils/CarlaBridgeUtils.cpp
+45 −0 source/utils/CarlaMemUtils.hpp
+42 −35 source/utils/CarlaPipeUtils.cpp
+12 −4 source/utils/CarlaPipeUtils.hpp
+55 −34 source/utils/CarlaRingBuffer.hpp
+2 −0 source/utils/CarlaShmUtils.hpp
+19 −16 source/utils/Lv2AtomRingBuffer.hpp
7 changes: 7 additions & 0 deletions main.cpp
Expand Up @@ -47,12 +47,19 @@ CARLA_BACKEND_USE_NAMESPACE;

int main(int argc, char *argv[])
{
#ifdef HAVE_X11
setenv("QT_QPA_PLATFORM", "xcb", 0);
#endif
#ifdef CARLA_OS_MAC
QApplication::setAttribute(Qt::AA_DontShowIconsInMenus);
#endif
#if QT_VERSION < 0x60000
QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
#endif
#if QT_VERSION < 0x50e00
QApplication::setAttribute(Qt::AA_X11InitThreads);
#endif

#ifdef CARLA_OS_WIN
QApplication::addLibraryPath(QString::fromUtf8(carla_get_library_folder()));
Expand Down

0 comments on commit 3c5793b

Please sign in to comment.