git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

diff --git a/Casparcg 2.0 Documentation.txt b/Casparcg 2.0 Documentation.txt
index 61e44f56a6c7e3bfcb4a2ba77c1ff13cbff54543..3942a828e7f3f4566dca9292fb6fef4091c5e6f3 100644 (file)
--- a/Casparcg 2.0 Documentation.txt
+++ b/Casparcg 2.0 Documentation.txt
@@ -48,6 +48,7 @@ Figure 1. A simplified diagram of the CasparCG 2.0 Architecture.
     ########                                          #######                                           ##################\r
     | FILE |                                          | GPU |                                           | DISPLAY DEVICE |\r
     ########                                          #######                                           ##################\r
+\r
 **********************************************************************************\r
 1.1. Producers\r
 **********************************************************************************\r
@@ -93,6 +94,7 @@ CasparCG 2.0 currently (fully or partially) supports the following producers:
 ----------------------------------------------------------------------------------\r
 1.2.5. Decklink Producer (decklink)\r
 ----------------------------------------------------------------------------------\r
+\r
 **********************************************************************************\r
 1.2. Consumers\r
 **********************************************************************************\r
@@ -184,6 +186,7 @@ a long string of xml-data.
 **********************************************************************************\r
 2.3. Command Specification\r
 **********************************************************************************\r
+\r
 ----------------------------------------------------------------------------------\r
 2.3.1. Required Value\r
 ----------------------------------------------------------------------------------\r
@@ -241,6 +244,7 @@ Examples:
 **********************************************************************************\r
 2.4. Basic Commands\r
 **********************************************************************************\r
+\r
 ----------------------------------------------------------------------------------\r
 2.4.1. LOADBG\r
 ----------------------------------------------------------------------------------\r
@@ -465,6 +469,7 @@ Description:
 **********************************************************************************\r
 2.6. Template Graphics Commands\r
 **********************************************************************************\r
+\r
 ----------------------------------------------------------------------------------\r
 2.6.1. Template Data\r
 ----------------------------------------------------------------------------------\r
@@ -611,6 +616,7 @@ Description:
 **********************************************************************************\r
 2.7. Mixer Commands\r
 **********************************************************************************\r
+\r
 ----------------------------------------------------------------------------------\r
 2.7.1. MIXER VIDEO IS_KEY\r
 ----------------------------------------------------------------------------------\r
@@ -787,6 +793,7 @@ Examples:
 **********************************************************************************\r
 2.8. Query Commands\r
 **********************************************************************************\r
+\r
 ----------------------------------------------------------------------------------\r
 2.8.1. CINF\r
 ----------------------------------------------------------------------------------\r
@@ -847,6 +854,7 @@ Description:
 **********************************************************************************\r
 2.9. Misc Commands\r
 **********************************************************************************\r
+\r
 ----------------------------------------------------------------------------------\r
 2.9.1. BYE\r
 ----------------------------------------------------------------------------------\r

diff --git a/casparcg.sln b/casparcg.sln
index 22f813e65bb2a1af3e1eb91c9a5099cf5dfe4a9b..2a63d3f1b9cdea1ba35afa68ad7ead81476c1063 100644 (file)
--- a/casparcg.sln
+++ b/casparcg.sln
@@ -11,6 +11,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "protocol", "protocol\protoc
 EndProject\r
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "documentation", "documentation", "{32079541-68ED-4319-91FB-0FF041642679}"\r
        ProjectSection(SolutionItems) = preProject\r
+               Casparcg 2.0 Documentation.txt = Casparcg 2.0 Documentation.txt\r
                ..\CasparCG 2.0 Preliminary Change Log.txt = ..\CasparCG 2.0 Preliminary Change Log.txt\r
                COPYING.txt = COPYING.txt\r
                README.txt = README.txt\r

diff --git a/core/channel.h b/core/channel.h
index b8ecf6299cb6819a860696f32fd2fc70baf08d37..14d3fd8fde26f840879ae73700f27693a6baaf19 100644 (file)
--- a/core/channel.h
+++ b/core/channel.h
@@ -31,16 +31,6 @@
 \r
 namespace caspar { namespace core {\r
 \r
-////////////////////////////////////////////////////////////////////////////////////////////////////\r
-/// \class     channel\r
-///\r
-/// \brief\r
-///            \r
-///                |**********| <-   empty frame   <- |***********| <-   frame format  <- |**********|\r
-///   PROTOCOL ->  | PRODUCER |                       |   MIXER          |                       | CONSUMER |  -> DISPLAY DEVICE\r
-///                |**********| -> rendered frames -> |***********| -> formatted frame -> |**********|\r
-///   \r
-////////////////////////////////////////////////////////////////////////////////////////////////////\r
 class channel : boost::noncopyable\r
 {\r
 public:\r