kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-08-13 17:38:59 +00:00
Code Issues Projects Releases Wiki Activity

fix eventConsumer issue and add flush() method

Browse Source
This commit is contained in:
Anthony Minessale
2010-05-17 18:37:27 -05:00
parent f1132a2b71
commit 7fd3aff6f0
12 changed files with 655 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/switch_cpp.cpp
View File

@@ -72,8 +72,10 @@ SWITCH_DECLARE(int) EventConsumer::bind(const char *event_name, const char *subc
subclass_name = NULL;
}
if (switch_event_bind(__FILE__, event_id, subclass_name, event_handler, this) == SWITCH_STATUS_SUCCESS) {
if (node_index <= SWITCH_EVENT_ALL &&
switch_event_bind_removable(__FILE__, event_id, subclass_name, event_handler, this, &enodes[node_index]) == SWITCH_STATUS_SUCCESS) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "bound to %s %s\n", event_name, switch_str_nil(subclass_name));
node_index++;
return 1;
} else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot bind to %s %s\n", event_name, switch_str_nil(subclass_name));
@@ -103,8 +105,11 @@ SWITCH_DECLARE(Event *) EventConsumer::pop(int block)
SWITCH_DECLARE_CONSTRUCTOR EventConsumer::~EventConsumer()
{
uint32_t i;
switch_event_unbind_callback(event_handler);
for (i = 0; i < node_index; i++) {
switch_event_unbind(&enodes[i]);
}
if (events) {
switch_queue_interrupt_all(events);
@@ -220,7 +225,7 @@ SWITCH_DECLARE(const char *) API::executeString(const char *cmd)
}
switch_safe_free(last_data);
SWITCH_STANDARD_STREAM(stream);
switch_api_execute(mycmd, arg, NULL, &stream);
last_data = (char *) stream.data;