falkTX
/
Carla
mirror of https://github.com/falkTX/Carla
1
0
Fork 0
Code Releases 43 Activity
Browse Source

carla-control is back, sorta working

tags/1.9.7
falkTX 10 years ago
parent
a2f5b4fbf5
commit
53bcf1d9a8
7 changed files with 389 additions and 1038 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +3
    -2
      Makefile
  2. +15
    -0
      data/carla-control
  3. +1
    -1
      data/carla-control.desktop
  4. +0
    -11
      data/todo/carla-control
  5. +0
    -160
      resources/ui/carla_control.ui
  6. +76
    -0
      source/carla-control
  7. +294
    -864
      source/carla_control.py

+ 3
- 2
Makefile View File

@@ -253,6 +253,7 @@ RES = \
bin/resources/carla_backend.py \ bin/resources/carla_backend.py \
bin/resources/carla_backend_qt.py \ bin/resources/carla_backend_qt.py \
bin/resources/carla_config.py \ bin/resources/carla_config.py \
bin/resources/carla_control.py \
bin/resources/carla_database.py \ bin/resources/carla_database.py \
bin/resources/carla_host.py \ bin/resources/carla_host.py \
bin/resources/carla_panels.py \ bin/resources/carla_panels.py \
@@ -317,7 +318,6 @@ endif


ifeq ($(HAVE_PYQT),true) ifeq ($(HAVE_PYQT),true)
UIs = \ UIs = \
source/ui_carla_control.py \
source/ui_carla_about.py \ source/ui_carla_about.py \
source/ui_carla_about_juce.py \ source/ui_carla_about_juce.py \
source/ui_carla_database.py \ source/ui_carla_database.py \
@@ -541,6 +541,7 @@ endif
$(LINK) $(PREFIX)/share/carla/carla_backend.py $(DESTDIR)$(PREFIX)/share/carla/resources/ $(LINK) $(PREFIX)/share/carla/carla_backend.py $(DESTDIR)$(PREFIX)/share/carla/resources/
$(LINK) $(PREFIX)/share/carla/carla_backend_qt.py $(DESTDIR)$(PREFIX)/share/carla/resources/ $(LINK) $(PREFIX)/share/carla/carla_backend_qt.py $(DESTDIR)$(PREFIX)/share/carla/resources/
$(LINK) $(PREFIX)/share/carla/carla_config.py $(DESTDIR)$(PREFIX)/share/carla/resources/ $(LINK) $(PREFIX)/share/carla/carla_config.py $(DESTDIR)$(PREFIX)/share/carla/resources/
$(LINK) $(PREFIX)/share/carla/carla_control.py $(DESTDIR)$(PREFIX)/share/carla/resources/
$(LINK) $(PREFIX)/share/carla/carla_database.py $(DESTDIR)$(PREFIX)/share/carla/resources/ $(LINK) $(PREFIX)/share/carla/carla_database.py $(DESTDIR)$(PREFIX)/share/carla/resources/
$(LINK) $(PREFIX)/share/carla/carla_host.py $(DESTDIR)$(PREFIX)/share/carla/resources/ $(LINK) $(PREFIX)/share/carla/carla_host.py $(DESTDIR)$(PREFIX)/share/carla/resources/
$(LINK) $(PREFIX)/share/carla/carla_modgui.py $(DESTDIR)$(PREFIX)/share/carla/resources/ $(LINK) $(PREFIX)/share/carla/carla_modgui.py $(DESTDIR)$(PREFIX)/share/carla/resources/
@@ -582,6 +583,7 @@ endif
# Adjust PREFIX value in script files # Adjust PREFIX value in script files
sed -i "s?X-PREFIX-X?$(PREFIX)?" \ sed -i "s?X-PREFIX-X?$(PREFIX)?" \
$(DESTDIR)$(PREFIX)/bin/carla \ $(DESTDIR)$(PREFIX)/bin/carla \
$(DESTDIR)$(PREFIX)/bin/carla-control \
$(DESTDIR)$(PREFIX)/bin/carla-database \ $(DESTDIR)$(PREFIX)/bin/carla-database \
$(DESTDIR)$(PREFIX)/bin/carla-patchbay \ $(DESTDIR)$(PREFIX)/bin/carla-patchbay \
$(DESTDIR)$(PREFIX)/bin/carla-rack \ $(DESTDIR)$(PREFIX)/bin/carla-rack \
@@ -589,7 +591,6 @@ endif
$(DESTDIR)$(PREFIX)/bin/carla-settings \ $(DESTDIR)$(PREFIX)/bin/carla-settings \
$(DESTDIR)$(PREFIX)/lib/carla/carla-bridge-lv2-modgui \ $(DESTDIR)$(PREFIX)/lib/carla/carla-bridge-lv2-modgui \
$(DESTDIR)$(PREFIX)/lib/pkgconfig/carla-standalone.pc $(DESTDIR)$(PREFIX)/lib/pkgconfig/carla-standalone.pc
# $(DESTDIR)$(PREFIX)/bin/carla-control \


# -------------------------------------------------------------------------------------------------------------------- # --------------------------------------------------------------------------------------------------------------------




+ 15
- 0
data/carla-control View File

@@ -0,0 +1,15 @@
#!/bin/bash

if [ -f /usr/bin/python3 ]; then
PYTHON=/usr/bin/python3
else
PYTHON=python
fi

if [ "$1" = "--gdb" ]; then
PYTHON="gdb --args $PYTHON"
fi

INSTALL_PREFIX="X-PREFIX-X"
export PATH="$INSTALL_PREFIX"/lib/carla:$PATH
exec $PYTHON "$INSTALL_PREFIX"/share/carla/carla-control --with-appname="$0" --with-libprefix="$INSTALL_PREFIX" "$@"

data/todo/carla-control.desktop → data/carla-control.desktop View File

@@ -2,7 +2,7 @@
Name=Carla Control Name=Carla Control
GenericName=Carla OSC Control GenericName=Carla OSC Control
Comment=Audio Plugin Host (OSC Control) Comment=Audio Plugin Host (OSC Control)
Exec=carla-control
Exec=carla-control %u
Icon=carla-control Icon=carla-control
Terminal=false Terminal=false
Type=Application Type=Application

+ 0
- 11
data/todo/carla-control View File

@@ -1,11 +0,0 @@
#!/bin/bash

if [ -f /usr/bin/python3 ]; then
PYTHON=/usr/bin/python3
else
PYTHON=python
fi

INSTALL_PREFIX="X-PREFIX-X"
export PATH="$INSTALL_PREFIX"/lib/carla:$PATH
exec $PYTHON "$INSTALL_PREFIX"/share/carla/carla_control.py --with-appname="$0" --with-libprefix="$INSTALL_PREFIX" "$@"

+ 0
- 160
resources/ui/carla_control.ui View File

@@ -1,160 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>CarlaControlW</class>
<widget class="QMainWindow" name="CarlaControlW">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>648</width>
<height>155</height>
</rect>
</property>
<property name="windowTitle">
<string>Carla Control</string>
</property>
<widget class="QWidget" name="centralwidget">
<layout class="QVBoxLayout" name="verticalLayout">
<property name="margin">
<number>0</number>
</property>
<item>
<widget class="QWidget" name="w_plugins" native="true">
<layout class="QVBoxLayout" name="layout">
<property name="spacing">
<number>3</number>
</property>
<property name="margin">
<number>0</number>
</property>
</layout>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<widget class="QMenuBar" name="menubar">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>648</width>
<height>19</height>
</rect>
</property>
<widget class="QMenu" name="menu_File">
<property name="title">
<string>&amp;File</string>
</property>
<addaction name="act_file_connect"/>
<addaction name="act_file_refresh"/>
<addaction name="separator"/>
<addaction name="act_file_quit"/>
</widget>
<widget class="QMenu" name="menu_Help">
<property name="title">
<string>&amp;Help</string>
</property>
<addaction name="act_help_about"/>
<addaction name="act_help_about_qt"/>
</widget>
<addaction name="menu_File"/>
<addaction name="menu_Help"/>
</widget>
<widget class="QStatusBar" name="statusbar"/>
<widget class="QToolBar" name="toolBar">
<property name="windowTitle">
<string>toolBar</string>
</property>
<property name="movable">
<bool>false</bool>
</property>
<property name="allowedAreas">
<set>Qt::NoToolBarArea</set>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
</property>
<attribute name="toolBarArea">
<enum>TopToolBarArea</enum>
</attribute>
<attribute name="toolBarBreak">
<bool>false</bool>
</attribute>
<addaction name="act_file_connect"/>
<addaction name="act_file_refresh"/>
<addaction name="separator"/>
<addaction name="act_file_quit"/>
</widget>
<action name="act_file_connect">
<property name="icon">
<iconset resource="../../resources/resources.qrc">
<normaloff>:/16x16/network-connect.png</normaloff>:/16x16/network-connect.png</iconset>
</property>
<property name="text">
<string>&amp;Connect...</string>
</property>
</action>
<action name="act_file_quit">
<property name="icon">
<iconset resource="../../resources/resources.qrc">
<normaloff>:/16x16/application-exit.png</normaloff>:/16x16/application-exit.png</iconset>
</property>
<property name="text">
<string>&amp;Quit</string>
</property>
</action>
<action name="act_help_about">
<property name="text">
<string>&amp;About</string>
</property>
</action>
<action name="act_help_about_qt">
<property name="text">
<string>About &amp;Qt</string>
</property>
</action>
<action name="act_file_refresh">
<property name="icon">
<iconset resource="../../resources/resources.qrc">
<normaloff>:/16x16/view-refresh.png</normaloff>:/16x16/view-refresh.png</iconset>
</property>
<property name="text">
<string>&amp;Refresh</string>
</property>
</action>
</widget>
<resources>
<include location="../../resources/resources.qrc"/>
</resources>
<connections>
<connection>
<sender>act_file_quit</sender>
<signal>triggered()</signal>
<receiver>CarlaControlW</receiver>
<slot>close()</slot>
<hints>
<hint type="sourcelabel">
<x>-1</x>
<y>-1</y>
</hint>
<hint type="destinationlabel">
<x>189</x>
<y>34</y>
</hint>
</hints>
</connection>
</connections>
</ui>

+ 76
- 0
source/carla-control View File

@@ -0,0 +1,76 @@
#!/usr/bin/env python3
# -*- coding: utf-8 -*-

# Carla plugin host
# Copyright (C) 2011-2015 Filipe Coelho <falktx@falktx.com>
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License as
# published by the Free Software Foundation; either version 2 of
# the License, or any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# For a full copy of the GNU General Public License see the doc/GPL.txt file.

# ------------------------------------------------------------------------------------------------------------
# Imports (Custom Stuff)

from carla_control import *

# ------------------------------------------------------------------------------------------------------------
# Main

if __name__ == '__main__':
# -------------------------------------------------------------
# Read CLI args

initName = os.path.basename(__file__) if ("__file__" in dir() and os.path.dirname(__file__) in PATH) else sys.argv[0]
libPrefix = None
oscAddr = None

for arg in sys.argv:
if arg.startswith("--with-appname="):
initName = os.path.basename(arg.replace("--with-initname=", ""))

elif arg.startswith("--with-libprefix="):
libPrefix = arg.replace("--with-libprefix=", "")

elif arg.startswith("osc."):
oscAddr = arg

# -------------------------------------------------------------
# App initialization

app = CarlaApplication("Carla2-Control", libPrefix)

# -------------------------------------------------------------
# Set-up custom signal handling

setUpSignals()

# -------------------------------------------------------------
# Init host backend

host = initHost(initName, libPrefix, True, False, True, CarlaHostOSC)
host.processMode = ENGINE_PROCESS_MODE_PATCHBAY
host.processModeForced = True
loadHostSettings(host)

# -------------------------------------------------------------
# Create GUI

gui = HostWindowOSC(host, oscAddr)

# -------------------------------------------------------------
# Show GUI

gui.show()

# -------------------------------------------------------------
# App-Loop

app.exit_exec()

+ 294
- 864
source/carla_control.py
File diff suppressed because it is too large
View File


Write Preview
Loading…
Cancel
Save