ソースを参照

Either method of storage

Bob Mottram 7 年 前
コミット
09f2505cfa
共有2 個のファイルを変更した18 個の追加18 個の削除を含む
  1. 1
    1
      doc/EN/app_icecast.org
  2. 17
    17
      website/EN/app_icecast.html

+ 1
- 1
doc/EN/app_icecast.org ファイルの表示

36
 * Adding files to be streamed
36
 * Adding files to be streamed
37
 There are two ways to get files onto the system: either via ssh or via a USB drive. File types can be *ogg, ogv, mp3 or mp4* format.
37
 There are two ways to get files onto the system: either via ssh or via a USB drive. File types can be *ogg, ogv, mp3 or mp4* format.
38
 
38
 
39
-It may take a while for the files to import, especially on a low power single board computer, since any mp3 or mp4 files will be converted to ogg or ogv. If you want to speed this up then you could do this conversion manually on a laptop with ffmpeg before storing files onto the USB drive.
39
+It may take a while for the files to import, especially on a low power single board computer, since any mp3 or mp4 files will be converted to ogg or ogv. If you want to speed this up then you could do this conversion manually on a laptop with ffmpeg before storing files onto the USB drive or uploading them via ssh.
40
 
40
 
41
 ** From a USB drive
41
 ** From a USB drive
42
 Create a directory on the USB drive named *icestream* and copy your files into there. Plug the drive into your server.
42
 Create a directory on the USB drive named *icestream* and copy your files into there. Plug the drive into your server.

+ 17
- 17
website/EN/app_icecast.html ファイルの表示

3
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
3
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
4
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
4
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
5
 <head>
5
 <head>
6
-<!-- 2017-11-27 Mon 12:34 -->
6
+<!-- 2017-11-27 Mon 12:35 -->
7
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
7
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
8
 <meta name="viewport" content="width=device-width, initial-scale=1" />
8
 <meta name="viewport" content="width=device-width, initial-scale=1" />
9
 <title>&lrm;</title>
9
 <title>&lrm;</title>
256
 This system is available only via an onion address, which should mitigate the potential for copyright disputes over streamed content. By default it's only set up to stream to a small number of users so that it doesn't put too much stress on CPU or memory requirements, although you can increase the maximum limit if you have a more powerful system and enough bandwidth.
256
 This system is available only via an onion address, which should mitigate the potential for copyright disputes over streamed content. By default it's only set up to stream to a small number of users so that it doesn't put too much stress on CPU or memory requirements, although you can increase the maximum limit if you have a more powerful system and enough bandwidth.
257
 </p>
257
 </p>
258
 
258
 
259
-<div id="outline-container-org39e710c" class="outline-2">
260
-<h2 id="org39e710c">Installation</h2>
261
-<div class="outline-text-2" id="text-org39e710c">
259
+<div id="outline-container-org9fecb99" class="outline-2">
260
+<h2 id="org9fecb99">Installation</h2>
261
+<div class="outline-text-2" id="text-org9fecb99">
262
 <p>
262
 <p>
263
 Log into your system with:
263
 Log into your system with:
264
 </p>
264
 </p>
282
 </div>
282
 </div>
283
 </div>
283
 </div>
284
 
284
 
285
-<div id="outline-container-org4aa7903" class="outline-2">
286
-<h2 id="org4aa7903">Adding files to be streamed</h2>
287
-<div class="outline-text-2" id="text-org4aa7903">
285
+<div id="outline-container-orgf30a581" class="outline-2">
286
+<h2 id="orgf30a581">Adding files to be streamed</h2>
287
+<div class="outline-text-2" id="text-orgf30a581">
288
 <p>
288
 <p>
289
 There are two ways to get files onto the system: either via ssh or via a USB drive. File types can be <b>ogg, ogv, mp3 or mp4</b> format.
289
 There are two ways to get files onto the system: either via ssh or via a USB drive. File types can be <b>ogg, ogv, mp3 or mp4</b> format.
290
 </p>
290
 </p>
291
 
291
 
292
 <p>
292
 <p>
293
-It may take a while for the files to import, especially on a low power single board computer, since any mp3 or mp4 files will be converted to ogg or ogv. If you want to speed this up then you could do this conversion manually on a laptop with ffmpeg before storing files onto the USB drive.
293
+It may take a while for the files to import, especially on a low power single board computer, since any mp3 or mp4 files will be converted to ogg or ogv. If you want to speed this up then you could do this conversion manually on a laptop with ffmpeg before storing files onto the USB drive or uploading them via ssh.
294
 </p>
294
 </p>
295
 </div>
295
 </div>
296
 
296
 
297
-<div id="outline-container-orgaeb4e7a" class="outline-3">
298
-<h3 id="orgaeb4e7a">From a USB drive</h3>
299
-<div class="outline-text-3" id="text-orgaeb4e7a">
297
+<div id="outline-container-org366fd74" class="outline-3">
298
+<h3 id="org366fd74">From a USB drive</h3>
299
+<div class="outline-text-3" id="text-org366fd74">
300
 <p>
300
 <p>
301
 Create a directory on the USB drive named <b>icestream</b> and copy your files into there. Plug the drive into your server.
301
 Create a directory on the USB drive named <b>icestream</b> and copy your files into there. Plug the drive into your server.
302
 </p>
302
 </p>
307
 </div>
307
 </div>
308
 </div>
308
 </div>
309
 
309
 
310
-<div id="outline-container-org01e736b" class="outline-3">
311
-<h3 id="org01e736b">Via ssh</h3>
312
-<div class="outline-text-3" id="text-org01e736b">
310
+<div id="outline-container-orgbb75a88" class="outline-3">
311
+<h3 id="orgbb75a88">Via ssh</h3>
312
+<div class="outline-text-3" id="text-orgbb75a88">
313
 <p>
313
 <p>
314
 Make a directory named <b>icestream</b> and copy your files into it. Then copy the directory to your server.
314
 Make a directory named <b>icestream</b> and copy your files into it. Then copy the directory to your server.
315
 </p>
315
 </p>
335
 </div>
335
 </div>
336
 </div>
336
 </div>
337
 
337
 
338
-<div id="outline-container-orge4a3d96" class="outline-2">
339
-<h2 id="orge4a3d96">Access controls</h2>
340
-<div class="outline-text-2" id="text-orge4a3d96">
338
+<div id="outline-container-orgdc2e42f" class="outline-2">
339
+<h2 id="orgdc2e42f">Access controls</h2>
340
+<div class="outline-text-2" id="text-orgdc2e42f">
341
 <p>
341
 <p>
342
 By default anyone who happens to find your Icecast onion address can listen to your stream. If you only want it to be available to a few friends or family then you can add an extra login password.
342
 By default anyone who happens to find your Icecast onion address can listen to your stream. If you only want it to be available to a few friends or family then you can add an extra login password.
343
 </p>
343
 </p>