-
- Downloads
Merge branch 'recording'
Conflicts: src/audio/audiortp.cpp src/sipvoiplink.cpp
Showing
- src/audio/codecs/speexcodec.cpp 1 addition, 0 deletionssrc/audio/codecs/speexcodec.cpp
- src/call.cpp 6 additions, 0 deletionssrc/call.cpp
- src/call.h 5 additions, 0 deletionssrc/call.h
- src/iaxvoiplink.cpp 74 additions, 13 deletionssrc/iaxvoiplink.cpp
- src/iaxvoiplink.h 16 additions, 1 deletionsrc/iaxvoiplink.h
- src/managerimpl.cpp 1 addition, 1 deletionsrc/managerimpl.cpp
- src/plug-in/audiorecorder/audiorecord.cpp 8 additions, 1 deletionsrc/plug-in/audiorecorder/audiorecord.cpp
- src/plug-in/audiorecorder/audiorecord.h 7 additions, 2 deletionssrc/plug-in/audiorecorder/audiorecord.h
- src/plug-in/pluginmanager.cpp 1 addition, 1 deletionsrc/plug-in/pluginmanager.cpp
- src/sipvoiplink.cpp 45 additions, 9 deletionssrc/sipvoiplink.cpp
- src/sipvoiplink.h 7 additions, 0 deletionssrc/sipvoiplink.h
- src/voiplink.h 7 additions, 0 deletionssrc/voiplink.h
- test/Makefile.am 3 additions, 0 deletionstest/Makefile.am
- test/audiorecorderTest.cpp 2 additions, 0 deletionstest/audiorecorderTest.cpp
- test/audiorecorderTest.h 1 addition, 1 deletiontest/audiorecorderTest.h
- test/pluginmanagerTest.h 1 addition, 1 deletiontest/pluginmanagerTest.h
Loading
Please register or sign in to comment