Hello community,
here is the log from the commit of package carla for openSUSE:Factory checked in at 2019-05-02 19:16:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/carla (Old)
and /work/SRC/openSUSE:Factory/.carla.new.5148 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "carla"
Thu May 2 19:16:46 2019 rev:14 rq:699558 version:2.0.0+git20190321.20cc5244
Changes:
--------
--- /work/SRC/openSUSE:Factory/carla/carla.changes 2019-04-03 09:27:50.543810359 +0200
+++ /work/SRC/openSUSE:Factory/.carla.new.5148/carla.changes 2019-05-02 19:16:49.485363678 +0200
@@ -1,0 +2,5 @@
+Tue Apr 30 07:12:42 UTC 2019 - Edgar Aichinger
+
+- update to 2.0.0
+
+-------------------------------------------------------------------
Old:
----
Carla-1.9.14+git20190227.737a0b0f.tar.xz
New:
----
Carla-2.0.0+git20190321.20cc5244.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ carla.spec ++++++
--- /var/tmp/diff_new_pack.ycXjE0/_old 2019-05-02 19:16:50.217365023 +0200
+++ /var/tmp/diff_new_pack.ycXjE0/_new 2019-05-02 19:16:50.221365030 +0200
@@ -19,7 +19,7 @@
%define __provides_exclude_from ^%{_libdir}/carla/jack/.*.so.0$
Name: carla
-Version: 1.9.14+git20190227.737a0b0f
+Version: 2.0.0+git20190321.20cc5244
Release: 0
Summary: An audio plugin host
License: GPL-2.0-or-later
++++++ Carla-1.9.14+git20190227.737a0b0f.tar.xz -> Carla-2.0.0+git20190321.20cc5244.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Carla-1.9.14+git20190227.737a0b0f/data/carla-native-plugin.pc new/Carla-2.0.0+git20190321.20cc5244/data/carla-native-plugin.pc
--- old/Carla-1.9.14+git20190227.737a0b0f/data/carla-native-plugin.pc 2019-02-27 22:20:39.000000000 +0100
+++ new/Carla-2.0.0+git20190321.20cc5244/data/carla-native-plugin.pc 2019-03-21 18:32:17.000000000 +0100
@@ -3,7 +3,7 @@
includedir=X-INCLUDEDIR-X/carla
Name: carla-native-plugin
-Version: 1.9.14
+Version: 2.0.0
Description: Carla Native Plugin
Libs: -Wl,rpath=${libdir} -L${libdir} -lcarla_native-plugin
Cflags: -DREAL_BUILD -I${includedir} -I${includedir}/includes
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Carla-1.9.14+git20190227.737a0b0f/data/carla-standalone.pc new/Carla-2.0.0+git20190321.20cc5244/data/carla-standalone.pc
--- old/Carla-1.9.14+git20190227.737a0b0f/data/carla-standalone.pc 2019-02-27 22:20:39.000000000 +0100
+++ new/Carla-2.0.0+git20190321.20cc5244/data/carla-standalone.pc 2019-03-21 18:32:17.000000000 +0100
@@ -3,7 +3,7 @@
includedir=X-INCLUDEDIR-X/carla
Name: carla-standalone
-Version: 1.9.14
+Version: 2.0.0
Description: Carla Host Standalone
Libs: -Wl,rpath=${libdir} -L${libdir} -lcarla_standalone2
Cflags: -DREAL_BUILD -I${includedir} -I${includedir}/includes
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Carla-1.9.14+git20190227.737a0b0f/data/carla-utils.pc new/Carla-2.0.0+git20190321.20cc5244/data/carla-utils.pc
--- old/Carla-1.9.14+git20190227.737a0b0f/data/carla-utils.pc 2019-02-27 22:20:39.000000000 +0100
+++ new/Carla-2.0.0+git20190321.20cc5244/data/carla-utils.pc 2019-03-21 18:32:17.000000000 +0100
@@ -3,7 +3,7 @@
includedir=X-INCLUDEDIR-X/carla
Name: carla-utils
-Version: 1.9.14
+Version: 2.0.0
Description: Carla Host Utilities
Libs: -Wl,rpath=${libdir} -L${libdir} -lcarla_utils
Cflags: -DREAL_BUILD -I${includedir} -I${includedir}/includes -I${includedir}/utils
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Carla-1.9.14+git20190227.737a0b0f/data/linux/build-all.sh new/Carla-2.0.0+git20190321.20cc5244/data/linux/build-all.sh
--- old/Carla-1.9.14+git20190227.737a0b0f/data/linux/build-all.sh 2019-02-27 22:20:39.000000000 +0100
+++ new/Carla-2.0.0+git20190321.20cc5244/data/linux/build-all.sh 2019-03-21 18:32:17.000000000 +0100
@@ -24,8 +24,8 @@
source common.env
CHROOT_CARLA_DIR="/tmp/carla-src"
-PKG_FOLDER="Carla_2.0-RC4-linux"
-PKGS_NUM="20190227"
+PKG_FOLDER="Carla_2.0.0-linux"
+PKGS_NUM="20190321"
# ---------------------------------------------------------------------------------------------------------------------
# function to remove old stuff
@@ -139,11 +139,11 @@
fi
if [ ! -d ${CHROOT_CARLA_DIR} ]; then
- git clone --depth=1 git://github.com/falkTX/Carla ${CHROOT_CARLA_DIR}
+ git clone --depth=1 -b master git://github.com/falkTX/Carla ${CHROOT_CARLA_DIR}
fi
if [ ! -f ${CHROOT_CARLA_DIR}/source/native-plugins/external/README.md ]; then
- git clone --depth=1 git://github.com/falkTX/Carla-Plugins ${CHROOT_CARLA_DIR}/source/native-plugins/external
+ git clone --depth=1 -b master git://github.com/falkTX/Carla-Plugins ${CHROOT_CARLA_DIR}/source/native-plugins/external
fi
cd ${CHROOT_CARLA_DIR}
@@ -269,8 +269,8 @@
{
CHROOT_DIR=${TARGETDIR}/chroot${ARCH}
-CARLA_VER="1.9.14+git20190227"
-WINBR_VER="1.9.14+git20190227"
+CARLA_VER="2.0.0"
+WINBR_VER="2.0.0"
WINE32_VER="1.9.14+git20190227"
WINE64_VER="1.9.14.git20190227"
@@ -353,7 +353,9 @@
rm -rf ./tmp-install
make ${MAKE_ARGS} install DESTDIR=./tmp-install PREFIX=/usr
+make -C data/windows/unzipfx-carla -f Makefile.linux ${MAKE_ARGS} clean
make -C data/windows/unzipfx-carla -f Makefile.linux ${MAKE_ARGS}
+make -C data/windows/unzipfx-carla-control -f Makefile.linux ${MAKE_ARGS} clean
make -C data/windows/unzipfx-carla-control -f Makefile.linux ${MAKE_ARGS}
# ---------------------------------------------------------------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Carla-1.9.14+git20190227.737a0b0f/data/macos/build.sh new/Carla-2.0.0+git20190321.20cc5244/data/macos/build.sh
--- old/Carla-1.9.14+git20190227.737a0b0f/data/macos/build.sh 2019-02-27 22:20:39.000000000 +0100
+++ new/Carla-2.0.0+git20190321.20cc5244/data/macos/build.sh 2019-03-21 18:32:17.000000000 +0100
@@ -15,7 +15,7 @@
# ---------------------------------------------------------------------------------------------------------------------
# set variables
-PKG_FOLDER="Carla_2.0-RC4-macos"
+PKG_FOLDER="Carla_2.0.0-macos"
source data/macos/common.env
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Carla-1.9.14+git20190227.737a0b0f/data/windows/build-win-all.sh new/Carla-2.0.0+git20190321.20cc5244/data/windows/build-win-all.sh
--- old/Carla-1.9.14+git20190227.737a0b0f/data/windows/build-win-all.sh 2019-02-27 22:20:39.000000000 +0100
+++ new/Carla-2.0.0+git20190321.20cc5244/data/windows/build-win-all.sh 2019-03-21 18:32:17.000000000 +0100
@@ -1,6 +1,6 @@
#!/bin/bash
-VERSION="2.0-RC4"
+VERSION="2.0.0"
# ---------------------------------------------------------------------------------------------------------------------
# stop on error
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Carla-1.9.14+git20190227.737a0b0f/data/windows/pack-win.sh new/Carla-2.0.0+git20190321.20cc5244/data/windows/pack-win.sh
--- old/Carla-1.9.14+git20190227.737a0b0f/data/windows/pack-win.sh 2019-02-27 22:20:39.000000000 +0100
+++ new/Carla-2.0.0+git20190321.20cc5244/data/windows/pack-win.sh 2019-03-21 18:32:17.000000000 +0100
@@ -1,5 +1,7 @@
#!/bin/bash
+VERSION="2.0.0"
+
# ---------------------------------------------------------------------------------------------------------------------
# check input
@@ -33,7 +35,7 @@
source data/windows/common.env
-PKG_FOLDER="Carla_2.0-RC4-win${ARCH}"
+PKG_FOLDER="Carla_${VERSION}-win${ARCH}"
export WIN32=true
@@ -174,6 +176,7 @@
mkdir ${PKG_FOLDER}
mkdir ${PKG_FOLDER}/vcredist
cp -r Carla.exe Carla.lv2 README.txt ${PKG_FOLDER}
+unix2dos ${PKG_FOLDER}/README.txt
cp ~/.cache/winetricks/vcrun2010/vcredist_x${VCARCH}.exe ${PKG_FOLDER}/vcredist
zip -r -9 ${PKG_FOLDER}.zip ${PKG_FOLDER}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Carla-1.9.14+git20190227.737a0b0f/resources/ui/carla_database.ui new/Carla-2.0.0+git20190321.20cc5244/resources/ui/carla_database.ui
--- old/Carla-1.9.14+git20190227.737a0b0f/resources/ui/carla_database.ui 2019-02-27 22:20:39.000000000 +0100
+++ new/Carla-2.0.0+git20190321.20cc5244/resources/ui/carla_database.ui 2019-03-21 18:32:17.000000000 +0100
@@ -257,6 +257,9 @@
<property name="sortingEnabled">
<bool>true</bool>
</property>
+ <property name="wordWrap">
+ <bool>false</bool>
+ </property>
<attribute name="horizontalHeaderStretchLastSection">
<bool>true</bool>
</attribute>
@@ -276,7 +279,7 @@
</column>
<column>
<property name="text">
- <string>Label</string>
+ <string>Label/URI</string>
</property>
</column>
<column>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Carla-1.9.14+git20190227.737a0b0f/source/Makefile.mk new/Carla-2.0.0+git20190321.20cc5244/source/Makefile.mk
--- old/Carla-1.9.14+git20190227.737a0b0f/source/Makefile.mk 2019-02-27 22:20:39.000000000 +0100
+++ new/Carla-2.0.0+git20190321.20cc5244/source/Makefile.mk 2019-03-21 18:32:17.000000000 +0100
@@ -115,6 +115,8 @@
# mingw has issues with this specific optimization
# See https://github.com/falkTX/Carla/issues/696
BASE_OPTS += -fno-rerun-cse-after-loop
+# See https://github.com/falkTX/Carla/issues/855
+BASE_OPTS += -mstackrealign
ifeq ($(BUILDING_FOR_WINDOWS),true)
BASE_FLAGS += -DBUILDING_CARLA_FOR_WINDOWS
endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Carla-1.9.14+git20190227.737a0b0f/source/backend/plugin/CarlaPluginBridge.cpp new/Carla-2.0.0+git20190321.20cc5244/source/backend/plugin/CarlaPluginBridge.cpp
--- old/Carla-1.9.14+git20190227.737a0b0f/source/backend/plugin/CarlaPluginBridge.cpp 2019-02-27 22:20:39.000000000 +0100
+++ new/Carla-2.0.0+git20190321.20cc5244/source/backend/plugin/CarlaPluginBridge.cpp 2019-03-21 18:32:17.000000000 +0100
@@ -2063,6 +2063,14 @@
}
} break;
+ case kPluginBridgeNonRtServerParameterTouch: {
+ // uint/index, bool/touch
+ const uint32_t index = fShmNonRtServerControl.readUInt();
+ const bool touch = fShmNonRtServerControl.readBool();
+
+ (void)index; (void)touch; // unused
+ } break;
+
case kPluginBridgeNonRtServerDefaultValue: {
// uint/index, float/value
const uint32_t index = fShmNonRtServerControl.readUInt();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Carla-1.9.14+git20190227.737a0b0f/source/backend/plugin/CarlaPluginInternal.cpp new/Carla-2.0.0+git20190321.20cc5244/source/backend/plugin/CarlaPluginInternal.cpp
--- old/Carla-1.9.14+git20190227.737a0b0f/source/backend/plugin/CarlaPluginInternal.cpp 2019-02-27 22:20:39.000000000 +0100
+++ new/Carla-2.0.0+git20190321.20cc5244/source/backend/plugin/CarlaPluginInternal.cpp 2019-03-21 18:32:17.000000000 +0100
@@ -520,7 +520,7 @@
void CarlaPlugin::ProtectedData::PostRtEvents::appendRT(const PluginPostRtEvent& e) noexcept
{
- CARLA_SAFE_ASSERT_RETURN(dataPendingMutex.tryLock(),);
+ CARLA_SAFE_ASSERT_INT2_RETURN(dataPendingMutex.tryLock(), e.type, e.value1,);
dataPendingRT.append(e);
dataPendingMutex.unlock();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Carla-1.9.14+git20190227.737a0b0f/source/backend/plugin/CarlaPluginJack.cpp new/Carla-2.0.0+git20190321.20cc5244/source/backend/plugin/CarlaPluginJack.cpp
--- old/Carla-1.9.14+git20190227.737a0b0f/source/backend/plugin/CarlaPluginJack.cpp 2019-02-27 22:20:39.000000000 +0100
+++ new/Carla-2.0.0+git20190321.20cc5244/source/backend/plugin/CarlaPluginJack.cpp 2019-03-21 18:32:17.000000000 +0100
@@ -1153,6 +1153,7 @@
case kPluginBridgeNonRtServerParameterRanges:
case kPluginBridgeNonRtServerParameterValue:
case kPluginBridgeNonRtServerParameterValue2:
+ case kPluginBridgeNonRtServerParameterTouch:
case kPluginBridgeNonRtServerDefaultValue:
case kPluginBridgeNonRtServerCurrentProgram:
case kPluginBridgeNonRtServerCurrentMidiProgram:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Carla-1.9.14+git20190227.737a0b0f/source/backend/plugin/CarlaPluginLV2.cpp new/Carla-2.0.0+git20190321.20cc5244/source/backend/plugin/CarlaPluginLV2.cpp
--- old/Carla-1.9.14+git20190227.737a0b0f/source/backend/plugin/CarlaPluginLV2.cpp 2019-02-27 22:20:39.000000000 +0100
+++ new/Carla-2.0.0+git20190321.20cc5244/source/backend/plugin/CarlaPluginLV2.cpp 2019-03-21 18:32:17.000000000 +0100
@@ -4205,6 +4205,11 @@
if (std::strstr(rdfUI->URI, "http://calf.sourceforge.net/plugins/gui/") != nullptr)
return pData->engine->getOptions().preferUiBridges;
+ // LSP-Plugins UIs make heavy use of URIDs, for which carla right now is very slow
+ // FIXME after some optimization, remove this
+ if (std::strstr(rdfUI->URI, "http://lsp-plug.in/ui/lv2/") != nullptr)
+ return false;
+
return true;
#else
return false;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Carla-1.9.14+git20190227.737a0b0f/source/backend/plugin/CarlaPluginVST2.cpp new/Carla-2.0.0+git20190321.20cc5244/source/backend/plugin/CarlaPluginVST2.cpp
--- old/Carla-1.9.14+git20190227.737a0b0f/source/backend/plugin/CarlaPluginVST2.cpp 2019-02-27 22:20:39.000000000 +0100
+++ new/Carla-2.0.0+git20190321.20cc5244/source/backend/plugin/CarlaPluginVST2.cpp 2019-03-21 18:32:17.000000000 +0100
@@ -1861,10 +1861,9 @@
}
// plugins should never do this:
- CARLA_SAFE_ASSERT_INT2(index >= 0 && index < static_cast(pData->param.count), index, pData->param.count);
-
- if (index < 0 || index >= static_cast(pData->param.count))
- break;
+ CARLA_SAFE_ASSERT_INT2_BREAK(index >= 0 && index < static_cast(pData->param.count),
+ index,
+ static_cast(pData->param.count));
const uint32_t uindex(static_cast(index));
const float fixedValue(pData->param.getFixedValue(uindex, opt));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Carla-1.9.14+git20190227.737a0b0f/source/bridges-plugin/CarlaBridgePlugin.cpp new/Carla-2.0.0+git20190321.20cc5244/source/bridges-plugin/CarlaBridgePlugin.cpp
--- old/Carla-1.9.14+git20190227.737a0b0f/source/bridges-plugin/CarlaBridgePlugin.cpp 2019-02-27 22:20:39.000000000 +0100
+++ new/Carla-2.0.0+git20190321.20cc5244/source/bridges-plugin/CarlaBridgePlugin.cpp 2019-03-21 18:32:17.000000000 +0100
@@ -181,7 +181,7 @@
if (File(gProjectFilename).existsAsFile())
{
if (carla_load_plugin_state(0, gProjectFilename.toRawUTF8()))
- carla_stdout("Plugin state loaded sucessfully");
+ carla_stdout("Plugin state loaded successfully");
else
carla_stderr("Plugin state load failed, error was:\n%s", carla_get_last_error());
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Carla-1.9.14+git20190227.737a0b0f/source/frontend/carla_host.py new/Carla-2.0.0+git20190321.20cc5244/source/frontend/carla_host.py
--- old/Carla-1.9.14+git20190227.737a0b0f/source/frontend/carla_host.py 2019-02-27 22:20:39.000000000 +0100
+++ new/Carla-2.0.0+git20190321.20cc5244/source/frontend/carla_host.py 2019-03-21 18:32:17.000000000 +0100
@@ -139,6 +139,7 @@
# ----------------------------------------------------------------------------------------------------
# Internal stuff
+ self.fIdleTimerNull = self.startTimer(1000) # keep application signals alive
self.fIdleTimerFast = 0
self.fIdleTimerSlow = 0
@@ -285,9 +286,6 @@
if WINDOWS:
self.ui.tabWidget.tabBar().hide()
- if host.isControl:
- self.ui.dockWidget.hide()
-
# ----------------------------------------------------------------------------------------------------
# Set up GUI (disk)
@@ -1562,7 +1560,9 @@
settings.setValue("Geometry", self.saveGeometry())
settings.setValue("ShowToolbar", self.ui.toolBar.isEnabled())
- settings.setValue("ShowSidePanel", self.ui.dockWidget.isEnabled())
+
+ if not self.host.isControl:
+ settings.setValue("ShowSidePanel", self.ui.dockWidget.isEnabled())
diskFolders = []
@@ -1596,7 +1596,7 @@
#else:
#self.ui.splitter.setSizes([210, 99999])
- showSidePanel = settings.value("ShowSidePanel", True, type=bool)
+ showSidePanel = settings.value("ShowSidePanel", True, type=bool) and not self.host.isControl
self.ui.act_settings_show_side_panel.setChecked(showSidePanel)
self.ui.dockWidget.setEnabled(showSidePanel)
self.ui.dockWidget.setVisible(showSidePanel)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Carla-1.9.14+git20190227.737a0b0f/source/frontend/carla_shared.py new/Carla-2.0.0+git20190321.20cc5244/source/frontend/carla_shared.py
--- old/Carla-1.9.14+git20190227.737a0b0f/source/frontend/carla_shared.py 2019-02-27 22:20:39.000000000 +0100
+++ new/Carla-2.0.0+git20190321.20cc5244/source/frontend/carla_shared.py 2019-03-21 18:32:17.000000000 +0100
@@ -66,7 +66,7 @@
# ------------------------------------------------------------------------------------------------------------
# Set Version
-VERSION = "1.9.14 (2.0-RC4)"
+VERSION = "2.0.0"
# ------------------------------------------------------------------------------------------------------------
# Set TMP
@@ -562,7 +562,7 @@
for arg in sys.argv[1:]:
if arg.startswith("--with-appname="):
- initName = os.path.basename(arg.replace("--with-initname=", ""))
+ initName = os.path.basename(arg.replace("--with-appname=", ""))
elif arg.startswith("--with-libprefix="):
libPrefix = arg.replace("--with-libprefix=", "")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Carla-1.9.14+git20190227.737a0b0f/source/frontend/carla_widgets.py new/Carla-2.0.0+git20190321.20cc5244/source/frontend/carla_widgets.py
--- old/Carla-1.9.14+git20190227.737a0b0f/source/frontend/carla_widgets.py 2019-02-27 22:20:39.000000000 +0100
+++ new/Carla-2.0.0+git20190321.20cc5244/source/frontend/carla_widgets.py 2019-03-21 18:32:17.000000000 +0100
@@ -76,7 +76,7 @@
self.ui.l_about.setText(self.tr(""
"<br>Version %s"
"<br>Carla is a fully-featured audio plugin host%s.<br>"
- "<br>Copyright (C) 2011-2018 falkTX<br>"
+ "<br>Copyright (C) 2011-2019 falkTX<br>"
"" % (VERSION, extraInfo)))
if self.ui.about.palette().color(QPalette.Background).blackF() < 0.5:
@@ -100,19 +100,19 @@
self.ui.le_osc_url_udp.setText(self.tr("(Engine not running)"))
self.ui.l_osc_cmds.setText("<table>"
- "<tr><td>" "/set_active" " </td><td><" "i-value" "></td><td>" "</td></tr>"
- "<tr><td>" "/set_drywet" " </td><td><" "f-value" "></td><td>" "</td></tr>"
- "<tr><td>" "/set_volume" " </td><td><" "f-value" "></td><td>" "</td></tr>"
- "<tr><td>" "/set_balance_left" " </td><td><" "f-value" "></td><td>" "</td></tr>"
- "<tr><td>" "/set_balance_right" " </td><td><" "f-value" "></td><td>" "</td></tr>"
- "<tr><td>" "/set_panning" " </td><td><" "f-value" "></td><td>" "</td></tr>"
- "<tr><td>" "/set_parameter_value" " </td><td><" "i-index" "></td><td><" "f-value" "></td></tr>"
- "<tr><td>" "/set_parameter_midi_cc" " </td><td><" "i-index" "></td><td><" "i-cc" "></td></tr>"
- "<tr><td>" "/set_parameter_midi_channel" " </td><td><" "i-index" "></td><td><" "i-channel" "></td></tr>"
- "<tr><td>" "/set_program" " </td><td><" "i-index" "></td><td>" "</td></tr>"
- "<tr><td>" "/set_midi_program" " </td><td><" "i-index" "></td><td>" "</td></tr>"
- "<tr><td>" "/note_on" " </td><td><" "i-note" "></td><td><" "i-velo" "></td></tr>"
- "<tr><td>" "/note_off" " </td><td><" "i-note" "></td><td>" "</td></tr>"
+ "<tr><td>" "/set_active" " </td><td><i-value></td></tr>"
+ "<tr><td>" "/set_drywet" " </td><td><f-value></td></tr>"
+ "<tr><td>" "/set_volume" " </td><td><f-value></td></tr>"
+ "<tr><td>" "/set_balance_left" " </td><td><f-value></td></tr>"
+ "<tr><td>" "/set_balance_right" " </td><td><f-value></td></tr>"
+ "<tr><td>" "/set_panning" " </td><td><f-value></td></tr>"
+ "<tr><td>" "/set_parameter_value" " </td><td><i-index> <f-value></td></tr>"
+ "<tr><td>" "/set_parameter_midi_cc" " </td><td><i-index> <i-cc></td></tr>"
+ "<tr><td>" "/set_parameter_midi_channel" " </td><td><i-index> <i-channel></td></tr>"
+ "<tr><td>" "/set_program" " </td><td><i-index></td></tr>"
+ "<tr><td>" "/set_midi_program" " </td><td><i-index></td></tr>"
+ "<tr><td>" "/note_on" " </td><td><i-channel> <i-note> <i-velo></td></tr>"
+ "<tr><td>" "/note_off" " </td><td><i-channel> <i-note</td></tr>"
"</table>"
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Carla-1.9.14+git20190227.737a0b0f/source/includes/CarlaDefines.h new/Carla-2.0.0+git20190321.20cc5244/source/includes/CarlaDefines.h
--- old/Carla-1.9.14+git20190227.737a0b0f/source/includes/CarlaDefines.h 2019-02-27 22:20:39.000000000 +0100
+++ new/Carla-2.0.0+git20190321.20cc5244/source/includes/CarlaDefines.h 2019-03-21 18:32:17.000000000 +0100
@@ -32,8 +32,8 @@
#endif
/* Set Version */
-#define CARLA_VERSION_HEX 0x010914
-#define CARLA_VERSION_STRING "1.9.14 (2.0-RC4)"
+#define CARLA_VERSION_HEX 0x020000
+#define CARLA_VERSION_STRING "2.0.0"
/* Check OS */
#if defined(WIN64) || defined(_WIN64) || defined(__WIN64__)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Carla-1.9.14+git20190227.737a0b0f/source/interposer/interposer-jack-x11.cpp new/Carla-2.0.0+git20190321.20cc5244/source/interposer/interposer-jack-x11.cpp
--- old/Carla-1.9.14+git20190227.737a0b0f/source/interposer/interposer-jack-x11.cpp 2019-02-27 22:20:39.000000000 +0100
+++ new/Carla-2.0.0+git20190321.20cc5244/source/interposer/interposer-jack-x11.cpp 2019-03-21 18:32:17.000000000 +0100
@@ -342,7 +342,7 @@
gInterposedCallback(1, nullptr);
event->type = 0;
- carla_stdout("XNextEvent close event catched, hiding UI instead");
+ carla_stdout("XNextEvent close event caught, hiding UI instead");
return real_XUnmapWindow(display, gCurrentlyMappedWindow);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Carla-1.9.14+git20190227.737a0b0f/source/jackbridge/JackBridge1.cpp new/Carla-2.0.0+git20190321.20cc5244/source/jackbridge/JackBridge1.cpp
--- old/Carla-1.9.14+git20190227.737a0b0f/source/jackbridge/JackBridge1.cpp 2019-02-27 22:20:39.000000000 +0100
+++ new/Carla-2.0.0+git20190321.20cc5244/source/jackbridge/JackBridge1.cpp 2019-03-21 18:32:17.000000000 +0100
@@ -29,6 +29,7 @@
# define JACKSYM_API
#endif
+#include <cerrno>
#include "CarlaLibUtils.hpp"
// -----------------------------------------------------------------------------
@@ -406,7 +407,7 @@
}
else
{
- fprintf(stdout, "%s loaded sucessfully!\n", filename);
+ fprintf(stdout, "%s loaded successfully!\n", filename);
}
#define JOIN(a, b) a ## b
@@ -1537,7 +1538,10 @@
return (jack_connect(client, source_port, destination_port) == 0);
#else
if (getBridgeInstance().connect_ptr != nullptr)
- return (getBridgeInstance().connect_ptr(client, source_port, destination_port) == 0);
+ {
+ const int ret = getBridgeInstance().connect_ptr(client, source_port, destination_port);
+ return ret == 0 || ret == EEXIST;
+ }
#endif
return false;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Carla-1.9.14+git20190227.737a0b0f/source/modules/rtaudio.diff new/Carla-2.0.0+git20190321.20cc5244/source/modules/rtaudio.diff
--- old/Carla-1.9.14+git20190227.737a0b0f/source/modules/rtaudio.diff 2019-02-27 22:20:39.000000000 +0100
+++ new/Carla-2.0.0+git20190321.20cc5244/source/modules/rtaudio.diff 2019-03-21 18:32:17.000000000 +0100
@@ -1,5 +1,5 @@
diff --git a/RtAudio.cpp b/RtAudio.cpp
-index 2ac2179..27a0c83 100644
+index 2ac2179..5fce9b2 100644
--- a/RtAudio.cpp
+++ b/RtAudio.cpp
@@ -76,7 +76,7 @@ const unsigned int RtApi::SAMPLE_RATES[] = {
@@ -156,7 +156,8 @@
{
- RtAudio::DeviceInfo info;
- info.probed = false;
--
++ static RtAudio::DeviceInfo devInfo[3];
+
- jack_options_t options = (jack_options_t) ( JackNoStartServer ); //JackNullOption
- jack_status_t *status = NULL;
- jack_client_t *client = jack_client_open( "RtApiJackInfo", options, status );
@@ -200,8 +201,7 @@
-
- info.preferredSampleRate = jack_get_sample_rate( client );
- info.sampleRates.push_back( info.preferredSampleRate );
-+ static RtAudio::DeviceInfo devInfo[3];
-
+-
- // Count the available ports containing the client name as device
- // channels. Jack "input ports" equal RtAudio output channels.
- unsigned int nChannels = 0;
@@ -706,7 +706,18 @@
if ( nBuffers < 2 ) nBuffers = 3;
// Check the lower range of the user-specified buffer size and set
-@@ -8012,12 +7898,14 @@ static void *alsaCallbackHandler( void *ptr )
+@@ -6795,7 +6681,9 @@ unsigned int RtApiAlsa :: getDeviceCount( void )
+ nDevices++;
+ }
+ nextcard:
+- snd_ctl_close( handle );
++ if (result == 0) {
++ snd_ctl_close( handle );
++ }
+ snd_card_next( &card );
+ }
+
+@@ -8012,12 +7900,14 @@ static void *alsaCallbackHandler( void *ptr )
}
pthread_exit( NULL );
@@ -722,7 +733,7 @@
// Code written by Peter Meerwald, pmeerw@pmeerw.net
// and Tristan Matthews.
-@@ -8092,6 +7980,8 @@ static void *pulseaudio_callback( void * user )
+@@ -8092,6 +7982,8 @@ static void *pulseaudio_callback( void * user )
}
pthread_exit( NULL );
@@ -731,7 +742,7 @@
}
void RtApiPulse::closeStream( void )
-@@ -8502,7 +8392,7 @@ bool RtApiPulse::probeDeviceOpen( unsigned int device, StreamMode mode,
+@@ -8502,7 +8394,7 @@ bool RtApiPulse::probeDeviceOpen( unsigned int device, StreamMode mode,
return FAILURE;
}
@@ -740,7 +751,7 @@
#endif
#if defined(__LINUX_OSS__)
-@@ -9446,6 +9336,8 @@ static void *ossCallbackHandler( void *ptr )
+@@ -9446,6 +9338,8 @@ static void *ossCallbackHandler( void *ptr )
}
pthread_exit( NULL );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Carla-1.9.14+git20190227.737a0b0f/source/native-plugins/resources/carla-plugin new/Carla-2.0.0+git20190321.20cc5244/source/native-plugins/resources/carla-plugin
--- old/Carla-1.9.14+git20190227.737a0b0f/source/native-plugins/resources/carla-plugin 2019-02-27 22:20:39.000000000 +0100
+++ new/Carla-2.0.0+git20190321.20cc5244/source/native-plugins/resources/carla-plugin 2019-03-21 18:32:17.000000000 +0100
@@ -494,7 +494,7 @@
self.host = host
self.fWinId = winId
self.fWidget = self.getWidget()
- self.fWidget.setFixedSize(740, 512)
+ self.fWidget.setFixedSize(1024, 712)
self.fLayout = QVBoxLayout(self.fWidget)
self.fLayout.setContentsMargins(0, 0, 0, 0)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Carla-1.9.14+git20190227.737a0b0f/source/plugin/carla-vst.cpp new/Carla-2.0.0+git20190321.20cc5244/source/plugin/carla-vst.cpp
--- old/Carla-1.9.14+git20190227.737a0b0f/source/plugin/carla-vst.cpp 2019-02-27 22:20:39.000000000 +0100
+++ new/Carla-2.0.0+git20190321.20cc5244/source/plugin/carla-vst.cpp 2019-03-21 18:32:17.000000000 +0100
@@ -105,8 +105,8 @@
fVstRect.top = 0;
fVstRect.left = 0;
- fVstRect.bottom = 512;
- fVstRect.right = 740;
+ fVstRect.bottom = 712;
+ fVstRect.right = 1024;
init();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Carla-1.9.14+git20190227.737a0b0f/source/utils/CarlaBridgeDefines.hpp new/Carla-2.0.0+git20190321.20cc5244/source/utils/CarlaBridgeDefines.hpp
--- old/Carla-1.9.14+git20190227.737a0b0f/source/utils/CarlaBridgeDefines.hpp 2019-02-27 22:20:39.000000000 +0100
+++ new/Carla-2.0.0+git20190321.20cc5244/source/utils/CarlaBridgeDefines.hpp 2019-03-21 18:32:17.000000000 +0100
@@ -20,7 +20,7 @@
#include "CarlaRingBuffer.hpp"
-#define CARLA_PLUGIN_BRIDGE_API_VERSION 5
+#define CARLA_PLUGIN_BRIDGE_API_VERSION 6
// -------------------------------------------------------------------------------------------------------------------
@@ -90,6 +90,7 @@
kPluginBridgeNonRtServerParameterRanges, // uint/index, float/def, float/min, float/max, float/step, float/stepSmall, float/stepLarge
kPluginBridgeNonRtServerParameterValue, // uint/index, float/value
kPluginBridgeNonRtServerParameterValue2, // uint/index, float/value (used for init/output parameters only, don't resend values)
+ kPluginBridgeNonRtServerParameterTouch, // uint/index, bool/touch
kPluginBridgeNonRtServerDefaultValue, // uint/index, float/value
kPluginBridgeNonRtServerCurrentProgram, // int/index
kPluginBridgeNonRtServerCurrentMidiProgram, // int/index
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Carla-1.9.14+git20190227.737a0b0f/source/utils/CarlaBridgeUtils.hpp new/Carla-2.0.0+git20190321.20cc5244/source/utils/CarlaBridgeUtils.hpp
--- old/Carla-1.9.14+git20190227.737a0b0f/source/utils/CarlaBridgeUtils.hpp 2019-02-27 22:20:39.000000000 +0100
+++ new/Carla-2.0.0+git20190321.20cc5244/source/utils/CarlaBridgeUtils.hpp 2019-03-21 18:32:17.000000000 +0100
@@ -163,6 +163,8 @@
return "kPluginBridgeNonRtServerParameterValue";
case kPluginBridgeNonRtServerParameterValue2:
return "kPluginBridgeNonRtServerParameterValue2";
+ case kPluginBridgeNonRtServerParameterTouch:
+ return "kPluginBridgeNonRtServerParameterTouch";
case kPluginBridgeNonRtServerDefaultValue:
return "kPluginBridgeNonRtServerDefaultValue";
case kPluginBridgeNonRtServerCurrentProgram:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Carla-1.9.14+git20190227.737a0b0f/source/utils/CarlaLv2Utils.hpp new/Carla-2.0.0+git20190321.20cc5244/source/utils/CarlaLv2Utils.hpp
--- old/Carla-1.9.14+git20190227.737a0b0f/source/utils/CarlaLv2Utils.hpp 2019-02-27 22:20:39.000000000 +0100
+++ new/Carla-2.0.0+git20190321.20cc5244/source/utils/CarlaLv2Utils.hpp 2019-03-21 18:32:17.000000000 +0100
@@ -1864,7 +1864,7 @@
rdfPort->Types |= LV2_PORT_DATA_MIDI_EVENT;
}
else
- carla_stderr("lv2_rdf_new(\"%s\") - port '%s' is of unkown data type", uri, rdfPort->Name);
+ carla_stderr("lv2_rdf_new(\"%s\") - port '%s' is of unknown data type", uri, rdfPort->Name);
}
// --------------------------------------------------------------------------------------------------------
++++++ Carla.obsinfo ++++++
--- /var/tmp/diff_new_pack.ycXjE0/_old 2019-05-02 19:16:51.813367954 +0200
+++ /var/tmp/diff_new_pack.ycXjE0/_new 2019-05-02 19:16:51.813367954 +0200
@@ -1,5 +1,5 @@
name: Carla
-version: 1.9.14+git20190227.737a0b0f
-mtime: 1551302439
-commit: 737a0b0fb7dea524eced619d4bc55c7d41e73964
+version: 2.0.0+git20190321.20cc5244
+mtime: 1553189537
+commit: 20cc5244d08de13668a36749b7b165507b4805bf
++++++ _service ++++++
--- /var/tmp/diff_new_pack.ycXjE0/_old 2019-05-02 19:16:51.829367984 +0200
+++ /var/tmp/diff_new_pack.ycXjE0/_new 2019-05-02 19:16:51.829367984 +0200
@@ -5,8 +5,8 @@
<param name="submodules">enable</param>
<param name="exclude">.git</param>
<param name="filename">Carla</param>
- <param name="versionformat">1.9.14+git%cd.%h</param>
- <param name="revision">737a0b0f</param>
+ <param name="versionformat">2.0.0+git%cd.%h</param>
+ <param name="revision">20cc5244</param>
<param name="changesgenerate">disable</param>
</service>
<service name="tar" mode="disabled">