mirror of
https://github.com/signalwire/freeswitch.git
synced 2025-06-07 21:44:51 +00:00
skypopen: cleanup begin
This commit is contained in:
parent
9274deeabb
commit
758254ad42
@ -398,9 +398,9 @@ static switch_status_t interface_exists(char *the_interface)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (tech_pvt->SkypopenHandles.disp) {
|
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);
|
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) {
|
if (globals.SKYPOPEN_INTERFACES[interface_id].skypopen_signaling_thread) {
|
||||||
@ -2000,9 +2000,9 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_skypopen_shutdown)
|
|||||||
switch_yield(50000);
|
switch_yield(50000);
|
||||||
}
|
}
|
||||||
if (tech_pvt->SkypopenHandles.disp) {
|
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);
|
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) {
|
if (globals.SKYPOPEN_INTERFACES[interface_id].skypopen_signaling_thread) {
|
||||||
switch_thread_join(&status, 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);
|
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) {
|
if (handle->managed == SWITCH_FALSE) {
|
||||||
// already removed
|
// already removed
|
||||||
switch_mutex_unlock(globals.list_mutex);
|
switch_mutex_unlock(globals.list_mutex);
|
||||||
NOTICA("EXIT REMOVE\n", SKYPOPEN_P_LOG);
|
DEBUGA_SKYPE("EXIT REMOVE\n", SKYPOPEN_P_LOG);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -3150,7 +3150,7 @@ struct SkypopenHandles *skypopen_list_remove_by_reference(struct SkypopenList *l
|
|||||||
list->entries--;
|
list->entries--;
|
||||||
|
|
||||||
switch_mutex_unlock(globals.list_mutex);
|
switch_mutex_unlock(globals.list_mutex);
|
||||||
NOTICA("EXIT REMOVE\n", SKYPOPEN_P_LOG);
|
DEBUGA_SKYPE("EXIT REMOVE\n", SKYPOPEN_P_LOG);
|
||||||
|
|
||||||
return handle;
|
return handle;
|
||||||
}
|
}
|
||||||
|
@ -1875,7 +1875,7 @@ void *skypopen_do_skypeapi_thread_func(void *obj)
|
|||||||
running = 0;
|
running = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
NOTICA("EXITING\n", SKYPOPEN_P_LOG);
|
DEBUGA_SKYPE("EXITING\n", SKYPOPEN_P_LOG);
|
||||||
|
|
||||||
// CLOUDTREE (Thomas Hazel)
|
// CLOUDTREE (Thomas Hazel)
|
||||||
#ifndef WIN32
|
#ifndef WIN32
|
||||||
|
Loading…
x
Reference in New Issue
Block a user