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

8b402ee6

Commit 8b402ee6 authored 13 years ago by Alexandre Savard

Downloads
- Plain Diff

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

parents f0c23e62 f196d54e

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

daemon/Makefile.am 1 addition, 6 deletions

daemon/Makefile.am
daemon/src/audio/audioloop.cpp 10 additions, 8 deletions

daemon/src/audio/audioloop.cpp
daemon/src/audio/pulseaudio/pulselayer.cpp 1 addition, 1 deletion

daemon/src/audio/pulseaudio/pulselayer.cpp
daemon/src/audio/samplerateconverter.cpp 5 additions, 6 deletions

daemon/src/audio/samplerateconverter.cpp
daemon/src/audio/samplerateconverter.h 1 addition, 1 deletion

daemon/src/audio/samplerateconverter.h
daemon/src/audio/sound/audiofile.cpp 44 additions, 46 deletions

daemon/src/audio/sound/audiofile.cpp
daemon/src/audio/sound/audiofile.h 1 addition, 1 deletion

daemon/src/audio/sound/audiofile.h
daemon/src/dbus/Makefile.am 1 addition, 0 deletions

daemon/src/dbus/Makefile.am
daemon/src/sip/sipvoiplink.cpp 13 additions, 14 deletions

daemon/src/sip/sipvoiplink.cpp

with 77 additions and 83 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