diff --git a/doc/masterindex.html b/doc/masterindex.html index 316ad1b..d33b8f4 100644 --- a/doc/masterindex.html +++ b/doc/masterindex.html @@ -40,7 +40,7 @@

A - B - C - D - E - F - G - H - I - J - K - L - M - N - O - P - Q - R - S - T - U - V - W - X - Y - Z - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9

diff --git a/doc/robo_files.html b/doc/robo_files.html index f62ae12..e0cbcb1 100644 --- a/doc/robo_files.html +++ b/doc/robo_files.html @@ -32,7 +32,7 @@

A - B - C - D - E - F - G - H - I - J - K - L - M - N - O - P - Q - R - S - T - U - V - W - X - Y - Z - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9

diff --git a/doc/robo_functions.html b/doc/robo_functions.html index 49291d2..7d85459 100644 --- a/doc/robo_functions.html +++ b/doc/robo_functions.html @@ -35,7 +35,7 @@

A - B - C - D - E - F - G - H - I - J - K - L - M - N - O - P - Q - R - S - T - U - V - W - X - Y - Z - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9

diff --git a/doc/robo_sourcefiles.html b/doc/robo_sourcefiles.html index dc5c3f8..914f22c 100644 --- a/doc/robo_sourcefiles.html +++ b/doc/robo_sourcefiles.html @@ -41,7 +41,7 @@ streamsaver diff --git a/doc/robo_variables.html b/doc/robo_variables.html index 43da1a2..a2c730e 100644 --- a/doc/robo_variables.html +++ b/doc/robo_variables.html @@ -33,7 +33,7 @@

A - B - C - D - E - F - G - H - I - J - K - L - M - N - O - P - Q - R - S - T - U - V - W - X - Y - Z - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9

diff --git a/doc/streamsaver.html b/doc/streamsaver.html index 87dafa6..6055e8d 100644 --- a/doc/streamsaver.html +++ b/doc/streamsaver.html @@ -230,53 +230,54 @@ 182 183 #ICECAST 184 enableOption input_channel -map %% -185 enableOption channel_name \ -186 -legacy_icecast 1 \ -187 -content_type audio/mpeg \ -188 -ice_name %% -189 -190 enableOption channel_descr \ -191 -ice_description %% -192 -193 enableOption icecast \ -194 icecast://source:${config[password]}@${config[icecast]}/${config[mountpoint]} -195 -196 # АРХИВ -197 enableOption input_channel -map %% -198 enableOption archive_log \ -199 -segment_list %% \ -200 -segment_list_entry_prefix "${config[archive_dir]}" \ -201 -segment_list_type csv \ -202 -segment_list_flags live -203 -204 # +СЕГМЕНТИРОВАНИЕ -205 enableOption archive_dir \ -206 -segment_atclocktime 1 \ -207 -acodec "${config[output_format]}" \ -208 -fi segment \ -209 -segment_time "${config[archive_time]}" \ -210 -segment_format "${config[output_format]}" \ -211 -strftime 1 "${config[archive_dir]}/$FILE_NAME" -212 -213 # АНАЛИЗ -214 enableOption input_channel -map %% -215 enableOption slices_log \ -216 -segment_list %% \ -217 -segment_list_entry_prefix "${config[slices_dir]}" \ -218 -segment_list_type csv \ -219 -segment_list_flags live -220 -221 # +СЕГМЕНТИРОВАНИЕ -222 enableOption slices_dir \ -223 -segment_atclocktime 1 \ -224 -acodec "${config[output_format]}" \ -225 -fi segment \ -226 -segment_time "${config[slices_time]}" \ -227 -segment_format "${config[output_format]}" \ -228 -strftime 1 "${config[slices_dir]}/$FILE_NAME" -229 -230 echo "$CMD" -231 } +185 enableOption audio_bitrate -ab %% +186 enableOption channel_name \ +187 -legacy_icecast 1 \ +188 -content_type audio/mpeg \ +189 -ice_name %% +190 +191 enableOption channel_descr \ +192 -ice_description %% +193 +194 enableOption icecast \ +195 icecast://source:${config[password]}@${config[icecast]}/${config[mountpoint]} +196 +197 # АРХИВ +198 enableOption input_channel -map %% +199 enableOption archive_log \ +200 -segment_list %% \ +201 -segment_list_entry_prefix "${config[archive_dir]}" \ +202 -segment_list_type csv \ +203 -segment_list_flags live +204 +205 # +СЕГМЕНТИРОВАНИЕ +206 enableOption archive_dir \ +207 -segment_atclocktime 1 \ +208 -acodec "${config[output_format]}" \ +209 -fi segment \ +210 -segment_time "${config[archive_time]}" \ +211 -segment_format "${config[output_format]}" \ +212 -strftime 1 "${config[archive_dir]}/$FILE_NAME" +213 +214 # АНАЛИЗ +215 enableOption input_channel -map %% +216 enableOption slices_log \ +217 -segment_list %% \ +218 -segment_list_entry_prefix "${config[slices_dir]}" \ +219 -segment_list_type csv \ +220 -segment_list_flags live +221 +222 # +СЕГМЕНТИРОВАНИЕ +223 enableOption slices_dir \ +224 -segment_atclocktime 1 \ +225 -acodec "${config[output_format]}" \ +226 -fi segment \ +227 -segment_time "${config[slices_time]}" \ +228 -segment_format "${config[output_format]}" \ +229 -strftime 1 "${config[slices_dir]}/$FILE_NAME" +230 +231 echo "$CMD" +232 }
@@ -292,30 +293,30 @@ 
    enableOption, readOption, readXML, makeCMD

SOURCE

-
247 typeset -A config
-248 
-249 config=(
-250         [stream]=""
-251         [icecast]=""
-252         [password]=""
-253         [channel_name]=""
-254         [channel_number]=""
-255         [channel_descr]=""
-256         [mountpoint]=""
-257         [cmd]="ffmpeg"
-258         [input_format]="mpegts"
-259         [input_channel]=""
-260         [archive_dir]=""
-261         [archive_time]=""
-262         [archive_log]=""
-263         [slices_dir]=""
-264         [slices_time]=""
-265         [slices_log]=""
-266         [filename_prefix]="%Y-%m-%d_%H:%M:%S"
-267         [filename_suffix]="mp2"
-268         [output_format]="mp2"
-269         [audio_bitrate]="256k"
-270 )
+
248 typeset -A config
+249 
+250 config=(
+251         [stream]=""
+252         [icecast]=""
+253         [password]=""
+254         [channel_name]=""
+255         [channel_number]=""
+256         [channel_descr]=""
+257         [mountpoint]=""
+258         [cmd]="ffmpeg"
+259         [input_format]="mpegts"
+260         [input_channel]=""
+261         [archive_dir]=""
+262         [archive_time]=""
+263         [archive_log]=""
+264         [slices_dir]=""
+265         [slices_time]=""
+266         [slices_log]=""
+267         [filename_prefix]="%Y-%m-%d_%H:%M:%S"
+268         [filename_suffix]="mp2"
+269         [output_format]="mp2"
+270         [audio_bitrate]="256k"
+271 )
 

 
 

@@ -398,7 +399,7 @@

SOURCE

-
336 SETTINGS="$1"
+
337 SETTINGS="$1"
 

 
 

@@ -410,30 +411,30 @@
 
    streamsaver
 

 
SOURCE

-
347 #Проверка на наличие файла настроек
-348 if [ -z "$SETTINGS" ]; then
-349         echo "USAGE: $(basename $0) <settings.xml>" >&2
-350         exit 1
-351 elif [ ! -r "$SETTINGS" ]; then
-352         echo "Unable open file $1." >&2
-353         echo "USAGE: $(basename $0) <settings.xml>" >&2
-354         exit 1
-355 fi
-356 
-357 #Чтение настроек
-358 readXML "$SETTINGS"
-359 
-360 #Создание директорий хранения файлов, если требуется
-361 mkdir -p ${config[archive_dir]}
-362 mkdir -p ${config[slices_dir]}
-363 
-364 #Создание команды оцифровки сигнала
-365 makeCMD
+
348 #Проверка на наличие файла настроек
+349 if [ -z "$SETTINGS" ]; then
+350         echo "USAGE: $(basename $0) <settings.xml>" >&2
+351         exit 1
+352 elif [ ! -r "$SETTINGS" ]; then
+353         echo "Unable open file $1." >&2
+354         echo "USAGE: $(basename $0) <settings.xml>" >&2
+355         exit 1
+356 fi
+357 
+358 #Чтение настроек
+359 readXML "$SETTINGS"
+360 
+361 #Создание директорий хранения файлов, если требуется
+362 mkdir -p ${config[archive_dir]}
+363 mkdir -p ${config[slices_dir]}
+364 
+365 #Создание команды оцифровки сигнала
+366 makeCMD
 

 
  
  
 
diff --git a/doc/tobo_toplevel.html b/doc/tobo_toplevel.html
index 3d62072..4666c5d 100644
--- a/doc/tobo_toplevel.html
+++ b/doc/tobo_toplevel.html
@@ -32,7 +32,7 @@
 
A - B - C - D - E - F - G - H - I - J - K - L - M - N - O - P - Q - R - S - T - U - V - W - X - Y - Z - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9

  
  
 
diff --git a/doc/toc_index.html b/doc/toc_index.html
index 4656d05..b924b5c 100644
--- a/doc/toc_index.html
+++ b/doc/toc_index.html
@@ -41,7 +41,7 @@
 
  
  
 
diff --git a/streamsaver b/streamsaver
index 6fa1825..37df644 100755
--- a/streamsaver
+++ b/streamsaver
@@ -182,6 +182,7 @@ makeCMD() {
 
 	#ICECAST
 	enableOption input_channel -map %%
+	enableOption audio_bitrate -ab %%
 	enableOption channel_name \
 		-legacy_icecast 1 \
 		-content_type audio/mpeg \