diff options
| author | MaZderMind <git@mazdermind.de> | 2015-09-02 15:19:30 +0200 |
|---|---|---|
| committer | MaZderMind <git@mazdermind.de> | 2015-09-02 15:19:30 +0200 |
| commit | 20d75f6c7f5cad2f5c1b4da71ad5405848230201 (patch) | |
| tree | 93894d7bc79a0b018275efbc0db524ac6f686570 /voctocore/README.md | |
| parent | a004948051e182edb3a7e40f1f7f2e14bebb0e0e (diff) | |
| parent | 8646386d09ab6cdabf0b8421cece5c1ddd69633f (diff) | |
Merge branch 'control-server-resilience'
Based on the work made by zuntrax & mithro at cccamp15
Diffstat (limited to 'voctocore/README.md')
| -rw-r--r-- | voctocore/README.md | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/voctocore/README.md b/voctocore/README.md index e9217e6..b5ad126 100644 --- a/voctocore/README.md +++ b/voctocore/README.md @@ -79,34 +79,34 @@ When another Client issues a Command and the Server executed it successfully, th ### Example Communication: ```` -< set_video_a cam1 -> ok +< set video a cam1 +> ok cam1 -< set_composite_mode side_by_side_equal -> ok +< set composite side_by_side_equal +> ok side_by_side_equal -< get_output_port +< get output port > ok 11000 -< get_video_a -> ok 0 cam1 +< get video a +> ok cam1 -< set_composite_mode +< get composite > ok side_by_side_equal -< set_video_a blafoo +< set video a blafoo > error "blafoo" is no known src -< set_stream_blank pause -> ok +< set status blank pause +> ok blank pause -< set_stream_live -> ok +< set status live +> ok live … -> signal set_video_a cam1 -> signal set_composite_mode side_by_side_equal +> signal set video a cam1 +> signal set composite side_by_side_equal ```` |