]> git.sesse.net Git - ultimatescore/commitdiff
projects / ultimatescore / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 3c3a5c0)
Remove some obsolete references to CasparCG.
authorSteinar H. Gunderson <sgunderson@bigfoot.com>
Fri, 23 Mar 2018 15:16:18 +0000 (16:16 +0100)
committerSteinar H. Gunderson <sgunderson@bigfoot.com>
Fri, 23 Mar 2018 15:16:18 +0000 (16:16 +0100)
casparcg.config [deleted file] patch | blob | history
nageru/ultimate.lua patch | blob | history
score.css patch | blob | history
score.js patch | blob | history

diff --git a/casparcg.config b/casparcg.config
deleted file mode 100644 (file)
index 633eee7..0000000
--- a/casparcg.config
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<configuration>\r
-  <paths>\r
-    <media-path>media/</media-path>\r
-    <log-path>log/</log-path>\r
-    <data-path>data/</data-path>\r
-    <template-path>template/</template-path>\r
-    <thumbnail-path>thumbnail/</thumbnail-path>\r
-    <font-path>font/</font-path>\r
-  </paths>\r
-  <lock-clear-phrase>secret</lock-clear-phrase>\r
-  <channels>\r
-    <channel>\r
-      <video-mode>720p5994</video-mode>\r
-      <channel-layout>stereo</channel-layout>\r
-      <consumers>\r
-       <!-- <screen>\r
-          <device>1</device>\r
-          <windowed>true</windowed>\r
-        </screen> -->\r
-        <ffmpeg>\r
-          <device>1</device>\r
-          <path>unix:///tmp/caspar.sock</path>\r
-          <!-- <path>udp://localhost:5251/</path>  -->\r
-          <args>-c:v rawvideo -vf format=pix_fmts=bgra -f nut -listen 1</args>\r
-        </ffmpeg>\r
-        <system-audio></system-audio>\r
-      </consumers>\r
-    </channel>\r
-  </channels>\r
-  <controllers>\r
-    <tcp>\r
-      <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>           info  [trace|debug|info|warning|error|fatal]</log-level>\r
-<log-categories>      communication  [calltrace|communication|calltrace,communication]</log-categories>\r
-<force-deinterlace>   false  [true|false]</force-deinterlace>\r
-<channel-grid>        false [true|false]</channel-grid>\r
-<mixer>\r
-    <blend-modes>          false [true|false]</blend-modes>\r
-    <mipmapping_default_on>false [true|false]</mipmapping_default_on>\r
-    <straight-alpha>       false [true|false]</straight-alpha>\r
-</mixer>\r
-<accelerator>auto [cpu|gpu|auto]</accelerator>\r
-<template-hosts>\r
-    <template-host>\r
-        <video-mode />\r
-        <filename />\r
-        <width />\r
-        <height />\r
-    </template-host>\r
-</template-hosts>\r
-<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
-    <height>144</height>\r
-    <video-grid>2</video-grid>\r
-    <scan-interval-millis>5000</scan-interval-millis>\r
-    <generate-delay-millis>2000</generate-delay-millis>\r
-    <video-mode>720p2500</video-mode>\r
-    <mipmap>true</mipmap>\r
-</thumbnails>\r
-<channels>\r
-    <channel>\r
-        <video-mode>PAL [PAL|NTSC|576p2500|720p2398|720p2400|720p2500|720p5000|720p2997|720p5994|720p3000|720p6000|1080p2398|1080p2400|1080i5000|1080i5994|1080i6000|1080p2500|1080p2997|1080p3000|1080p5000|1080p5994|1080p6000|1556p2398|1556p2400|1556p2500|dci1080p2398|dci1080p2400|dci1080p2500|2160p2398|2160p2400|2160p2500|2160p2997|2160p3000|dci2160p2398|dci2160p2400|dci2160p2500] </video-mode>\r
-        <straight-alpha-output>false [true|false]</straight-alpha-output>\r
-        <channel-layout>stereo [mono|stereo|matrix|film|smpte|ebu_r123_8a|ebu_r123_8b|8ch|16ch]</channel-layout>\r
-        <consumers>\r
-            <decklink>\r
-                <device>[1..]</device>\r
-                <key-device>device + 1 [1..]</key-device>\r
-                <embedded-audio>false [true|false]</embedded-audio>\r
-                <channel-layout>stereo [mono|stereo|matrix|film|smpte|ebu_r123_8a|ebu_r123_8b|8ch|16ch]</channel-layout>\r
-                <latency>normal [normal|low|default]</latency>\r
-                <keyer>external [external|external_separate_device|internal|default]</keyer>\r
-                <key-only>false [true|false]</key-only>\r
-                <buffer-depth>3 [1..]</buffer-depth>\r
-            </decklink>\r
-            <bluefish>\r
-                <device>[1..]</device>\r
-                <embedded-audio>false [true|false]</embedded-audio>\r
-                <channel-layout>stereo [mono|stereo|matrix|film|smpte|ebu_r123_8a|ebu_r123_8b|8ch|16ch]</channel-layout>\r
-                <key-only>false [true|false]</key-only>\r
-            </bluefish>\r
-            <system-audio>\r
-                <channel-layout>stereo [mono|stereo|matrix]</channel-layout>\r
-                <latency>200 [0..]</latency>\r
-            </system-audio>\r
-            <screen>\r
-                <device>[0..]</device>\r
-                <aspect-ratio>default [default|4:3|16:9]</aspect-ratio>\r
-                <stretch>fill [none|fill|uniform|uniform_to_fill]</stretch>\r
-                <windowed>true [true|false]</windowed>\r
-                <key-only>false [true|false]</key-only>\r
-                <auto-deinterlace>true [true|false]</auto-deinterlace>\r
-                <vsync>false [true|false]</vsync>\r
-                <interactive>true [true|false]</interactive>\r
-                <borderless>false [true|false]</borderless>\r
-            </screen>\r
-            <newtek-ivga></newtek-ivga>\r
-            <ffmpeg>\r
-                <path>[file|url]</path>\r
-                <args>[most ffmpeg arguments related to filtering and output codecs]</args>\r
-                <separate-key>false [true|false]</separate-key>\r
-                <mono-streams>false [true|false]</mono-streams>\r
-            </ffmpeg>\r
-            <syncto>\r
-                <channel-id>1</channel-id>\r
-            </syncto>\r
-        </consumers>\r
-    </channel>\r
-</channels>\r
-<osc>\r
-  <default-port>6250</default-port>\r
-  <disable-send-to-amcp-clients>false [true|false]</disable-send-to-amcp-clients>\r
-  <predefined-clients>\r
-    <predefined-client>\r
-      <address>127.0.0.1</address>\r
-      <port>5253</port>\r
-    </predefined-client>\r
-  </predefined-clients>\r
-</osc>\r
-<audio>\r
-       <channel-layouts>\r
-               <channel-layout name="mono"        type="mono"        num-channels="1" channel-order="FC" />\r
-               <channel-layout name="stereo"      type="stereo"      num-channels="2" channel-order="FL FR" />\r
-               <channel-layout name="matrix"      type="matrix"      num-channels="2" channel-order="ML MR" />\r
-               <channel-layout name="film"        type="5.1"         num-channels="6" channel-order="FL FC FR BL BR LFE" />\r
-               <channel-layout name="smpte"       type="5.1"         num-channels="6" channel-order="FL FR FC LFE BL BR" />\r
-               <channel-layout name="ebu_r123_8a" type="5.1+downmix" num-channels="8" channel-order="DL DR FL FR FC LFE BL BR" />\r
-               <channel-layout name="ebu_r123_8b" type="5.1+downmix" num-channels="8" channel-order="FL FR FC LFE BL BR DL DR" />\r
-               <channel-layout name="8ch"         type="8ch"         num-channels="8" />\r
-               <channel-layout name="16ch"        type="16ch"        num-channels="16" />\r
-       </channel-layouts>\r
-       <mix-configs>\r
-               <mix-config from-type="mono"          to-types="stereo, 5.1"  mix="FL = FC                                           | FR = FC" />\r
-               <mix-config from-type="mono"          to-types="5.1+downmix"  mix="FL = FC                                           | FR = FC                                         | DL = FC | DR = FC" />\r
-               <mix-config from-type="mono"          to-types="matrix"       mix="ML = FC                                           | MR = FC" />\r
-               <mix-config from-type="stereo"        to-types="mono"         mix="FC &lt; FL + FR" />\r
-               <mix-config from-type="stereo"        to-types="matrix"       mix="ML = FL                                           | MR = FR" />\r
-               <mix-config from-type="stereo"        to-types="5.1"          mix="FL = FL                                           | FR = FR" />\r
-               <mix-config from-type="stereo"        to-types="5.1+downmix"  mix="FL = FL                                           | FR = FR                                         | DL = FL | DR = FR" />\r
-               <mix-config from-type="5.1"           to-types="mono"         mix="FC &lt; FL + FR + 0.707*FC + 0.707*BL + 0.707*BR" />\r
-               <mix-config from-type="5.1"           to-types="stereo"       mix="FL &lt; FL + 0.707*FC + 0.707*BL                  | FR &lt; FR + 0.707*FC + 0.707*BR" />\r
-               <mix-config from-type="5.1"           to-types="5.1+downmix"  mix="FL = FL                                           | FR = FR                                         | FC = FC | BL = BL | BR = BR | LFE = LFE | DL &lt; FL + 0.707*FC + 0.707*BL | DR &lt; FR + 0.707*FC + 0.707*BR" />\r
-               <mix-config from-type="5.1"           to-types="matrix"       mix="ML = 0.3204*FL + 0.293*FC + -0.293*BL + -0.293*BR | MR = 0.3204*FR + 0.293*FC + 0.293*BL + 0.293*BR" />\r
-               <mix-config from-type="5.1+stereomix" to-types="mono"         mix="FC &lt; DL + DR" />\r
-               <mix-config from-type="5.1+stereomix" to-types="stereo"       mix="FL = DL                                           | FR = DR" />\r
-               <mix-config from-type="5.1+stereomix" to-types="5.1"          mix="FL = FL                                           | FR = FR                                         | FC = FC | BL = BL | BR = BR | LFE = LFE" />\r
-               <mix-config from-type="5.1+stereomix" to-types="matrix"       mix="ML = 0.3204*FL + 0.293*FC + -0.293*BL + -0.293*BR | MR = 0.3204*FR + 0.293*FC + 0.293*BL + 0.293*BR" />\r
-       </mix-configs>\r
-</audio>\r
--->\r
diff --git a/nageru/ultimate.lua b/nageru/ultimate.lua
index 586b36d7223cb0b29fc6de1d24dd85aa4d45fa55..3f51fd87379f921e3509422a6b6146d9f4b53032 100644 (file)
--- a/nageru/ultimate.lua
+++ b/nageru/ultimate.lua
@@ -292,7 +292,7 @@ local simple_chains = make_cartesian_product({
        return make_simple_chain(input_deint, input_scale, has_overlay, hq)
 end)
 
--- A chain to show a single static picture on screen. Never with CasparCG overlay.
+-- A chain to show a single static picture on screen. Never with HTML overlay.
 local static_chains = make_cartesian_product({
        {true, false}            -- hq
 }, function(hq)
diff --git a/score.css b/score.css
index 307a1ada284155ce097c68c1ac2c4bf5405f4e5e..e70a4d3ca20f0e29317cd1542076b3481787afa2 100644 (file)
--- a/score.css
+++ b/score.css
@@ -247,7 +247,7 @@ body {
   clip: rect(0px,0px,200px,0px);
 }
 
-/* these are hidden when actually run in casparcg */
+/* these are hidden when actually run in Nageru */
 #area {
   position: fixed;
   left: 0px;
diff --git a/score.js b/score.js
index 1d28e4cf2308015377b98626ea629003bb7e3b4c..17ac07c4f8a679b7ec2466b59a1c6a43135be7ce 100644 (file)
--- a/score.js
+++ b/score.js
@@ -202,7 +202,7 @@ function update_score()
        document.getElementById('score').innerHTML = scoreA + "&nbsp;–&nbsp;" + scoreB;
 }
 
-/* called by caspar only */
+/* called by the Nageru theme only */
 function play()
 {
        document.getElementById('manualcontrols').style.display = 'none';
Unnamed repository; edit this file 'description' to name the repository.