Skip to content

Commit

Permalink
Rename repo; rename directories; improve backup and dist scripts; add…
Browse files Browse the repository at this point in the history
… Traktor desktop image
  • Loading branch information
dotherightthing committed Apr 10, 2024
1 parent 31feb50 commit 737c454
Show file tree
Hide file tree
Showing 16 changed files with 80 additions and 27 deletions.
28 changes: 14 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
@@ -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*)

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -517,7 +517,7 @@ Set `MIDI To` to:

### Roadmap

See <https://github.com/dotherightthing/traktor-pro/labels/Control%20Traktor%20Deck>
See <https://github.com/dotherightthing/control-traktor/labels/Control%20Traktor%20Deck>

---

Expand Down Expand Up @@ -642,7 +642,7 @@ Note: This patch is functionally similar to ClyphX Pro's `INSAUDIO`/`INSMIDI`.

### Roadmap

See <https://github.com/dotherightthing/traktor-pro/labels/Presample%20Selected%20Track>
See <https://github.com/dotherightthing/control-traktor/labels/Presample%20Selected%20Track>

---

Expand All @@ -668,7 +668,7 @@ When jamming it's easy to lose track of what each track represents. This functio

### Roadmap

See <https://github.com/dotherightthing/traktor-pro/labels/Rename%20Selected%20Track>
See <https://github.com/dotherightthing/control-traktor/labels/Rename%20Selected%20Track>

---

Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 10 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -12,21 +12,20 @@
"email": "[email protected]"
},
"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",
Expand All @@ -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",
Expand Down
23 changes: 23 additions & 0 deletions scripts/backup.sh
Original file line number Diff line number Diff line change
@@ -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"
31 changes: 31 additions & 0 deletions scripts/dist.sh
Original file line number Diff line number Diff line change
@@ -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"
Binary file added src/loopback/Devices.plist
Binary file not shown.
Binary file added src/loopback/RecentApps.plist
Binary file not shown.
File renamed without changes
Binary file added src/traktor/traktor-desktop.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 737c454

Please sign in to comment.