From: Brian West <brian@freeswitch.org>
Date: Wed, 22 Jul 2015 22:39:41 +0000 (-0500)
Subject: conference tweaks %ignore
X-Git-Tag: v1.6.2~244
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25ae4dbbca393d6f639f8faac994c14e319f8621;p=thirdparty%2Ffreeswitch.git

conference tweaks %ignore
---

diff --git a/conf/testing/autoload_configs/conference.conf.xml b/conf/testing/autoload_configs/conference.conf.xml
index 212237c461..d9d89d45c0 100644
--- a/conf/testing/autoload_configs/conference.conf.xml
+++ b/conf/testing/autoload_configs/conference.conf.xml
@@ -23,6 +23,23 @@
       <control action="vol listen dn" digits="4"/>
       <control action="hangup" digits="#"/>
     </group>
+    <group name="defaultvideo">
+      <control action="mute" digits="0"/>
+      <control action="vmute" digits="*0"/>
+      <control action="vmute snap" digits="*1"/>
+      <control action="vmute snapoff" digits="*2"/>
+      <control action="energy up" digits="9"/>
+      <control action="energy equ" digits="8"/>
+      <control action="energy dn" digits="7"/>
+      <control action="vol talk up" digits="3"/>
+      <control action="vol talk zero" digits="2"/>
+      <control action="vol talk dn" digits="1"/>
+      <control action="vol listen up" digits="6"/>
+      <control action="vol listen zero" digits="5"/>
+      <control action="vol listen dn" digits="4"/>
+      <control action="hangup" digits="#"/>
+    </group>
+
   </caller-controls>
 
   <!-- Profiles are collections of settings you can reference by name. -->
@@ -235,6 +252,7 @@
       <param name="energy-level" value="200"/>
       <!-- <param name="tts-engine" value="flite"/> -->
       <!-- <param name="tts-voice" value="kal16"/> -->
+      <param name="caller-controls" value="defaultvideo"/>
       <param name="muted-sound" value="conference/conf-muted.wav"/>
       <param name="unmuted-sound" value="conference/conf-unmuted.wav"/>
       <param name="alone-sound" value="conference/conf-alone.wav"/>
diff --git a/conf/testing/autoload_configs/conference_layouts.conf.xml b/conf/testing/autoload_configs/conference_layouts.conf.xml
index a074a2e3cb..444b63471b 100644
--- a/conf/testing/autoload_configs/conference_layouts.conf.xml
+++ b/conf/testing/autoload_configs/conference_layouts.conf.xml
@@ -12,9 +12,53 @@
 	<image x="0" y="90" scale="180"/>
 	<image x="180" y="90" scale="180"/>
       </layout>
-      <layout name="test_res_id" auto-3d-position="true">
-	<image x="0" y="90" scale="180" reservation_id="left"/>
-	<image x="180" y="90" scale="180" reservation_id="right"/>
+      <layout name="2x1-zoom" auto-3d-position="true">
+	<image x="0" y="0" scale="180" hscale="360" zoom="true"/>
+	<image x="180" y="0" scale="180" hscale="360" zoom="true"/>
+      </layout>
+      <layout name="3x1-zoom" auto-3d-position="true">
+	<image x="0" y="0" scale="120" hscale="360" zoom="true"/>
+	<image x="120" y="0" scale="120" hscale="360" zoom="true"/>
+	<image x="240" y="0" scale="120" hscale="360" zoom="true"/>
+      </layout>
+      <layout name="5-grid-zoom" auto-3d-position="true">
+	<image x="0" y="0" scale="180"/>
+	<image x="180" y="0" scale="180"/>
+	<image x="0" y="180" scale="120" hscale="180" zoom="true"/>
+	<image x="120" y="180" scale="120" hscale="180" zoom="true"/>
+	<image x="240" y="180" scale="120" hscale="180" zoom="true"/>
+      </layout>
+      <layout name="3x2-zoom" auto-3d-position="true">
+	<image x="0" y="0" scale="120" hscale="180" zoom="true"/>
+	<image x="120" y="0" scale="120" hscale="180" zoom="true"/>
+	<image x="240" y="0" scale="120" hscale="180" zoom="true"/>
+	<image x="0" y="180" scale="120" hscale="180" zoom="true"/>
+	<image x="120" y="180" scale="120" hscale="180" zoom="true"/>
+	<image x="240" y="180" scale="120" hscale="180" zoom="true"/>
+      </layout>
+      <layout name="7-grid-zoom" auto-3d-position="true">
+	<image x="0" y="0" scale="120" hscale="180" zoom="true"/>
+	<image x="120" y="0" scale="120" hscale="180" zoom="true"/>
+	<image x="240" y="0" scale="120" hscale="180" zoom="true"/>
+	<image x="0" y="180" scale="90" hscale="180" zoom="true"/>
+	<image x="90" y="180" scale="90" hscale="180" zoom="true"/>
+	<image x="180" y="180" scale="90" hscale="180" zoom="true"/>
+	<image x="270" y="180" scale="90" hscale="180" zoom="true"/>
+      </layout>
+      <layout name="4x2-zoom" auto-3d-position="true">
+	<image x="0" y="0" scale="90" hscale="180" zoom="true"/>
+	<image x="90" y="0" scale="90" hscale="180" zoom="true"/>
+	<image x="180" y="0" scale="90" hscale="180" zoom="true"/>
+	<image x="270" y="0" scale="90" hscale="180" zoom="true"/>
+	<image x="0" y="180" scale="90" hscale="180" zoom="true"/>
+	<image x="90" y="180" scale="90" hscale="180" zoom="true"/>
+	<image x="180" y="180" scale="90" hscale="180" zoom="true"/>
+	<image x="270" y="180" scale="90" hscale="180" zoom="true"/>
+      </layout>
+      <layout name="1x1+2x1" auto-3d-position="true">
+	<image x="90" y="0" scale="180"/>
+	<image x="0" y="180" scale="180"/>
+	<image x="180" y="180" scale="180"/>
       </layout>
       <layout name="2x2" auto-3d-position="true">
 	<image x="0" y="0" scale="180"/>
@@ -304,11 +348,14 @@
 	<image x="60" y="300" scale="60" overlap="true"/>
 	<image x="0" y="300" scale="60" overlap="true"/>
       </layout>
+      
+
     </layouts>
     <groups>
       <group name="grid">
 	<layout>1x1</layout>
 	<layout>2x1</layout>
+	<layout>1x1+2x1</layout>
 	<layout>2x2</layout>
 	<layout>3x3</layout>
 	<layout>4x4</layout>
@@ -316,6 +363,17 @@
 	<layout>6x6</layout>
 	<layout>8x8</layout>
       </group>
+      <group name="grid-zoom">
+	<layout>1x1</layout>
+	<layout>2x1-zoom</layout>
+	<layout>3x1-zoom</layout>
+	<layout>2x2</layout>
+	<layout>5-grid-zoom</layout>
+	<layout>3x2-zoom</layout>
+	<layout>7-grid-zoom</layout>
+	<layout>4x2-zoom</layout>
+	<layout>3x3</layout>
+      </group>
       <group name="1up_top_left_plus">
 	<layout>1up_top_left+5</layout>
 	<layout>1up_top_left+7</layout>
diff --git a/conf/testing/dialplan/default/0019_conf.xml b/conf/testing/dialplan/default/0019_conf.xml
index 95edf08b22..568ff01138 100644
--- a/conf/testing/dialplan/default/0019_conf.xml
+++ b/conf/testing/dialplan/default/0019_conf.xml
@@ -2,6 +2,7 @@
 <extension name="conf">
   <condition field="destination_number" expression="^6070$">
     <!--<action application="answer" data="is_conference"/>  -->
+    <action application="push" data="conference_member_flags=moderator"/>
     <action application="conference" data="6070@video-mcu-stereo"/>  
   </condition>
 </extension>