From 3b8e0056c01a99c87aa83a8fc367e78a3f5b3c64 Mon Sep 17 00:00:00 2001 From: LongHairedHacker Date: Sun, 7 Jun 2015 20:05:08 +0200 Subject: [PATCH] Basic version of the mixer config works --- ini/.base.ini.swp | Bin 0 -> 12288 bytes ini/.test720p.ini.swp | Bin 0 -> 12288 bytes ini/base.ini | 255 ++++++++++++------------------------------ ini/test720p.ini | 10 +- 4 files changed, 77 insertions(+), 188 deletions(-) create mode 100644 ini/.base.ini.swp create mode 100644 ini/.test720p.ini.swp diff --git a/ini/.base.ini.swp b/ini/.base.ini.swp new file mode 100644 index 0000000000000000000000000000000000000000..924d3bf79d236087200bcecc9c5836875742dae3 GIT binary patch literal 12288 zcmeI2PiP!f9LHZP{)skPD@p~ypXTDBnVmnoNqV#Y5~2wfO9a6xv%4?5V`k=U=Dkg_ zZPB!XLIpvv^imK#6#w<22M<~>-UTay2k{_!u-2o+tKT<&cBeE+ZRx?lo6RRP^XC12 zzxVsT-@Zr4)a@6hXKCE3G8{V@TYO8+ompL^zjiYwdEJ*P@MHaKlOyyyN^~~qkUx5@ z@37KI#H+laWTmat=u*(+q7uYG1@X9r3#KuLQNSp0yAf1EuetvY-6uuoZIuU>T7*$%TE1serrxf0i%FX zz$jo8FbWt2i~>dhqkvJsC}0#Y3T#0I{3c_E?quxf-55On|6lz5fB6B%J_VnE55WiE zZEzY`U>A50{Cq!S--0#pJ~#;5>L2oB+oG2hV{=!EUe}Tp42Q3-CEO2i^oT;92ktcp8j@QLqOL zfvfj0_BZ$mtbuR9$KWh@1DpaUKnDmAgE?>zc)$gF0D;HBUEnI_@pteW_yt@7--9o~ zd2j~22i^gvz)7$Q0?-C&9c;lmHbXWF7zK<1|0@L|5eG^nBw{S!OFRkv9?j#`Hrb{l zZLz#B3^Ck>h$2635|5i~C=~idx}hNQTbv3LhYc;wbKdMXczvTr!hOY4ZgI-H16iX$hN9`-Tb#>*}0_@-2_>rQ$0p*-s(4-aC9W{!|;F~LBs39)Y35S z%?GKGOQk5aO`}vvcfaXGs^pYHRLddy+LbP#Y?>;`;25VgRY?Pt%RSdo!b>N!JjOhB zSz3?0(uh3LUz`n;#T?;t1Ap!{Q{`^v&-pL@P{pP3IVFFk?2Ak2rN>{EYdy74ooQJ~ z(OBS$JgTUuQ_)Rc_8@469LJ^>(3hFlN6b4J^lwG&Dh`366+9)sX z?18RVk1|2aG2KB-w-gg4b>o=1K|ki84hJz^9TO{7Ii@p+>6BtZ;Ty-y4f-)*bX}fK zo@X%|gR@>C;!anQ9!_bQ==Z=YnCVDU;Zb9y;o)xmNf@EDceZ>j2blIcC#(xp$MUye z>F*9Eci>h95vS3t!KT!}510L()OOmHMbq;X3v5c5{XkL+6CCfso8LXDctm-%q_q+S zD?D-X5TdJeZVeHuM4G+a z=6&3<@zL2I0;3=C7J$sD? z@1T>#Si%>(L4rk(ClW)^+k;iZBFB@ukR0_w2Slfr1g*BBdXEls#S@zK(R*QZR)it$ lT-$Lm;n)}{?I$rn$&)4Cg!O)31`V3j^{DGa1#wHVe*xyL^H%5;o!1rcD*-N`+7u zW+{Re38>1gmk1=p)5D#%h;vx9k>-9Q`lRh}`&^Y?Z zo^QTy=KKC0+iS&D>(QwSmGdJE+h)ezeMKK$I5tB+-Nl&VRa27W_ay!)sao)16xmUt_RwGYS|5i~>dhqkvJsC}0#Y3K#|c4+?01fW3f12IFFO#`}R4`?zU# zMggOMQNSo*6fg=H1&jhl0i%FXz$jo8Fbez!6|n1!{dpT>AKi}R@&Etc`~UZw7&{H# z2k(Hl!K>gT$b&854)D!J#y$t1fj7Z%a12yI1snht*ao(OFE=o@2u^~d;91ZFkAq3D z4~&Al!DjFy^11+)zEgt;z)GvF=oI(QA70B!ITI07C94}k~4IM@j`fsJ4g{EoVR z13!ST!KdI8@G&?G&VbWk0lWk};DX1%17IB70|vnW_~ll{eg;>-WpD|+2Tp&( zc7bhREBJPZu`j>};4F9poB#?0U z1^0rRz^^wmb`dOrufT`k6nGi9;0SmUn9V3)6fg=H1^$KtuJnYK0ZETBImd&QZO86V z1E0F7bVvF)3`(3@bf_iUyB!A^t?A^h>{;1PhD&#(k8fnotoRIDhKW`s93`0L*$~-Q z=$De_-#=bv71v?RbX`N6Y~SUIv6^&U+p81z>TJl7($Cg#jVZhvn*(b&JMem}S1W|E zA>pRxNybhNyi{-ZB26xk{-Wx8_g&VH%ZkAI%{FH!nB^Epr@PX%^;27QONlP&bX?ca zwWRH9CAj!DsRnrx4^wNC*6vYaIl7YBlXW-t;T&gqHB$sn}mmf?cuz literal 0 HcmV?d00001 diff --git a/ini/base.ini b/ini/base.ini index 316a161..3952b50 100644 --- a/ini/base.ini +++ b/ini/base.ini @@ -1,238 +1,127 @@ # Basic Feeds Settings # Copyright by Peter Maersk-Moller 2012 - All rights reserved -#verbose -require version 0.4.2 + +verbose + +require version 0.4.5 # Define allowed remote host IP addresses. If omitted then only 127.0.0.1 will be accepted. system host allow 127.0.0.1 -system host allow 192.168.11.211 # Listen on port 9999 for command control connections system control port 9999 # Set system Geometry to 1024x768 -system geometry 1024 768 ARGB +system geometry 1280 720 ARGB # Set system frame rate to 24 -system frame rate 24 +system frame rate 25 # Set output control socket system socket /tmp/mixer1 # Set feed idle time - feed 0 will always be idle. If no file is given, # idle image will be all black. -feed idle 0 1 frames/test_1024x768 +feed idle 0 1 frames/test_1280x720 #feed idle 0 1 ################## # Input feeds ################## -# Keep size of input feeds to same size as feed 0 -# otherwise things explode. -feed add 1 Feed1 -feed geometry 1 1024 768 +feed add 1 Cam1 +feed geometry 1 1280 720 feed live 1 -feed idle 1 100 frames/test_1024x768 +feed idle 1 100 frames/test_1280x720 feed socket 1 /tmp/feed1 -feed add 2 Feed2 -feed geometry 2 1024 768 +feed add 2 Cam2 +feed geometry 2 1280 720 feed live 2 -feed idle 2 100 frames/test_1024x768 +feed idle 2 100 frames/test_1280x720 feed socket 2 /tmp/feed2 -feed add 3 Feed3 -feed geometry 3 1024 768 +feed add 3 Cam1 +feed geometry 3 1280 720 feed live 3 -feed idle 3 100 frames/test_1024x768 +feed idle 3 100 frames/test_1280x720 feed socket 3 /tmp/feed3 -###################### -# Virtual feeds -####################### -# Maximized settings for any feed: -# virtual feed place rect X 20 20 1024 768 0 0 0.0 0.75 0.75 1.0 -# Feed 1 -# Starts maximized -# Minimized position: 800 20 -# Minimized size: 205 154 -virtual feed add 1 VirtualFeed #1 -virtual feed source feed 1 1 -virtual feed place rect 1 20 20 1024 768 0 0 0.0 0.75 0.75 1.0 +################### +# Full size vfeeds +################### -# Feed 2 -# Starts minimized -# Minimized position: 800 231 -# Minimized size: 205 154 -virtual feed add 2 Feed #2 -virtual feed source feed 2 2 -virtual feed place rect 2 800 230 1024 768 0 0 0.0 0.20 0.20 1.0 +vfeed add 1 FullCam1 +vfeed source feed 1 1 +vfeed place rect 1 0 0 1280 720 0 0 -# Feed 3 -# Starts minimized -# Minimized position: 800 442 -# Minimized size: 205 154 -virtual feed add 3 VirtualFeed #3 -virtual feed source feed 3 3 -virtual feed place rect 3 800 442 1024 768 0 0 0.0 0.20 0.20 1.0 +vfeed add 2 FullCam1 +vfeed source feed 2 2 +vfeed place rect 2 0 0 1280 720 0 0 + +vfeed add 3 FullCam1 +vfeed source feed 3 3 +vfeed place rect 3 0 0 1280 720 0 0 +#################### +# Small size vfeeds +#################### -command create MinimizeFeed1 - # Since everything from now on is relative, - # we should make sure everthings is where we expect it to be - virtual feed place rect 1 20 20 1024 768 0 0 0.0 0.75 0.75 1.0 +vfeed add 4 SmallCam1 +vfeed source feed 4 1 +vfeed place rect 4 5 2 1280 720 0 0 0 0.492 0.492 1.0 - # The scale and coor commands are nonblocking - virtual feed move scale 1 -0.055 -0.055 10 10 - virtual feed move coor 1 65 0 12 0 +vfeed add 5 SmallCam1 +vfeed source feed 5 2 +vfeed place rect 5 645 2 1280 720 0 0 0 0.492 0.492 1.0 - # Allow Maximizing - command restart MaximizeFeed1 -command end - -command create MaximizeFeed1 - # Since everything from now on is relative, - # we should make sure everthings is where we expect it to be - virtual feed place rect 1 800 20 1024 768 0 0 0.0 0.20 0.20 1.0 - - # The scale and coor commands are nonblocking - virtual feed move scale 1 0.055 0.055 10 10 - virtual feed move coor 1 -65 0 12 0 - - # Allow Minimizing - command restart MinimizeFeed1 -command end - -command create MinimizeFeed2 - # Since everything from now on is relative, - # we should make sure everthings is where we expect it to be - virtual feed place rect 2 20 20 1024 768 0 0 0.0 0.75 0.75 1.0 - - # The scale and coor commands are nonblocking - virtual feed move scale 2 -0.055 -0.055 10 10 - virtual feed move coor 2 65 21 12 10 - - # Allow Maximizing - command restart MaximizeFeed2 -command end - -command create MaximizeFeed2 - # Since everything from now on is relative, - # we should make sure everthings is where we expect it to be - virtual feed place rect 2 800 230 1024 768 0 0 0.0 0.20 0.20 1.0 - - # The scale and coor commands are nonblocking - virtual feed move scale 2 0.055 0.055 10 10 - virtual feed move coor 2 -65 -21 12 10 - - # Allow Minimizing - command restart MinimizeFeed2 -command end - -command create MinimizeFeed3 - # Since everything from now on is relative, - # we should make sure everthings is where we expect it to be - virtual feed place rect 3 20 20 1024 768 0 0 0.0 0.75 0.75 1.0 - - # The scale and coor commands are nonblocking - virtual feed move scale 3 -0.055 -0.055 10 10 - virtual feed move coor 3 65 35 12 12 - - # Allow Maximizing - command restart MaximizeFeed3 -command end - -command create MaximizeFeed3 - # Since everything from now on is relative, - # we should make sure everthings is where we expect it to be - virtual feed place rect 3 800 442 1024 768 0 0 0.0 0.20 0.20 1.0 - - # The scale and coor commands are nonblocking - virtual feed move scale 3 0.055 0.055 10 10 - virtual feed move coor 3 -65 -35 12 12 - - # Allow Minimizing - command restart MinimizeFeed3 -command end - -command create Swap12 - MinimizeFeed1 - MaximizeFeed2 - command restart Swap21 - command restart Swap23 -command end - -command create Swap13 - MinimizeFeed1 - MaximizeFeed3 - command restart Swap31 - command restart Swap32 -command end - -command create Swap21 - MinimizeFeed2 - MaximizeFeed1 - command restart Swap12 - command restart Swap13 -command end - -command create Swap23 - MinimizeFeed2 - MaximizeFeed3 - command restart Swap31 - command restart Swap32 -command end - -command create Swap31 - MinimizeFeed3 - MaximizeFeed1 - command restart Swap12 - command restart Swap13 -command end +vfeed add 6 SmallCam1 +vfeed source feed 6 2 +vfeed place rect 6 645 363 1280 720 0 0 0 0.492 0.492 1.0 -command create Swap32 - MinimizeFeed3 - MaximizeFeed2 - command restart Swap21 - command restart Swap23 -command end +######### +# Images +######### -stack 0 - -# Load the background image load 0 images/background.png image place 0 0 0 0 -# Load the logo image load 1 images/logo.png image place 1 1 24 24 +command create ShowAll + overlay image 0 + vfeed overlay 4..6 -#Text -text font 1 Source Code Pro Bold 32 - -text string 1 [Test text 1] -text place 1 1 1 32 650 1.0 1.0 1.0 - -text string 2 [Test text 2] -text place 2 2 1 32 700 1.0 1.0 1.0 - - -command create Show - overlay image 0 - - overlay virtual feed 1..3 - - overlay image 1 - overlay text all - loop + loop command end -overlay finish Show + +command create ShowFull1 + vfeed overlay 1 + image overlay 1 + + loop +command end + +command create ShowFull2 + vfeed overlay 2 + image overlay 1 + + loop +command end + +command create ShowFull3 + vfeed overlay 3 + image overlay 1 + + loop +command end -#montor on +overlay finish ShowAll + +monitor on diff --git a/ini/test720p.ini b/ini/test720p.ini index 8d2f8ea..9f43188 100644 --- a/ini/test720p.ini +++ b/ini/test720p.ini @@ -1,6 +1,8 @@ # Basic Feeds Settings # Copyright by Peter Maersk-Moller 2012 - All rights reserved -#verbose + +verbose + require version 0.4.5 # Define allowed remote host IP addresses. If omitted then only 127.0.0.1 will be accepted. @@ -26,10 +28,8 @@ feed idle 0 1 frames/test_1280x720 ################## # Input feeds ################## -# Keep size of input feeds to same size as feed 0 -# otherwise things explode. -feed add 1 Feed1 +feed add 1 Cam1 feed geometry 1 1280 720 feed live 1 feed idle 1 100 frames/test_1280x720 @@ -37,4 +37,4 @@ feed socket 1 /tmp/feed1 stack 0 1 -montor on +monitor on