[svn-commits] pabelanger: branch 10 r337640 - in /branches/10: ./ apps/

[SVN commits to the Digium repositories]

Author: pabelanger
Date: Thu Sep 22 13:43:35 2011
New Revision: 337640

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=337640
Log:
Revert previous commit

New feature should be added into trunk, unfortantly it is too late for the
Asterisk 10 branch.

Modified:
    branches/10/CHANGES
    branches/10/CREDITS
    branches/10/apps/app_meetme.c

Modified: branches/10/CHANGES
URL: http://svnview.digium.com/svn/asterisk/branches/10/CHANGES?view=diff&rev=337640&r1=337639&r2=337640
==============================================================================
--- branches/10/CHANGES (original)
+++ branches/10/CHANGES Thu Sep 22 13:43:35 2011
@@ -203,8 +203,6 @@
 ------------
  * Added 'v' option to MeetMe to play voicemail greetings when a user joins/leaves
    a MeetMe conference
- * Added 'k' option to MeetMe to automatically kill the conference when there's only
-   one participant left (much like a normal call bridge)
 
 Asterisk Database
 -----------------

Modified: branches/10/CREDITS
URL: http://svnview.digium.com/svn/asterisk/branches/10/CREDITS?view=diff&rev=337640&r1=337639&r2=337640
==============================================================================
--- branches/10/CREDITS (original)
+++ branches/10/CREDITS Thu Sep 22 13:43:35 2011
@@ -22,8 +22,6 @@
 
 Omnitor AB, Gunnar Hellström, for funding work with videocaps, T.140 RED,
 originate with video/text and many more contributions.
-
-ClearIT AB for work with meetme, res_mutestream, RTCP, manager and tonezones
 
 === WISHLIST CONTRIBUTERS ===
 Jeremy McNamara - SpeeX support

Modified: branches/10/apps/app_meetme.c
URL: http://svnview.digium.com/svn/asterisk/branches/10/apps/app_meetme.c?view=diff&rev=337640&r1=337639&r2=337640
==============================================================================
--- branches/10/apps/app_meetme.c (original)
+++ branches/10/apps/app_meetme.c Thu Sep 22 13:43:35 2011
@@ -123,9 +123,6 @@
 					</option>
 					<option name="I">
 						<para>Announce user join/leave without review.</para>
-					</option>
-					<option name="k">
-						<para>Close the conference if there's only one active participant left at exit.</para>
 					</option>
 					<option name="l">
 						<para>Set listen only mode (Listen only, no talking).</para>
@@ -545,7 +542,6 @@
 	ADMINFLAG_KICKME =    (1 << 3),  /*!< User has been kicked */
 	/*! User has requested to speak */
 	ADMINFLAG_T_REQUEST = (1 << 4),
-	ADMINFLAG_HANGUP = (1 << 5),	/*!< User will be leaving the conference */
 };
 
 #define MEETME_DELAYDETECTTALK     300
@@ -637,8 +633,6 @@
 #define CONFFLAG_NO_AUDIO_UNTIL_UP  (1ULL << 31)
 #define CONFFLAG_INTROMSG           (1ULL << 32) /*!< If set play an intro announcement at start of conference */
 #define CONFFLAG_INTROUSER_VMREC    (1ULL << 33)
-/*! If there's only one person left in a conference when someone leaves, kill the conference */
-#define CONFFLAG_KILL_LAST_MAN_STANDING ((uint64_t)1 << 34)
 
 enum {
 	OPT_ARG_WAITMARKED = 0,
@@ -666,7 +660,6 @@
 	AST_APP_OPTION_ARG('v', CONFFLAG_INTROUSER_VMREC , OPT_ARG_INTROUSER_VMREC),
 	AST_APP_OPTION('i', CONFFLAG_INTROUSER ),
 	AST_APP_OPTION('I', CONFFLAG_INTROUSERNOREVIEW ),
-	AST_APP_OPTION('k', CONFFLAG_KILL_LAST_MAN_STANDING ),
 	AST_APP_OPTION_ARG('M', CONFFLAG_MOH, OPT_ARG_MOH_CLASS ),
 	AST_APP_OPTION('m', CONFFLAG_STARTMUTED ),
 	AST_APP_OPTION('o', CONFFLAG_OPTIMIZETALKER ),
@@ -2197,17 +2190,6 @@
 			send_talking_event(chan, conf, user, now_talking);
 		}
 	}
-}
-
-static int user_set_hangup_cb(void *obj, void *check_admin_arg, int flags)
-{
-	struct ast_conf_user *user = obj;
-	/* actual pointer contents of check_admin_arg is irrelevant */
-
-	if (!check_admin_arg || (check_admin_arg && !ast_test_flag64(&user->userflags, CONFFLAG_ADMIN))) {
-		user->adminflags |= ADMINFLAG_HANGUP;
-	}
-	return 0;
 }
 
 static int user_set_kickme_cb(void *obj, void *check_admin_arg, int flags)
@@ -3189,13 +3171,7 @@
 							      "Status: off\r\n",
 							     chan->name, chan->uniqueid, conf->confno, user->user_no);
 			}
-
-			/* If user have been hung up, exit the conference */
-			if (user->adminflags & ADMINFLAG_HANGUP) {
-				ret = 0;
-				break;
-			}
-
+			
 			/* If I have been kicked, exit the conference */
 			if (user->adminflags & ADMINFLAG_KICKME) {
 				/* You have been kicked. */
@@ -3883,11 +3859,6 @@
 			ast_devstate_changed(AST_DEVICE_NOT_INUSE, "meetme:%s", conf->confno);
 		}
 
- 		/* This flag is meant to kill a conference with only one participant remaining.  */
-		if (conf->users == 1 && ast_test_flag64(confflags, CONFFLAG_KILL_LAST_MAN_STANDING)) {
- 			ao2_callback(conf->usercontainer, 0, user_set_hangup_cb, NULL);
- 		}
-
 		/* Return the number of seconds the user was in the conf */
 		snprintf(meetmesecs, sizeof(meetmesecs), "%d", (int) (time(NULL) - user->jointime));
 		pbx_builtin_setvar_helper(chan, "MEETMESECS", meetmesecs);