Parcourir la source

fix audio + move comments

David il y a 10 ans
Parent
commit
4d918ceeb6
1 fichiers modifiés avec 9 ajouts et 11 suppressions
  1. 9 11
      completo-2cam.ini

+ 9 - 11
completo-2cam.ini

@@ -59,7 +59,7 @@ 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
@@ -67,7 +67,7 @@ audio feed mute off 1
 
 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
@@ -75,7 +75,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
@@ -92,7 +92,7 @@ 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
@@ -100,7 +100,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
@@ -124,19 +124,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
-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
 #1024x768 - 320x240 = 704x528
+command create place_virtual_feed_pip
+  vfeed place rect 1 000 000 1024 768 000 00 0.0 1.0 1.0 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_video
-  vfeed place rect 1 000 000 960 720 000 00 0.0 0.937 0.937 1.0
 #800x600 * 0.4 => 320x240
 #1024x768 - 320x240 = 704x528
+command create place_virtual_feed_video
+  vfeed place rect 1 000 000 960 720 000 00 0.0 0.937 0.937 1.0
   vfeed place rect 2 544 408 480 360 000 00 0.0 0.600 0.600 1.0
   loop
 command end
@@ -145,14 +145,12 @@ 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
   loop
 command end
 
 command create place_virtual_feed_secondary
   vfeed place rect 1 000 000 1024 768 000 00 0.0 1.0 1.0 0.0
   vfeed place rect 2 000 000 0800 600 000 00 0.0 1.0 1.0 1.0
-#  vfeed place rect 2 0 0 1   1   0   0  0   1   1   0.1
   loop
 command end