Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

jami-daemon
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Releases
- Model registry
- Incidents

Snippets Groups Projects

9963c8ff

Commit 9963c8ff authored 12 years ago by Tristan Matthews

Downloads
- Patches
- Plain Diff

* #11269: merged master into video

parent 1cbb4291

Branches

Tags

No related merge requests found

Changes 285

Hide whitespace changes

Inline Side-by-side

Showing

NEWS 2 additions, 0 deletions

NEWS
daemon/Makefile.am 1 addition, 2 deletions

daemon/Makefile.am
daemon/configure.ac 1 addition, 1 deletion

daemon/configure.ac
daemon/src/account.cpp 17 additions, 16 deletions

daemon/src/account.cpp
daemon/src/account.h 5 additions, 5 deletions

daemon/src/account.h
daemon/src/audio/alsa/alsalayer.cpp 19 additions, 18 deletions

daemon/src/audio/alsa/alsalayer.cpp
daemon/src/audio/audiolayer.cpp 2 additions, 11 deletions

daemon/src/audio/audiolayer.cpp
daemon/src/audio/audiolayer.h 4 additions, 4 deletions

daemon/src/audio/audiolayer.h
daemon/src/audio/audioloop.cpp 2 additions, 2 deletions

daemon/src/audio/audioloop.cpp
daemon/src/audio/audiorecord.cpp 35 additions, 31 deletions

daemon/src/audio/audiorecord.cpp
daemon/src/audio/audiorecorder.cpp 9 additions, 7 deletions

daemon/src/audio/audiorecorder.cpp
daemon/src/audio/audiorecorder.h 2 additions, 0 deletions

daemon/src/audio/audiorecorder.h
daemon/src/audio/audiortp/audio_rtp_factory.cpp 48 additions, 17 deletions

daemon/src/audio/audiortp/audio_rtp_factory.cpp
daemon/src/audio/audiortp/audio_rtp_factory.h 21 additions, 5 deletions

daemon/src/audio/audiortp/audio_rtp_factory.h
daemon/src/audio/audiortp/audio_rtp_record_handler.cpp 85 additions, 43 deletions

daemon/src/audio/audiortp/audio_rtp_record_handler.cpp
daemon/src/audio/audiortp/audio_rtp_record_handler.h 18 additions, 16 deletions

daemon/src/audio/audiortp/audio_rtp_record_handler.h
daemon/src/audio/audiortp/audio_rtp_session.cpp 21 additions, 22 deletions

daemon/src/audio/audiortp/audio_rtp_session.cpp
daemon/src/audio/audiortp/audio_srtp_session.cpp 129 additions, 83 deletions

daemon/src/audio/audiortp/audio_srtp_session.cpp
daemon/src/audio/audiortp/audio_srtp_session.h 91 additions, 32 deletions

daemon/src/audio/audiortp/audio_srtp_session.h
daemon/src/audio/audiortp/audio_symmetric_rtp_session.cpp 5 additions, 9 deletions

daemon/src/audio/audiortp/audio_symmetric_rtp_session.cpp

with 517 additions and 324 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment