Changeset 7136

Show
Ignore:
Timestamp:
02/05/10 00:20:53 (5 weeks ago)
Author:
metamorph68
Message:

Changed part of the doc to use the new outputs.. May still need some work though..

Location:
trunk/liquidsoap/doc/content
Files:
8 modified

Legend:

Unmodified
Added
Removed

  • trunk/liquidsoap/doc/content/blank.txt

    r6875 r7136  
    2626 
    2727# Put that stream to a local file 
    28 output.file.ogg("/tmp/hop.ogg",stream) 
     28output.file(%vorbis, "/tmp/hop.ogg", stream) 
    2929%% 
    3030 

  • trunk/liquidsoap/doc/content/complete_case.txt

    r5678 r7136  
    6565 
    6666# Output the full stream in OGG and MP3 
    67 output.icecast.mp3( 
     67output.icecast(%mp3,  
    6868  host="localhost",port=8000,password="hackme", 
    6969  mount="radio",full) 
    70 output.icecast.vorbis( 
     70output.icecast(%vorbis,  
    7171  host="localhost",port=8000,password="hackme", 
    7272  mount="radio.ogg",full) 
    7373 
    7474# Output the stream without live in OGG 
    75 output.icecast.vorbis( 
     75output.icecast(%vorbis,  
    7676  host="localhost",port=8000,password="hackme", 
    7777  mount="radio_nolive.ogg",radio) 
    … …  
    8484 
    8585%%(run_alsa_input.sh) 
    86 liquidsoap 'output.icecast.vorbis( 
     86liquidsoap 'output.icecast(%vorbis,  
    8787  mount="live.ogg",host="...",password="...",input.alsa())' 
    8888%% 

  • trunk/liquidsoap/doc/content/cookbook.txt

    r6835 r7136  
    5656 
    5757# First transcoder: MP3 32 kbps 
    58 output.icecast.mp3( 
     58output.icecast(%mp3,  
    5959  mount="/your-stream-32.mp3", bitrate=32, 
    6060  samplerate = 22050, stereo = false, 
    … …  
    6262  input) 
    6363# Second transcoder : MP3 128 kbps 
    64 output.icecast.mp3( 
     64output.icecast(%mp3,  
    6565  mount="/your-stream-128.mp3", bitrate=128, 
    6666  host="streaming.example.com", port=8000, password="xxx", 
    … …  
    8686output = "/tmp/output.ogg" 
    8787source = once(single(input)) 
    88 output.file.vorbis(output,fallible=true,on_stop=shutdown,source) 
     88output.file(%vorbis, output,fallible=true,on_stop=shutdown,source) 
    8989%% 
    9090 
    … …  
    189189 
    190190# output it 
    191 output.icecast.vorbis(radio,mount="test",host="host") 
     191output.icecast(%vorbis, radio,mount="test",host="host") 
    192192%% 
    193193 

  • trunk/liquidsoap/doc/content/dolebrai.txt

    r5627 r7136  
    126126 
    127127# === OUTPUT === 
    128 out_mp3 = output.icecast.mp3( 
     128out_mp3 = output.icecast(%mp3,  
    129129    password="XXX", bitrate=64, samplerate=22050, quality=2, 
    130130    genre="Musique Libre", 
    131131    url="http://dolebrai.net", 
    132132    description="La radio des musiques libres") 
    133 out_vorbis = output.icecast.vorbis( 
     133out_vorbis = output.icecast(%vorbis,  
    134134    password="XXX", 
    135135    genre="Musique Libre", 

  • trunk/liquidsoap/doc/content/external_encoders.txt

    r6525 r7136  
    11title: External encoders 
     2 
     3** External encoders are currently unavailable in the SVN trunk. This page will be updated 
     4when they are available again. ** 
    25 
    36h3. Introduction 

  • trunk/liquidsoap/doc/content/kube.txt

    r5540 r7136  
    7474                host=kubeHost,port=kubePort,user=kubeUser,password=kubePassword,genre=kubeGenre,url=kubeUrl,description=kubeDesc, 
    7575                restart=true) 
    76 output.icecast.vorbis(radio,mount="kube-low.ogg",id="kubeOggLow",name="KUBE Radio LOW bandwidth",quality=2., 
     76output.icecast(%vorbis, radio,mount="kube-low.ogg",id="kubeOggLow",name="KUBE Radio LOW bandwidth",quality=2., 
    7777                    host=kubeHost,port=kubePort,user=kubeUser,password=kubePassword,genre=kubeGenre,url=kubeUrl,description=kubeDesc, 
    7878                    restart=true) 
    79 output.icecast.vorbis(radio,mount="kube.ogg",id="kubeOggHigh",name="KUBE Radio HIGH bandwidth",quality=8., 
     79output.icecast(%vorbis, radio,mount="kube.ogg",id="kubeOggHigh",name="KUBE Radio HIGH bandwidth",quality=8., 
    8080                    host=kubeHost,port=kubePort,user=kubeUser,password=kubePassword,genre=kubeGenre,url=kubeUrl,description=kubeDesc, 
    8181                    restart=true) 
    82 output.icecast.vorbis(radio,mount="kube-archive.ogg",id="kubeOggLow",name="KUBE Radio Archive stream",quality=10.,public=false, 
     82output.icecast(%vorbis, radio,mount="kube-archive.ogg",id="kubeOggLow",name="KUBE Radio Archive stream",quality=10.,public=false, 
    8383                    host=kubeHost,port=kubePort,user=kubeUser,password=kubePassword,genre=kubeGenre,url=kubeUrl,description=kubeDesc, 
    8484                    restart=true) 

  • trunk/liquidsoap/doc/content/language.txt

    r6875 r7136  
    6363 
    6464%%(lang_partial_application.liq) 
    65 out = output.icecast.vorbis(host="streamer",port="8080", 
     65out = output.icecast(%vorbis, host="streamer",port="8080", 
    6666                            password="sesame") 
    6767# out is a function waiting for the other parameters 

  • trunk/liquidsoap/doc/content/radiopi.txt

    r5627 r7136  
    7474 
    7575# Live relay to secondary encoder 
    76 output.icecast.vorbis(id="stream_relay",start=false,restart=true,host="1.2.3.4",port=8005,password="xxxx",mount="live.ogg",live_safe) 
     76output.icecast(%vorbis, id="stream_relay",start=false,restart=true,host="1.2.3.4",port=8005,password="xxxx",mount="live.ogg",live_safe) 
    7777 
    7878# File source for archiving 
    7979title = '$(if $(title),"$(title)","Emission inconnue")$(if $(artist), " par  $(artist)") - %m-%d-%Y, %H:%M:%S' 
    80 output.file.vorbis(id="archives",start=false,reopen_on_metadata=true,"/path/to/archives/" ^ title ^ ".ogg",live_safe) 
     80output.file(%vorbis, id="archives",start=false,reopen_on_metadata=true,"/path/to/archives/" ^ title ^ ".ogg",live_safe) 
    8181 
    8282# === Main script === 
    8383 
    8484# Specialize the output functions by partial application 
    85 output.icecast     = output.icecast.mp3(restart=true,description=descr, url=url) 
     85output.icecast     = output.icecast(%mp3, restart=true,description=descr, url=url) 
    8686out = output.icecast(host=ice_host,port=8080,password=pass) 
    8787