Browse Source

More work, set settings min-width to 600

tags/v0.9.0
falkTX 13 years ago
parent
commit
02f3055114
9 changed files with 88 additions and 47 deletions
  1. +11
    -12
      src/carla-bridge-ui/qtcreator/carla-bridge-lv2-gtk2.pro
  2. +5
    -0
      src/carla-bridge/carla_bridge.cpp
  3. +15
    -0
      src/carla-bridge/carla_osc.cpp
  4. +21
    -21
      src/carla-bridge/qtcreator/carla-bridge.pro
  5. +3
    -0
      src/carla-discovery/carla-discovery.cpp
  6. +9
    -7
      src/carla-discovery/qtcreator/carla-discovery.pro
  7. +9
    -0
      src/carla/carla_plugin.h
  8. +7
    -5
      src/carla/qtcreator/carla-backend.pro
  9. +8
    -2
      src/ui/settings_app.ui

+ 11
- 12
src/carla-bridge-ui/qtcreator/carla-bridge-lv2-gtk2.pro View File

@@ -3,28 +3,27 @@
CONFIG = warn_on qt release CONFIG = warn_on qt release


TEMPLATE = app TEMPLATE = app
VERSION = 0.5

TARGET = carla-bridge-lv2-gtk2
VERSION = 0.5.0


SOURCES = \ SOURCES = \
../carla_bridge_lv2.cpp \
../carla_bridge_gtk2.cpp \
../../carla-bridge/carla_osc.cpp
../carla_bridge_lv2.cpp \
../carla_bridge_gtk2.cpp \
../../carla-bridge/carla_osc.cpp


HEADERS = \ HEADERS = \
../carla_bridge_ui.h \
../../carla-bridge/carla_osc.h \
../../carla-includes/carla_includes.h
../carla_bridge_ui.h \
../../carla-bridge/carla_osc.h


INCLUDEPATH = .. \ INCLUDEPATH = .. \
../../carla-bridge \
../../carla-includes
../../carla-bridge \
../../carla-includes


LIBS += -ldl -lpthread -llo
TARGET = carla-bridge-lv2-gtk2


DEFINES = BUILD_BRIDGE BUILD_BRIDGE_UI DEFINES = BUILD_BRIDGE BUILD_BRIDGE_UI


LIBS += -ldl -lpthread -llo

unix { unix {
CONFIG += link_pkgconfig CONFIG += link_pkgconfig
PKGCONFIG += gtk+-2.0 PKGCONFIG += gtk+-2.0


+ 5
- 0
src/carla-bridge/carla_bridge.cpp View File

@@ -28,6 +28,11 @@ short add_plugin_ladspa(const char* filename, const char* label, void* extra_stu
short add_plugin_dssi(const char* filename, const char* label, void* extra_stuff); short add_plugin_dssi(const char* filename, const char* label, void* extra_stuff);
short add_plugin_vst(const char* filename, const char* label); short add_plugin_vst(const char* filename, const char* label);


void close_bridge_now()
{
close_now = true;
}

int main(int argc, char* argv[]) int main(int argc, char* argv[])
{ {
if (argc != 5) if (argc != 5)


+ 15
- 0
src/carla-bridge/carla_osc.cpp View File

@@ -21,6 +21,7 @@
#include "carla_bridge_ui.h" #include "carla_bridge_ui.h"
#else #else
#include "carla_plugin.h" #include "carla_plugin.h"
extern void close_bridge_now();
#endif #endif


#include <cstring> #include <cstring>
@@ -155,6 +156,9 @@ int osc_handle_control(lo_arg** argv)
#ifdef BUILD_BRIDGE_UI #ifdef BUILD_BRIDGE_UI
if (ui) if (ui)
ui->queque_message(BRIDGE_MESSAGE_PARAMETER, index, 0, value); ui->queque_message(BRIDGE_MESSAGE_PARAMETER, index, 0, value);
#else
if (CarlaPlugins[0])
CarlaPlugins[0]->set_parameter_value_rindex(index, value, false, true, true);
#endif #endif


return 0; return 0;
@@ -167,6 +171,9 @@ int osc_handle_program(lo_arg** argv)
#ifdef BUILD_BRIDGE_UI #ifdef BUILD_BRIDGE_UI
if (ui && index >= 0) if (ui && index >= 0)
ui->queque_message(BRIDGE_MESSAGE_PROGRAM, index, 0, 0.0); ui->queque_message(BRIDGE_MESSAGE_PROGRAM, index, 0, 0.0);
#else
if (CarlaPlugins[0])
CarlaPlugins[0]->set_program(index, false, true, true, true);
#endif #endif


return 0; return 0;
@@ -177,6 +184,9 @@ int osc_handle_show()
#ifdef BUILD_BRIDGE_UI #ifdef BUILD_BRIDGE_UI
if (ui) if (ui)
ui->queque_message(BRIDGE_MESSAGE_SHOW_GUI, 1, 0, 0.0); ui->queque_message(BRIDGE_MESSAGE_SHOW_GUI, 1, 0, 0.0);
#else
if (CarlaPlugins[0])
CarlaPlugins[0]->show_gui(true);
#endif #endif


return 0; return 0;
@@ -187,6 +197,9 @@ int osc_handle_hide()
#ifdef BUILD_BRIDGE_UI #ifdef BUILD_BRIDGE_UI
if (ui) if (ui)
ui->queque_message(BRIDGE_MESSAGE_SHOW_GUI, 0, 0, 0.0); ui->queque_message(BRIDGE_MESSAGE_SHOW_GUI, 0, 0, 0.0);
#else
if (CarlaPlugins[0])
CarlaPlugins[0]->show_gui(false);
#endif #endif


return 0; return 0;
@@ -197,6 +210,8 @@ int osc_handle_quit()
#ifdef BUILD_BRIDGE_UI #ifdef BUILD_BRIDGE_UI
if (ui) if (ui)
ui->queque_message(BRIDGE_MESSAGE_QUIT, 0, 0, 0.0); ui->queque_message(BRIDGE_MESSAGE_QUIT, 0, 0, 0.0);
#else
close_bridge_now();
#endif #endif


return 0; return 0;


+ 21
- 21
src/carla-bridge/qtcreator/carla-bridge.pro View File

@@ -3,32 +3,32 @@
CONFIG = warn_on qt release CONFIG = warn_on qt release


TEMPLATE = app TEMPLATE = app
VERSION = 0.5

TARGET = carla-bridge-qtcreator
VERSION = 0.5.0


SOURCES = \ SOURCES = \
../carla_bridge.cpp \
../carla_osc.cpp \
../../carla/carla_jack.cpp \
../../carla/carla_shared.cpp \
../../carla/ladspa.cpp \
../../carla/dssi.cpp \
../../carla/vst.cpp
../carla_bridge.cpp \
../carla_osc.cpp \
../../carla/carla_jack.cpp \
../../carla/carla_shared.cpp \
../../carla/ladspa.cpp \
../../carla/dssi.cpp \
../../carla/vst.cpp


HEADERS = \ HEADERS = \
../carla_osc.h \
../../carla/carla_backend.h \
../../carla/carla_jack.h \
../../carla/carla_plugin.h \
../../carla/carla_shared.h \
../../carla-includes/carla_includes.h
../carla_osc.h \
../../carla/carla_backend.h \
../../carla/carla_jack.h \
../../carla/carla_plugin.h \
../../carla/carla_shared.h \
../../carla-includes/carla_includes.h


INCLUDEPATH = .. \ INCLUDEPATH = .. \
../../carla-includes \
# ../../carla-includes/vestige \
../../carla
../../carla-includes \
../../carla-includes/vestige \
../../carla


LIBS += -ldl -ljack -llo
TARGET = carla-bridge-qtcreator


DEFINES = BUILD_BRIDGE
DEFINES = VESTIGE_HEADER BUILD_BRIDGE

LIBS += -ldl -ljack -llo

+ 3
- 0
src/carla-discovery/carla-discovery.cpp View File

@@ -278,7 +278,10 @@ intptr_t VstHostCallback(AEffect* effect, int32_t opcode, int32_t index, intptr_
default: default:
break; break;
} }

return 0; return 0;

(void)value;
} }


// ------------------------------ Plugin Check ------------------------------ // ------------------------------ Plugin Check ------------------------------


+ 9
- 7
src/carla-discovery/qtcreator/carla-discovery.pro View File

@@ -3,15 +3,17 @@
CONFIG = warn_on qt release CONFIG = warn_on qt release


TEMPLATE = app TEMPLATE = app
VERSION = 0.5
VERSION = 0.5.0


TARGET = carla-discovery-qtcreator
SOURCES = \
../carla-discovery.cpp


SOURCES = ../carla-discovery.cpp
INCLUDEPATH = .. \
../../carla-includes \
../../carla-includes/vestige


INCLUDEPATH = ../../carla-includes
#../../carla-includes/vestige
TARGET = carla-discovery-qtcreator


LIBS += -ldl
DEFINES = VESTIGE_HEADER BUILD_UNIX64


DEFINES = BUILD_UNIX64
LIBS += -ldl

+ 9
- 0
src/carla/carla_plugin.h View File

@@ -581,6 +581,15 @@ public:
callback_action(CALLBACK_PARAMETER_CHANGED, m_id, param_id, 0, value); callback_action(CALLBACK_PARAMETER_CHANGED, m_id, param_id, 0, value);
} }


void set_parameter_value_rindex(int32_t rindex, double value, bool gui_send, bool osc_send, bool callback_send)
{
for (uint32_t i=0; i < param.count; i++)
{
if (param.data[i].rindex == rindex)
set_parameter_value(i, value, gui_send, osc_send, callback_send);
}
}

void set_parameter_midi_channel(uint32_t index, uint8_t channel) void set_parameter_midi_channel(uint32_t index, uint8_t channel)
{ {
param.data[index].midi_channel = channel; param.data[index].midi_channel = channel;


src/carla/qtcreator/qtcreator.pro → src/carla/qtcreator/carla-backend.pro View File

@@ -30,10 +30,12 @@ HEADERS = \
../lv2_rdf.h \ ../lv2_rdf.h \
../../carla-includes/carla_includes.h ../../carla-includes/carla_includes.h


TARGET = carla_backend
INCLUDEPATH = .. \
../../carla-includes \
../../carla-includes/vestige


INCLUDEPATH = \
../../carla-includes
# ../../carla-includes/vestige
TARGET = carla_backend


LIBS += -ljack -llo
DEFINES = VESTIGE_HEADER

LIBS += -ldl -ljack -llo

+ 8
- 2
src/ui/settings_app.ui View File

@@ -6,10 +6,16 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>585</width>
<height>460</height>
<width>600</width>
<height>451</height>
</rect> </rect>
</property> </property>
<property name="minimumSize">
<size>
<width>600</width>
<height>0</height>
</size>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>Settings</string> <string>Settings</string>
</property> </property>


Loading…
Cancel
Save