diff --git a/doc/masterindex.html b/doc/masterindex.html index 61fa4e2..316ad1b 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 199d9de..f62ae12 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 feb1036..49291d2 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 90d2a3f..dc5c3f8 100644 --- a/doc/robo_sourcefiles.html +++ b/doc/robo_sourcefiles.html @@ -32,12 +32,16 @@
  • streamsaver
    • +
  • +./settings/ +
    • diff --git a/doc/robo_variables.html b/doc/robo_variables.html index 2ef64ab..43da1a2 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 5a90837..87dafa6 100644 --- a/doc/streamsaver.html +++ b/doc/streamsaver.html @@ -220,16 +220,16 @@

    SOURCE

    173 makeCMD() {
 174         #Правило именования файлов
-175         FILE_NAME="${config[filename_prefix]}-${config[channel_name]}-${config[channel_number]}.${config[filename_suffix]}"
+175         FILE_NAME="${config[filename_prefix]}-${config[channel_name]}-CH${config[channel_number]}.${config[filename_suffix]}"
 176 
 177         #Минимальная команда
-178         CMD="${config[cmd]} -i ${config[stream]} -f ${config[output_format]}"
+178         CMD="${config[cmd]} -f ${config[input_format]} -i ${config[stream]} -f ${config[output_format]}"
 179 
 180         #КОДИРОВАНИЕ
 181         # enableOption output_format -c %%
 182 
 183         #ICECAST
-184         enableOption input_channel -map 0:%%
+184         enableOption input_channel -map %%
 185         enableOption channel_name \
 186                 -legacy_icecast 1 \
 187                 -content_type audio/mpeg \
@@ -242,7 +242,7 @@
 194                 icecast://source:${config[password]}@${config[icecast]}/${config[mountpoint]}
 195 
 196         # АРХИВ
-197         enableOption input_channel -map 0:%%
+197         enableOption input_channel -map %%
 198         enableOption archive_log \
 199                 -segment_list %% \
 200                 -segment_list_entry_prefix "${config[archive_dir]}" \
@@ -259,7 +259,7 @@
 211                 -strftime 1     "${config[archive_dir]}/$FILE_NAME"
 212 
 213         # АНАЛИЗ
-214         enableOption input_channel -map 0:%%
+214         enableOption input_channel -map %%
 215         enableOption slices_log \
 216                 -segment_list %% \
 217                 -segment_list_entry_prefix "${config[slices_dir]}" \
@@ -296,21 +296,21 @@
 248 
 249 config=(
 250         [stream]=""
-251         [icecast]="http://localhost:8000/"
-252         [password]="hackme"
+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]="0"
+259         [input_channel]=""
 260         [archive_dir]=""
-261         [archive_time]="3600"
-262         [archive_log]="/var/log/tuc01_archive.log"
+261         [archive_time]=""
+262         [archive_log]=""
 263         [slices_dir]=""
-264         [slices_time]=10
-265         [slices_log]="/var/log/tuc01_slices.log"
+264         [slices_time]=""
+265         [slices_log]=""
 266         [filename_prefix]="%Y-%m-%d_%H:%M:%S"
 267         [filename_suffix]="mp2"
 268         [output_format]="mp2"
@@ -433,7 +433,7 @@
 
  
  
 
diff --git a/doc/tobo_toplevel.html b/doc/tobo_toplevel.html
index 51e59bb..3d62072 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 30a8bd5..4656d05 100644
--- a/doc/toc_index.html
+++ b/doc/toc_index.html
@@ -41,7 +41,7 @@