fix a bunch more stuff that broke from fixing it yesterday!

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7857 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale
2008-03-11 16:55:58 +00:00
parent da754b5098
commit 2294d90653
6 changed files with 79 additions and 37 deletions
+4 -1
View File
@@ -977,12 +977,15 @@ SWITCH_DECLARE(switch_status_t) switch_core_timer_next(switch_timer_t *timer);
*/
SWITCH_DECLARE(switch_status_t) switch_core_timer_step(switch_timer_t *timer);
SWITCH_DECLARE(switch_status_t) switch_core_timer_sync(switch_timer_t *timer);
/*!
\brief Check if the current step has been exceeded
\param timer the timer to wait on
\param step increment timer if a tick was detected
\return the newest sample count
*/
SWITCH_DECLARE(switch_status_t) switch_core_timer_check(switch_timer_t *timer);
SWITCH_DECLARE(switch_status_t) switch_core_timer_check(switch_timer_t *timer, switch_bool_t step);
/*!
\brief Destroy an allocated timer
+5 -1
View File
@@ -202,12 +202,14 @@ struct switch_timer {
void *private_info;
/*! remaining time from last call to _check()*/
switch_size_t diff;
switch_size_t tick;
};
typedef enum {
SWITCH_TIMER_FUNC_TIMER_INIT,
SWITCH_TIMER_FUNC_TIMER_NEXT,
SWITCH_TIMER_FUNC_TIMER_STEP,
SWITCH_TIMER_FUNC_TIMER_SYNC,
SWITCH_TIMER_FUNC_TIMER_CHECK,
SWITCH_TIMER_FUNC_TIMER_DESTROY
} switch_timer_func_name_t;
@@ -222,8 +224,10 @@ struct switch_timer_interface {
switch_status_t (*timer_next) (switch_timer_t *);
/*! function to step the timer one step */
switch_status_t (*timer_step) (switch_timer_t *);
/*! function to reset the timer */
switch_status_t (*timer_sync) (switch_timer_t *);
/*! function to check if the current step has expired */
switch_status_t (*timer_check) (switch_timer_t *);
switch_status_t (*timer_check) (switch_timer_t *, switch_bool_t);
/*! function to deallocate the timer */
switch_status_t (*timer_destroy) (switch_timer_t *);
struct switch_timer_interface *next;