[asterisk-commits] oej: branch oej/pinepeach r242232 - /team/oej/pinepeach/apps/

[SVN commits to the Asterisk project]

Author: oej
Date: Fri Jan 22 03:48:18 2010
New Revision: 242232

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=242232
Log:
Revert some changes that doesn't belong to this branch

Modified:
    team/oej/pinepeach/apps/app_chanspy.c
    team/oej/pinepeach/apps/app_meetme.c

Modified: team/oej/pinepeach/apps/app_chanspy.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinepeach/apps/app_chanspy.c?view=diff&rev=242232&r1=242231&r2=242232
==============================================================================
--- team/oej/pinepeach/apps/app_chanspy.c (original)
+++ team/oej/pinepeach/apps/app_chanspy.c Fri Jan 22 03:48:18 2010
@@ -44,7 +44,6 @@
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/audiohook.h"
-#include "asterisk/manager.h"
 #include "asterisk/features.h"
 #include "asterisk/options.h"
 #include "asterisk/app.h"
@@ -217,12 +216,6 @@
 	struct ast_channel *peer;
 
 	ast_log(LOG_NOTICE, "Attaching %s to %s\n", spychan_name, chan->name);
-	manager_event(EVENT_FLAG_CALL, "SpyHook",
-                              "Channel: %s\r\n"
-                              "SpyChannel: %s\r\n"
-                              "Action: %s\r\n",
-                              chan->name, spychan_name, "start");
-
 
 	ast_set_flag(audiohook, AST_AUDIOHOOK_TRIGGER_SYNC | AST_AUDIOHOOK_SMALL_QUEUE);
 
@@ -517,14 +510,6 @@
 	return setup_chanspy_ds(this, chanspy_ds);
 }
 
-static void manager_stop(const char *chan_name)
-{
-	manager_event(EVENT_FLAG_CALL, "SpyHook",
-                              "Channel: %s\r\n"
-                              "Action: stop\r\n",
-                              chan_name);
-}
-
 static int common_exec(struct ast_channel *chan, const struct ast_flags *flags,
 		       int volfactor, const int fd, const char *mygroup, const char *spec,
 		       const char *exten, const char *context)
@@ -567,7 +552,6 @@
 		res = ast_waitfordigit(chan, waitms);
 		if (res < 0) {
 			ast_clear_flag(chan, AST_FLAG_SPYING);
-			manager_stop(chan->name);
 			break;
 		}
 				
@@ -698,7 +682,6 @@
 		if (res == -1 || ast_check_hangup(chan))
 			break;
 	}
-	manager_stop(chan->name);
 	
 	ast_clear_flag(chan, AST_FLAG_SPYING);
 

Modified: team/oej/pinepeach/apps/app_meetme.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinepeach/apps/app_meetme.c?view=diff&rev=242232&r1=242231&r2=242232
==============================================================================
--- team/oej/pinepeach/apps/app_meetme.c (original)
+++ team/oej/pinepeach/apps/app_meetme.c Fri Jan 22 03:48:18 2010
@@ -167,8 +167,6 @@
 	CONFFLAG_SLA_TRUNK = (1 << 27),
 	/*! Do not write any audio to this channel until the state is up. */
 	CONFFLAG_NO_AUDIO_UNTIL_UP = (1 << 28),
-	/*! Do not *send* audio to user, a.k.a. reverse mute */
-	CONFFLAG_REVERSE_MUTE = (1 << 29),
 };
 
 enum {
@@ -283,7 +281,6 @@
 "      'M' -- Mute one user\n"
 "      'n' -- Unmute all users in the conference\n"
 "      'N' -- Mute all non-admin users in the conference\n"
-"      'Q' -- Reverse mute one user\n"
 "      'r' -- Reset one user's volume settings\n"
 "      'R' -- Reset all users volume settings\n"
 "      's' -- Lower entire conference speaking volume\n"