diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2012-11-10 00:21:50 +0100 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2012-11-10 00:21:50 +0100 |
| commit | 103351526eb3ad6b7a6eba86892b835fe525d55f (patch) | |
| tree | c8d1b5732cae845acb07db784bcfc347235cfe92 /src/examples | |
| parent | updated TODO (diff) | |
cleaned up examples
Diffstat (limited to 'src/examples')
| -rw-r--r-- | src/examples/test.json | 14 | ||||
| -rw-r--r-- | src/examples/test2.json | 6 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/examples/test.json b/src/examples/test.json index b921481..ea3faa3 100644 --- a/src/examples/test.json +++ b/src/examples/test.json @@ -2,8 +2,8 @@ "globals":{ "templates": "default", "version": "0.10.0", - "name": "elevate-live", - "description": "Live from Elevate Festival 2012", + "name": "test", + "description": "flufigut example", "domain": "spreadspace.org", "rrd-dir": "/var/lib/flumotion/rrd", "manager": { @@ -38,9 +38,9 @@ "muxer-av-webm-medium", "muxer-av-webm-low", "muxer-audio-ogg-high", "streamer-local1" ], "calypso": [ "encoder-sdi-h264-720p25", "encoder-sdi-h264-480p25", "encoder-sdi-h264-360p25" ], "telesto": [ "encoder-sdi-vp8-720p25", "encoder-sdi-vp8-480p25", "encoder-sdi-vp8-360p25" ], - "elevate1": [ "streamer-pub1" ], - "elevate2": [ "streamer-pub2" ], - "elevate3": [ "streamer-pub3" ] + "streamer1": [ "streamer-pub1" ], + "streamer2": [ "streamer-pub2" ], + "streamer3": [ "streamer-pub3" ] } }, "input": { @@ -78,13 +78,13 @@ "muxes": [ "av", "audio" ], "type": "http", "count": 1, "port": 8000, "max-con": 5, "burst-on-connect": 5, - "hostname": "elevate-feed" + "hostname": "flufigut-feed" }, "streamer-pub": { "muxes": [ "av" ], "type": "http", "count": 3, "port": 8000, "max-bw": 290000, "burst-on-connect": 5, - "hostname": "elevate-live%i" + "hostname": "flufigut-live%i" } } } diff --git a/src/examples/test2.json b/src/examples/test2.json index 1479563..31739b3 100644 --- a/src/examples/test2.json +++ b/src/examples/test2.json @@ -2,8 +2,8 @@ "globals":{ "templates": "default", "version": "0.10.0", - "name": "elevate-live", - "description": "Live from Elevate Festival 2012", + "name": "test2", + "description": "flufigut example", "domain": "spreadspace.org", "rrd-dir": "/var/lib/flumotion/rrd", "manager": { @@ -98,7 +98,7 @@ "muxes": [ "av-orig", "av-en", "audio", "audio-en" ], "type": "http", "count": 1, "port": 8000, "max-con": 5, "burst-on-connect": 5, - "hostname": "elevate-feed" + "hostname": "test-feed" } } } |