aboutsummaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorDavid Runge <david.runge@frqrec.com>2014-11-30 18:55:57 +0100
committerDavid Runge <david.runge@frqrec.com>2014-11-30 18:55:57 +0100
commitc75d96166e8f6dfc30923f689b45ec327b071385 (patch)
tree2c8f59f9e36adf921b53e144b084a4f800850085 /bin
parent6694053f06ff93df23c32664daf26af4ca05bc2d (diff)
parent23fda4bd1bddd3786a808dc78743f9d24338de5a (diff)
downloaddotfiles-c75d96166e8f6dfc30923f689b45ec327b071385.tar.gz
dotfiles-c75d96166e8f6dfc30923f689b45ec327b071385.tar.bz2
dotfiles-c75d96166e8f6dfc30923f689b45ec327b071385.tar.xz
dotfiles-c75d96166e8f6dfc30923f689b45ec327b071385.zip
Merge branch 'master' of https://git.frqrec.com/git/dot
* 'master' of https://git.frqrec.com/git/dot: .dircolors: Added .dircolors for colorful ls output in Termite. stop_jack: Added enabling of pulseaudio after disabling of JACK. start_jack: Added disabling of pulseaudio before starting jack, as it breaks system audio when using USB-MIDI interfaces. export.zsh: Unified settings for TERM and LC_TIME for some machines. .zprofile: Removed unnessecary exports. Added eval of dircolors (needed for Termite ls output). .tmux.conf: Setting allow rename to true .Xresources: Adding new font (Monospace) as default. Setting borderLess to true.
Diffstat (limited to 'bin')
-rwxr-xr-xbin/start_jack6
-rwxr-xr-xbin/stop_jack3
2 files changed, 7 insertions, 2 deletions
diff --git a/bin/start_jack b/bin/start_jack
index 0c99aab..dfd6e4f 100755
--- a/bin/start_jack
+++ b/bin/start_jack
@@ -25,9 +25,11 @@ case "$HOSTNAME" in
DEVICE="/dev/fw1"
# TODO: Add settings from separate config file
if [[ -e $DEVICE && -r $DEVICE && -w $DEVICE ]]; then
+ echo "Stopping pulseaudio"
+ systemctl --user stop pulse
echo "Setting up "$DEVICE" with JACK."
jack_control start
- sudo schedtool -R -p 20 `pidof jackdbus`
+# sudo /usr/bin/schedtool -R -p 20 `pidof jackdbus`
jack_control eps realtime true
jack_control ds firewire
jack_control dps device $DEVICE
@@ -36,7 +38,7 @@ case "$HOSTNAME" in
jack_control dps period 256
sleep 3
a2jmidid -e &
- sudo schedtool -R -p 20 `pidof a2jmidid`
+# sudo /usr/bin/schedtool -R -p 20 `pidof a2jmidid`
rm ~/.config/SuperCollider/startup.scd
ln -s ~/.config/SuperCollider/startupfiles/electronicStudio.scd ~/.config/SuperCollider/startup.scd -v
else
diff --git a/bin/stop_jack b/bin/stop_jack
index 9c47548..786f16a 100755
--- a/bin/stop_jack
+++ b/bin/stop_jack
@@ -3,6 +3,9 @@
jack_control stop
sleep 3
jack_control exit
+
+systemctl --user start pulse
+
exit 0
#kill $(pidof jackd)