Browse Source

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

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

12
streamproxy

@ -102,15 +102,19 @@ proxyCMD() { @@ -102,15 +102,19 @@ proxyCMD() {
ICECAST="$(readXML icecast $XML)/$(readXML mountpoint $XML)"
ICENAME="$(readXML channel_name $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" \
-f "$FORMAT" \
echo ffmpeg \
-f "$FORMAT_IN" \
-i "$STREAM" \
-f "$FORMAT_OUT" \
-legacy_icecast 1 \
-content_type audio/mpeg \
-ice_name "$ICENAME" \
-ice_description "$ICEDESC" \
icecast://source:$ICECAST
icecast://source:$ICEPASS@$ICECAST
}
#*****

5
streamsaver

@ -368,7 +368,10 @@ mkdir -p ${config[archive_dir]} @@ -368,7 +368,10 @@ mkdir -p ${config[archive_dir]}
mkdir -p ${config[slices_dir]}
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]=""
fi

Loading…
Cancel
Save