(no commit message)

diff --git a/source/_themes/scrolls/static/watermark.png b/source/_themes/scrolls/static/watermark.png
index eb1b6be957b2f137a0667b35f43c0d4cb6291cf6..fa87e7b7948a4f641596799c45f22fbff258fcd1 100644 (file)
Binary files a/source/_themes/scrolls/static/watermark.png and b/source/_themes/scrolls/static/watermark.png differ

diff --git a/source/basic-commands.rst b/source/basic-commands.rst
index 830ad3281942eab0b2de1e3dcfa476d537e07da8..cfd62311cabf86a2bef7b19fd0d46ca8aaafe4e8 100644 (file)
--- a/source/basic-commands.rst
+++ b/source/basic-commands.rst
@@ -14,7 +14,7 @@ Syntax::
                        \r
 Example::\r
 \r
-       <<< LOADBG 1-1 MY_VIDEO PUSH 20 easeinesine LOOP SEEK 200 LENGTH 400 AUTO FILTER hflip \r
+       >> LOADBG 1-1 MY_VIDEO PUSH 20 easeinesine LOOP SEEK 200 LENGTH 400 AUTO FILTER hflip \r
                \r
 ====\r
 LOAD\r
@@ -28,7 +28,7 @@ Syntax::
        \r
 Example::      \r
 \r
-       <<< LOAD 1-1 MY_VIDEO PUSH 20 easeinesine LOOP SEEK 200 LENGTH 400 AUTO FILTER hflip \r
+       >> LOAD 1-1 MY_VIDEO PUSH 20 easeinesine LOOP SEEK 200 LENGTH 400 AUTO FILTER hflip \r
        \r
 ====\r
 PLAY\r
@@ -43,8 +43,8 @@ Syntax::
        \r
 Example::\r
 \r
-       <<< PLAY 1-1 MY_VIDEO PUSH 20 easeinesine LOOP SEEK 200 LENGTH 400 AUTO FILTER hflip \r
-       <<< PLAY 1-1\r
+       >> PLAY 1-1 MY_VIDEO PUSH 20 easeinesine LOOP SEEK 200 LENGTH 400 AUTO FILTER hflip \r
+       >> PLAY 1-1\r
        \r
 =====\r
 PAUSE\r
@@ -57,7 +57,7 @@ Syntax::
 \r
 Example::\r
 \r
-       <<< PAUSE 1-1\r
+       >> PAUSE 1-1\r
        \r
 =====\r
 STOP\r
@@ -70,7 +70,7 @@ Syntax::
 \r
 Example::\r
 \r
-       <<< STOP 1-1\r
+       >> STOP 1-1\r
 \r
 =====\r
 CLEAR\r
@@ -83,8 +83,8 @@ Syntax::
 \r
 Example::\r
 \r
-       <<< CLEAR 1-1\r
-       <<< CLEAR 1\r
+       >> CLEAR 1-1\r
+       >> CLEAR 1\r
                \r
 ======\r
 CALL\r
@@ -97,7 +97,7 @@ Syntax::
 \r
 Example::\r
 \r
-       <<< CALL 1-1 SEEK 400\r
+       >> CALL 1-1 SEEK 400\r
                \r
 ====\r
 SWAP\r
@@ -110,8 +110,8 @@ Syntax::
 \r
 Example::\r
 \r
-       <<< SWAP 1-1 1-2\r
-       <<< SWAP 1-0 2-0                \r
+       >> SWAP 1-1 1-2\r
+       >> SWAP 1-0 2-0         \r
                \r
 ===\r
 ADD\r
@@ -124,8 +124,8 @@ Syntax::
        \r
 Example::\r
 \r
-       <<< ADD 1 FILE output.mov CODEC DNXHD\r
-       <<< ADD 1 DECKLINK 1\r
+       >> ADD 1 FILE output.mov CODEC DNXHD\r
+       >> ADD 1 DECKLINK 1\r
                \r
 ======\r
 REMOVE\r
@@ -138,5 +138,5 @@ Syntax::
 \r
 Example::\r
 \r
-       <<< REMOVE 1 FILE \r
-       <<< REMOVE 1 DECKLINK 1
\ No newline at end of file
+       >> REMOVE 1 FILE \r
+       >> REMOVE 1 DECKLINK 1
\ No newline at end of file

diff --git a/source/conf.py b/source/conf.py
index 8c03c6d642332056999a06e78ccfc5a68d8afc2b..713121249cc2e04cf7417e88e343ff5044b0bbcc 100644 (file)
--- a/source/conf.py
+++ b/source/conf.py
@@ -41,7 +41,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'CasparCG'
-copyright = u'2011, Robert Nagy'
+copyright = u'2011, Robert Nagy (ronag89@gmail.com)'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

diff --git a/source/consumers.rst b/source/consumers.rst
index 41d4182a1f106730fd15f7b870dcc6c80407ae60..c879d26f8f5cd8d4e30d56a54d9f59253ad4e6dd 100644 (file)
--- a/source/consumers.rst
+++ b/source/consumers.rst
@@ -1,3 +1,276 @@
 #########\r
 Consumers\r
-#########
\ No newline at end of file
+#########\r
+\r
+=============\r
+File Consumer\r
+=============\r
+\r
+-----------\r
+Diagnostics\r
+-----------\r
+\r
+ffmpeg[*filename*]\r
+\r
++---------------+-----------------------------------------------+--------+\r
+| Graph         | Description                                   |  Scale |\r
++===============+===============================================+========+\r
+| frame-time    | Time spent decoding the current frame.        | fps/2  |\r
++---------------+-----------------------------------------------+--------+\r
+               \r
+----------\r
+Parameters\r
+----------\r
+\r
+The file consumer uses the same option syntax as ffmpeg. \r
+\r
+Note, not all options supported by ffmpeg have been implemented.\r
+\r
+    \r
+^^^^^^^^\r
+FILENAME\r
+^^^^^^^^\r
+\r
+Target filename.\r
+\r
+Syntax::\r
+\r
+    [filename:string]\r
+    \r
+Example::\r
+\r
+    ADD 1 FILE test.mov -vcodec libx264 -crf 5 -preset ultrafast -tune fastdecode -s 1280x720 -r 50 -acodec aac -ab 128k \r
+    REMOVE 1 FILE    \r
+        \r
+=================\r
+Bluefish Consumer\r
+=================\r
+\r
+-----------\r
+Diagnostics\r
+-----------\r
+\r
+ffmpeg[*filename*]\r
+\r
++---------------+-----------------------------------------------+--------+\r
+| Graph         | Description                                   |  Scale |\r
++===============+===============================================+========+\r
+| frame-time    | Time spent decoding the current frame.        | fps/2  |\r
++---------------+-----------------------------------------------+--------+\r
+| sync-time     | Time spent waiting for sync.                  | fps/2  |\r
++---------------+-----------------------------------------------+--------+\r
+| tick-time     | Time between frames frame.                    | fps/2  |\r
++---------------+-----------------------------------------------+--------+\r
+               \r
+----------\r
+Parameters\r
+----------\r
+\r
+^^^^^^\r
+DEVICE\r
+^^^^^^\r
+\r
+Which BlueFish device to attach.\r
+\r
+Syntax::\r
+\r
+       [device:int]\r
+    \r
+Configuration Syntax::\r
+\r
+    <device>[1..]</device>\r
+       \r
+Example::\r
+       \r
+       << ADD 1 BLUEFISH 1\r
+    \r
+    \r
+^^^^^^^^^^^^^^\r
+EMBEDDED_AUDIO\r
+^^^^^^^^^^^^^^\r
+\r
+Enables embedded-audio.\r
+\r
+Syntax::\r
+\r
+       EMBEDDED_AUDIO\r
+    \r
+Default::\r
+\r
+    Disabled\r
+    \r
+Configuration Syntax::\r
+\r
+    <embedded-audio>[true|false]</embedded-audio>\r
+       \r
+Example::\r
+       \r
+       << ADD 1 BLUEFISH 1 EMBEDDED_AUDIO\r
+    \r
+^^^^^^^^\r
+KEY_ONLY\r
+^^^^^^^^\r
+\r
+Displays key as fill.\r
+\r
+Default::\r
+\r
+    Disabled\r
+\r
+Syntax::\r
+\r
+       KEY_ONLY\r
+    \r
+Configuration Syntax::\r
+\r
+    <key-only>[true|false]</key-only>\r
+           \r
+Example::\r
+       \r
+       << ADD 1 BLUEFISH 1 EMBEDDED_AUDIO KEY_ONLY\r
+    \r
+\r
+=================\r
+Decklink Consumer\r
+=================\r
+\r
+-----------\r
+Diagnostics\r
+-----------\r
+\r
+ffmpeg[*filename*]\r
+\r
++---------------+-----------------------------------------------+--------------+\r
+| Graph         | Description                                   |  Scale       |\r
++===============+===============================================+==============+\r
+| frame-time    | Time spent decoding the current frame.        | fps/2        |\r
++---------------+-----------------------------------------------+--------------+\r
+| sync-time     | Time spent waiting for sync.                  | fps/2        |\r
++---------------+-----------------------------------------------+--------------+\r
+| tick-time     | Time between frames frame.                    | fps/2        |\r
++---------------+-----------------------------------------------+--------------+\r
+| dropped-frame | Frame was dropped.                            |  N/A         |\r
++---------------+-----------------------------------------------+--------------+\r
+| late-frame    | Frame was late.                               |  N/A         |\r
++---------------+-----------------------------------------------+--------------+\r
+| buffered-video| Frame was dropped.                            |  fps         |\r
++---------------+-----------------------------------------------+--------------+\r
+| buffered-audio| Frame was late.                               |  cadence*2   |\r
++---------------+-----------------------------------------------+--------------+\r
+               \r
+----------\r
+Parameters\r
+----------\r
+\r
+^^^^^^\r
+DEVICE\r
+^^^^^^\r
+\r
+Which BlueFish device to attach.\r
+\r
+Syntax::\r
+\r
+       [device:int]\r
+    \r
+Configuration Syntax::\r
+\r
+    <device>[1..]</device>\r
+       \r
+Example::\r
+       \r
+       << ADD 1 BLUEFISH 1\r
+    \r
+    \r
+^^^^^^^^^^^^^^\r
+EMBEDDED_AUDIO\r
+^^^^^^^^^^^^^^\r
+\r
+Enables embedded-audio.\r
+\r
+Syntax::\r
+\r
+       EMBEDDED_AUDIO\r
+    \r
+Default::\r
+\r
+    Disabled\r
+    \r
+Configuration Syntax::\r
+\r
+    <embedded-audio>[true|false]</embedded-audio>\r
+       \r
+Example::\r
+       \r
+       << ADD 1 BLUEFISH 1 EMBEDDED_AUDIO\r
+    \r
+^^^^^^^^\r
+KEY_ONLY\r
+^^^^^^^^\r
+\r
+Displays key as fill.\r
+\r
+Default::\r
+\r
+    Disabled\r
+\r
+Syntax::\r
+\r
+       KEY_ONLY\r
+    \r
+Configuration Syntax::\r
+\r
+    <key-only>[true|false]</key-only>\r
+           \r
+Example::\r
+       \r
+       << ADD 1 BLUEFISH 1 EMBEDDED_AUDIO KEY_ONLY    \r
+    \r
+^^^^^^^\r
+LATENCY\r
+^^^^^^^\r
+\r
+Set latency mode.\r
+\r
+Default::\r
+\r
+    normal\r
+\r
+Configuration Syntax::\r
+\r
+    <latency>[normal|low|default]</latency>\r
+        \r
+^^^^^\r
+KEYER\r
+^^^^^\r
+\r
+Set keyer mode.\r
+\r
+Default::\r
+\r
+    external\r
+\r
+Configuration Syntax::\r
+\r
+    <keyer>[external|internal|default]</keyer>\r
+    \r
+^^^^^^^^^^^^\r
+BUFFER_DEPTH\r
+^^^^^^^^^^^^\r
+\r
+Set buffer depth. Settings this value to low can cause output distortion.\r
+\r
+Default::\r
+\r
+    3\r
+\r
+Configuration Syntax::\r
+\r
+    <buffer-depth>[1..]</buffer-depth>\r
+    \r
+===============\r
+Screen Consumer\r
+===============\r
+\r
+=====================\r
+System Audio Consumer\r
+=====================
\ No newline at end of file

diff --git a/source/data-commands.rst b/source/data-commands.rst
index cfb4de056c997f5045f6ef41a94b813b3ec2eb99..7021656664e04241bbba2f9384637f93aa46958f 100644 (file)
--- a/source/data-commands.rst
+++ b/source/data-commands.rst
@@ -15,7 +15,7 @@ Syntax::
                \r
 Example::\r
 \r
-       <<< DATA STORE my_data "Some useful data"\r
+       >> DATA STORE my_data "Some useful data"\r
        \r
 =============\r
 DATA RETRIEVE\r
@@ -28,8 +28,8 @@ Syntax::
                \r
 Example::\r
 \r
-       <<< DATA RETRIEVE my_data\r
-       >>> "Some usefule data"\r
+       >> DATA RETRIEVE my_data\r
+       << "Some usefule data"\r
        \r
 =========\r
 DATA LIST\r
@@ -41,5 +41,5 @@ Syntax::
 \r
 Example::\r
 \r
-       <<< DATA LIST\r
-       >>> my_data
\ No newline at end of file
+       >> DATA LIST\r
+       << my_data
\ No newline at end of file

diff --git a/source/faq.rst b/source/faq.rst
new file mode 100644 (file)
index 0000000..87c2314
--- /dev/null
+++ b/source/faq.rst
@@ -0,0 +1,3 @@
+###
+FAQ
+###
\ No newline at end of file

diff --git a/source/index.rst b/source/index.rst
index a36665cde9788d2a25963b1ae6958e684bd36778..9c87e86953533ca21b7139fb145c505ff81140ee 100644 (file)
--- a/source/index.rst
+++ b/source/index.rst
@@ -9,12 +9,12 @@ Welcome to CasparCG's documentation!
 Contents:
 
 ..     toctree::
-       :maxdepth: 2
+       :maxdepth: 3
        :numbered:
    
-       producers
-       consumers
-       commands
+       producers.rst
+       consumers.rst
+       commands.rst
 
 Indices and tables
 ==================

diff --git a/source/misc-commands.rst b/source/misc-commands.rst
index 756dcd4b1cd6591bbe878c1db77c086396193701..dddf5066c445d27c0cacbda00301a838c8c30173 100644 (file)
--- a/source/misc-commands.rst
+++ b/source/misc-commands.rst
@@ -12,7 +12,7 @@ Syntax::
        \r
 Example::\r
 \r
-       <<< DIAG\r
+       >> DIAG\r
        \r
 ===\r
 BYE\r
@@ -25,7 +25,7 @@ Syntax::
        \r
 Example\r
 \r
-       <<< BYE\r
+       >> BYE\r
        \r
 ====\r
 CHANNEL_GRID\r
@@ -34,8 +34,8 @@ Opens a window displaying all the channels currently running on the server.
 \r
 Syntax::\r
 \r
-       <<< CHANNEL_GRID\r
+       >> CHANNEL_GRID\r
        \r
 Example::\r
 \r
-       <<< CHANNEL_GRID
\ No newline at end of file
+       >> CHANNEL_GRID
\ No newline at end of file

diff --git a/source/mixer-commands.rst b/source/mixer-commands.rst
index c885d59ef00fdd70a76ece1b6646ee816be64760..291f6a576cafcb40e60ee05a1f1b407e82c21a94 100644 (file)
--- a/source/mixer-commands.rst
+++ b/source/mixer-commands.rst
@@ -14,7 +14,7 @@ Syntax::
                \r
 Example::\r
 \r
-       <<< MIXER 1-1 KEYER 1\r
+       >> MIXER 1-1 KEYER 1\r
        \r
 ===========\r
 MIXER BLEND\r
@@ -29,7 +29,7 @@ Syntax::
                \r
 Example::\r
 \r
-       <<< MIXER 1-1 BLEND overlay\r
+       >> MIXER 1-1 BLEND overlay\r
        \r
 See:: \r
 \r
@@ -46,7 +46,7 @@ Syntax::
                \r
 Example::\r
 \r
-       <<< MIXER 1-1 OPACITY 0.5\r
+       >> MIXER 1-1 OPACITY 0.5\r
        \r
 ================\r
 MIXER BRIGTHNESS\r
@@ -60,7 +60,7 @@ Syntax::
                \r
 Example::\r
 \r
-       <<< MIXER 1-1 BRIGTHNESS 0.5\r
+       >> MIXER 1-1 BRIGTHNESS 0.5\r
        \r
 ================\r
 MIXER SATURATION\r
@@ -75,7 +75,7 @@ Syntax::
                \r
 Example::\r
 \r
-       <<< MIXER 1-1 SATURATION 0.5\r
+       >> MIXER 1-1 SATURATION 0.5\r
        \r
 ==============\r
 MIXER CONTRAST\r
@@ -90,7 +90,7 @@ Syntax::
                \r
 Example::\r
 \r
-       <<< MIXER 1-1 CONTRAST 0.5\r
+       >> MIXER 1-1 CONTRAST 0.5\r
 \r
 ============\r
 MIXER LEVELS\r
@@ -104,7 +104,7 @@ Syntax::
                \r
 Example::\r
 \r
-       <<< MIXER 1-1 LEVELS 0.1 0.1 1.0 0.9 0.9\r
+       >> MIXER 1-1 LEVELS 0.1 0.1 1.0 0.9 0.9\r
        \r
 ==========\r
 MIXER FILL\r
@@ -117,7 +117,7 @@ Syntax::
                \r
 Example::\r
 \r
-       <<< MIXER 1-1 FILL 0.25 0.25 0.5 0.5\r
+       >> MIXER 1-1 FILL 0.25 0.25 0.5 0.5\r
        \r
 ==========\r
 MIXER CLIP\r
@@ -130,7 +130,7 @@ Syntax::
                \r
 Example::\r
 \r
-       <<< MIXER 1-1 CLIP 0.25 0.25 0.5 0.5\r
+       >> MIXER 1-1 CLIP 0.25 0.25 0.5 0.5\r
        \r
 ==========\r
 MIXER GRID\r
@@ -141,7 +141,7 @@ Creates a grid of video streams in ascending order of the layer index, i.e. if r
                \r
 Example::\r
 \r
-       <<< MIXER 1 GRID 2\r
+       >> MIXER 1 GRID 2\r
 \r
 ============\r
 MIXER VOLUME\r
@@ -154,7 +154,7 @@ Syntax::
                \r
 Example::\r
 \r
-       <<< MIXER 1-1 VOLUME 0.5\r
+       >> MIXER 1-1 VOLUME 0.5\r
        \r
 ===========\r
 MIXER CLEAR\r
@@ -170,5 +170,5 @@ Syntax::
                \r
 Example::\r
 \r
-       <<< MIXER 1-1 CLEAR\r
+       >> MIXER 1-1 CLEAR\r
                
\ No newline at end of file

diff --git a/source/producers.rst b/source/producers.rst
index 89a986682688c39d2f5558698ad0c93bde91f4e5..bd8cbaadd166c9d2fa860f4648ce866651c3f79f 100644 (file)
--- a/source/producers.rst
+++ b/source/producers.rst
@@ -3,16 +3,14 @@ Producers
 #########\r
 \r
 ===============\r
-FFMPEG Producer\r
+ffmpeg Producer\r
 ===============\r
 \r
 ---------------\r
 Supported Media\r
 ---------------\r
 \r
-The ffmpeg producer supports all files that the ffmpeg library (www.ffmpeg.org) can play. \r
-\r
-Support check is not dependent on file extension.\r
+The ffmpeg producer supports all files that the "ffmpeg" library (www.ffmpeg.org) can play. \r
 \r
 -------\r
 Filters\r
@@ -24,7 +22,7 @@ The ffmpeg producer supports "libavfilter" filters through the "FILTER" paramete
 Diagnostics\r
 -----------\r
 \r
-ffmpeg[ *filename* | *video-mode* | *file-frame-number* / *file-nb-frames*]\r
+ffmpeg[*filename* | *video-mode* | *file-frame-number* / *file-nb-frames*]\r
 \r
 +---------------+-----------------------------------------------+--------+\r
 | Graph         | Description                                   |  Scale |\r
@@ -55,7 +53,7 @@ Syntax::
        \r
 Example::\r
        \r
-       >>> PLAY 1-1 MOVIE LOOP\r
+       << PLAY 1-1 MOVIE LOOP\r
        \r
 ^^^^\r
 SEEK\r
@@ -68,8 +66,21 @@ Syntax::
        \r
 Example::\r
        \r
-       >>> PLAY 1-1 MOVIE SEEK 100 LOOP\r
+       << PLAY 1-1 MOVIE SEEK 100 LOOP\r
+           \r
+^^^^\r
+START (CasparCG 2.1)\r
+^^^^\r
+Sets the start of the file. This point will be used while looping.\r
+\r
+Syntax::\r
+\r
+       START [frames:int]\r
+       \r
+Example::\r
        \r
+       << PLAY 1-1 MOVIE START 100 LOOP\r
+    \r
 ^^^^^^\r
 LENGTH\r
 ^^^^^^\r
@@ -81,7 +92,7 @@ Syntax::
        \r
 Example::\r
        \r
-       >>> PLAY 1-1 MOVIE LENGTH 100\r
+       << PLAY 1-1 MOVIE LENGTH 100\r
        \r
 ^^^^^^\r
 FILTER\r
@@ -94,7 +105,7 @@ Syntax::
                \r
 Example::\r
                \r
-       >>> PLAY 1-1 MOVIE FILTER hflip:yadif=0:0\r
+       << PLAY 1-1 MOVIE FILTER hflip:yadif=0:0\r
        \r
 ---------\r
 Functions\r
@@ -115,9 +126,9 @@ Returns
        \r
 Example::\r
        \r
-       >>> CALL 1-1 LOOP 1\r
-       >>> CALL 1-1 LOOP   // Queries without changing.\r
-       <<< 1\r
+       << CALL 1-1 LOOP 1\r
+       << CALL 1-1 LOOP   // Queries without changing.\r
+       >> 1\r
        \r
 ^^^^\r
 SEEK\r
@@ -134,8 +145,34 @@ Returns
        \r
 Example::\r
        \r
-       >>> CALL 1-1 SEEK 200\r
+       << CALL 1-1 SEEK 200\r
         \r
+^^^^\r
+START (CasparCG 2.1)\r
+^^^^\r
+Sets the start of the file. This point will be used while looping.\r
+\r
+Syntax::\r
+\r
+       START [frames:int]\r
+       \r
+Example::\r
+       \r
+       << CALL 1-1 START 100\r
+    \r
+^^^^^^\r
+LENGTH (CasparCG 2.1)\r
+^^^^^^\r
+Sets the end of the file.\r
+\r
+Syntax::\r
+\r
+       LENGTH [frames:int]\r
+       \r
+Example::\r
+       \r
+       << CALL 1-1 LENGTH 100P\r
+    \r
 ==============\r
 Flash Producer\r
 ==============\r
@@ -158,7 +195,7 @@ Supported Media
 Diagnostics\r
 -----------\r
 \r
-flash[ *template-host* | *video-mode*]\r
+flash[*template-host* | *video-mode*]\r
 \r
 +---------------+-----------------------------------------------+--------+\r
 | Graph         | Description                                   |  Scale |\r
@@ -183,7 +220,7 @@ Decklink Producer
 Diagnostics\r
 -----------\r
 \r
-flash[ *model-name* | *device-index* | *video-mode*]\r
+flash[*model-name* | *device-index* | *video-mode*]\r
 \r
 +---------------+-----------------------------------------------+--------+\r
 | Graph         | Description                                   |  Scale |\r
@@ -214,7 +251,7 @@ Syntax::
        \r
 Example::\r
        \r
-       >>> PLAY 1-1 DECKLINK 1\r
+       << PLAY 1-1 DECKLINK 1\r
     \r
 ^^^^^^\r
 LENGTH\r
@@ -227,7 +264,7 @@ Syntax::
        \r
 Example::\r
        \r
-       >>> PLAY 1-1 DECKLINK 1 LENGTH 100\r
+       << PLAY 1-1 DECKLINK 1 LENGTH 100\r
        \r
 ^^^^^^\r
 FILTER\r
@@ -240,7 +277,7 @@ Syntax::
                \r
 Example::\r
                \r
-       >>> PLAY 1-1 DECKLINK 1 FILTER hflip:yadif=0:0\r
+       << PLAY 1-1 DECKLINK 1 FILTER hflip:yadif=0:0\r
        \r
 ^^^^^^\r
 FORMAT\r
@@ -253,7 +290,7 @@ Syntax::
        \r
 Example::\r
        \r
-       >>> PLAY 1-1 DECKLINK 1 FORMAT PAL LENGTH 100\r
+       << PLAY 1-1 DECKLINK 1 FORMAT PAL LENGTH 100\r
         \r
 ==============\r
 Image Producer\r

diff --git a/source/query-commands.rst b/source/query-commands.rst
index 99d61851adb0ee66eaecc001d53983827b4f69ea..0b6d731d715f41899397684aaa126d667c9153f9 100644 (file)
--- a/source/query-commands.rst
+++ b/source/query-commands.rst
@@ -13,8 +13,8 @@ Syntax::
                \r
 Example::\r
 \r
-       <<< CINF movie\r
-       >>> ...\r
+       >> CINF movie\r
+       << ...\r
 \r
 ===\r
 CLS\r
@@ -27,8 +27,8 @@ Syntax::
                \r
 Example::\r
 \r
-       <<< CLS\r
-       >>> ...\r
+       >> CLS\r
+       << ...\r
        \r
 ===\r
 TLS\r
@@ -41,8 +41,8 @@ Syntax::
                \r
 Example::\r
 \r
-       <<< TLS\r
-       >>> ...\r
+       >> TLS\r
+       << ...\r
        \r
 =======\r
 VERSION\r
@@ -57,10 +57,10 @@ Syntax::
                \r
 Example::\r
 \r
-       <<< VERSION\r
-       >>> ...\r
-       <<< VERSION FLASH\r
-       >>> ...\r
+       >> VERSION\r
+       << ...\r
+       >> VERSION FLASH\r
+       << ...\r
        \r
 ====\r
 INFO\r
@@ -90,11 +90,11 @@ Syntax::
                \r
 Example::\r
 \r
-       <<< INFO\r
-       >>> ...\r
-       <<< INFO 1\r
-       >>> ...\r
-       <<< INFO 1-1\r
-       >>> ...\r
-       <<< INFO TEMPLATE my_table_template\r
-       >>> ...\r
+       >> INFO\r
+       << ...\r
+       >> INFO 1\r
+       << ...\r
+       >> INFO 1-1\r
+       << ...\r
+       >> INFO TEMPLATE my_table_template\r
+       << ...\r

diff --git a/source/template-graphics-commands.rst b/source/template-graphics-commands.rst
index 094ce42e3aaa84889bd55c11ace12a17a3c536b6..57c65525f7d6c159a55ba4b213875b727bc8a222 100644 (file)
--- a/source/template-graphics-commands.rst
+++ b/source/template-graphics-commands.rst
@@ -37,7 +37,7 @@ Syntax::
                \r
 Example::\r
 \r
-       <<< CG 1-1 ADD 10 svtnews/info 1\r
+       >> CG 1-1 ADD 10 svtnews/info 1\r
        \r
 =========\r
 CG REMOVE\r
@@ -50,7 +50,7 @@ Syntax::
                \r
 Example::\r
 \r
-       <<< CG 1-1 REMOVE 1\r
+       >> CG 1-1 REMOVE 1\r
                \r
 ========\r
 CG CLEAR\r
@@ -63,7 +63,7 @@ Syntax::
                \r
 Example::\r
 \r
-       <<< CG 1-1 CLEAR\r
+       >> CG 1-1 CLEAR\r
 \r
 =======\r
 CG PLAY\r
@@ -76,7 +76,7 @@ Syntax::
                \r
 Example::\r
 \r
-       <<< CG 1-1 PLAY 1\r
+       >> CG 1-1 PLAY 1\r
 \r
 =======\r
 CG STOP\r
@@ -89,7 +89,7 @@ Syntax::
                \r
 Example::\r
 \r
-       <<< CG 1-1 STOP\r
+       >> CG 1-1 STOP\r
 \r
 =======\r
 CG NEXT\r
@@ -102,7 +102,7 @@ Syntax::
                \r
 Example::\r
 \r
-       <<< CG 1-1 NEXT 1\r
+       >> CG 1-1 NEXT 1\r
 \r
 =======\r
 CG GOTO\r
@@ -115,7 +115,7 @@ Syntax::
                \r
 Example::\r
 \r
-       <<< CG 1-1 GOTO 1 intro\r
+       >> CG 1-1 GOTO 1 intro\r
        \r
 =========\r
 CG UPDATE\r
@@ -128,7 +128,7 @@ Syntax::
                \r
 Example::\r
 \r
-       <<< CG 1-1 UPDATE 1 "Some data"\r
+       >> CG 1-1 UPDATE 1 "Some data"\r
        \r
 =========\r
 CG INVOKE\r
@@ -141,4 +141,4 @@ Syntax::
                \r
 Example::\r
 \r
-       <<< CG 1-1 INVOKE 1 start_intro
\ No newline at end of file
+       >> CG 1-1 INVOKE 1 start_intro
\ No newline at end of file