From 758254ad420b28d8e5539cca0138b9c6d2c0dd6f Mon Sep 17 00:00:00 2001
From: Giovanni Maruzzelli <gmaruzz@gmail.com>
Date: Tue, 26 Oct 2010 06:13:25 -0500
Subject: [PATCH] skypopen: cleanup begin
---
src/mod/endpoints/mod_skypopen/mod_skypopen.c | 14 +++++++-------
src/mod/endpoints/mod_skypopen/skypopen_protocol.c | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/mod/endpoints/mod_skypopen/mod_skypopen.c b/src/mod/endpoints/mod_skypopen/mod_skypopen.c
index bd9f10cf17..82d26357d1 100644
--- a/src/mod/endpoints/mod_skypopen/mod_skypopen.c
+++ b/src/mod/endpoints/mod_skypopen/mod_skypopen.c
@@ -398,9 +398,9 @@ static switch_status_t interface_exists(char *the_interface)
}
if (tech_pvt->SkypopenHandles.disp) {
- NOTICA("REMOVE CLOSIN X\n", SKYPOPEN_P_LOG);
+ DEBUGA_SKYPE("REMOVE CLOSIN X\n", SKYPOPEN_P_LOG);
XCloseDisplay(tech_pvt->SkypopenHandles.disp);
- NOTICA("REMOVE CLOSIN X END\n", SKYPOPEN_P_LOG);
+ DEBUGA_SKYPE("REMOVE CLOSIN X END\n", SKYPOPEN_P_LOG);
}
if (globals.SKYPOPEN_INTERFACES[interface_id].skypopen_signaling_thread) {
@@ -2000,9 +2000,9 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_skypopen_shutdown)
switch_yield(50000);
}
if (tech_pvt->SkypopenHandles.disp) {
- NOTICA("CLOSIN X\n", SKYPOPEN_P_LOG);
+ DEBUGA_SKYPE("CLOSIN X\n", SKYPOPEN_P_LOG);
XCloseDisplay(tech_pvt->SkypopenHandles.disp);
- NOTICA("CLOSIN X END\n", SKYPOPEN_P_LOG);
+ DEBUGA_SKYPE("CLOSIN X END\n", SKYPOPEN_P_LOG);
}
if (globals.SKYPOPEN_INTERFACES[interface_id].skypopen_signaling_thread) {
switch_thread_join(&status, globals.SKYPOPEN_INTERFACES[interface_id].skypopen_signaling_thread);
@@ -3121,11 +3121,11 @@ struct SkypopenHandles *skypopen_list_remove_by_reference(struct SkypopenList *l
switch_mutex_lock(globals.list_mutex);
- NOTICA("BEGIN REMOVE\n", SKYPOPEN_P_LOG);
+ DEBUGA_SKYPE("BEGIN REMOVE\n", SKYPOPEN_P_LOG);
if (handle->managed == SWITCH_FALSE) {
// already removed
switch_mutex_unlock(globals.list_mutex);
- NOTICA("EXIT REMOVE\n", SKYPOPEN_P_LOG);
+ DEBUGA_SKYPE("EXIT REMOVE\n", SKYPOPEN_P_LOG);
return 0;
}
@@ -3150,7 +3150,7 @@ struct SkypopenHandles *skypopen_list_remove_by_reference(struct SkypopenList *l
list->entries--;
switch_mutex_unlock(globals.list_mutex);
- NOTICA("EXIT REMOVE\n", SKYPOPEN_P_LOG);
+ DEBUGA_SKYPE("EXIT REMOVE\n", SKYPOPEN_P_LOG);
return handle;
}
diff --git a/src/mod/endpoints/mod_skypopen/skypopen_protocol.c b/src/mod/endpoints/mod_skypopen/skypopen_protocol.c
index 2ea46dc356..07c461b196 100644
--- a/src/mod/endpoints/mod_skypopen/skypopen_protocol.c
+++ b/src/mod/endpoints/mod_skypopen/skypopen_protocol.c
@@ -1875,7 +1875,7 @@ void *skypopen_do_skypeapi_thread_func(void *obj)
running = 0;
}
- NOTICA("EXITING\n", SKYPOPEN_P_LOG);
+ DEBUGA_SKYPE("EXITING\n", SKYPOPEN_P_LOG);
// CLOUDTREE (Thomas Hazel)
#ifndef WIN32