Merge branch 'master' into develop

This commit is contained in:
BadAix 2017-01-10 20:48:04 +01:00
commit dce6e7f6ba
2 changed files with 7 additions and 3 deletions

View file

@ -95,6 +95,10 @@ There is an Android client available in [Releases](https://github.com/badaix/sna
![Snapcast for Android](https://raw.githubusercontent.com/badaix/snapcast/master/doc/snapcast_android_scaled.png)
There is also an unofficial WebApp from @atoomic [atoomic/snapcast-volume-ui](https://github.com/atoomic/snapcast-volume-ui).
This app list all clients connected to a server and allow to control individualy the volume of each client.
Once installed, you can use any mobile device, laptop, desktop, or browser.
Setup of audio players/server
-----------------------------
Snapcast can be used with a number of different audio players and servers, and so it can be integrated into your favorite audio-player solution and make it synced-multiroom capable.
@ -108,7 +112,7 @@ This [guide](doc/player_setup.md) shows how to configure different players/audio
* [MPD](doc/player_setup.md#mpd)
* [Mopidy](doc/player_setup.md#mopidy)
* [FFmpeg](doc/player_setup.md#ffmpeg)
* [mpv](doc/play_setup.md#mpv)
* [mpv](doc/player_setup.md#mpv)
* [MPlayer](doc/player_setup.md#mplayer)
* [Alsa](doc/player_setup.md#alsa)
* [PulseAudio](doc/player_setup.md#pulseaudio)

View file

@ -120,7 +120,7 @@ $ brew install flac libvorbis
Install Snapclient
$ sudo make install
$ sudo make install TARGET=MACOS
This will copy the client binary to `/usr/local/bin` and create a Launch Agent to start the client as a daemon.
@ -132,7 +132,7 @@ This will copy the client binary to `/usr/local/bin` and create a Launch Agent t
Install Snapserver
$ sudo make install
$ sudo make install TARGET=MACOS
This will copy the server binary to `/usr/local/bin` and create a Launch Agent to start the server as a daemon.