summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-01-18 15:21:01 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-01-18 15:21:01 +0100
commit66f1f2204619377eb34d657d582bd098813e5a7c (patch)
tree85292a08a099a0a5d8776e77e8e1fa014c794a0e
parent277744c7412c44b54ff46c1d6548c2c4242327e3 (diff)
parent9e15bf3431b4a622213365eed47b21d0f2bcae52 (diff)
Merge branch 'develop' of github.com:amooma/GS5 into develop
-rw-r--r--app/models/automatic_call_distributor.rb2
-rw-r--r--misc/freeswitch/conf/freeswitch.xml8
2 files changed, 5 insertions, 5 deletions
diff --git a/app/models/automatic_call_distributor.rb b/app/models/automatic_call_distributor.rb
index a34392e..5807757 100644
--- a/app/models/automatic_call_distributor.rb
+++ b/app/models/automatic_call_distributor.rb
@@ -26,6 +26,6 @@ class AutomaticCallDistributor < ActiveRecord::Base
self.announce_call_agents ||= 'ivr/ivr-stay_on_line_call_answered_momentarily.wav'
self.greeting ||= 'ivr/ivr-thank_you_for_calling.wav'
self.goodbye ||= 'ivr/ivr-thank_you_for_calling.wav'
- self.music ||= 'local_stream://mohl'
+ self.music ||= 'local_stream://moh'
end
end
diff --git a/misc/freeswitch/conf/freeswitch.xml b/misc/freeswitch/conf/freeswitch.xml
index c5dd3f1..3c098fc 100644
--- a/misc/freeswitch/conf/freeswitch.xml
+++ b/misc/freeswitch/conf/freeswitch.xml
@@ -492,21 +492,21 @@
</settings>
</configuration>
<configuration name="local_stream.conf" description="stream files from local dir">
- <directory name="default" path="/opt/freeswitch/sounds/music/16000">
- <param name="rate" value="16000"/>
+ <directory name="default" path="/opt/freeswitch/sounds/music/8000">
+ <param name="rate" value="8000"/>
<param name="shuffle" value="true"/>
<param name="channels" value="1"/>
<param name="interval" value="20"/>
<param name="timer-name" value="soft"/>
</directory>
- <directory name="moh" path="/opt/freeswitch/sounds/music/16000">
+ <directory name="mohh" path="/opt/freeswitch/sounds/music/16000">
<param name="rate" value="16000"/>
<param name="shuffle" value="true"/>
<param name="channels" value="1"/>
<param name="interval" value="20"/>
<param name="timer-name" value="soft"/>
</directory>
- <directory name="mohl" path="/opt/freeswitch/sounds/music/8000">
+ <directory name="moh" path="/opt/freeswitch/sounds/music/8000">
<param name="rate" value="8000"/>
<param name="shuffle" value="true"/>
<param name="channels" value="1"/>