[svn-commits] jpeeler: branch jpeeler/feature14882 r284470 - /team/jpeeler/feature14882/main/

[SVN commits to the Digium repositories]

Author: jpeeler
Date: Tue Aug 31 17:00:26 2010
New Revision: 284470

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=284470
Log:
remove useless check and add newly recorded sound for parking failure

Modified:
    team/jpeeler/feature14882/main/features.c

Modified: team/jpeeler/feature14882/main/features.c
URL: http://svnview.digium.com/svn/asterisk/team/jpeeler/feature14882/main/features.c?view=diff&rev=284470&r1=284469&r2=284470
==============================================================================
--- team/jpeeler/feature14882/main/features.c (original)
+++ team/jpeeler/feature14882/main/features.c Tue Aug 31 17:00:26 2010
@@ -711,7 +711,7 @@
 	uint32_t flags;
 	/*! Parked user that has already obtained a parking space */
 	struct parkeduser *pu;
-	struct ast_parkinglot *parkinglot; /*! parkinglot to be parked in */
+	struct ast_parkinglot *parkinglot; /*! parkinglot to be parked in, based on parkext */
 };
 
 static struct parkeduser *park_space_reserve(struct ast_channel *chan, struct ast_channel *peer, struct ast_park_call_args *args)
@@ -735,6 +735,7 @@
 		if (parkinglotname) {
 			parkinglot = find_parkinglot(parkinglotname);
 		} else {
+			/* JPEELER change to ast_debug */
 			ast_log(LOG_WARNING, "This could be an indication channel driver needs updating, using default lot.\n");
 			parkinglot = parkinglot_addref(default_parkinglot);
 		}
@@ -1048,7 +1049,6 @@
 {
 	struct ast_channel *chan;
 	struct ast_frame *f;
-	int park_status;
 	struct ast_park_call_args park_args = {0,};
 
 	if (!args) {
@@ -1059,7 +1059,7 @@
 
 	if ((args->pu = park_space_reserve(rchan, peer, args)) == NULL) {
 		if (peer) { /* if error */
-			ast_stream_and_wait(peer, "beeperr", "");
+			ast_stream_and_wait(peer, "pbx-parkingfailed", "");
 		}
 		return AST_FEATURE_RETURN_PARKFAILED;
 	}
@@ -1095,13 +1095,8 @@
 		args->orig_chan_name = ast_strdupa(peer->name);
 	}
 
-	park_status = park_call_full(chan, peer, args);
-	if (park_status == 1) {
-	/* would be nice to play "invalid parking extension" */
-ast_log(LOG_WARNING, "jpeeler: this executed\n");
-		ast_hangup(chan);
-		return -1;
-	}
+	/* parking space reserved, return code check unnecessary */
+	park_call_full(chan, peer, args);
 
 	return 0;
 }