Skip to content

Commit

Permalink
Update versions, use liquidsoap.info
Browse files Browse the repository at this point in the history
  • Loading branch information
toots committed Sep 11, 2018
1 parent 991d171 commit 8526b19
Show file tree
Hide file tree
Showing 8 changed files with 33 additions and 33 deletions.
32 changes: 16 additions & 16 deletions INSTALL
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ liquidsoap-<version>-full.tar.bz2 tarballs for easier builds.
Libraries not developed by Savonet are:

ocaml-pcre, ocaml-magic, ocaml-sdl
camomile, json-wheel, camlimages, gd4o
camomile, yojson, camlimages, gd4o

Mandatory dependencies :

Expand All @@ -30,23 +30,23 @@ Recommended dependencies :
Optional dependencies :

ocaml-cry>=0.6.0 for sending to Shoutcast & Icecast
ocaml-ogg>=0.4.5 for Ogg codecs
ocaml-ogg>=0.5.0 for Ogg codecs
ocaml-vorbis>=0.7.0 for Ogg/Vorbis codec
ocaml-opus>=0.1.0 for Ogg/Opus codec
ocaml-theora>=0.3.0 for Ogg/Theora codec
ocaml-speex>=0.2.0 for Ogg/Speex codec
ocaml-flac>=0.1.1 for Flac and Ogg/Flac codec
ocaml-opus>=0.1.1 for Ogg/Opus codec
ocaml-theora>=0.3.1 for Ogg/Theora codec
ocaml-speex>=0.2.1 for Ogg/Speex codec
ocaml-flac>=0.1.2 for Flac and Ogg/Flac codec
ocaml-mad>=0.4.4 for MP3 decoding
ocaml-lame>=0.3.2 for MP3 encoding
ocaml-shine>=0.1.0 for fixed-point MP3 encoding
ocaml-taglib>=0.3.1 for MP3ID3 metadata access
ocaml-shine>=0.2.0 for fixed-point MP3 encoding
ocaml-taglib>=0.3.0 for MP3ID3 metadata access
ocaml-faad>=0.4.0 for AAC stream decoding
ocaml-fdkaac>=0.1.0 for AAC(+) encoding
ocaml-fdkaac>=0.2.1 for AAC(+) encoding
camlimages>=4.0.0 for image decoding
ocaml-sdl for display, font & image support
ocaml-gavl>=0.1.5 for video conversion using the gavl library
ocaml-ffmpeg>=0.1.0 for video conversion using the ffmpeg library
ocaml-samplerate>=0.1.2 for libsamplerate audio conversion
ocaml-gavl>=0.1.4 for video conversion using the gavl library
ocaml-ffmpeg>=0.2.0 for video conversion using the ffmpeg library
ocaml-samplerate>=0.1.1 for libsamplerate audio conversion
ocaml-lastfm>=0.3.0 for lastfm protocol support
ocaml-xmlplaylist>=0.1.3 for XML-based playlist formats
ocaml-dssi>=0.1.1 for DSSI sound synthesis
Expand All @@ -58,12 +58,12 @@ Optional dependencies :
ocaml-alsa>=0.2.1 for ALSA I/O
ocaml-portaudio>=0.2.0 for Portaudio I/O
ocaml-pulseaudio>=0.1.2 for PulseAudio I/O
ocaml-bjack>=0.1.4 for Jack support
ocaml-gstreamer>=0.2.0 for GStreamer input, output and encoding/decoding
ocaml-bjack>=0.1.3 for Jack support
ocaml-gstreamer>=0.3.0 for GStreamer input, output and encoding/decoding
ocaml-inotify>=1.0 for reloading playlists when changed
ocaml-ssl>=0.5.0 for enabling SSL/https client connections
ocaml-ssl>=0.5.2 for enabling SSL/https client connections
osx-secure-transport for enabling SSL/https client connections via OSX's SecureTransport
json-wheel for parsing JSON data (of_json function)
yojson for parsing JSON data (of_json function)
gd4o for video.add_text() on servers without X

Runtime optional dependencies :
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ components working together.
Copyright 2003-2018 Savonet team

* Email : [email protected]
* Homepage : http://liquidsoap.fm
* Homepage : http://liquidsoap.info
* Bugreports: https://github.com/savonet/liquidsoap/issues

Installation
Expand All @@ -25,7 +25,7 @@ See the [INSTALL](INSTALL) file.
Documentation
-------------

Some documentation is available on [our website](http://liquidsoap.fm) and HTML
Some documentation is available on [our website](http://liquidsoap.info) and HTML
documentation is included in the distribution: doc/html/index.html.

License
Expand Down
2 changes: 1 addition & 1 deletion doc/content/documentation.txt
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ h4@specific. Specific tutorials
* "Dynamic source creation":dynamic_sources.html: dynamically create sources using server requests.
* "Smart crossfading":smartcrossfade.html: define custom crossfade transitions.
* "Using in production":in_production.html: integrate liquidsoap scripts in a production environment.
* "Liquid Flows":flows.html: add your radio to the "webpage":http://flows.liquidsoap.fm/ of proud users.
* "Liquid Flows":flows.html: add your radio to the "webpage":http://flows.liquidsoap.info/ of proud users.
* "Videos streams":video.html: why restrict yourself to sound only?

h4@users. User scripts
Expand Down
18 changes: 9 additions & 9 deletions doc/content/flows.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ title: Flows
h3. Flows

We maintain a
"webpage of streams generated by Liquidsoap":http://flows.liquidsoap.fm/.
"webpage of streams generated by Liquidsoap":http://flows.liquidsoap.info/.
In order to register your radio on this page, a simple
operator called @register_flow@ is provided. If your stream is called @stream@,
just wrap it as follows before outputting it:
Expand Down Expand Up @@ -51,7 +51,7 @@ A list of radios, encoded in JSON format, can be obtained by querying the
following url:

%%
http://flows.liquidsoap.fm/radios
http://flows.liquidsoap.info/radios
%%

Output is a JSON string like this:
Expand All @@ -77,15 +77,15 @@ A single radio, encoded in JSON format, can be obtained by querying the
following url:

%%
http://flows.liquidsoap.fm/radio?name=foo&website=bar
http://flows.liquidsoap.info/radio?name=foo&website=bar
%%

All argument are optional and should be in UTF8 and properly encoded for a HTTP
GET request.

A direct request using a radio's token can also be performed at this URL:
%%
http://flows.liquidsoap.fm/radio/:token
http://flows.liquidsoap.info/radio/:token
%%

Output is a JSON string like this:
Expand Down Expand Up @@ -114,7 +114,7 @@ If you radio's token is @:token@ and has a stream of format @:format@, then the
following url will redirect any request to your stream's URL.

%%
http://flows.liquidsoap.fm/radio/:token/:format
http://flows.liquidsoap.info/radio/:token/:format
%%

h4. Playlist
Expand All @@ -123,7 +123,7 @@ As for streams, if you radio's token is @:token@ then the following link will
return a "PLS":http://en.wikipedia.org/wiki/PLS_(file_format) playlist:

%%
http://flows.liquidsoap.fm/radio/:token.pls
http://flows.liquidsoap.info/radio/:token.pls
%%

h4. Real-time notifications
Expand All @@ -140,9 +140,9 @@ Then, in your webpage's head, you need to add javascript code adapted from this
example:

%%html
<script src="http://flows.liquidsoap.fm/socket.io/socket.io.js"></script>
<script src="http://flows.liquidsoap.info/socket.io/socket.io.js"></script>
<script type="text/javascript">
var socket = io.connect("http://flows.liquidsoap.fm");
var socket = io.connect("http://flows.liquidsoap.info");

socket.emit('join', radio_token);

Expand Down Expand Up @@ -191,7 +191,7 @@ First you issue a @HTTP@ @GET@ request, authenticated with your radio
credentials at this address:

%%
http://flows.liquidsoap.fm/radio/:token/twitter/auth?redirect_to=:link
http://flows.liquidsoap.info/radio/:token/twitter/auth?redirect_to=:link
%%

Then you should receive a response of the form:
Expand Down
2 changes: 1 addition & 1 deletion doc/content/index.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ It guides you through these pages,
starting with the "quickstart tour":quick_start.html.

Liquidsoap is an open-source sofware
from the "Savonet":http://liquidsoap.fm project.
from the "Savonet":http://liquidsoap.info project.

h3. Features

Expand Down
4 changes: 2 additions & 2 deletions doc/liquidsoap.1
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ A script will be read from standard input if
.B \-
is given as script filename.
Information about scripting liquidsoap is available on our website:
.B http://liquidsoap.fm/
.B http://liquidsoap.info/

If the parameter is not a file it will be treated as an expression which will
be executed. It is a convenient way to test simple one-line scripts. When
Expand Down Expand Up @@ -141,7 +141,7 @@ Display this list of options
.\"
.SH SEE ALSO
Our website
.B http://www.liquidsoap.fm/
.B http://www.liquidsoap.info/
and the HTML documentation coming with your distribution of liquidsoap.
.\"
.SH AUTHOR
Expand Down
2 changes: 1 addition & 1 deletion examples/README
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ they'll fail to startup with an "infallible source" error.
* fallible.liq example of fallible scheduler
* transitions.liq an example of custom transitions

Find some more doc and examples on <http://liquidsoap.fm>.
Find some more doc and examples on <http://liquidsoap.info>.
2 changes: 1 addition & 1 deletion src/main.ml
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,7 @@ let options = [
Copyright (c) 2003-2018 Savonet team\n\
Liquidsoap is open-source software, \
released under GNU General Public License.\n\
See <http://liquidsoap.fm> for more information.\n"
See <http://liquidsoap.info> for more information.\n"
Configure.version SVN.rev ;
exit 0),
"Display liquidsoap's version." ;
Expand Down

0 comments on commit 8526b19

Please sign in to comment.