diff options
Diffstat (limited to 'src/audio.json')
| -rw-r--r-- | src/audio.json | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/src/audio.json b/src/audio.json index 133e776..d8bc0d9 100644 --- a/src/audio.json +++ b/src/audio.json @@ -20,14 +20,14 @@ "low": { "audio": 96 } }, "machines": { - "calypso": [ "input", "encoder-vorbis-160", "encoder-vorbis-128", "encoder-vorbis-96", - "muxer-ogg-high", "muxer-ogg-medium", "muxer-ogg-low", "streamer-local1" ] + "calypso": [ "input-alsa", "encoder-alsa-vorbis-160", "encoder-alsa-vorbis-128", "encoder-alsa-vorbis-96", + "muxer-audio-ogg-high", "muxer-audio-ogg-medium", "muxer-audio-ogg-low", "streamer-local1" ] } }, "input": { "alsa": { - "type": "ao", - "source": "soundcard", + "type": "soundcard", + "master": true, "properties": { "samplerate": 48000, "depth": 16, @@ -35,12 +35,17 @@ } } }, - "transcode": { - "ogg": [ "high", "medium", "low" ] + "mux": { + "audio": { + "audio": "alsa", + "formats": { + "ogg": [ "high", "medium", "low" ] + } + } }, "stream": { "streamer-local": { - "formats": [ "ogg" ], + "muxes": [ "audio" ], "type": "http", "count": 1, "port": 8000, "max-con": 5, "burst-on-connect": 5, "hostname": "audio" |