ims-volte-vowifi
/
doubango
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix issue reported at https://groups.google.com/forum/#!topic/doubango/y3m4kCUrxCk

This commit is contained in:
bossiel 2014-11-18 19:43:40 +00:00
parent 261835c264
commit 392aa5505c
2 changed files with 29 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
branches/2.0/doubango/tinyMEDIA/src/tmedia_consumer.c
View File

@ -1,7 +1,5 @@
/*
* Copyright (C) 2010-2011 Mamadou Diop.
*
* Contact: Mamadou Diop <diopmamadou(at)doubango[dot]org>
* Copyright (C) 2010-2014 Mamadou DIOP
*
* This file is part of Open Source Doubango Framework.
*
@ -22,10 +20,6 @@
/**@file tmedia_consumer.c
* @brief Base consumer object.
*
* @author Mamadou Diop <diopmamadou(at)doubango[dot]org>
*
*/
#include "tinymedia/tmedia_consumer.h"
#include "tinymedia/tmedia_defaults.h"
@ -274,29 +268,21 @@ int tmedia_consumer_plugin_unregister(const tmedia_consumer_plugin_def_t* plugin
*/
int tmedia_consumer_plugin_unregister_by_type(tmedia_type_t type)
{
tsk_size_t i;
tsk_bool_t found = tsk_false;
int i, j;
/* find the plugin to unregister */
for(i = 0; i<TMED_CONSUMER_MAX_PLUGINS && __tmedia_consumer_plugins[i]; i++){
if((__tmedia_consumer_plugins[i]->type & type) == __tmedia_consumer_plugins[i]->type){
for (i = 0; i < TMED_CONSUMER_MAX_PLUGINS && __tmedia_consumer_plugins[i]; ) {
if ((__tmedia_consumer_plugins[i]->type & type) == __tmedia_consumer_plugins[i]->type) {
__tmedia_consumer_plugins[i] = tsk_null;
found = tsk_true;
break;
/* compact */
for (j = i; j < (TMED_CONSUMER_MAX_PLUGINS - 1) && __tmedia_consumer_plugins[j + 1]; ++j) {
__tmedia_consumer_plugins[j] = __tmedia_consumer_plugins[j + 1];
}
__tmedia_consumer_plugins[j] = tsk_null;
}
else {
++i;
}
}
/* compact */
if(found){
for(; i<(TMED_CONSUMER_MAX_PLUGINS - 1); i++){
if(__tmedia_consumer_plugins[i+1]){
__tmedia_consumer_plugins[i] = __tmedia_consumer_plugins[i+1];
}
else{
break;
}
}
__tmedia_consumer_plugins[i] = tsk_null;
}
return (found ? 0 : -2);
}
return 0;
}

42
branches/2.0/doubango/tinyMEDIA/src/tmedia_producer.c
View File

@ -1,7 +1,5 @@
/*
* Copyright (C) 2010-2011 Mamadou Diop.
*
* Contact: Mamadou Diop <diopmamadou(at)doubango[dot]org>
* Copyright (C) 2010-2014 Mamadou DIOP
*
* This file is part of Open Source Doubango Framework.
*
@ -22,10 +20,6 @@
/**@file tmedia_producer.c
* @brief Base producer object.
*
* @author Mamadou Diop <diopmamadou(at)doubango[dot]org>
*
*/
#include "tinymedia/tmedia_producer.h"
#include "tinymedia/tmedia_defaults.h"
@ -290,29 +284,21 @@ int tmedia_producer_plugin_unregister(const tmedia_producer_plugin_def_t* plugin
*/
int tmedia_producer_plugin_unregister_by_type(tmedia_type_t type)
{
tsk_size_t i;
tsk_bool_t found = tsk_false;
int i, j;
/* find the plugin to unregister */
for(i = 0; i<TMED_PRODUCER_MAX_PLUGINS && __tmedia_producer_plugins[i]; i++){
if((__tmedia_producer_plugins[i]->type & type) == __tmedia_producer_plugins[i]->type){
for (i = 0; i < TMED_PRODUCER_MAX_PLUGINS && __tmedia_producer_plugins[i]; ) {
if ((__tmedia_producer_plugins[i]->type & type) == __tmedia_producer_plugins[i]->type) {
__tmedia_producer_plugins[i] = tsk_null;
found = tsk_true;
break;
/* compact */
for (j = i; j < (TMED_PRODUCER_MAX_PLUGINS - 1) && __tmedia_producer_plugins[j + 1]; ++j) {
__tmedia_producer_plugins[j] = __tmedia_producer_plugins[j + 1];
}
__tmedia_producer_plugins[j] = tsk_null;
}
else {
++i;
}
}
/* compact */
if(found){
for(; i<(TMED_PRODUCER_MAX_PLUGINS - 1); i++){
if(__tmedia_producer_plugins[i+1]){
__tmedia_producer_plugins[i] = __tmedia_producer_plugins[i+1];
}
else{
break;
}
}
__tmedia_producer_plugins[i] = tsk_null;
}
return (found ? 0 : -2);
return 0;
}