Commit 20347c80 authored by Alexandre Bourget's avatar Alexandre Bourget
Browse files

Minor fixes and documentation fixes.

parent 47f23dd8
...@@ -224,14 +224,12 @@ EXTRACT_ALL = YES ...@@ -224,14 +224,12 @@ EXTRACT_ALL = YES
# If the EXTRACT_PRIVATE tag is set to YES all private members of a class # If the EXTRACT_PRIVATE tag is set to YES all private members of a class
# will be included in the documentation. # will be included in the documentation.
EXTRACT_PRIVATE = NO EXTRACT_PRIVATE = YES
EXTRACT_PRIVATE = YES
# If the EXTRACT_STATIC tag is set to YES all static members of a file # If the EXTRACT_STATIC tag is set to YES all static members of a file
# will be included in the documentation. # will be included in the documentation.
EXTRACT_STATIC = NO EXTRACT_STATIC = YES
EXTRACT_STATIC = YES
# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) # If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
# defined locally in source files will be included in the documentation. # defined locally in source files will be included in the documentation.
...@@ -244,8 +242,7 @@ EXTRACT_LOCAL_CLASSES = YES ...@@ -244,8 +242,7 @@ EXTRACT_LOCAL_CLASSES = YES
# the interface are included in the documentation. # the interface are included in the documentation.
# If set to NO (the default) only methods in the interface are included. # If set to NO (the default) only methods in the interface are included.
EXTRACT_LOCAL_METHODS = NO EXTRACT_LOCAL_METHODS = YES
EXTRACT_LOCAL_METHODS = YES
# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all # If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
# undocumented members of documented classes, files or namespaces. # undocumented members of documented classes, files or namespaces.
...@@ -720,7 +717,7 @@ ENUM_VALUES_PER_LINE = 4 ...@@ -720,7 +717,7 @@ ENUM_VALUES_PER_LINE = 4
# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are # Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are
# probably better off using the HTML help feature. # probably better off using the HTML help feature.
GENERATE_TREEVIEW = NO GENERATE_TREEVIEW = YES
# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be # If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
# used to set the initial width (in pixels) of the frame in which the tree # used to set the initial width (in pixels) of the frame in which the tree
......
...@@ -380,7 +380,7 @@ AudioRtpRTX::receiveSessionForSpkr (int& countTime) ...@@ -380,7 +380,7 @@ AudioRtpRTX::receiveSessionForSpkr (int& countTime)
int expandedSize = audiocodec->codecDecode(_receiveDataDecoded, data, size); int expandedSize = audiocodec->codecDecode(_receiveDataDecoded, data, size);
int nbInt16 = expandedSize / sizeof(int16); int nbInt16 = expandedSize / sizeof(int16);
if (nbInt16 > RTP_20S_8KHZ_MAX) { if (nbInt16 > RTP_20S_8KHZ_MAX) {
_debug("We have decoded a RTP packet larger than expected: %s VS %s. crop\n", nbInt16, RTP_20S_8KHZ_MAX); _debug("We have decoded an RTP packet larger than expected: %s VS %s. Cropping.\n", nbInt16, RTP_20S_8KHZ_MAX);
nbInt16=RTP_20S_8KHZ_MAX; nbInt16=RTP_20S_8KHZ_MAX;
} }
......
...@@ -77,9 +77,13 @@ private: ...@@ -77,9 +77,13 @@ private:
/** Debugging output file */ /** Debugging output file */
//std::ofstream _fstream; //std::ofstream _fstream;
/** libsamplerate-related */ /** libsamplerate converter for incoming voice */
SRC_STATE* _src_state_spkr; SRC_STATE* _src_state_spkr;
/** libsamplerate converter for outgoing voice */
SRC_STATE* _src_state_mic; SRC_STATE* _src_state_mic;
/** libsamplerate error */
int _src_err; int _src_err;
void initAudioRtpSession(void); void initAudioRtpSession(void);
......
...@@ -224,6 +224,7 @@ ManagerImpl::answerCall(const CallID& id) ...@@ -224,6 +224,7 @@ ManagerImpl::answerCall(const CallID& id)
if (!getAccountLink(accountid)->answer(id)) { if (!getAccountLink(accountid)->answer(id)) {
// error when receiving... // error when receiving...
removeCallAccount(id); removeCallAccount(id);
return false; return false;
} }
...@@ -582,7 +583,9 @@ bool ...@@ -582,7 +583,9 @@ bool
ManagerImpl::incomingCall(Call* call, const AccountID& accountId) ManagerImpl::incomingCall(Call* call, const AccountID& accountId)
{ {
_debug("Incoming call\n"); _debug("Incoming call\n");
associateCallToAccount(call->getCallId(), accountId); associateCallToAccount(call->getCallId(), accountId);
if ( !hasCurrentCall() ) { if ( !hasCurrentCall() ) {
call->setConnectionState(Call::Ringing); call->setConnectionState(Call::Ringing);
ringtone(); ringtone();
...@@ -594,11 +597,17 @@ ManagerImpl::incomingCall(Call* call, const AccountID& accountId) ...@@ -594,11 +597,17 @@ ManagerImpl::incomingCall(Call* call, const AccountID& accountId)
std::string from = call->getPeerName(); std::string from = call->getPeerName();
std::string number = call->getPeerNumber(); std::string number = call->getPeerNumber();
if ( !number.empty() ) { if (from != "" && number != "") {
from.append(" <"); from.append(" <");
from.append(number); from.append(number);
from.append(">"); from.append(">");
} else if ( from.empty() ) {
from.append("<");
from.append(number);
from.append(">");
} }
// otherwise, leave 'from' as is.
_gui->incomingCall(accountId, call->getCallId(), from); _gui->incomingCall(accountId, call->getCallId(), from);
return true; return true;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment