@@ -339,14 +339,17 @@ const char* jackbridge_get_version_string() | |||||
jack_client_t* jackbridge_client_open(const char* client_name, jack_options_t options, jack_status_t* status, ...) | jack_client_t* jackbridge_client_open(const char* client_name, jack_options_t options, jack_status_t* status, ...) | ||||
{ | { | ||||
#if JACKBRIDGE_DUMMY | #if JACKBRIDGE_DUMMY | ||||
return nullptr; | |||||
#elif JACKBRIDGE_DIRECT | #elif JACKBRIDGE_DIRECT | ||||
return jack_client_open(client_name, options, status); | return jack_client_open(client_name, options, status); | ||||
#else | #else | ||||
if (bridge.client_open_ptr != nullptr) | if (bridge.client_open_ptr != nullptr) | ||||
return bridge.client_open_ptr(client_name, options, status); | return bridge.client_open_ptr(client_name, options, status); | ||||
return nullptr; | |||||
#endif | #endif | ||||
if (status != nullptr) | |||||
*status = JackServerError; | |||||
return nullptr; | |||||
} | } | ||||
const char* jackbridge_client_rename(jack_client_t* client, const char* new_name) | const char* jackbridge_client_rename(jack_client_t* client, const char* new_name) | ||||
@@ -9,8 +9,8 @@ include ../Makefile.mk | |||||
# -------------------------------------------------------------- | # -------------------------------------------------------------- | ||||
BUILD_CXX_FLAGS += -I../widgets | BUILD_CXX_FLAGS += -I../widgets | ||||
BUILD_CXX_FLAGS += $(shell pkg-config --cflags QtCore QtGui jack) | |||||
LINK_FLAGS += $(shell pkg-config --libs QtCore QtGui jack) | |||||
BUILD_CXX_FLAGS += $(shell pkg-config --cflags QtCore QtGui) | |||||
LINK_FLAGS += $(shell pkg-config --libs QtCore QtGui) | |||||
ifeq ($(HAVE_JACKSESSION),true) | ifeq ($(HAVE_JACKSESSION),true) | ||||
BUILD_CXX_FLAGS += -DHAVE_JACKSESSION | BUILD_CXX_FLAGS += -DHAVE_JACKSESSION | ||||
@@ -9,8 +9,8 @@ include ../Makefile.mk | |||||
# -------------------------------------------------------------- | # -------------------------------------------------------------- | ||||
BUILD_CXX_FLAGS += -I../widgets | BUILD_CXX_FLAGS += -I../widgets | ||||
BUILD_CXX_FLAGS += $(shell pkg-config --cflags QtCore QtGui jack) | |||||
LINK_FLAGS += $(shell pkg-config --libs QtCore QtGui jack) | |||||
BUILD_CXX_FLAGS += $(shell pkg-config --cflags QtCore QtGui) | |||||
LINK_FLAGS += $(shell pkg-config --libs QtCore QtGui) | |||||
ifeq ($(HAVE_JACKSESSION),true) | ifeq ($(HAVE_JACKSESSION),true) | ||||
BUILD_CXX_FLAGS += -DHAVE_JACKSESSION | BUILD_CXX_FLAGS += -DHAVE_JACKSESSION | ||||
@@ -2,7 +2,7 @@ | |||||
#ifndef __APP_DETAILS_H__ | #ifndef __APP_DETAILS_H__ | ||||
#define __APP_DETAILS_H__ | #define __APP_DETAILS_H__ | ||||
#define SFX_APP_VERSION "0.8.0" | |||||
#define SFX_APP_VERSION "0.8.1" | |||||
#define SFX_APP_BANNER "Catarina self-contained executable " SFX_APP_VERSION ", based on UnZipSFX." | #define SFX_APP_BANNER "Catarina self-contained executable " SFX_APP_VERSION ", based on UnZipSFX." | ||||
#ifndef SFX_APP_MININAME | #ifndef SFX_APP_MININAME | ||||
@@ -2,7 +2,7 @@ | |||||
#ifndef __APP_DETAILS_H__ | #ifndef __APP_DETAILS_H__ | ||||
#define __APP_DETAILS_H__ | #define __APP_DETAILS_H__ | ||||
#define SFX_APP_VERSION "0.8.0" | |||||
#define SFX_APP_VERSION "0.8.1" | |||||
#define SFX_APP_BANNER "Catia self-contained executable " SFX_APP_VERSION ", based on UnZipSFX." | #define SFX_APP_BANNER "Catia self-contained executable " SFX_APP_VERSION ", based on UnZipSFX." | ||||
#ifndef SFX_APP_MININAME | #ifndef SFX_APP_MININAME | ||||
@@ -7,7 +7,7 @@ | |||||
<x>0</x> | <x>0</x> | ||||
<y>0</y> | <y>0</y> | ||||
<width>588</width> | <width>588</width> | ||||
<height>498</height> | |||||
<height>523</height> | |||||
</rect> | </rect> | ||||
</property> | </property> | ||||
<property name="windowTitle"> | <property name="windowTitle"> | ||||
@@ -143,25 +143,16 @@ | |||||
<item> | <item> | ||||
<widget class="QScrollArea" name="scrollArea"> | <widget class="QScrollArea" name="scrollArea"> | ||||
<property name="sizePolicy"> | <property name="sizePolicy"> | ||||
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> | |||||
<sizepolicy hsizetype="Expanding" vsizetype="Fixed"> | |||||
<horstretch>0</horstretch> | <horstretch>0</horstretch> | ||||
<verstretch>0</verstretch> | <verstretch>0</verstretch> | ||||
</sizepolicy> | </sizepolicy> | ||||
</property> | </property> | ||||
<property name="minimumSize"> | |||||
<size> | |||||
<width>0</width> | |||||
<height>70</height> | |||||
</size> | |||||
</property> | |||||
<property name="verticalScrollBarPolicy"> | <property name="verticalScrollBarPolicy"> | ||||
<enum>Qt::ScrollBarAlwaysOff</enum> | <enum>Qt::ScrollBarAlwaysOff</enum> | ||||
</property> | </property> | ||||
<property name="horizontalScrollBarPolicy"> | <property name="horizontalScrollBarPolicy"> | ||||
<enum>Qt::ScrollBarAlwaysOff</enum> | |||||
</property> | |||||
<property name="widgetResizable"> | |||||
<bool>true</bool> | |||||
<enum>Qt::ScrollBarAlwaysOn</enum> | |||||
</property> | </property> | ||||
<property name="alignment"> | <property name="alignment"> | ||||
<set>Qt::AlignCenter</set> | <set>Qt::AlignCenter</set> | ||||
@@ -170,30 +161,33 @@ | |||||
<property name="geometry"> | <property name="geometry"> | ||||
<rect> | <rect> | ||||
<x>0</x> | <x>0</x> | ||||
<y>0</y> | |||||
<width>864</width> | |||||
<height>64</height> | |||||
<y>10</y> | |||||
<width>1440</width> | |||||
<height>69</height> | |||||
</rect> | </rect> | ||||
</property> | </property> | ||||
<property name="sizePolicy"> | <property name="sizePolicy"> | ||||
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> | |||||
<sizepolicy hsizetype="Fixed" vsizetype="Fixed"> | |||||
<horstretch>0</horstretch> | <horstretch>0</horstretch> | ||||
<verstretch>0</verstretch> | <verstretch>0</verstretch> | ||||
</sizepolicy> | </sizepolicy> | ||||
</property> | </property> | ||||
<property name="minimumSize"> | <property name="minimumSize"> | ||||
<size> | <size> | ||||
<width>864</width> | |||||
<height>64</height> | |||||
<width>1440</width> | |||||
<height>69</height> | |||||
</size> | </size> | ||||
</property> | </property> | ||||
<property name="maximumSize"> | <property name="maximumSize"> | ||||
<size> | <size> | ||||
<width>864</width> | |||||
<height>64</height> | |||||
<width>1440</width> | |||||
<height>69</height> | |||||
</size> | </size> | ||||
</property> | </property> | ||||
<layout class="QHBoxLayout" name="horizontalLayout_2"> | <layout class="QHBoxLayout" name="horizontalLayout_2"> | ||||
<property name="spacing"> | |||||
<number>0</number> | |||||
</property> | |||||
<property name="margin"> | <property name="margin"> | ||||
<number>0</number> | <number>0</number> | ||||
</property> | </property> | ||||
@@ -207,17 +201,16 @@ | |||||
</property> | </property> | ||||
<property name="minimumSize"> | <property name="minimumSize"> | ||||
<size> | <size> | ||||
<width>864</width> | |||||
<height>64</height> | |||||
<width>1440</width> | |||||
<height>69</height> | |||||
</size> | </size> | ||||
</property> | </property> | ||||
<property name="maximumSize"> | <property name="maximumSize"> | ||||
<size> | <size> | ||||
<width>864</width> | |||||
<height>64</height> | |||||
<width>1440</width> | |||||
<height>69</height> | |||||
</size> | </size> | ||||
</property> | </property> | ||||
<layout class="QHBoxLayout" name="horizontalLayout_4"/> | |||||
</widget> | </widget> | ||||
</item> | </item> | ||||
</layout> | </layout> | ||||