Skip to content
Snippets Groups Projects
Commit 332400c8 authored by Emmanuel Milou's avatar Emmanuel Milou
Browse files

Merge branch 'yun-pjsip' of ssh://milou@192.168.1.203/home/yun/release/sflphone into sip_dev

parents c2407947 b53f0169
No related branches found
No related tags found
No related merge requests found
...@@ -73,7 +73,7 @@ class AudioLayer { ...@@ -73,7 +73,7 @@ class AudioLayer {
, _inChannel( 1 ) , _inChannel( 1 )
, _outChannel ( 1 ) , _outChannel ( 1 )
, _errorMessage ( 0 ) , _errorMessage ( 0 )
, _mutex (NULL) , _mutex ()
{ {
} }
...@@ -82,7 +82,7 @@ class AudioLayer { ...@@ -82,7 +82,7 @@ class AudioLayer {
/** /**
* Destructor * Destructor
*/ */
virtual ~AudioLayer(void){} ~AudioLayer(void){}
virtual void closeLayer( void ) = 0; virtual void closeLayer( void ) = 0;
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
static pa_channel_map channel_map ; static pa_channel_map channel_map ;
AudioStream::AudioStream( pa_context* context, int type, std::string desc, double vol ) AudioStream::AudioStream( pa_context* context, int type, std::string desc, double vol )
: _audiostream (createStream( context )), _streamType(type), _streamDescription(desc), flag(PA_STREAM_AUTO_TIMING_UPDATE), sample_spec(), _volume() : _audiostream(NULL), _streamType(type), _streamDescription(desc), flag(PA_STREAM_AUTO_TIMING_UPDATE), sample_spec(), _volume()
{ {
sample_spec.format = PA_SAMPLE_S16LE; sample_spec.format = PA_SAMPLE_S16LE;
sample_spec.rate = 44100; sample_spec.rate = 44100;
...@@ -30,7 +30,7 @@ AudioStream::AudioStream( pa_context* context, int type, std::string desc, doubl ...@@ -30,7 +30,7 @@ AudioStream::AudioStream( pa_context* context, int type, std::string desc, doubl
channel_map.channels = 1; channel_map.channels = 1;
pa_cvolume_set( &_volume , 1 , PA_VOLUME_MUTED ) ; // * vol / 100 ; pa_cvolume_set( &_volume , 1 , PA_VOLUME_MUTED ) ; // * vol / 100 ;
//_audiostream = createStream( context ); _audiostream = createStream( context );
} }
AudioStream::~AudioStream() AudioStream::~AudioStream()
......
...@@ -954,6 +954,8 @@ void UserAgent::call_on_tsx_changed(pjsip_inv_session *inv, pjsip_transaction *t ...@@ -954,6 +954,8 @@ void UserAgent::call_on_tsx_changed(pjsip_inv_session *inv, pjsip_transaction *t
} }
break; break;
case PJSIP_TSX_STATE_COMPLETED: case PJSIP_TSX_STATE_COMPLETED:
if (tsx->status_code == 407)
break;
if (tsx->status_code / 100 == 6 || tsx->status_code / 100 == 4) { if (tsx->status_code / 100 == 6 || tsx->status_code / 100 == 4) {
// We get error message of outgoing call from server // We get error message of outgoing call from server
_debug("UserAgent: Server error message is received!\n"); _debug("UserAgent: Server error message is received!\n");
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment