[svn-commits] rmudgett: branch rmudgett/parking r330826 - in /team/rmudgett/parking: config...

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Thu Aug  4 09:57:50 2011
New Revision: 330826

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=330826
Log:
Address JIRA AST-607/SWP-3605.

The courtesytone is not playing to the expected call when picking up a
parked call.

This is mostly a documentation problem, but the option is not reset to the
default when features is reloaded.

* Updated features.conf documentation for courtesytone and parkedplay
options.

* Reset the parkedplay option to default when features is reloaded.

Modified:
    team/rmudgett/parking/configs/features.conf.sample
    team/rmudgett/parking/main/features.c

Modified: team/rmudgett/parking/configs/features.conf.sample
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/parking/configs/features.conf.sample?view=diff&rev=330826&r1=330825&r2=330826
==============================================================================
--- team/rmudgett/parking/configs/features.conf.sample (original)
+++ team/rmudgett/parking/configs/features.conf.sample Thu Aug  4 09:57:50 2011
@@ -38,11 +38,11 @@
                                 ;         Dial() to 'SIP/0004F2040001'.
                                 ;
 
-;courtesytone = beep		; Sound file to play to the parked caller
-				; when someone dials a parked call
-				; or the Touch Monitor is activated/deactivated.
-;parkedplay = caller		; Who to play the courtesy tone to when picking up a parked call
-				; one of: parked, caller, both  (default is caller)
+;courtesytone = beep		; Sound file to play to when someone picks up a parked call
+				; and also when the Touch Monitor is activated/deactivated.
+				; Default is no tone.
+;parkedplay = caller		; Who to play courtesytone to when picking up a parked call.
+				; One of: parked, caller, both  (default is caller)
 ;parkedcalltransfers = caller   ; Enables or disables DTMF based transfers when picking up a parked call.
                                 ; one of: callee, caller, both, no (default is no)
 ;parkedcallreparking = caller   ; Enables or disables DTMF based parking when picking up a parked call.

Modified: team/rmudgett/parking/main/features.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/parking/main/features.c?view=diff&rev=330826&r1=330825&r2=330826
==============================================================================
--- team/rmudgett/parking/main/features.c (original)
+++ team/rmudgett/parking/main/features.c Thu Aug  4 09:57:50 2011
@@ -540,9 +540,9 @@
 /*! Force a config reload to reload regardless of config file timestamp. */
 static int force_reload_load;
 
-static int parkedplay = 0;                                 /*!< Who to play the courtesy tone to */
+static int parkedplay = 0;                                 /*!< Who to play courtesytone to when someone picks up a parked call. */
 static int parkeddynamic = 0;                              /*!< Enable creation of parkinglots dynamically */
-static char courtesytone[256];                             /*!< Courtesy tone */
+static char courtesytone[256];                             /*!< Courtesy tone used to pickup parked calls and on-touch-record */
 static char xfersound[256];                                /*!< Call transfer sound */
 static char xferfailsound[256];                            /*!< Call transfer failure sound */
 static char pickupsound[256];                              /*!< Pickup sound */
@@ -5222,22 +5222,29 @@
 		"applicationmap"
 	};
 
-	/* Reset to defaults */
+	/* Set general features global defaults. */
+	featuredigittimeout = DEFAULT_FEATURE_DIGIT_TIMEOUT;
+
+	/* Set global call pickup defaults. */
 	strcpy(pickup_ext, "*8");
-	courtesytone[0] = '\0';
+	pickupsound[0] = '\0';
+	pickupfailsound[0] = '\0';
+
+	/* Set global call transfer defaults. */
 	strcpy(xfersound, "beep");
 	strcpy(xferfailsound, "beeperr");
-	pickupsound[0] = '\0';
-	pickupfailsound[0] = '\0';
-	adsipark = 0;
-	comebacktoorigin = 1;
-	parkeddynamic = 0;
 	transferdigittimeout = DEFAULT_TRANSFER_DIGIT_TIMEOUT;
-	featuredigittimeout = DEFAULT_FEATURE_DIGIT_TIMEOUT;
 	atxfernoanswertimeout = DEFAULT_NOANSWER_TIMEOUT_ATTENDED_TRANSFER;
 	atxferloopdelay = DEFAULT_ATXFER_LOOP_DELAY;
 	atxferdropcall = DEFAULT_ATXFER_DROP_CALL;
 	atxfercallbackretries = DEFAULT_ATXFER_CALLBACK_RETRIES;
+
+	/* Set global call parking defaults. */
+	comebacktoorigin = 1;
+	courtesytone[0] = '\0';
+	parkedplay = 0;
+	adsipark = 0;
+	parkeddynamic = 0;
 
 	var = ast_variable_browse(cfg, "general");
 	build_parkinglot(DEFAULT_PARKINGLOT, var);