Misc
This commit is contained in:
parent
bc743d4c15
commit
975e740f05
50
Makefile
50
Makefile
|
@ -9,6 +9,7 @@ DESTDIR =
|
||||||
|
|
||||||
SED_PREFIX = $(shell echo $(PREFIX) | sed "s/\//\\\\\\\\\//g")
|
SED_PREFIX = $(shell echo $(PREFIX) | sed "s/\//\\\\\\\\\//g")
|
||||||
|
|
||||||
|
LINK = ln -s
|
||||||
PYUIC = pyuic4
|
PYUIC = pyuic4
|
||||||
PYRCC = pyrcc4 -py3
|
PYRCC = pyrcc4 -py3
|
||||||
|
|
||||||
|
@ -21,9 +22,29 @@ endif
|
||||||
|
|
||||||
# -----------------------------------------------------------------------------------------------------------------------------------------
|
# -----------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
all: UI RES CPP
|
all: CPP RES UI
|
||||||
|
|
||||||
# -----------------------------------------------------------------------------------------------------------------------------------------
|
# -----------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
# C++ code
|
||||||
|
|
||||||
|
CPP: jackmeter xycontroller
|
||||||
|
|
||||||
|
jackmeter:
|
||||||
|
$(MAKE) -C c++/jackmeter
|
||||||
|
|
||||||
|
xycontroller:
|
||||||
|
$(MAKE) -C c++/xycontroller
|
||||||
|
|
||||||
|
# -----------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
# Resources
|
||||||
|
|
||||||
|
RES: src/resources_rc.py
|
||||||
|
|
||||||
|
src/resources_rc.py: resources/resources.qrc
|
||||||
|
$(PYRCC) $< -o $@
|
||||||
|
|
||||||
|
# -----------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
# UI code
|
||||||
|
|
||||||
UI: cadence catarina catia claudia tools
|
UI: cadence catarina catia claudia tools
|
||||||
|
|
||||||
|
@ -52,20 +73,10 @@ src/ui_%.py: resources/ui/%.ui
|
||||||
|
|
||||||
# -----------------------------------------------------------------------------------------------------------------------------------------
|
# -----------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
RES: src/resources_rc.py
|
clean:
|
||||||
|
$(MAKE) clean -C c++/jackmeter
|
||||||
src/resources_rc.py: resources/resources.qrc
|
$(MAKE) clean -C c++/xycontroller
|
||||||
$(PYRCC) $< -o $@
|
rm -f *~ src/*~ src/*.pyc src/ui_*.py src/resources_rc.py
|
||||||
|
|
||||||
# -----------------------------------------------------------------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
CPP: jackmeter xycontroller
|
|
||||||
|
|
||||||
jackmeter:
|
|
||||||
$(MAKE) -C c++/jackmeter
|
|
||||||
|
|
||||||
xycontroller:
|
|
||||||
$(MAKE) -C c++/xycontroller
|
|
||||||
|
|
||||||
# -----------------------------------------------------------------------------------------------------------------------------------------
|
# -----------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
@ -74,13 +85,6 @@ debug:
|
||||||
|
|
||||||
# -----------------------------------------------------------------------------------------------------------------------------------------
|
# -----------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
clean:
|
|
||||||
$(MAKE) clean -C c++/jackmeter
|
|
||||||
$(MAKE) clean -C c++/xycontroller
|
|
||||||
rm -f *~ src/*~ src/*.pyc src/ui_*.py src/resources_rc.py
|
|
||||||
|
|
||||||
# -----------------------------------------------------------------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
install:
|
install:
|
||||||
# Create directories
|
# Create directories
|
||||||
install -d $(DESTDIR)$(PREFIX)/bin/
|
install -d $(DESTDIR)$(PREFIX)/bin/
|
||||||
|
@ -180,6 +184,8 @@ install:
|
||||||
$(X11_RC_DIR)/70cadence-plugin-paths \
|
$(X11_RC_DIR)/70cadence-plugin-paths \
|
||||||
$(X11_RC_DIR)/99cadence-session-start
|
$(X11_RC_DIR)/99cadence-session-start
|
||||||
|
|
||||||
|
# -----------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
uninstall:
|
uninstall:
|
||||||
rm -f $(DESTDIR)$(PREFIX)/bin/cadence*
|
rm -f $(DESTDIR)$(PREFIX)/bin/cadence*
|
||||||
rm -f $(DESTDIR)$(PREFIX)/bin/catarina
|
rm -f $(DESTDIR)$(PREFIX)/bin/catarina
|
||||||
|
|
1
TODO
1
TODO
|
@ -20,6 +20,7 @@ Cadence:
|
||||||
- add freq Hz change
|
- add freq Hz change
|
||||||
- add desktop decriptions
|
- add desktop decriptions
|
||||||
- jacksettings, remember last tab
|
- jacksettings, remember last tab
|
||||||
|
- reset xruns, change BufSize (reset xrun also in Unity desktop)
|
||||||
|
|
||||||
Claudia:
|
Claudia:
|
||||||
- Handle sample-rate changes in JACK (made possible by switch-master)
|
- Handle sample-rate changes in JACK (made possible by switch-master)
|
||||||
|
|
|
@ -111,6 +111,8 @@ if __name__ == '__main__':
|
||||||
|
|
||||||
useZita = bool(len(sys.argv) == 2 and sys.argv[1] in ("-zita", "--zita"))
|
useZita = bool(len(sys.argv) == 2 and sys.argv[1] in ("-zita", "--zita"))
|
||||||
|
|
||||||
|
# TODO - check consistency, and check channels value
|
||||||
|
|
||||||
# Init JACK client
|
# Init JACK client
|
||||||
client = jacklib.client_open("cadence-aloop-daemon", jacklib.JackUseExactName, None)
|
client = jacklib.client_open("cadence-aloop-daemon", jacklib.JackUseExactName, None)
|
||||||
|
|
||||||
|
|
|
@ -134,7 +134,7 @@ def asciiString(string):
|
||||||
return normalize("NFKD", string).encode("ascii", "ignore").decode("utf-8")
|
return normalize("NFKD", string).encode("ascii", "ignore").decode("utf-8")
|
||||||
|
|
||||||
# ------------------------------------------------------------------------------------------------------------
|
# ------------------------------------------------------------------------------------------------------------
|
||||||
# Convert a ctypes c_char_p to a python string
|
# Convert a ctypes c_char_p into a python string
|
||||||
|
|
||||||
def cString(value):
|
def cString(value):
|
||||||
if not value:
|
if not value:
|
||||||
|
|
Loading…
Reference in New Issue