- external icecast protocol property

bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/freeswitch/FreeswitchApplication.java

@@ -58,6 +58,7 @@ public class FreeswitchApplication extends Observable implements ConferenceServi
     private FreeswitchHeartbeatMonitor heartbeatMonitor;
     private boolean debug = false;
  
+    private String icecastProtocol = "shout";
     private String icecastHost = "localhost";
     private int icecastPort = 8000;
     private String icecastUsername = "source";
@@ -364,7 +365,11 @@ public class FreeswitchApplication extends Observable implements ConferenceServi
     public void setDebugNullConferenceAction(boolean enabled) {
         this.debug = enabled;
     }
-  
+    
+    public void setIcecastProtocol(String protocol) {
+    	icecastProtocol = protocol;
+    }
+    
     public void setIcecastHost(String host) {
     	icecastHost = host;
     }

bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-voice-freeswitch.xml

@@ -14,6 +14,7 @@
 	<beans:bean id="freeswitchApplication" class="org.bigbluebutton.webconference.voice.freeswitch.FreeswitchApplication">
 		<beans:property name="managerConnection" ref="eslConnection"/>
     <beans:property name="DebugNullConferenceAction" value="true"/>
+    <beans:property name="icecastProtocol" value="${icecast.protocol}"/>
     <beans:property name="icecastHost" value="${icecast.host}"/>
     <beans:property name="icecastPort" value="${icecast.port}"/>
     <beans:property name="icecastUsername" value="${icecast.username}"/>

bigbluebutton-apps/src/main/webapp/WEB-INF/bigbluebutton.properties

@@ -31,6 +31,7 @@ version=0.63
 redis.host=127.0.0.1
 redis.port=6379
 
+icecast.protocol=shout
 icecast.host=127.0.0.1
 icecast.port=8000
 icecast.username=source