From a35f57f0f9180e3eb5089229b91c34cae370768e Mon Sep 17 00:00:00 2001 From: mattf Date: Fri, 9 Mar 2007 21:36:48 +0000 Subject: [PATCH] Updated BASE_INSTALL doc instructions for Asterisk 1.2.16 Added app_meetme.c patch for volume control to extras directory git-svn-id: svn://192.168.202.10@551 3d104415-ff17-0410-8863-d5cf3c621b8a --- agc_2-X/trunk/docs/BASE_INSTALL.txt | 24 +++--- .../extras/meetme_volume_control_1.2.16.patch | 81 +++++++++++++++++++ 2 files changed, 93 insertions(+), 12 deletions(-) create mode 100644 agc_2-X/trunk/extras/meetme_volume_control_1.2.16.patch diff --git a/agc_2-X/trunk/docs/BASE_INSTALL.txt b/agc_2-X/trunk/docs/BASE_INSTALL.txt index 043fbb09..7614266e 100644 --- a/agc_2-X/trunk/docs/BASE_INSTALL.txt +++ b/agc_2-X/trunk/docs/BASE_INSTALL.txt @@ -31,16 +31,16 @@ PHASE 1: INSTALLING ASTERISK 1. follow these command line steps: mkdir /usr/src/asterisk cd /usr/src/asterisk -wget http://ftp.digium.com/pub/asterisk/releases/asterisk-1.2.14.tar.gz -wget http://ftp.digium.com/pub/zaptel/releases/zaptel-1.2.12.tar.gz +wget http://ftp.digium.com/pub/asterisk/releases/asterisk-1.2.16.tar.gz +wget http://ftp.digium.com/pub/zaptel/releases/zaptel-1.2.15.tar.gz wget http://ftp.digium.com/pub/libpri/releases/libpri-1.2.4.tar.gz -gunzip asterisk-1.2.14.tar.gz -tar xvf asterisk-1.2.14.tar -gunzip zaptel-1.2.12.tar.gz -tar xvf zaptel-1.2.12.tar +gunzip asterisk-1.2.16.tar.gz +tar xvf asterisk-1.2.16.tar +gunzip zaptel-1.2.15.tar.gz +tar xvf zaptel-1.2.15.tar gunzip libpri-1.2.4.tar.gz tar xvf libpri-1.2.4.tar -cd ./zaptel-1.2.12 +cd ./zaptel-1.2.15 wget http://www.freedomphones.net/files/newt-0.51.6.tar.gz gunzip newt-0.51.6.tar.gz tar xvf newt-0.51.6.tar @@ -58,7 +58,7 @@ cd ../libpri-1.2.4 make clean make make install -cd ../asterisk-1.2.14 +cd ../asterisk-1.2.16 (1.2 tree) If you want to include Answering Machine Detection ability you will need to download app_amd.c and amd.conf and alter the apps/Makefile to compile it properly @@ -73,9 +73,9 @@ cd ../asterisk-1.2.14 wget http://www.eflo.net/files/amd2.conf mkdir /etc/asterisk mv amd2.conf /etc/asterisk/amd.conf - *OPTIONAL*(1.2.12.1 thru 1.2.14) apply the meetme volume control patch - wget http://www.eflo.net/files/meetmeadmin_volume_control.patch - patch -p1 < ./meetmeadmin_volume_control.patch + *OPTIONAL*(1.2.12.1 thru 1.2.16) apply the meetme volume control patch + wget http://www.eflo.net/files/meetme_volume_control_1.2.16.patch + patch -p1 < ./meetme_volume_control_1.2.16.patch - File to patch: app_meetme.c cd ../ @@ -246,7 +246,7 @@ GRANT SELECT on asterisk.phones TO idcheck@localhost IDENTIFIED BY '1234'; ##### make sure on these queries that you change the server_ip "10.10.10.15" ##### to the server IP that you are using -insert into servers (server_id,server_description,server_ip,active,asterisk_version)values('TESTasterisk','Test install of Asterisk server', '10.10.10.15','Y','1.2.14'); +insert into servers (server_id,server_description,server_ip,active,asterisk_version)values('TESTasterisk','Test install of Asterisk server', '10.10.10.15','Y','1.2.16'); insert into server_updater values('10.10.10.15',''); diff --git a/agc_2-X/trunk/extras/meetme_volume_control_1.2.16.patch b/agc_2-X/trunk/extras/meetme_volume_control_1.2.16.patch new file mode 100644 index 00000000..ebad477d --- /dev/null +++ b/agc_2-X/trunk/extras/meetme_volume_control_1.2.16.patch @@ -0,0 +1,81 @@ +--- app_meetme_orig.c 2007-03-09 16:19:50.000000000 -0500 ++++ app_meetme.c 2007-03-09 16:01:54.000000000 -0500 +@@ -122,6 +122,16 @@ + " 'M' -- Mute conference\n" + " 'n' -- Unmute entire conference (except admin)\n" + " 'N' -- Mute entire conference (except admin)\n" ++" 'S' -- Raise entire conference speaking volume\n" ++" 's' -- Lower entire conference speaking volume\n" ++" 'V' -- Raise entire conference listening volume\n" ++" 'v' -- Lower entire conference listening volume\n" ++" 'T' -- Raise one user's talk volume\n" ++" 't' -- Lower one user's talk volume\n" ++" 'U' -- Raise one user's listen volume\n" ++" 'u' -- Lower one user's listen volume\n" ++" 'R' -- Reset all user's volume settings\n" ++" 'r' -- Reset one user's volume settings\n" + ""; + + #define CONFIG_FILE_NAME "meetme.conf" +@@ -2114,6 +2124,61 @@ + ast_log(LOG_NOTICE, "Specified User not found!\n"); + } + break; ++ case 118: /* v: Lower all users listen volume */ ++AST_LIST_TRAVERSE(&cnf->userlist, user, list) { ++ tweak_listen_volume(user, VOL_DOWN); ++ } ++ break; ++ case 86: /* V: Raise all users listen volume */ ++AST_LIST_TRAVERSE(&cnf->userlist, user, list) { ++ tweak_listen_volume(user, VOL_UP); ++ } ++ break; ++ case 115: /* s: Lower all users speaking volume */ ++AST_LIST_TRAVERSE(&cnf->userlist, user, list) { ++ tweak_talk_volume(user, VOL_DOWN); ++ } ++ break; ++ case 83: /* S: Raise all users speaking volume */ ++AST_LIST_TRAVERSE(&cnf->userlist, user, list) { ++ tweak_talk_volume(user, VOL_UP); ++ } ++ break; ++ case 82: /* R: Reset all volume levels */ ++AST_LIST_TRAVERSE(&cnf->userlist, user, list) { ++ reset_volumes(user); ++ } ++ break; ++ case 114: /* r: Reset user's volume level */ ++ if (user) ++ reset_volumes(user); ++ else ++ ast_log(LOG_NOTICE, "Specified User not found!"); ++ break; ++ case 85: /* U: Raise user's listen volume */ ++ if (user) ++ tweak_listen_volume(user, VOL_UP); ++ else ++ ast_log(LOG_NOTICE, "Specified User not found!"); ++ break; ++ case 117: /* u: Lower user's listen volume */ ++ if (user) ++ tweak_listen_volume(user, VOL_DOWN); ++ else ++ ast_log(LOG_NOTICE, "Specified User not found!"); ++ break; ++ case 84: /* T: Raise user's talk volume */ ++ if (user) ++ tweak_talk_volume(user, VOL_UP); ++ else ++ ast_log(LOG_NOTICE, "Specified User not found!"); ++ break; ++ case 116: /* t: Lower user's talk volume */ ++ if (user) ++ tweak_talk_volume(user, VOL_DOWN); ++ else ++ ast_log(LOG_NOTICE, "Specified User not found!"); ++ break; + } + + dispose_conf(cnf);