-
- Downloads
Merge branch 'master' into fix_threads
Resolved Conflicts: sflphone-common/src/audio/audiortp/AudioRtpRecordHandler.cpp
Showing
- sflphone-common/src/audio/alsa/alsalayer.cpp 2 additions, 2 deletionssflphone-common/src/audio/alsa/alsalayer.cpp
- sflphone-common/src/audio/audiolayer.cpp 4 additions, 4 deletionssflphone-common/src/audio/audiolayer.cpp
- sflphone-common/src/audio/audiolayer.h 1 addition, 8 deletionssflphone-common/src/audio/audiolayer.h
- sflphone-common/src/audio/audiortp/AudioRtpRecordHandler.cpp 6 additions, 22 deletionssflphone-common/src/audio/audiortp/AudioRtpRecordHandler.cpp
- sflphone-common/src/audio/audiortp/AudioRtpSession.cpp 5 additions, 17 deletionssflphone-common/src/audio/audiortp/AudioRtpSession.cpp
- sflphone-common/src/audio/mainbuffer.cpp 19 additions, 59 deletionssflphone-common/src/audio/mainbuffer.cpp
- sflphone-common/src/audio/mainbuffer.h 2 additions, 4 deletionssflphone-common/src/audio/mainbuffer.h
- sflphone-common/src/audio/pulseaudio/pulselayer.cpp 2 additions, 2 deletionssflphone-common/src/audio/pulseaudio/pulselayer.cpp
- sflphone-common/src/audio/ringbuffer.cpp 1 addition, 14 deletionssflphone-common/src/audio/ringbuffer.cpp
- sflphone-common/src/audio/ringbuffer.h 1 addition, 2 deletionssflphone-common/src/audio/ringbuffer.h
- sflphone-common/src/global.h 0 additions, 1 deletionsflphone-common/src/global.h
- sflphone-common/src/iax/iaxvoiplink.cpp 45 additions, 118 deletionssflphone-common/src/iax/iaxvoiplink.cpp
- sflphone-common/src/iax/iaxvoiplink.h 0 additions, 6 deletionssflphone-common/src/iax/iaxvoiplink.h
- sflphone-common/src/sip/sipcall.h 0 additions, 7 deletionssflphone-common/src/sip/sipcall.h
- sflphone-common/src/sip/sipvoiplink.cpp 3 additions, 7 deletionssflphone-common/src/sip/sipvoiplink.cpp
- sflphone-common/test/mainbuffertest.cpp 7 additions, 7 deletionssflphone-common/test/mainbuffertest.cpp
Loading
Please register or sign in to comment