From 909ee4bfb9180a87e02504acb47f27b47cb5adea Mon Sep 17 00:00:00 2001 From: Kinsey Moore Date: Mon, 1 Jul 2013 13:16:09 +0000 Subject: Refactor extraneous channel events This change removes JitterBufStats, ChannelReload, and ChannelUpdate and refactors the following events to travel over Stasis-Core: * LocalBridge * DAHDIChannel * AlarmClear * SpanAlarmClear * Alarm * SpanAlarm * DNDState * MCID * SIPQualifyPeerDone * SessionTimeout Review: https://reviewboard.asterisk.org/r/2627/ (closes issue ASTERISK-21476) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@393284 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_meetme.c | 72 +++++-------------------------------------------------- 1 file changed, 6 insertions(+), 66 deletions(-) (limited to 'apps/app_meetme.c') diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 4bd732b59..b79ab63eb 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -1117,75 +1117,15 @@ static const char gain_map[] = { 15, }; -/*! - * \internal - * \brief accessor for join message type - * \since 12.0.0 - * - * \retval pointer to the stasis message type - * \retval NULL if not initialized - */ -static struct stasis_message_type *meetme_join_type(void); - -/*! - * \internal - * \brief accessor for leave message type - * \since 12.0.0 - * - * \retval pointer to the stasis message type - * \retval NULL if not initialized - */ -static struct stasis_message_type *meetme_leave_type(void); - -/*! - * \internal - * \brief accessor for end message type - * \since 12.0.0 - * - * \retval pointer to the stasis message type - * \retval NULL if not initialized - */ -static struct stasis_message_type *meetme_end_type(void); - -/*! - * \internal - * \brief accessor for mute message type - * \since 12.0.0 - * - * \retval pointer to the stasis message type - * \retval NULL if not initialized - */ -static struct stasis_message_type *meetme_mute_type(void); - -/*! - * \internal - * \brief accessor for talking message type - * \since 12.0.0 - * - * \retval pointer to the stasis message type - * \retval NULL if not initialized - */ -static struct stasis_message_type *meetme_talking_type(void); - -/*! - * \internal - * \brief accessor for talk request message type - * \since 12.0.0 - * - * \retval pointer to the stasis message type - * \retval NULL if not initialized - */ -static struct stasis_message_type *meetme_talk_request_type(void); - /* Routes the various meetme message types to the meetme stasis callback function to turn them into events */ static struct stasis_message_router *meetme_event_message_router; -STASIS_MESSAGE_TYPE_DEFN(meetme_join_type); -STASIS_MESSAGE_TYPE_DEFN(meetme_leave_type); -STASIS_MESSAGE_TYPE_DEFN(meetme_end_type); -STASIS_MESSAGE_TYPE_DEFN(meetme_mute_type); -STASIS_MESSAGE_TYPE_DEFN(meetme_talking_type); -STASIS_MESSAGE_TYPE_DEFN(meetme_talk_request_type); +STASIS_MESSAGE_TYPE_DEFN_LOCAL(meetme_join_type); +STASIS_MESSAGE_TYPE_DEFN_LOCAL(meetme_leave_type); +STASIS_MESSAGE_TYPE_DEFN_LOCAL(meetme_end_type); +STASIS_MESSAGE_TYPE_DEFN_LOCAL(meetme_mute_type); +STASIS_MESSAGE_TYPE_DEFN_LOCAL(meetme_talking_type); +STASIS_MESSAGE_TYPE_DEFN_LOCAL(meetme_talk_request_type); static void meetme_stasis_cb(void *data, struct stasis_subscription *sub, struct stasis_topic *topic, struct stasis_message *message); -- cgit v1.2.3