Selaa lähdekoodia

rename ini files

David 10 vuotta sitten
vanhempi
commit
0d96b5fc7a
3 muutettua tiedostoa jossa 76 lisäystä ja 76 poistoa
  1. 36 40
      completo.ini
  2. 0 0
      old/completo-2cam.ini
  3. 40 36
      completo-3cam.ini

+ 36 - 40
completo.ini

@@ -7,12 +7,10 @@ require version 0.5.1
 # Listen on port 9999 for command control connections
 system control port 9999
 
-# Set system Geometry to 1024x576
-#system geometry 1024 576 BGRA
-system geometry 1024 768 BGRA
+system geometry 800 600 BGRA
 
 # Set system frame rate to 24
-system frame rate 25
+system frame rate 24
 
 # Set output control socket
 system socket /tmp/mixer1
@@ -27,9 +25,9 @@ feed idle 0 1
 # Furthermore the feed is defined as live meaning Snowmix will drop frames if
 # it is late.
 feed add 1 Feed #1
-feed geometry 1 1024 768
+feed geometry 1 800 600
 feed live 1
-feed idle 1 100 frames/dead-1024x768.bgra
+feed idle 1 100 frames/dead-800x600.bgra
 #feed scale 1 1 1
 feed socket 1 /tmp/feed1-control-pipe
 
@@ -50,6 +48,7 @@ feed socket 2 /tmp/feed2-control-pipe
 image load 0 /home/nginx/logoeba.png
 #place id, image id, x y
 image place 0 0 40 700
+image alpha 0 0.4
 
 ################################################################################
 audio feed verbose 0
@@ -58,15 +57,15 @@ audio sink verbose 0
 
 audio feed add 1 Audio feed #1
 audio feed channels 1 2
-audio feed rate 1 48000
+audio feed rate 1 44100
 audio feed format 1 16 signed
 audio feed mute off 1
 #audio feed volume 1 1
-audio feed delay 1 50
+#audio feed delay 1 150
 
 audio feed add 2 Audio feed #2
 audio feed channels 2 2
-audio feed rate 2 48000
+audio feed rate 2 44100
 audio feed format 2 16 signed
 audio feed mute off 2
 #audio feed volume 2 1
@@ -74,7 +73,7 @@ audio feed delay 2 50
 
 audio mixer add 1 Main Live Mixer
 audio mixer channels 1 2
-audio mixer rate 1 48000
+audio mixer rate 1 44100
 audio mixer mute off 1
 #audio mixer volume 1 1
 audio mixer source feed 1 1
@@ -82,12 +81,16 @@ audio mixer source feed 1 2
 #audio mixer source volume 1 1 1.0
 #audio mixer source volume 1 2 1.0
 audio mixer source mute off 1 1
-#audio mixer source mute off 1 2
+audio mixer source mute off 1 2
+
+
+audio mixer source mindelay 1 1 170
+audio mixer source maxdelay 1 1 250
 
 # Dummy sink
 audio sink add 0 Dummy Audio
 audio sink channels 0 2
-audio sink rate 0 48000
+audio sink rate 0 44100
 audio sink format 0 16 signed
 audio sink mute on 0
 audio sink source mixer 0 1
@@ -95,7 +98,7 @@ audio sink source mixer 0 1
 # Sink for 'ctr isaudio'
 audio sink add 1 Main Live Sink
 audio sink channels 1 2
-audio sink rate 1 48000
+audio sink rate 1 44100
 audio sink format 1 16 signed
 audio sink mute off 1
 audio sink source mixer 1 1
@@ -110,24 +113,6 @@ audio mixer verbose 1
 ################################################################################
 stack  0
 
-# Define some text strings identified by their text id.
-text string 0 Snowmix Virtual Feed Setup by Peter Maersk-Moller
-text string 1 This is feed #1
-text string 2 This is feed #2
-text string 6 [#RUNTIME,1]
-text string 7 [#RUNTIME,2]
-text string 10 [#FEEDSTATE,2,RUNNING]Running 2
-text string 11 [#FEEDSTATE,2,PENDING]Pending 2
-text string 12 [#FEEDSTATE,2,STALLED]Stalled 2
-text string 13 [#FEEDSTATE,2,DISCONNECTED]Lost Signal 2
-text string 20 [#DATETIME] CET
-
-# This defines 3 font selections identified by their font id
-text font 0 Sans Bold 8
-text font 1 Sans Bold 12
-text font 2 Sans Bold 14
-text font 0 Sans Bold 7
-
 command create create_virtual_feeds
   vfeed add 1 Feed #1
   vfeed source feed 1 1
@@ -137,19 +122,33 @@ command end
 
 # vfeed place rect [<vir id> [<x> <y> <clip w> <clip h> <clip x> <clip y> [<rotation> <scale_x> <scale_y> <alpha>]]]
 # vfeed place rect id x  y   c_w c_h c_x cy rot s_x s_y alp
-command create place_virtual_feed_pip
-  vfeed place rect 1 000 000 1024 768 000 00 0.0 1.0 1.0 1.0
 
 #800x600 * 0.4 => 320x240
+#800x600 - 320x240 = 480x360
+command create place_virtual_feed_pip
+  vfeed place rect 1 000 000 800 600 000 00 0.0 1.0 1.0 1.0
+  vfeed place rect 2 480 360 320 240 000 00 0.0 0.4 0.4 1.0
+  loop
+command end
+
+#800x600 * 0.6 => 320x240
 #1024x768 - 320x240 = 704x528
-  vfeed place rect 2 704 528 0320 240 000 00 0.0 0.4 0.4 1.0
+command create place_virtual_feed_video
+  vfeed place rect 1 000 000 640 480 000 00 0.0 0.800 0.800 1.0
+  vfeed place rect 2 400 300 400 300 000 00 0.0 0.600 0.500 1.0
   loop
 command end
 
+
 command create place_virtual_feed_main
-  vfeed place rect 1 000 000 1024 768 000 00 0.0 1.0 1.0 1.0
-  vfeed place rect 2 704 384 0800 600 000 00 0.0 0.4 0.4 0.0
-#  vfeed place rect 2 0 0 1   1   0   0  0   1   1   0.1
+  vfeed place rect 1 000 000 800 600 000 00 0.0 1.0 1.0 1.0
+  vfeed place rect 2 000 000 800 600 000 00 0.0 1.0 1.0 0.0
+  loop
+command end
+
+command create place_virtual_feed_secondary
+  vfeed place rect 1 000 000 800 600 000 00 0.0 1.0 1.0 0.0
+  vfeed place rect 2 000 000 800 600 000 00 0.0 1.0 1.0 1.0
   loop
 command end
 
@@ -162,9 +161,6 @@ command create Show
   vfeed overlay 1
   vfeed overlay 2
   image overlay 0
-#  text overlay 1 3
-#  text overlay 2 4..end
-#  text overlay 0
   loop
 command end
 

completo-2cam.ini → old/completo-2cam.ini


+ 40 - 36
completo-3cam.ini

@@ -7,10 +7,12 @@ require version 0.5.1
 # Listen on port 9999 for command control connections
 system control port 9999
 
-system geometry 800 600 BGRA
+# Set system Geometry to 1024x576
+#system geometry 1024 576 BGRA
+system geometry 1024 768 BGRA
 
 # Set system frame rate to 24
-system frame rate 24
+system frame rate 25
 
 # Set output control socket
 system socket /tmp/mixer1
@@ -25,9 +27,9 @@ feed idle 0 1
 # Furthermore the feed is defined as live meaning Snowmix will drop frames if
 # it is late.
 feed add 1 Feed #1
-feed geometry 1 800 600
+feed geometry 1 1024 768
 feed live 1
-feed idle 1 100 frames/dead-800x600.bgra
+feed idle 1 100 frames/dead-1024x768.bgra
 #feed scale 1 1 1
 feed socket 1 /tmp/feed1-control-pipe
 
@@ -48,7 +50,6 @@ feed socket 2 /tmp/feed2-control-pipe
 image load 0 /home/nginx/logoeba.png
 #place id, image id, x y
 image place 0 0 40 700
-image alpha 0 0.4
 
 ################################################################################
 audio feed verbose 0
@@ -57,15 +58,15 @@ audio sink verbose 0
 
 audio feed add 1 Audio feed #1
 audio feed channels 1 2
-audio feed rate 1 44100
+audio feed rate 1 48000
 audio feed format 1 16 signed
 audio feed mute off 1
 #audio feed volume 1 1
-#audio feed delay 1 150
+audio feed delay 1 50
 
 audio feed add 2 Audio feed #2
 audio feed channels 2 2
-audio feed rate 2 44100
+audio feed rate 2 48000
 audio feed format 2 16 signed
 audio feed mute off 2
 #audio feed volume 2 1
@@ -73,7 +74,7 @@ audio feed delay 2 50
 
 audio mixer add 1 Main Live Mixer
 audio mixer channels 1 2
-audio mixer rate 1 44100
+audio mixer rate 1 48000
 audio mixer mute off 1
 #audio mixer volume 1 1
 audio mixer source feed 1 1
@@ -81,16 +82,12 @@ audio mixer source feed 1 2
 #audio mixer source volume 1 1 1.0
 #audio mixer source volume 1 2 1.0
 audio mixer source mute off 1 1
-audio mixer source mute off 1 2
-
-
-audio mixer source mindelay 1 1 170
-audio mixer source maxdelay 1 1 250
+#audio mixer source mute off 1 2
 
 # Dummy sink
 audio sink add 0 Dummy Audio
 audio sink channels 0 2
-audio sink rate 0 44100
+audio sink rate 0 48000
 audio sink format 0 16 signed
 audio sink mute on 0
 audio sink source mixer 0 1
@@ -98,7 +95,7 @@ audio sink source mixer 0 1
 # Sink for 'ctr isaudio'
 audio sink add 1 Main Live Sink
 audio sink channels 1 2
-audio sink rate 1 44100
+audio sink rate 1 48000
 audio sink format 1 16 signed
 audio sink mute off 1
 audio sink source mixer 1 1
@@ -113,6 +110,24 @@ audio mixer verbose 1
 ################################################################################
 stack  0
 
+# Define some text strings identified by their text id.
+text string 0 Snowmix Virtual Feed Setup by Peter Maersk-Moller
+text string 1 This is feed #1
+text string 2 This is feed #2
+text string 6 [#RUNTIME,1]
+text string 7 [#RUNTIME,2]
+text string 10 [#FEEDSTATE,2,RUNNING]Running 2
+text string 11 [#FEEDSTATE,2,PENDING]Pending 2
+text string 12 [#FEEDSTATE,2,STALLED]Stalled 2
+text string 13 [#FEEDSTATE,2,DISCONNECTED]Lost Signal 2
+text string 20 [#DATETIME] CET
+
+# This defines 3 font selections identified by their font id
+text font 0 Sans Bold 8
+text font 1 Sans Bold 12
+text font 2 Sans Bold 14
+text font 0 Sans Bold 7
+
 command create create_virtual_feeds
   vfeed add 1 Feed #1
   vfeed source feed 1 1
@@ -122,33 +137,19 @@ command end
 
 # vfeed place rect [<vir id> [<x> <y> <clip w> <clip h> <clip x> <clip y> [<rotation> <scale_x> <scale_y> <alpha>]]]
 # vfeed place rect id x  y   c_w c_h c_x cy rot s_x s_y alp
-
-#800x600 * 0.4 => 320x240
-#800x600 - 320x240 = 480x360
 command create place_virtual_feed_pip
-  vfeed place rect 1 000 000 800 600 000 00 0.0 1.0 1.0 1.0
-  vfeed place rect 2 480 360 320 240 000 00 0.0 0.4 0.4 1.0
-  loop
-command end
+  vfeed place rect 1 000 000 1024 768 000 00 0.0 1.0 1.0 1.0
 
-#800x600 * 0.6 => 320x240
+#800x600 * 0.4 => 320x240
 #1024x768 - 320x240 = 704x528
-command create place_virtual_feed_video
-  vfeed place rect 1 000 000 640 480 000 00 0.0 0.800 0.800 1.0
-  vfeed place rect 2 400 300 400 300 000 00 0.0 0.600 0.500 1.0
+  vfeed place rect 2 704 528 0320 240 000 00 0.0 0.4 0.4 1.0
   loop
 command end
 
-
 command create place_virtual_feed_main
-  vfeed place rect 1 000 000 800 600 000 00 0.0 1.0 1.0 1.0
-  vfeed place rect 2 000 000 800 600 000 00 0.0 1.0 1.0 0.0
-  loop
-command end
-
-command create place_virtual_feed_secondary
-  vfeed place rect 1 000 000 800 600 000 00 0.0 1.0 1.0 0.0
-  vfeed place rect 2 000 000 800 600 000 00 0.0 1.0 1.0 1.0
+  vfeed place rect 1 000 000 1024 768 000 00 0.0 1.0 1.0 1.0
+  vfeed place rect 2 704 384 0800 600 000 00 0.0 0.4 0.4 0.0
+#  vfeed place rect 2 0 0 1   1   0   0  0   1   1   0.1
   loop
 command end
 
@@ -161,6 +162,9 @@ command create Show
   vfeed overlay 1
   vfeed overlay 2
   image overlay 0
+#  text overlay 1 3
+#  text overlay 2 4..end
+#  text overlay 0
   loop
 command end