[svn-commits] branch oej/metermaids-trunk r36042 - in /team/oej/metermaids-trunk: channels/...

[svn-commits at lists.digium.com]

Author: oej
Date: Mon Jun 26 10:15:43 2006
New Revision: 36042

URL: http://svn.digium.com/view/asterisk?rev=36042&view=rev
Log:
More clean up of old code

Modified:
    team/oej/metermaids-trunk/channels/chan_iax2.c
    team/oej/metermaids-trunk/channels/chan_sip.c
    team/oej/metermaids-trunk/include/asterisk/features.h
    team/oej/metermaids-trunk/res/res_features.c

Modified: team/oej/metermaids-trunk/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/team/oej/metermaids-trunk/channels/chan_iax2.c?rev=36042&r1=36041&r2=36042&view=diff
==============================================================================
--- team/oej/metermaids-trunk/channels/chan_iax2.c (original)
+++ team/oej/metermaids-trunk/channels/chan_iax2.c Mon Jun 26 10:15:43 2006
@@ -5512,9 +5512,6 @@
 			} else
 				ast_context_remove_extension(regcontext, ext, 1, NULL);
 		}
-
-		/* Notify local watcher about extension changes */
-		local_watcher(ext, regcontext);
 	}
 }
 static void prune_peers(void);

Modified: team/oej/metermaids-trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/oej/metermaids-trunk/channels/chan_sip.c?rev=36042&r1=36041&r2=36042&view=diff
==============================================================================
--- team/oej/metermaids-trunk/channels/chan_sip.c (original)
+++ team/oej/metermaids-trunk/channels/chan_sip.c Mon Jun 26 10:15:43 2006
@@ -2223,9 +2223,6 @@
 				 ast_strdup(peer->name), free, "SIP");
 		} else
 			ast_context_remove_extension(context, ext, 1, NULL);
-
-		/* Notify local channel about device state change */
-		local_watcher(ext, context);
 	}
 }
 

Modified: team/oej/metermaids-trunk/include/asterisk/features.h
URL: http://svn.digium.com/view/asterisk/team/oej/metermaids-trunk/include/asterisk/features.h?rev=36042&r1=36041&r2=36042&view=diff
==============================================================================
--- team/oej/metermaids-trunk/include/asterisk/features.h (original)
+++ team/oej/metermaids-trunk/include/asterisk/features.h Mon Jun 26 10:15:43 2006
@@ -92,25 +92,4 @@
     \param feature the ast_call_feature object which was registered before*/
 void ast_unregister_feature(struct ast_call_feature *feature);
 
-
-/*! \brief Add parking watcher (metermaid) to list. These will be notified when we create
- 	or remove parking extensions in the dial plan 
-		
- */
-int ast_park_metermaid_add(void (*maid)(const char *exten, const char *context), const char *context);
-
-/*! \brief Remove parking watcher 
-	\param id	Watcher ID returned by ast_park_metermaid_add()
-	\return -1 on error (ID not found), otherwise 0
-*/
-int ast_park_metermaid_remove(int id);
-
-/*! \brief Watcher callback for extension state changes (metermaids) 
-	Will notify about a device state change for local/ devices
-	based on exten and context
-	\param exten	Extension
-	\param context	Context
-*/
-void local_watcher(const char *exten, const char *context);
-
 #endif /* _AST_FEATURES_H */

Modified: team/oej/metermaids-trunk/res/res_features.c
URL: http://svn.digium.com/view/asterisk/team/oej/metermaids-trunk/res/res_features.c?rev=36042&r1=36041&r2=36042&view=diff
==============================================================================
--- team/oej/metermaids-trunk/res/res_features.c (original)
+++ team/oej/metermaids-trunk/res/res_features.c Mon Jun 26 10:15:43 2006
@@ -95,7 +95,6 @@
 static int parkfindnext;
 
 static int adsipark;
-static int watchid;                                        /*!< Metermaid watcher ID */
 
 static int transferdigittimeout;
 static int featuredigittimeout;
@@ -2027,14 +2026,6 @@
 			ast_log(LOG_DEBUG, "No call pickup possible...\n");
 	}
 	return res;
-}
-
-/*! \brief Watcher callback for extension state changes (metermaids) */
-void local_watcher(const char *exten, const char *context)
-{
-	if (option_debug > 1)
-		ast_log(LOG_DEBUG, "Got notification of state change for %s@%s\n", exten, context);
-	ast_device_state_changed("local/%s@%s/park", exten, context);
 }
 
 /*! \brief Add parking hints for all defined parking lots */
@@ -2274,9 +2265,6 @@
 			"Park a channel", mandescr_park); 
 	}
 
-	/* Register watcher for parking lots */
-        watchid = ast_park_metermaid_add(&local_watcher, NULL);
-
 	res |= ast_devstate_prov_add("Park", metermaidstate);
 
 	return res;
@@ -2289,7 +2277,6 @@
 
 	ast_manager_unregister("ParkedCalls");
 	ast_manager_unregister("Park");
-	ast_park_metermaid_remove(watchid);
 	ast_cli_unregister(&showfeatures);
 	ast_cli_unregister(&showparked);
 	ast_unregister_application(parkcall);