Whitespace cleanup.

This commit is contained in:
Rolf Ahrenberg 2009-03-06 19:06:47 +02:00
parent abf0a5ece4
commit 25ec9df0cc
5 changed files with 34 additions and 34 deletions

View File

@ -27,7 +27,7 @@
if [ $# -ne 2 ]; then if [ $# -ne 2 ]; then
logger "$0: error: Invalid parameter count '$#' $*" logger "$0: error: Invalid parameter count '$#' $*"
exit 1; exit 1
fi fi
# Channels.conf parameter # Channels.conf parameter
@ -49,8 +49,8 @@ rm -f "${FIFO}"
mkfifo "${FIFO}" mkfifo "${FIFO}"
mplayer -dumpstream "${URL}" \ mplayer -dumpstream "${URL}" \
-quiet -nolirc -noautosub -noconsolecontrols -novideo -nojoystick \ -quiet -nolirc -noautosub -noconsolecontrols -novideo -nojoystick \
-dumpfile "$FIFO" & -dumpfile "$FIFO" &
# Time to connect and fill pipe # Time to connect and fill pipe
sleep 3 sleep 3
@ -58,10 +58,10 @@ sleep 3
# Build audio only stream # Build audio only stream
# PID 0x100/256 = Audio # PID 0x100/256 = Audio
ffmpeg -v -1 \ ffmpeg -v -1 \
-i "${FIFO}" \ -i "${FIFO}" \
-title "${TITLE}" \ -title "${TITLE}" \
-f mpegts -acodec mp2 -ac 2 -ab 96k -ar 48000 \ -f mpegts -acodec mp2 -ac 2 -ab 96k -ar 48000 \
- | nc -u 127.0.0.1 ${PORT} - | nc -u 127.0.0.1 ${PORT}
rm -f "${FIFO}" rm -f "${FIFO}"
} > ${LOG} 2>&1 } > ${LOG} 2>&1

View File

@ -22,7 +22,7 @@
if [ $# -ne 2 ]; then if [ $# -ne 2 ]; then
logger "$0: error: Invalid parameter count '$#' $*" logger "$0: error: Invalid parameter count '$#' $*"
exit 1; exit 1
fi fi
# Channels.conf parameter # Channels.conf parameter
@ -41,24 +41,24 @@ ABITRATE=320
# then controlled by the extra parameter passed by IPTV plugin to the script # then controlled by the extra parameter passed by IPTV plugin to the script
case ${PARAMETER} in case ${PARAMETER} in
1) 1)
URL="" URL=""
WIDTH=720 WIDTH=720
HEIGHT=576 HEIGHT=576
;; ;;
2) 2)
URL="" URL=""
;; ;;
3) 3)
URL="" URL=""
;; ;;
*) *)
URL="" # Default URL URL="" # Default URL
;; ;;
esac esac
if [ -z "${URL}" ]; then if [ -z "${URL}" ]; then
logger "$0: error: URL not defined!" logger "$0: error: URL not defined!"
exit 1; exit 1
fi fi
# Create transcoding options # Create transcoding options

View File

@ -27,7 +27,7 @@
if [ $# -ne 2 ]; then if [ $# -ne 2 ]; then
logger "$0: error: Invalid parameter count '$#' $*" logger "$0: error: Invalid parameter count '$#' $*"
exit 1; exit 1
fi fi
# Channels.conf parameter # Channels.conf parameter
@ -46,9 +46,9 @@ LOG=/dev/null
# PID 0x100/256 = Audio # PID 0x100/256 = Audio
arecord -q -D hw:0,0 -f dat | \ arecord -q -D hw:0,0 -f dat | \
ffmpeg -v -1 \ ffmpeg -v -1 \
-f wav \ -f wav \
-i - \ -i - \
-title "${TITLE}" \ -title "${TITLE}" \
-f mpegts -acodec mp2 -ac 2 -ab 128k -ar 48000 \ -f mpegts -acodec mp2 -ac 2 -ab 128k -ar 48000 \
- | nc -nu 127.0.0.1 ${PORT} - | nc -nu 127.0.0.1 ${PORT}
} > ${LOG} 2>&1 } > ${LOG} 2>&1

View File

@ -37,7 +37,7 @@ AUDIO_BITRATE=320
exit_with_error() exit_with_error()
{ {
logger "vlc2iptv: error: $*" logger "vlc2iptv: error: $*"
exit 1; exit 1
} }
read_arguments() read_arguments()

View File

@ -27,7 +27,7 @@
if [ $# -ne 2 ]; then if [ $# -ne 2 ]; then
logger "$0: error: Invalid parameter count '$#' $*" logger "$0: error: Invalid parameter count '$#' $*"
exit 1; exit 1
fi fi
# Channels.conf parameter # Channels.conf parameter
@ -50,8 +50,8 @@ rm -f "${FIFO}"
mkfifo "${FIFO}" mkfifo "${FIFO}"
mplayer -dumpstream "${URL}" \ mplayer -dumpstream "${URL}" \
-quiet -nolirc -noautosub -noconsolecontrols -novideo -nojoystick \ -quiet -nolirc -noautosub -noconsolecontrols -novideo -nojoystick \
-dumpfile "${FIFO}" & -dumpfile "${FIFO}" &
# Time to connect and fill pipe # Time to connect and fill pipe
sleep 3 sleep 3
@ -59,11 +59,11 @@ sleep 3
# Build stream from audiodump with cycle image as video # Build stream from audiodump with cycle image as video
# PID 0x100/256 = Video 0x101/257 = Audio # PID 0x100/256 = Video 0x101/257 = Audio
ffmpeg -v -1 \ ffmpeg -v -1 \
-i "${FIFO}" -r 0.5 -loop_input -i '${IMAGE}' \ -i "${FIFO}" -r 0.5 -loop_input -i '${IMAGE}' \
-title "${TITLE}" \ -title "${TITLE}" \
-f mpegts -intra -r 24 -vcodec mpeg2video -b 500k -s 352x288 \ -f mpegts -intra -r 24 -vcodec mpeg2video -b 500k -s 352x288 \
-acodec mp2 -ac 2 -ab 96k -ar 48000 \ -acodec mp2 -ac 2 -ab 96k -ar 48000 \
- | nc -u 127.0.0.1 ${PORT} - | nc -u 127.0.0.1 ${PORT}
rm -f "${FIFO}" rm -f "${FIFO}"
} > ${LOG} 2>&1 } > ${LOG} 2>&1