From: Brian West <brian@freeswitch.org>
Date: Fri, 7 Aug 2015 15:26:21 +0000 (-0500)
Subject: tweaks %nojira
X-Git-Tag: v1.6.2~177
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4190a2c282f7fab1b794bdab8ff6427ce9c4ecd;p=thirdparty%2Ffreeswitch.git

tweaks %nojira
---

diff --git a/conf/testing/autoload_configs/conference.conf.xml b/conf/testing/autoload_configs/conference.conf.xml
index 4e51fde813..4ce9ceceab 100644
--- a/conf/testing/autoload_configs/conference.conf.xml
+++ b/conf/testing/autoload_configs/conference.conf.xml
@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- http://wiki.freeswitch.org/wiki/Mod_conference --> 
 <!-- None of these paths are real if you want any of these options you need to really set them up -->
 <configuration name="conference.conf" description="Audio Conference">
@@ -268,7 +270,7 @@
       <param name="caller-id-name" value="$${outbound_caller_name}"/>
       <param name="caller-id-number" value="$${outbound_caller_id}"/>
       <param name="comfort-noise" value="false"/>
-      <param name="conference-flags" value="video-floor-only|livearray-sync|minimize-video-encoding|video-muxing-personal-canvas|video-required-for-canvas"/>
+      <param name="conference-flags" value="livearray-json-status|json-events|video-floor-only|livearray-sync|minimize-video-encoding|video-required-for-canvas"/>
       <param name="video-mode" value="mux"/> 
       <param name="video-layout-name" value="3x3"/>
       <param name="video-layout-name" value="group:grid"/>
diff --git a/conf/testing/dialplan/default/0019_conf.xml b/conf/testing/dialplan/default/0019_conf.xml
index 4e83876708..a19729ab43 100644
--- a/conf/testing/dialplan/default/0019_conf.xml
+++ b/conf/testing/dialplan/default/0019_conf.xml
@@ -2,8 +2,7 @@
 <extension name="conf">
   <condition field="destination_number" expression="^6070$">
     <!--<action application="answer" data="is_conference"/>  -->
-    <action application="set" data="video_mirror_input=true"/> 
-    <action application="set" data="video_use_dedicated_encoder=true"/> 
+
     <action application="push" data="conference_member_flags=moderator"/>
     <action application="conference" data="6070@video-mcu-stereo"/>  
   </condition>