From a3e1f320c010dea49bba7ca5a155ca5cdbc02a94 Mon Sep 17 00:00:00 2001
From: Richard Alam <ritzalam@gmail.com>
Date: Wed, 14 Nov 2012 20:40:12 +0000
Subject: [PATCH]  - external icecast protocol property

---
 .../voice/freeswitch/FreeswitchApplication.java            | 7 ++++++-
 .../src/main/webapp/WEB-INF/bbb-voice-freeswitch.xml       | 1 +
 .../src/main/webapp/WEB-INF/bigbluebutton.properties       | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/freeswitch/FreeswitchApplication.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/freeswitch/FreeswitchApplication.java
index 9c6a6149e4..070df79711 100755
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/freeswitch/FreeswitchApplication.java
+++ b/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;
     }
diff --git a/bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-voice-freeswitch.xml b/bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-voice-freeswitch.xml
index 72a64f3e19..b4d9d76239 100755
--- a/bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-voice-freeswitch.xml
+++ b/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}"/>
diff --git a/bigbluebutton-apps/src/main/webapp/WEB-INF/bigbluebutton.properties b/bigbluebutton-apps/src/main/webapp/WEB-INF/bigbluebutton.properties
index 5127e693c5..79efd4dd5f 100755
--- a/bigbluebutton-apps/src/main/webapp/WEB-INF/bigbluebutton.properties
+++ b/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