Skip to content

Commit e81bb64

Browse files
falkTXfalkTX
committed
Remove all stuff not related to the individual cadence-tools
Signed-off-by: falkTX <falktx@falktx.com>
1 parent c167f35 commit e81bb64

File tree

119 files changed

+26
-46594
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+26
-46594
lines changed

‎Makefile‎

Lines changed: 22 additions & 163 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/make -f
2-
# Makefile for Cadence #
3-
# ---------------------- #
2+
# Makefile for Cadence-Tools #
3+
# -------------------------- #
44
# Created by falkTX
55
#
66

@@ -11,18 +11,11 @@ LINK = ln -s
1111
PYUIC ?= pyuic5
1212
PYRCC ?= pyrcc5
1313

14-
# Detect X11 rules dir
15-
ifeq "$(wildcard /etc/X11/Xsession.d/ )" ""
16-
X11_RC_DIR = $(DESTDIR)/etc/X11/xinit/xinitrc.d/
17-
else
18-
X11_RC_DIR = $(DESTDIR)/etc/X11/Xsession.d/
19-
endif
14+
# ---------------------------------------------------------------------------------------------------------------------
2015

21-
# -----------------------------------------------------------------------------------------------------------------------------------------
16+
all: CPP UI
2217

23-
all: CPP RES UI
24-
25-
# -----------------------------------------------------------------------------------------------------------------------------------------
18+
# ---------------------------------------------------------------------------------------------------------------------
2619
# C++ code
2720

2821
CPP: jackmeter xycontroller
@@ -33,191 +26,57 @@ jackmeter:
3326
xycontroller:
3427
$(MAKE) -C c++/xycontroller
3528

36-
# -----------------------------------------------------------------------------------------------------------------------------------------
37-
# Resources
38-
39-
RES: src/resources_rc.py
40-
41-
src/resources_rc.py: resources/resources.qrc
42-
$(PYRCC) $< -o $@
43-
44-
# -----------------------------------------------------------------------------------------------------------------------------------------
29+
# ---------------------------------------------------------------------------------------------------------------------
4530
# UI code
4631

47-
UI: cadence catarina catia claudia tools
48-
49-
cadence: src/ui_cadence.py \
50-
src/ui_cadence_tb_jack.py src/ui_cadence_tb_alsa.py src/ui_cadence_tb_a2j.py src/ui_cadence_tb_pa.py \
51-
src/ui_cadence_rwait.py
52-
53-
catarina: src/ui_catarina.py \
54-
src/ui_catarina_addgroup.py src/ui_catarina_removegroup.py src/ui_catarina_renamegroup.py \
55-
src/ui_catarina_addport.py src/ui_catarina_removeport.py src/ui_catarina_renameport.py \
56-
src/ui_catarina_connectports.py src/ui_catarina_disconnectports.py
57-
58-
catia: src/ui_catia.py
59-
60-
claudia: src/ui_claudia.py \
61-
src/ui_claudia_studioname.py src/ui_claudia_studiolist.py \
62-
src/ui_claudia_createroom.py src/ui_claudia_projectname.py src/ui_claudia_projectproperties.py \
63-
src/ui_claudia_runcustom.py src/ui_claudia_launcher.py src/ui_claudia_launcher_app.py
64-
65-
tools: \
66-
src/ui_logs.py src/ui_render.py \
67-
src/ui_settings_app.py src/ui_settings_jack.py
32+
UI: src/ui_logs.py src/ui_render.py src/ui_settings_app.py src/ui_settings_jack.py
6833

6934
src/ui_%.py: resources/ui/%.ui
7035
$(PYUIC) $< -o $@
7136

72-
# -----------------------------------------------------------------------------------------------------------------------------------------
37+
# ---------------------------------------------------------------------------------------------------------------------
7338

7439
clean:
7540
$(MAKE) clean -C c++/jackmeter
7641
$(MAKE) clean -C c++/xycontroller
7742
rm -f *~ src/*~ src/*.pyc src/ui_*.py src/resources_rc.py
7843

79-
# -----------------------------------------------------------------------------------------------------------------------------------------
44+
# ---------------------------------------------------------------------------------------------------------------------
8045

8146
debug:
8247
$(MAKE) DEBUG=true
8348

84-
# -----------------------------------------------------------------------------------------------------------------------------------------
49+
# ---------------------------------------------------------------------------------------------------------------------
8550

8651
install:
8752
# Create directories
88-
install -d $(DESTDIR)/etc/xdg/autostart/
89-
install -d $(DESTDIR)$(PREFIX)/bin/
90-
install -d $(DESTDIR)$(PREFIX)/share/applications/
91-
install -d $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/
92-
install -d $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/
93-
install -d $(DESTDIR)$(PREFIX)/share/icons/hicolor/128x128/apps/
94-
install -d $(DESTDIR)$(PREFIX)/share/icons/hicolor/256x256/apps/
95-
install -d $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/
96-
install -d $(DESTDIR)$(PREFIX)/share/cadence/
97-
install -d $(DESTDIR)$(PREFIX)/share/cadence/src/
98-
install -d $(DESTDIR)$(PREFIX)/share/cadence/pulse2jack/
99-
install -d $(DESTDIR)$(PREFIX)/share/cadence/pulse2loopback/
100-
install -d $(DESTDIR)$(PREFIX)/share/cadence/icons/
101-
install -d $(DESTDIR)$(PREFIX)/share/cadence/templates/
102-
install -d $(X11_RC_DIR)
53+
install -d $(DESTDIR)$(PREFIX)/bin
54+
install -d $(DESTDIR)$(PREFIX)/share/cadence-tools
10355

10456
# Install script files and binaries
10557
install -m 755 \
106-
data/cadence \
107-
data/cadence-aloop-daemon \
10858
data/cadence-jacksettings \
10959
data/cadence-logs \
110-
data/cadence-pulse2jack \
111-
data/cadence-pulse2loopback \
11260
data/cadence-render \
113-
data/cadence-session-start \
114-
data/catarina \
115-
data/catia \
116-
data/claudia \
117-
data/claudia-launcher \
11861
c++/jackmeter/cadence-jackmeter \
11962
c++/xycontroller/cadence-xycontroller \
12063
$(DESTDIR)$(PREFIX)/bin/
12164

122-
# Install desktop files
123-
install -m 644 data/autostart/*.desktop $(DESTDIR)/etc/xdg/autostart/
124-
install -m 644 data/*.desktop $(DESTDIR)$(PREFIX)/share/applications/
125-
126-
# Install icons, 16x16
127-
install -m 644 resources/16x16/cadence.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/
128-
install -m 644 resources/16x16/catarina.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/
129-
install -m 644 resources/16x16/catia.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/
130-
install -m 644 resources/16x16/claudia.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/
131-
install -m 644 resources/16x16/claudia-launcher.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/
132-
133-
# Install icons, 48x48
134-
install -m 644 resources/48x48/cadence.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/
135-
install -m 644 resources/48x48/catarina.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/
136-
install -m 644 resources/48x48/catia.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/
137-
install -m 644 resources/48x48/claudia.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/
138-
install -m 644 resources/48x48/claudia-launcher.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/
139-
140-
# Install icons, 128x128
141-
install -m 644 resources/128x128/cadence.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/128x128/apps/
142-
install -m 644 resources/128x128/catarina.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/128x128/apps/
143-
install -m 644 resources/128x128/catia.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/128x128/apps/
144-
install -m 644 resources/128x128/claudia.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/128x128/apps/
145-
install -m 644 resources/128x128/claudia-launcher.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/128x128/apps/
146-
147-
# Install icons, 256x256
148-
install -m 644 resources/256x256/cadence.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/256x256/apps/
149-
install -m 644 resources/256x256/catarina.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/256x256/apps/
150-
install -m 644 resources/256x256/catia.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/256x256/apps/
151-
install -m 644 resources/256x256/claudia.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/256x256/apps/
152-
install -m 644 resources/256x256/claudia-launcher.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/256x256/apps/
153-
154-
# Install icons, scalable
155-
install -m 644 resources/scalable/cadence.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/
156-
install -m 644 resources/scalable/catarina.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/
157-
install -m 644 resources/scalable/catia.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/
158-
install -m 644 resources/scalable/claudia.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/
159-
install -m 644 resources/scalable/claudia-launcher.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/
160-
16165
# Install main code
162-
install -m 755 src/*.py $(DESTDIR)$(PREFIX)/share/cadence/src/
163-
164-
# Install addtional stuff for Cadence
165-
install -m 644 data/pulse2jack/* $(DESTDIR)$(PREFIX)/share/cadence/pulse2jack/
166-
install -m 644 data/pulse2loopback/* $(DESTDIR)$(PREFIX)/share/cadence/pulse2loopback/
167-
install -m 755 data/61cadence-session-inject $(X11_RC_DIR)
168-
169-
# Install addtional stuff for Claudia
170-
cp -r data/icons/* $(DESTDIR)$(PREFIX)/share/cadence/icons/
171-
cp -r data/templates/* $(DESTDIR)$(PREFIX)/share/cadence/templates/
66+
install -m 755 src/*.py $(DESTDIR)$(PREFIX)/share/cadence-tools/
17267

17368
# Adjust PREFIX value in script files
17469
sed -i "s?X-PREFIX-X?$(PREFIX)?" \
175-
$(DESTDIR)$(PREFIX)/bin/cadence \
176-
$(DESTDIR)$(PREFIX)/bin/cadence-aloop-daemon \
17770
$(DESTDIR)$(PREFIX)/bin/cadence-jacksettings \
17871
$(DESTDIR)$(PREFIX)/bin/cadence-logs \
179-
$(DESTDIR)$(PREFIX)/bin/cadence-pulse2jack \
180-
$(DESTDIR)$(PREFIX)/bin/cadence-pulse2loopback \
181-
$(DESTDIR)$(PREFIX)/bin/cadence-render \
182-
$(DESTDIR)$(PREFIX)/bin/cadence-session-start \
183-
$(DESTDIR)$(PREFIX)/bin/catarina \
184-
$(DESTDIR)$(PREFIX)/bin/catia \
185-
$(DESTDIR)$(PREFIX)/bin/claudia \
186-
$(DESTDIR)$(PREFIX)/bin/claudia-launcher \
187-
$(X11_RC_DIR)/61cadence-session-inject
188-
189-
# Delete old files
190-
rm -f $(X11_RC_DIR)/21cadence-session-inject
191-
rm -f $(X11_RC_DIR)/70cadence-plugin-paths
192-
rm -f $(X11_RC_DIR)/99cadence-session-start
193-
194-
# -----------------------------------------------------------------------------------------------------------------------------------------
72+
$(DESTDIR)$(PREFIX)/bin/cadence-render
73+
74+
# ---------------------------------------------------------------------------------------------------------------------
19575

19676
uninstall:
197-
rm -f $(DESTDIR)$(PREFIX)/bin/cadence*
198-
rm -f $(DESTDIR)$(PREFIX)/bin/catarina
199-
rm -f $(DESTDIR)$(PREFIX)/bin/catia
200-
rm -f $(DESTDIR)$(PREFIX)/bin/claudia*
201-
rm -f $(DESTDIR)$(PREFIX)/share/applications/cadence.desktop
202-
rm -f $(DESTDIR)$(PREFIX)/share/applications/catarina.desktop
203-
rm -f $(DESTDIR)$(PREFIX)/share/applications/catia.desktop
204-
rm -f $(DESTDIR)$(PREFIX)/share/applications/claudia.desktop
205-
rm -f $(DESTDIR)$(PREFIX)/share/applications/claudia-launcher.desktop
206-
rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/*/apps/cadence.png
207-
rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/*/apps/catarina.png
208-
rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/*/apps/catia.png
209-
rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/*/apps/claudia.png
210-
rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/*/apps/claudia-launcher.png
211-
rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/cadence.svg
212-
rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/catarina.svg
213-
rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/catia.svg
214-
rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/claudia.svg
215-
rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/claudia-launcher.svg
216-
rm -f $(DESTDIR)/etc/xdg/autostart/cadence-session-start.desktop
217-
rm -f $(X11_RC_DIR)/61cadence-session-inject
218-
rm -rf $(DESTDIR)$(PREFIX)/share/cadence/
219-
220-
# Old stuff
221-
rm -f $(X11_RC_DIR)/21cadence-session-inject
222-
rm -f $(X11_RC_DIR)/70cadence-plugin-paths
223-
rm -f $(X11_RC_DIR)/99cadence-session-start
77+
rm -f $(DESTDIR)$(PREFIX)/bin/cadence-jackmeter
78+
rm -f $(DESTDIR)$(PREFIX)/bin/cadence-jacksettings
79+
rm -f $(DESTDIR)$(PREFIX)/bin/cadence-logs
80+
rm -f $(DESTDIR)$(PREFIX)/bin/cadence-render
81+
rm -f $(DESTDIR)$(PREFIX)/bin/cadence-xycontroller
82+
rm -rf $(DESTDIR)$(PREFIX)/share/cadence-tools

‎README.md‎

Lines changed: 4 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# --- README for Cadence ---
1+
# Cadence-Tools
22

33
Cadence is a set of tools useful for audio production. <br/>
44
It's being developed by falkTX, using Python3 and Qt5 (and some C++ where needed).
@@ -8,20 +8,16 @@ Also, lots of custom widgets were coded when needed (like pixmapdial, pixmapkeyb
88
They can be re-used in other projects. Contact the author if you need help on that.
99

1010

11-
===== DESCRIPTIONS =====
12-
------------------------
13-
Here's a brief description of the main tools:
14-
15-
### [Cadence](http://kxstudio.sourceforge.net/KXStudio:Applications:Cadence)
16-
The main app. It performs system checks, manages JACK, calls other tools and make system tweaks.
11+
## The tools
12+
Here's a brief description of the included tools:
1713

1814
### [Cadence-JackMeter](http://kxstudio.sourceforge.net/KXStudio:Applications:Cadence-JackMeter)
1915
Digital peak meter for JACK. <br/>
2016
It automatically connects itself to all application JACK output ports that are also connected to the system output.
2117

2218
### [Cadence-JackSettings](http://kxstudio.sourceforge.net/KXStudio:Applications:Cadence-JackSettings)
2319
Simple and easy-to-use configure dialog for jackdbus. <br/>
24-
It can configure JACK's driver and engine parameters, and it also supports LADISH studios.
20+
It can configure JACK's driver and engine parameters.
2521

2622
### [Cadence-Logs](http://kxstudio.sourceforge.net/KXStudio:Applications:Cadence-Logs)
2723
Small tool that shows JACK, A2J, LASH and LADISH logs in a multi-tab window. <br/>
@@ -34,24 +30,3 @@ It supports a vast number of file types and can render in both realtime and free
3430
### [Cadence-XY Controller](http://kxstudio.sourceforge.net/KXStudio:Applications:Cadence-XYController)
3531
Simple XY widget that sends and receives data from Jack MIDI. <br/>
3632
It can send data through specific channels and has a MIDI Keyboard too.
37-
38-
### [Catarina](http://kxstudio.sourceforge.net/KXStudio:Applications:Catarina)
39-
A Patchbay test app, created while the patchcanvas module was being developed. <br/>
40-
It allows the user to experiment with the patchbay, without using ALSA, JACK or LADISH. <br/>
41-
You can save & load patchbay configurations too.
42-
43-
### [Catia](http://kxstudio.sourceforge.net/KXStudio:Applications:Catia)
44-
JACK Patchbay, with some neat features like A2J bridge support and JACK Transport. <br/>
45-
It's supposed to be as simple as possible (there's Claudia for advanced things), so it can work nicely on Windows and Mac too. <br/>
46-
Currently has ALSA-MIDI support in experimental stage (it doesn't automatically refresh the canvas when changes happen externally).
47-
48-
### [Claudia](http://kxstudio.sourceforge.net/KXStudio:Applications:Claudia)
49-
LADISH frontend; just like Catia, but focused at session management through LADISH. <br/>
50-
It has a bit more features than the official LADISH GUI, with a nice preview of the main canvas in the bottom-left. <br/>
51-
It also implements the 'Claudia-Launcher' add-application style for LADISH.
52-
53-
### [Claudia-Launcher](http://kxstudio.sourceforge.net/KXStudio:Applications:Claudia-Launcher)
54-
A multimedia application launcher with LADISH support. <br/>
55-
It searches for installed packages (not binaries), and displays the respective content as a launcher. <br/>
56-
The content is got through an hardcoded database, created and/or modified to suit the target distribution. <br/>
57-
Currently supports Debian and ArchLinux based distros.

‎c++/patchcanvas.cpp‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)