Changeset 8036

Timestamp:

12/01/11 23:14:14 (18 months ago)

Author:

iordan

Message:

1) Added sounds needed for authentication app.
2) Added license and attribution for sounds
3) Added linking sounds into the asterisk sounds directory.

Location:

luci/trunk/applications/luci-pbx

Files:

• CREDITS-SOUNDS (added)
• LICENSE-SOUNDS (added)
• root/etc/init.d/pbx-asterisk (modified) (4 diffs)
• root/etc/pbx-asterisk/sounds (added)
• root/etc/pbx-asterisk/sounds/agent-alreadyon.gsm (added)
• root/etc/pbx-asterisk/sounds/auth-thankyou.gsm (added)

luci/trunk/applications/luci-pbx/root/etc/init.d/pbx-asterisk

@@ -32 +32 @@
 ASTDIRSRECURSIVE="/var/run/asterisk /var/log/asterisk /var/spool/asterisk"
 ASTDIRS="/usr/lib/asterisk"
+ASTSOUNDSDIR="/usr/lib/asterisk/sounds"
 
 TEMPLATEDIR=/etc/${MODULENAME}-asterisk
+PBXSOUNDSDIR=$TEMPLATEDIR/sounds
 VMTEMPLATEDIR=/etc/${MODULENAME}-voicemail
+VMSOUNDSDIR=$VMTEMPLATEDIR/sounds
 ASTERISKDIR=/etc/asterisk
 WORKDIR=/tmp/$MODULENAME.$$
@@ -576 +579 @@
 }
 
+# Links any sound files found in $PBXSOUNDSDIR and $VMSOUNDSDIR
+# into $ASTSOUNDSDIR for use by Asterisk. Does not overwrite files.
+pbx_link_sounds()
+{
+    mkdir -p $ASTSOUNDSDIR
+
+    for dir in $PBXSOUNDSDIR $VMSOUNDSDIR ; do
+        if [ -d $dir ] ; then
+            for f in $dir/* ; do
+                ln -s $f $ASTSOUNDSDIR 2>/dev/null
+            done
+        fi
+    done
+}
+
+
 # Makes sure the ownership of specified directories is proper.
 pbx_fix_ownership()
@@ -668 +687 @@
     config_unset
     config_load ${MODULENAME}-voicemail
-    pbx_configure_voicemail    
+    pbx_configure_voicemail
 
     # Assemble the configuration, and copy changed files over.
@@ -675 +694 @@
     pbx_assemble_and_copy_config
 
+    # Link sound files
+    pbx_link_sounds
+
     # Enforce ownership of specified files and directories.
     pbx_fix_ownership