From 48d6fda2fe416fb8fab8ee4b4f90771833cfd4e4 Mon Sep 17 00:00:00 2001 From: falkTX Date: Wed, 8 Oct 2014 14:54:26 +0100 Subject: [PATCH] Update about text --- source/backend/CarlaStandalone.cpp | 35 ++++++++++++++++---------- source/carla_backend.py | 40 +++++++++++++++++++++++++++++- source/carla_widgets.py | 4 +-- 3 files changed, 63 insertions(+), 16 deletions(-) diff --git a/source/backend/CarlaStandalone.cpp b/source/backend/CarlaStandalone.cpp index 16d218587..801bf51f0 100644 --- a/source/backend/CarlaStandalone.cpp +++ b/source/backend/CarlaStandalone.cpp @@ -458,16 +458,16 @@ const char* carla_get_complete_license_text() "" + "

" +#if defined(CARLA_OS_MAC) || defined(CARLA_OS_WIN) || ! defined(VESTIGE_HEADER) + // Required by VST SDK + " [1] Trademark of Steinberg Media Technologies GmbH.
" +#endif #ifdef HAVE_LINUXSAMPLER // LinuxSampler GPL exception - "

(*) Using LinuxSampler code in commercial hardware or software products is not allowed without prior written authorization by the authors.

" + " [2] Using LinuxSampler code in commercial hardware or software products is not allowed without prior written authorization by the authors." #endif + "

; } diff --git a/source/carla_backend.py b/source/carla_backend.py index 16155dce1..9aa2ebd30 100644 --- a/source/carla_backend.py +++ b/source/carla_backend.py @@ -1981,7 +1981,45 @@ class CarlaHostNull(CarlaHostMeta): self.fEngineRunning = False def get_complete_license_text(self): - return "" + text = ( + "

This current Carla build is using the following features and 3rd-party code:

" + "" + + "

" + # Required by VST SDK + " [1] Trademark of Steinberg Media Technologies GmbH.
" + # LinuxSampler GPL exception + " [2] Using LinuxSampler code in commercial hardware or software products is not allowed without prior written authorization by the authors." + "

" + ) + return text def get_juce_version(self): return "" diff --git a/source/carla_widgets.py b/source/carla_widgets.py index 384919c7c..441dcac96 100755 --- a/source/carla_widgets.py +++ b/source/carla_widgets.py @@ -1557,8 +1557,8 @@ if __name__ == '__main__': host.add_plugin(BINARY_NATIVE, PLUGIN_DSSI, "/usr/lib/dssi/karplong.so", "karplong", "karplong", 0, None) host.set_active(0, True) - #gui1 = CarlaAboutW(None, host) - #gui1.show() + gui1 = CarlaAboutW(None, host) + gui1.show() gui2 = PluginEdit(None, host, 0) gui2.testTimer()