[asterisk-commits] oej: branch group/multiparking r104048 - /team/group/multiparking/main/

[SVN commits to the Asterisk project]

Author: oej
Date: Sat Feb 23 05:48:24 2008
New Revision: 104048

URL: http://svn.digium.com/view/asterisk?view=rev&rev=104048
Log:
Small changes from Fosdem

Modified:
    team/group/multiparking/main/features.c

Modified: team/group/multiparking/main/features.c
URL: http://svn.digium.com/view/asterisk/team/group/multiparking/main/features.c?view=diff&rev=104048&r1=104047&r2=104048
==============================================================================
--- team/group/multiparking/main/features.c (original)
+++ team/group/multiparking/main/features.c Sat Feb 23 05:48:24 2008
@@ -95,31 +95,36 @@
 
 static char *parkedcall = "ParkedCall";
 
+/*! \todo Should this move into the parking lot ??? */
 static int parkaddhints = 0;                               /*!< Add parking hints automatically */
 static int parkedcalltransfers = 0;                        /*!< Enable DTMF based transfers on bridge when picking up parked calls */
 static int parkedcallreparking = 0;                        /*!< Enable DTMF based parking on bridge when picking up parked calls */
-static int parkingtime = DEFAULT_PARK_TIME;                /*!< No more than 45 seconds parked before you do something with them */
+//static int parkingtime = DEFAULT_PARK_TIME;                /*!< No more than 45 seconds parked before you do something with them */
+
 static char pickup_ext[AST_MAX_EXTENSION];                 /*!< Call pickup extension */
-static char parkmohclass[MAX_MUSICCLASS];                  /*!< Music class used for parking */
 
 /*! \brief Structure for parking lots in a linked list. */
 struct ast_parkinglot {
 	ASTOBJ_COMPONENTS(struct ast_parkinglot);	/*!< various object stuff, including ->name */
 	char parking_con[AST_MAX_EXTENSION];		/*!< Context for which parking is made accessible */
 	char parking_con_dial[AST_MAX_EXTENSION];	/*!< Context for dialback for parking (KLUDGE) */
-	char parking_ext[AST_MAX_EXTENSION];                /*!< Extension you type to park the call */
+	char parking_ext[AST_MAX_EXTENSION];            /*!< Extension you type to park the call */
 	int parking_start;				/*!< First available extension for parking */
 	int parking_stop;				/*!< Last available extension for parking */
 	int parking_offset;
 	int parkfindnext;
 	int parkingtime;				/*!< Default parking time */
 	struct parkeduser *occupiedlots;
+	char parkmohclass[MAX_MUSICCLASS];                  /*!< Music class used for parking */
 };
 
+/*! \brief The list of parking lots configured. Always at least one  - the default parking lot */
 struct ast_parkinglot_list {
 	ASTOBJ_CONTAINER_COMPONENTS(struct ast_parkinglot);
 } parkinglots;
  
+struct ast_parkinglot *default_parkinglot;
+
 static char courtesytone[256];                             /*!< Courtesy tone */
 static int parkedplay = 0;                                 /*!< Who to play the courtesy tone to */
 static char xfersound[256];                                /*!< Call transfer sound */
@@ -129,7 +134,6 @@
 
 static int transferdigittimeout;
 static int featuredigittimeout;
-struct ast_parkinglot *default_parkinglot;
 static int comebacktoorigin = 1;
 
 static int atxfernoanswertimeout;
@@ -186,10 +190,11 @@
 	char peername[1024];
 	unsigned char moh_trys;
 	struct ast_parkinglot *parkinglot;
-//	AST_LIST_ENTRY(parkeduser) list;
+//	AST_LIST_ENTRY(parkeduser) list;	/* Temporary disabled, will come back to an Asterisk near you soon */
 };
 
-//static AST_LIST_HEAD_STATIC(parkinglot, parkeduser);
+//static AST_LIST_HEAD_STATIC(parkinglot, parkeduser);	/* Temporary disabled, will come back to an Asterisk near you soon */
+
 /* Forward declarations */
 static struct ast_parkinglot *parkinglot_addref(struct ast_parkinglot *parkinglot);
 static void parkinglot_unref(struct ast_parkinglot *parkinglot);
@@ -217,7 +222,6 @@
 	struct ast_channel *peer;
 	unsigned int return_to_pbx:1;
 };
-
 
 
 /*!