Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0

[casparcg] / shell / casparcg.config
diff --git a/shell/casparcg.config b/shell/casparcg.config

index c69af225a5ed81abaa88d914fccec29de441333e..efc5c51c2c302ae2defe080eeaa051c19a0276eb 100644 (file)
--- a/shell/casparcg.config
+++ b/shell/casparcg.config
@@ -27,11 +27,16 @@
        <port>5250</port>\r
        <protocol>AMCP</protocol>\r
      </tcp>\r
+    <tcp>\r
+      <port>3250</port>\r
+      <protocol>LOG</protocol>\r
+    </tcp>\r
    </controllers>\r
  </configuration>\r
  \r
  <!--\r
-<log-level>           trace [trace|debug|info|warning|error]</log-level>\r
+<log-level>           info  [trace|debug|info|warning|error|fatal]</log-level>\r
+<log-categories>      communication  [calltrace|communication|calltrace,communication]</log-categories>\r
  <force-deinterlace>   true  [true|false]</force-deinterlacing>\r
  <channel-grid>        false [true|false]</channel-grid>\r
  <mixer>\r
@@ -52,6 +57,9 @@
  <flash>\r
      <buffer-depth>auto [auto|1..]</buffer-depth>\r
  </flash>\r
+<html>\r
+    <remote-debugging-port>0 [0|1024-65535]</remote-debugging-port>\r
+</html>\r
  <thumbnails>\r
      <generate-thumbnails>true [true|false]</generate-thumbnails>\r
      <width>256</width>\r