From 56515803bdcabf71af05c263f8917eef74ff3539 Mon Sep 17 00:00:00 2001 From: Connor Olding Date: Mon, 13 Apr 2015 18:03:56 -0700 Subject: [PATCH] more laptop stuff --- home/-shrc | 14 +++++++++----- mpv/config | 2 +- sh/scropt | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/home/-shrc b/home/-shrc index 0c6c0eb..716a468 100644 --- a/home/-shrc +++ b/home/-shrc @@ -32,7 +32,7 @@ for x in AR CC CPP CXX CFLAGS CPPFLAGS CXXFLAGS LDFLAGS RANLIB RC WINDRES; do unset $x done -[ "$LANG" != "en_US.UTF-8" ] && echo "Warning: LANG is $LANG" +[ "$LANG" != "en_US.UTF-8" ] && [ "$LANG" != "en_CA.UTF-8" ] && echo "Warning: LANG is $LANG" # PuTTY over serial [[ "$TERM" == vt102 ]] && export TERM="xterm" @@ -104,18 +104,22 @@ function trash() { . ~/sh/z/z.sh -export MPV_STREAM_FLAGS="--quiet --no-sub" +MPV_STREAM_FLAGS="--quiet --no-sub" +LIVESTREAMER_FLAGS="" if [[ "$(uname -n)" != "banshee" ]]; then - export MPV_STREAM_FLAGS="$MPV_STREAM_FLAGS --vo=opengl:swapinterval=0" + MPV_STREAM_FLAGS="$MPV_STREAM_FLAGS --vo=opengl:swapinterval=0" +else + _COMPAND="$(~/sh/compandy 1 140 -30 10 6 18 1)" + MPV_STREAM_FLAGS="$MPV_STREAM_FLAGS "'--af=lavfi=\"aformat=channel_layouts=stereo,'"$_COMPAND"',lowpass=f=1000:p=1,lowpass=f=4000:p=2\"' fi twitch(){ - livestreamer "twitch.tv/$1" best -p mpv -a \ + livestreamer "twitch.tv/$1" best -p mpv $LIVESTREAMER_FLAGS -a \ "$MPV_STREAM_FLAGS ${2:+--autofit=}${2:-} {filename}" } # hitbox uses rtmp but mpv doesnt support rtmp dump parameters hitbox(){ - livestreamer "hitbox.tv/$1" best -p mpv -a \ + livestreamer "hitbox.tv/$1" best -p mpv $LIVESTREAMER_FLAGS -a \ "$MPV_STREAM_FLAGS ${2:+--autofit=}${2:-} {filename}" } diff --git a/mpv/config b/mpv/config index 160841b..ff894f3 100644 --- a/mpv/config +++ b/mpv/config @@ -1,5 +1,5 @@ [default] -volume=50 +volume=70 #af=drc msg-level=all=info osd-level=1 diff --git a/sh/scropt b/sh/scropt index d8fc09f..1d19047 100755 --- a/sh/scropt +++ b/sh/scropt @@ -1,4 +1,4 @@ #!/usr/bin/env bash local now=$(date +%F_%H-%M-%S) -scrot ~/$now.png -e "optipng -quiet \$f" \ +scrot ~/$now.png -e "optipng -quiet \$f" "$@" \ && mv ~/$now.png ~/Dropbox/Public/screenshots/