Browse Source

Misc

tags/v0.9.0
falkTX 8 years ago
parent
commit
975e740f05
4 changed files with 32 additions and 23 deletions
  1. +28
    -22
      Makefile
  2. +1
    -0
      TODO
  3. +2
    -0
      src/cadence_aloop_daemon.py
  4. +1
    -1
      src/shared.py

+ 28
- 22
Makefile View File

@@ -9,6 +9,7 @@ DESTDIR =

SED_PREFIX = $(shell echo $(PREFIX) | sed "s/\//\\\\\\\\\//g")

LINK = ln -s
PYUIC = pyuic4
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

@@ -52,20 +73,10 @@ src/ui_%.py: resources/ui/%.ui

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

RES: src/resources_rc.py

src/resources_rc.py: resources/resources.qrc
$(PYRCC) $< -o $@

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

CPP: jackmeter xycontroller

jackmeter:
$(MAKE) -C c++/jackmeter

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

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

@@ -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:
# Create directories
install -d $(DESTDIR)$(PREFIX)/bin/
@@ -180,6 +184,8 @@ install:
$(X11_RC_DIR)/70cadence-plugin-paths \
$(X11_RC_DIR)/99cadence-session-start

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

uninstall:
rm -f $(DESTDIR)$(PREFIX)/bin/cadence*
rm -f $(DESTDIR)$(PREFIX)/bin/catarina


+ 1
- 0
TODO View File

@@ -20,6 +20,7 @@ Cadence:
- add freq Hz change
- add desktop decriptions
- jacksettings, remember last tab
- reset xruns, change BufSize (reset xrun also in Unity desktop)

Claudia:
- Handle sample-rate changes in JACK (made possible by switch-master)


+ 2
- 0
src/cadence_aloop_daemon.py View File

@@ -111,6 +111,8 @@ if __name__ == '__main__':

useZita = bool(len(sys.argv) == 2 and sys.argv[1] in ("-zita", "--zita"))

# TODO - check consistency, and check channels value

# Init JACK client
client = jacklib.client_open("cadence-aloop-daemon", jacklib.JackUseExactName, None)



+ 1
- 1
src/shared.py View File

@@ -134,7 +134,7 @@ def asciiString(string):
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):
if not value:


Loading…
Cancel
Save