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

f29bea17

Commit f29bea17 authored 15 years ago by Emmanuel Milou

Downloads
- Plain Diff

Merge branch 'master' of...

Merge branch 'master' of git+ssh://repos-sflphone-git@git.sflphone.org/var/repos/sflphone/git/sflphone

parents df5f1976 7a83c0dd

Branches

Tags

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

sflphone-common/src/audio/alsa/alsalayer.cpp 141 additions, 49 deletions

sflphone-common/src/audio/alsa/alsalayer.cpp
sflphone-common/src/audio/alsa/alsalayer.h 3 additions, 4 deletions

sflphone-common/src/audio/alsa/alsalayer.h
sflphone-common/src/audio/audiolayer.cpp 2 additions, 2 deletions

sflphone-common/src/audio/audiolayer.cpp
sflphone-common/src/audio/audiortp/AudioRtpSession.h 3 additions, 1 deletion

sflphone-common/src/audio/audiortp/AudioRtpSession.h
sflphone-common/src/audio/pulseaudio/audiostream.cpp 6 additions, 7 deletions

sflphone-common/src/audio/pulseaudio/audiostream.cpp
sflphone-common/src/audio/pulseaudio/audiostream.h 2 additions, 0 deletions

sflphone-common/src/audio/pulseaudio/audiostream.h
sflphone-common/src/audio/pulseaudio/pulselayer.cpp 67 additions, 71 deletions

sflphone-common/src/audio/pulseaudio/pulselayer.cpp
sflphone-common/src/audio/pulseaudio/pulselayer.h 1 addition, 1 deletion

sflphone-common/src/audio/pulseaudio/pulselayer.h
sflphone-common/src/managerimpl.cpp 44 additions, 8 deletions

sflphone-common/src/managerimpl.cpp
sflphone-common/test/audiolayerTest.cpp 1 addition, 1 deletion

sflphone-common/test/audiolayerTest.cpp

with 270 additions and 144 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