Browse Source

v1.1. Исправлены недочёты

master
Maxim Lihachev 9 years ago
parent
commit
42dac48d76
  1. 88
      streamproxy
  2. 5
      streamsaver

88
streamproxy

@ -19,36 +19,36 @@
# #
# |dot start # |dot start
# digraph G { # digraph G {
# subgraph cluster_0 { # subgraph cluster_0 {
# style=filled; # style=filled;
# color=lightgrey; # color=lightgrey;
# node [style=filled,color=white]; # node [style=filled,color=white];
# UDP -> ICECAST; # UDP -> ICECAST;
# label = "streamproxy"; # label = "streamproxy";
# } # }
# #
# subgraph cluster_1 { # subgraph cluster_1 {
# node [style=filled]; # node [style=filled];
# ПХАС; # ПХАС;
# label = "streamsaver"; # label = "streamsaver";
# color=blue # color=blue
# ПХАС [shape=tab]; # ПХАС [shape=tab];
# } # }
# #
# subgraph cluster_2 { # subgraph cluster_2 {
# style=filled; # style=filled;
# color=lightblue; # color=lightblue;
# node [style=filled,color=white]; # node [style=filled,color=white];
# "Сигнал тишины"; # "Сигнал тишины";
# label = "iceloop"; # label = "iceloop";
# } # }
# #
# "Сигнал тишины" -> ICECAST; # "Сигнал тишины" -> ICECAST;
# ICECAST -> ПХАС; # ICECAST -> ПХАС;
# ICECAST -> "WEB-сервис"; # ICECAST -> "WEB-сервис";
# ПХАС -> "WEB-сервис"; # ПХАС -> "WEB-сервис";
# #
# UDP [shape=Mdiamond]; # UDP [shape=Mdiamond];
# } # }
# |dot end # |dot end
# #
@ -80,7 +80,7 @@
# SOURCE # SOURCE
# #
readXML() { readXML() {
\grep -oPm1 "(?<=<$1>)[^<]+" "$2" \grep -oPm1 "(?<=<$1>)[^<]+" "$2"
} }
#***** #*****
@ -98,19 +98,23 @@ readXML() {
# SOURCE # SOURCE
# #
proxyCMD() { proxyCMD() {
STREAM=$(readXML stream "$XML") STREAM=$(readXML stream "$XML")
ICECAST="$(readXML icecast $XML)/$(readXML mountpoint $XML)" ICECAST="$(readXML icecast $XML)/$(readXML mountpoint $XML)"
ICENAME="$(readXML channel_name $XML)" ICENAME="$(readXML channel_name $XML)"
ICEDESC="$(readXML channel_descr $XML)" ICEDESC="$(readXML channel_descr $XML)"
FORMAT="$(readXML input_format $XML)" ICEPASS="$(readXML password $XML)"
FORMAT_IN="$(readXML input_format $XML)"
FORMAT_OUT="$(readXML output_format $XML)"
echo ffmpeg -i "$STREAM" \ echo ffmpeg \
-f "$FORMAT" \ -f "$FORMAT_IN" \
-legacy_icecast 1 \ -i "$STREAM" \
-content_type audio/mpeg \ -f "$FORMAT_OUT" \
-ice_name "$ICENAME" \ -legacy_icecast 1 \
-ice_description "$ICEDESC" \ -content_type audio/mpeg \
icecast://source:$ICECAST -ice_name "$ICENAME" \
-ice_description "$ICEDESC" \
icecast://source:$ICEPASS@$ICECAST
} }
#***** #*****
@ -124,8 +128,8 @@ proxyCMD() {
#Проверка аргументов #Проверка аргументов
if [ -z $1 ]; then if [ -z $1 ]; then
echo "USAGE: $0 <xml>" echo "USAGE: $0 <xml>"
exit 1 exit 1
fi fi
#Файл настроек #Файл настроек
@ -135,7 +139,7 @@ XML="$1"
PROXY=$(readXML proxy "$XML") PROXY=$(readXML proxy "$XML")
if [ "$PROXY" == 1 ]; then if [ "$PROXY" == 1 ]; then
proxyCMD proxyCMD
fi fi
#***** #*****

5
streamsaver

@ -368,7 +368,10 @@ mkdir -p ${config[archive_dir]}
mkdir -p ${config[slices_dir]} mkdir -p ${config[slices_dir]}
if [ ${config[proxy]} == 1 ]; then if [ ${config[proxy]} == 1 ]; then
config[stream]="${config[icecast]}/${config[mountpoint]}" config[stream]="http://${config[icecast]}/${config[mountpoint]}"
config[input_format]="${config[output_format]}"
config[output_format]="copy"
config[input_channel]=""
config[icecast]="" config[icecast]=""
fi fi

Loading…
Cancel
Save