jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-12 22:09:25 +08:00
Code Issues Projects Releases Wiki Activity

[#1883] Add usefull and permanent debug info for conference cretion/deletion

Browse Source
This commit is contained in:
Alexandre Savard
2009-08-20 10:53:26 -04:00
parent 54bc813c99
commit f0d2b54b8a
5 changed files with 30 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
sflphone-client-gnome/src/dbus/dbus.c
View File

@ -416,6 +416,8 @@ dbus_clean ()
void void
dbus_hold (const callable_obj_t * c) dbus_hold (const callable_obj_t * c)
{ {
DEBUG("dbus_hold %s\n", c->_callID);
GError *error = NULL; GError *error = NULL;
org_sflphone_SFLphone_CallManager_hold ( callManagerProxy, c->_callID, &error); org_sflphone_SFLphone_CallManager_hold ( callManagerProxy, c->_callID, &error);
if (error) if (error)
@ -429,6 +431,8 @@ dbus_hold (const callable_obj_t * c)
void void
dbus_unhold (const callable_obj_t * c) dbus_unhold (const callable_obj_t * c)
{ {
DEBUG("dbus_unhold %s\n", c->_callID);
GError *error = NULL; GError *error = NULL;
org_sflphone_SFLphone_CallManager_unhold ( callManagerProxy, c->_callID, &error); org_sflphone_SFLphone_CallManager_unhold ( callManagerProxy, c->_callID, &error);
if (error) if (error)
@ -442,6 +446,8 @@ dbus_unhold (const callable_obj_t * c)
void void
dbus_hang_up (const callable_obj_t * c) dbus_hang_up (const callable_obj_t * c)
{ {
DEBUG("dbus_hang_up %s\n", c->_callID);
GError *error = NULL; GError *error = NULL;
org_sflphone_SFLphone_CallManager_hang_up ( callManagerProxy, c->_callID, &error); org_sflphone_SFLphone_CallManager_hang_up ( callManagerProxy, c->_callID, &error);
if (error) if (error)
@ -471,6 +477,9 @@ dbus_accept (const callable_obj_t * c)
#if GTK_CHECK_VERSION(2,10,0) #if GTK_CHECK_VERSION(2,10,0)
status_tray_icon_blink( FALSE ); status_tray_icon_blink( FALSE );
#endif #endif
DEBUG("dbus_accept %s\n", c->_callID);
GError *error = NULL; GError *error = NULL;
org_sflphone_SFLphone_CallManager_accept ( callManagerProxy, c->_callID, &error); org_sflphone_SFLphone_CallManager_accept ( callManagerProxy, c->_callID, &error);
if (error) if (error)
@ -487,6 +496,9 @@ dbus_refuse (const callable_obj_t * c)
#if GTK_CHECK_VERSION(2,10,0) #if GTK_CHECK_VERSION(2,10,0)
status_tray_icon_blink( FALSE ); status_tray_icon_blink( FALSE );
#endif #endif
DEBUG("dbus_refuse %s\n", c->_callID);
GError *error = NULL; GError *error = NULL;
org_sflphone_SFLphone_CallManager_refuse ( callManagerProxy, c->_callID, &error); org_sflphone_SFLphone_CallManager_refuse ( callManagerProxy, c->_callID, &error);
if (error) if (error)
@ -501,6 +513,8 @@ dbus_refuse (const callable_obj_t * c)
void void
dbus_place_call (const callable_obj_t * c) dbus_place_call (const callable_obj_t * c)
{ {
DEBUG("dbus_place_call %s\n", c->_callID);
GError *error = NULL; GError *error = NULL;
org_sflphone_SFLphone_CallManager_place_call ( callManagerProxy, c->_accountID, c->_callID, c->_peer_number, &error); org_sflphone_SFLphone_CallManager_place_call ( callManagerProxy, c->_accountID, c->_callID, c->_peer_number, &error);
if (error) if (error)
@ -1232,8 +1246,7 @@ dbus_set_volume_controls( )
dbus_add_participant(const callable_obj_t * c) dbus_add_participant(const callable_obj_t * c)
{ {
DEBUG("calling dbus_add_participant on CallManager"); DEBUG("dbus_add_participant %s\n", c->_callID);
DEBUG("CallID : %s", c->_callID);
GError* error = NULL; GError* error = NULL;
org_sflphone_SFLphone_CallManager_add_participant( org_sflphone_SFLphone_CallManager_add_participant(
@ -1251,8 +1264,8 @@ dbus_add_participant(const callable_obj_t * c)
void void
dbus_set_record(const callable_obj_t * c) dbus_set_record(const callable_obj_t * c)
{ {
DEBUG("calling dbus_set_record on CallManager"); DEBUG("dbus_set_record %s\n", c->_callID);
DEBUG("CallID : %s", c->_callID);
GError* error = NULL; GError* error = NULL;
org_sflphone_SFLphone_CallManager_set_recording ( org_sflphone_SFLphone_CallManager_set_recording (
callManagerProxy, callManagerProxy,
@ -1267,7 +1280,7 @@ dbus_set_record(const callable_obj_t * c)
gboolean gboolean
dbus_get_is_recording(const callable_obj_t * c) dbus_get_is_recording(const callable_obj_t * c)
{ {
DEBUG("calling dbus_get_is_recording on CallManager"); DEBUG("dbus_get_is_recording %s\n", c->_callID);
GError* error = NULL; GError* error = NULL;
gboolean isRecording; gboolean isRecording;
org_sflphone_SFLphone_CallManager_get_is_recording ( org_sflphone_SFLphone_CallManager_get_is_recording (

1
sflphone-common/src/audio/alsalayer.cpp
View File

@ -771,6 +771,7 @@ void AlsaLayer::audioCallback (void)
// If nothing urgent, play the regular sound samples // If nothing urgent, play the regular sound samples
normalAvail = _mainBuffer.availForGet(); normalAvail = _mainBuffer.availForGet();
// _debug("Alsa: normalAvail %i\n", normalAvail);
toGet = (normalAvail < (int) (framesPerBufferAlsa * sizeof (SFLDataFormat))) ? normalAvail : framesPerBufferAlsa * sizeof (SFLDataFormat); toGet = (normalAvail < (int) (framesPerBufferAlsa * sizeof (SFLDataFormat))) ? normalAvail : framesPerBufferAlsa * sizeof (SFLDataFormat);
out = (SFLDataFormat*) malloc (framesPerBufferAlsa * sizeof (SFLDataFormat)); out = (SFLDataFormat*) malloc (framesPerBufferAlsa * sizeof (SFLDataFormat));

17
sflphone-common/src/audio/mainbuffer.cpp
View File

@ -93,7 +93,7 @@ bool MainBuffer::removeCallIDSet(CallID set_id)
void MainBuffer::addCallIDtoSet(CallID set_id, CallID call_id) void MainBuffer::addCallIDtoSet(CallID set_id, CallID call_id)
{ {
_debug("---- MainBuffer::addCallIDtoSet %s from callid %s\n", set_id.c_str(), call_id.c_str()); _debug("---- MainBuffer::addCallIDtoSet %s in %s\n", set_id.c_str(), call_id.c_str());
CallIDSet* callid_set = getCallIDSet(set_id); CallIDSet* callid_set = getCallIDSet(set_id);
callid_set->insert(call_id); callid_set->insert(call_id);
@ -102,7 +102,7 @@ void MainBuffer::addCallIDtoSet(CallID set_id, CallID call_id)
void MainBuffer::removeCallIDfromSet(CallID set_id, CallID call_id) void MainBuffer::removeCallIDfromSet(CallID set_id, CallID call_id)
{ {
_debug("---- MainBuffer::removeCallIDfromSet element %s from set %s\n", call_id.c_str(), set_id.c_str()); _debug("---- MainBuffer::removeCallIDfromSet element %s from %s\n", call_id.c_str(), set_id.c_str());
CallIDSet* callid_set = getCallIDSet(set_id); CallIDSet* callid_set = getCallIDSet(set_id);
if(callid_set != NULL) if(callid_set != NULL)
@ -182,7 +182,7 @@ void MainBuffer::bindCallID(CallID call_id1, CallID call_id2)
ost::MutexLock guard (_mutex); ost::MutexLock guard (_mutex);
_debug("---- MainBuffer:: bindCallID %s and callid %s\n", call_id1.c_str(), call_id2.c_str()); _debug("---- MainBuffer::bindCallID %s and callid %s\n", call_id1.c_str(), call_id2.c_str());
RingBuffer* ring_buffer; RingBuffer* ring_buffer;
CallIDSet* callid_set; CallIDSet* callid_set;
@ -270,7 +270,6 @@ void MainBuffer::unBindAll(CallID call_id)
while (iter_set != temp_set.end()) while (iter_set != temp_set.end())
{ {
CallID call_id_in_set = *iter_set; CallID call_id_in_set = *iter_set;
_debug("--------------- call_id1: %s, call_id2: %s -----------------------", call_id.c_str(), call_id_in_set.c_str());
unBindCallID(call_id, call_id_in_set); unBindCallID(call_id, call_id_in_set);
iter_set++; iter_set++;
@ -404,17 +403,7 @@ int MainBuffer::getDataByID(void *buffer, int toCopy, unsigned short volume, Cal
return 0; return 0;
} }
int a;
// ost::MutexLock guard (_mutex);
// a = ring_buffer->AvailForGet(reader_id);
// if (a >= toCopy) {
return ring_buffer->Get (buffer, toCopy, volume, reader_id); return ring_buffer->Get (buffer, toCopy, volume, reader_id);
// } else {
// _debug ("RingBuffer is quite empty\n");
// return ring_buffer->Get (buffer, a, volume, reader_id);
// }
return 0; return 0;

8
sflphone-common/src/audio/ringbuffer.cpp
View File

@ -168,10 +168,10 @@ void
RingBuffer::createReadPointer(CallID call_id) RingBuffer::createReadPointer(CallID call_id)
{ {
_debug("---- createReadPointer call_id %s\n", call_id.c_str()); _debug("---- createReadPointer ringbuffer_id %s, call_id %s\n", buffer_id.c_str(), call_id.c_str());
_readpointer.insert(pair<CallID, int>(call_id, mEnd)); _readpointer.insert(pair<CallID, int>(call_id, mEnd));
_debug("---- createReadPointer size: %i\n", _readpointer.size()); _debug("---- createReadPointer ringbuffer_id %s, size %i\n", buffer_id.c_str(),_readpointer.size());
} }
@ -180,10 +180,10 @@ void
RingBuffer::removeReadPointer(CallID call_id) RingBuffer::removeReadPointer(CallID call_id)
{ {
_debug("---- removeReadPointer call_id %s\n", call_id.c_str()); _debug("---- removeReadPointer ringbuffer_id %s, call_id %s\n", buffer_id.c_str(), call_id.c_str());
_readpointer.erase(call_id); _readpointer.erase(call_id);
_debug("---- removeReadPointer size: %i\n", _readpointer.size()); _debug("---- removeReadPointer ringbuffer_id %s, size %i\n", buffer_id.c_str(), _readpointer.size());
} }

8
sflphone-common/src/dbus/callmanager.cpp
View File

@ -58,7 +58,7 @@ CallManager::accept (const std::string& callID)
void void
CallManager::hangUp (const std::string& callID) CallManager::hangUp (const std::string& callID)
{ {
_debug ("CallManager::hangUp received\n"); _debug ("CallManager::hangUp received %s\n", callID.c_str());
Manager::instance().hangupCall (callID); Manager::instance().hangupCall (callID);
} }
@ -66,7 +66,7 @@ CallManager::hangUp (const std::string& callID)
void void
CallManager::hold (const std::string& callID) CallManager::hold (const std::string& callID)
{ {
_debug ("CallManager::hold received\n"); _debug ("CallManager::hold received %s\n", callID.c_str());
Manager::instance().onHoldCall (callID); Manager::instance().onHoldCall (callID);
} }
@ -74,7 +74,7 @@ CallManager::hold (const std::string& callID)
void void
CallManager::unhold (const std::string& callID) CallManager::unhold (const std::string& callID)
{ {
_debug ("CallManager::unhold received\n"); _debug ("CallManager::unhold received %s\n", callID.c_str());
Manager::instance().offHoldCall (callID); Manager::instance().offHoldCall (callID);
} }
@ -134,7 +134,7 @@ CallManager::setRecording (const std::string& callID)
bool bool
CallManager::getIsRecording (const std::string& callID) CallManager::getIsRecording (const std::string& callID)
{ {
_debug ("CallManager::getIsRecording received \n"); _debug ("CallManager::getIsRecording received \n");
return Manager::instance().isRecording (callID); return Manager::instance().isRecording (callID);
} }