[svn-commits] branch oej/moduletest r18129 - in /team/oej/moduletest: ./ apps/app_meetme.c

[svn-commits at lists.digium.com]

Author: oej
Date: Fri Apr  7 01:48:22 2006
New Revision: 18129

URL: http://svn.digium.com/view/asterisk?rev=18129&view=rev
Log:
Merge conflict in app_meetme.c that was not touched in this branch

Modified:
    team/oej/moduletest/   (props changed)
    team/oej/moduletest/apps/app_meetme.c

Propchange: team/oej/moduletest/
------------------------------------------------------------------------------
    automerge = http://edvina.net/training/

Propchange: team/oej/moduletest/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Apr  7 01:48:22 2006
@@ -1,1 +1,1 @@
-/branches/1.2:1-7496,7498-17969
+/branches/1.2:1-7496,7498-18127

Modified: team/oej/moduletest/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/team/oej/moduletest/apps/app_meetme.c?rev=18129&r1=18128&r2=18129&view=diff
==============================================================================
--- team/oej/moduletest/apps/app_meetme.c (original)
+++ team/oej/moduletest/apps/app_meetme.c Fri Apr  7 01:48:22 2006
@@ -1,7 +1,7 @@
 /*
  * Asterisk -- An open source telephony toolkit.
  *
- * Copyright (C) 1999 - 2005, Digium, Inc.
+ * Copyright (C) 1999 - 2006, Digium, Inc.
  *
  * Mark Spencer <markster at digium.com>
  *
@@ -72,8 +72,9 @@
 "If the conference number is omitted, the user will be prompted to enter\n"
 "one. \n"
 "User can exit the conference by hangup, or if the 'p' option is specified, by pressing '#'.\n"
-"Please note: A ZAPTEL INTERFACE MUST BE INSTALLED FOR CONFERENCING TO WORK!\n\n"
-
+"Please note: The Zaptel kernel modules and at least one hardware driver (or ztdummy)\n"
+"             must be present for conferencing to operate properly. In addition, the chan_zap\n"
+"             channel driver must be loaded for the 'i' and 'r' options to operate at all.\n\n"
 "The option string may contain zero or more of the following characters:\n"
 "      'a' -- set admin mode\n"
 "      'A' -- set marked mode\n"
@@ -1721,7 +1722,8 @@
 	return ret;
 }
 
-static struct ast_conference *find_conf(struct ast_channel *chan, char *confno, int make, int dynamic, char *dynamic_pin)
+static struct ast_conference *find_conf(struct ast_channel *chan, char *confno, int make, int dynamic, char *dynamic_pin,
+					struct ast_flags *confflags)
 {
 	struct ast_config *cfg;
 	struct ast_variable *var;
@@ -1803,6 +1805,21 @@
 			dynamic_pin[0] = '\0';
 	}
 
+	if (cnf) {
+		if (confflags && !cnf->chan &&
+		    !ast_test_flag(confflags, CONFFLAG_QUIET) &&
+		    ast_test_flag(confflags, CONFFLAG_INTROUSER)) {
+			ast_log(LOG_WARNING, "No Zap channel available for conference, user introduction disabled (is chan_zap loaded?)\n");
+			ast_clear_flag(confflags, CONFFLAG_INTROUSER);
+		}
+		
+		if (confflags && !cnf->chan &&
+		    ast_test_flag(confflags, CONFFLAG_RECORDCONF)) {
+			ast_log(LOG_WARNING, "No Zap channel available for conference, conference recording disabled (is chan_zap loaded?)\n");
+			ast_clear_flag(confflags, CONFFLAG_RECORDCONF);
+		}
+	}
+
 	return cnf;
 }
 
@@ -1836,7 +1853,8 @@
 
 	AST_STANDARD_APP_ARGS(args, localdata);
 	
-	conf = find_conf(chan, args.confno, 0, 0, NULL);
+	confnum = strsep(&localdata,"|");       
+	conf = find_conf(chan, confnum, 0, 0, NULL, NULL);
 	if (conf)
 		count = conf->users;
 	else
@@ -2026,7 +2044,7 @@
 		}
 		if (!ast_strlen_zero(confno)) {
 			/* Check the validity of the conference */
-			cnf = find_conf(chan, confno, 1, dynamic, the_pin);
+			cnf = find_conf(chan, confno, 1, dynamic, the_pin, &confflags);
 			if (!cnf) {
 				res = ast_streamfile(chan, "conf-invalid", chan->language);
 				if (!res)