diff --git a/README.md b/README.md index f212a37..db03490 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ -# Traktor Pro +# Control Traktor -A collection of settings and Max4Live devices which speed up aspects of my DJing and jamming workflows. +A collection of settings and Max4Live devices for improved control over Traktor Pro. ## Installation only -1. Download `release.zip` from the latest [Release](https://github.com/dotherightthing/traktor-pro/releases) +1. Download `release.zip` from the latest [Release](https://github.com/dotherightthing/control-traktor/releases) 2. Unzip/expand the folder and copy to `~/Music/Ableton/User\ Library/` (note: devices may be a mix of Audio/Instrument/MIDI types) 3. See device usage instructions below (*Rename Selected Track*, *Presample Selected Track*) @@ -90,14 +90,14 @@ Note: there is a little noise from each of the S8 inputs, even if nothing is plu Screenshots: -* [Live Audio Preferences](./src/rogue-amoeba-loopback/live-audio-preferences.png) -* [Live Audio Preferences: Input](./src/rogue-amoeba-loopback/live-audio-preferences-input.png) -* [Live Audio Preferences: Output](./src/rogue-amoeba-loopback/live-audio-preferences-output.png) -* [Live track routing](./src/rogue-amoeba-loopback/live-track-routing.png) -* [S8 Loopback virtual device](./src/rogue-amoeba-loopback/s8-loopback.png) -* [Traktor Audio Setup](./src/rogue-amoeba-loopback/traktor-audio-setup.png) -* [Traktor Input Routing](./src/rogue-amoeba-loopback/traktor-input-routing.png) -* [Traktor Output Routing](./src/rogue-amoeba-loopback/traktor-output-routing.png) +* [Live Audio Preferences](./src/loopback/screenshots/live-audio-preferences.png) +* [Live Audio Preferences: Input](./src/loopback/screenshots/live-audio-preferences-input.png) +* [Live Audio Preferences: Output](./src/loopback/screenshots/live-audio-preferences-output.png) +* [Live track routing](./src/loopback/screenshots/live-track-routing.png) +* [S8 Loopback virtual device](./src/loopback/screenshots/s8-loopback.png) +* [Traktor Audio Setup](./src/loopback/screenshots/traktor-audio-setup.png) +* [Traktor Input Routing](./src/loopback/screenshots/traktor-input-routing.png) +* [Traktor Output Routing](./src/loopback/screenshots/traktor-output-routing.png) ### Tips @@ -517,7 +517,7 @@ Set `MIDI To` to: ### Roadmap -See +See --- @@ -642,7 +642,7 @@ Note: This patch is functionally similar to ClyphX Pro's `INSAUDIO`/`INSMIDI`. ### Roadmap -See +See --- @@ -668,7 +668,7 @@ When jamming it's easy to lose track of what each track represents. This functio ### Roadmap -See +See --- diff --git a/package-lock.json b/package-lock.json index e3c7266..adc0e96 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { - "name": "traktor-pro", + "name": "control-traktor", "version": "1.2.1", "lockfileVersion": 2, "requires": true, "packages": { "": { - "name": "traktor-pro", + "name": "control-traktor", "version": "1.2.1", "hasInstallScript": true, "license": "ISC", diff --git a/package.json b/package.json index a1e4196..2ac42c3 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { - "name": "traktor-pro", + "name": "control-traktor", "version": "1.2.1", - "description": "A collection of settings and Max4Live devices which speed up aspects of my DJing and jamming workflows.", + "description": "A collection of settings and Max4Live devices for improved control over Traktor Pro.", "main": "README.md", "engines": { "node": "18.7.0", @@ -12,21 +12,20 @@ "email": "dev@dotherightthing.co.nz" }, "scripts": { - "backup": "cp ./dist/*.amxd ./src/patches", - "build": "npm run backup && npm run lint && npm run compile", + "backup": "./scripts/backup.sh", + "build": "npm run backup && npm run lint && rm -r dist && mkdir dist && ./scripts/dist.sh", "changelog": "git log --pretty='* [%h] %s' --no-merges $(git describe --tags --abbrev=0 @^)..@ > CHANGELOG.md", - "compile": "babel ./src/js/*.js -d ./dist", - "postinstall": "mkdir dist && cp ./src/patches/*.amxd ./dist && cp ./src/presets/*.adg ./dist && cp ./src/sets/*.als ./dist && cp ./src/traktor/*.tsi ./dist && npm run build", - "reinstall": "rm -r dist && mkdir dist && cp ./src/patches/*.amxd ./dist && cp ./src/presets/*.adg ./dist && cp ./src/sets/*.als ./dist && cp ./src/traktor/*.tsi ./dist && npm run build", + "postinstall": "chmod a+x scripts/*sh && mkdir dist && npm run build", + "reinstall": "rm -r dist && mkdir dist && npm run build", "lint": "eslint './src/js/*.js'", "prepare": "husky install", - "release": "npm run changelog && cp ./README.md ./release && cp ./dist/* ./release", + "release": "npm run build && npm run changelog && cp ./dist/* ./release", "test": "echo \"Error: no test specified\" && exit 1", "watch": "nodemon" }, "repository": { "type": "git", - "url": "git+https://github.com/dotherightthing/traktor-pro.git" + "url": "git+https://github.com/dotherightthing/control-traktor.git" }, "keywords": [ "m4l", @@ -35,9 +34,9 @@ "author": "", "license": "ISC", "bugs": { - "url": "https://github.com/dotherightthing/traktor-pro/issues" + "url": "https://github.com/dotherightthing/control-traktor/issues" }, - "homepage": "https://github.com/dotherightthing/traktor-pro#readme", + "homepage": "https://github.com/dotherightthing/control-traktor#readme", "devDependencies": { "@babel/cli": "^7.18.10", "@babel/core": "^7.19.1", diff --git a/scripts/backup.sh b/scripts/backup.sh new file mode 100755 index 0000000..04026a8 --- /dev/null +++ b/scripts/backup.sh @@ -0,0 +1,23 @@ +#!/bin/bash + +# File: ./scripts/backup.sh +# Description: Backup files that are created and managed externally +# +# Note: +# chmod a+x = Change access permissions of this file, to 'e[x]ecutable' for '[a]ll users' +# +# Example: +# --- +# chmod a+x scripts/*.sh +# --- + +# e: exit the script if any statement returns a non-true return value +# v: print shell input lines as they are read (including all comments!) +set -e + +cd "$INIT_CWD" \ +&& echo "Copying files from ./dist to ./src/patches" \ +&& cp ./dist/*.amxd ./src/patches \ +&& echo "Copying files from 'Library/Application Support/Loopback' to ./src/Loopback" \ +&& cp ~/Library/Application\ Support/Loopback/*.plist ./src/loopback \ +&& echo "Backup task complete" diff --git a/scripts/dist.sh b/scripts/dist.sh new file mode 100755 index 0000000..a3efa77 --- /dev/null +++ b/scripts/dist.sh @@ -0,0 +1,31 @@ +#!/bin/bash + +# File: ./scripts/dist.sh +# Description: Copy relevant files to the dist folder +# +# Note: +# chmod a+x = Change access permissions of this file, to 'e[x]ecutable' for '[a]ll users' +# +# Example: +# --- +# chmod a+x scripts/*.sh +# --- + +# e: exit the script if any statement returns a non-true return value +# v: print shell input lines as they are read (including all comments!) +set -e + +cd "$INIT_CWD" \ +&& echo "Compiling JavaScript" \ +&& babel ./src/js/*.js -d ./dist \ +&& echo "Copying files from ./src/Loopback to 'Library/Application Support/Loopback'" \ +&& cp ./src/loopback/*.plist ~/Library/Application\ Support/Loopback \ +&& echo "Copying files from ./src to ./dist" \ +&& cp ./src/patches/*.amxd ./dist \ +&& cp ./src/presets/*.adg ./dist \ +&& cp ./README.md ./dist \ +&& cp ./src/sets/*.als ./dist \ +&& cp ./src/streamdeck-xl/profiles/Traktor.streamDeckProfile ./dist \ +&& cp ./src/traktor/*.png ./dist \ +&& cp ./src/traktor/*.tsi ./dist \ +&& echo "Dist task complete" diff --git a/src/loopback/Devices.plist b/src/loopback/Devices.plist new file mode 100644 index 0000000..0e42b26 Binary files /dev/null and b/src/loopback/Devices.plist differ diff --git a/src/loopback/RecentApps.plist b/src/loopback/RecentApps.plist new file mode 100644 index 0000000..3e8dda4 Binary files /dev/null and b/src/loopback/RecentApps.plist differ diff --git a/src/rogue-amoeba-loopback/live-audio-preferences-input.png b/src/loopback/screenshots/live-audio-preferences-input.png similarity index 100% rename from src/rogue-amoeba-loopback/live-audio-preferences-input.png rename to src/loopback/screenshots/live-audio-preferences-input.png diff --git a/src/rogue-amoeba-loopback/live-audio-preferences-output.png b/src/loopback/screenshots/live-audio-preferences-output.png similarity index 100% rename from src/rogue-amoeba-loopback/live-audio-preferences-output.png rename to src/loopback/screenshots/live-audio-preferences-output.png diff --git a/src/rogue-amoeba-loopback/live-audio-preferences.png b/src/loopback/screenshots/live-audio-preferences.png similarity index 100% rename from src/rogue-amoeba-loopback/live-audio-preferences.png rename to src/loopback/screenshots/live-audio-preferences.png diff --git a/src/rogue-amoeba-loopback/live-track-routing.png b/src/loopback/screenshots/live-track-routing.png similarity index 100% rename from src/rogue-amoeba-loopback/live-track-routing.png rename to src/loopback/screenshots/live-track-routing.png diff --git a/src/rogue-amoeba-loopback/s8-loopback.png b/src/loopback/screenshots/s8-loopback.png similarity index 100% rename from src/rogue-amoeba-loopback/s8-loopback.png rename to src/loopback/screenshots/s8-loopback.png diff --git a/src/rogue-amoeba-loopback/traktor-audio-setup.png b/src/loopback/screenshots/traktor-audio-setup.png similarity index 100% rename from src/rogue-amoeba-loopback/traktor-audio-setup.png rename to src/loopback/screenshots/traktor-audio-setup.png diff --git a/src/rogue-amoeba-loopback/traktor-input-routing.png b/src/loopback/screenshots/traktor-input-routing.png similarity index 100% rename from src/rogue-amoeba-loopback/traktor-input-routing.png rename to src/loopback/screenshots/traktor-input-routing.png diff --git a/src/rogue-amoeba-loopback/traktor-output-routing.png b/src/loopback/screenshots/traktor-output-routing.png similarity index 100% rename from src/rogue-amoeba-loopback/traktor-output-routing.png rename to src/loopback/screenshots/traktor-output-routing.png diff --git a/src/traktor/traktor-desktop.png b/src/traktor/traktor-desktop.png new file mode 100644 index 0000000..ca12c55 Binary files /dev/null and b/src/traktor/traktor-desktop.png differ