Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

J

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

Snippets Groups Projects

This is an archived project. Repository and other project resources are read-only.

84bdf884

Commit 84bdf884 authored 10 years ago by Emmanuel Lepage Vallee

Downloads
- Patches
- Plain Diff

Merge remote-tracking branch 'origin/video_osx_10'

Merge all work required to compile with the Video on Mac OS X
and on Linux without DBus and SHM support.

parent f0658b14

No related branches found

No related tags found

No related merge requests found

Changes 38

Hide whitespace changes

Inline Side-by-side

Showing

CMakeLists.txt 14 additions, 16 deletions

CMakeLists.txt
cmake/FindRing.cmake 5 additions, 6 deletions

cmake/FindRing.cmake
src/account.cpp 4 additions, 2 deletions

src/account.cpp
src/accountmodel.cpp 10 additions, 2 deletions

src/accountmodel.cpp
src/accountstatusmodel.cpp 26 additions, 23 deletions

src/accountstatusmodel.cpp
src/audio/inputdevicemodel.cpp 18 additions, 10 deletions

src/audio/inputdevicemodel.cpp
src/audio/inputdevicemodel.h 2 additions, 1 deletion

src/audio/inputdevicemodel.h
src/audio/outputdevicemodel.cpp 16 additions, 10 deletions

src/audio/outputdevicemodel.cpp
src/audio/outputdevicemodel.h 2 additions, 1 deletion

src/audio/outputdevicemodel.h
src/call.cpp 2 additions, 1 deletion

src/call.cpp
src/call.h 2 additions, 2 deletions

src/call.h
src/certificate.cpp 1 addition, 0 deletions

src/certificate.cpp
src/codecmodel.cpp 43 additions, 2 deletions

src/codecmodel.cpp
src/codecmodel.h 6 additions, 0 deletions

src/codecmodel.h
src/collectionmanagerinterface.h 8 additions, 0 deletions

src/collectionmanagerinterface.h
src/collectionmanagerinterface.hpp 23 additions, 0 deletions

src/collectionmanagerinterface.hpp
src/dbus/configurationmanager.cpp 0 additions, 4 deletions

src/dbus/configurationmanager.cpp
src/dbus/metatypes.h 11 additions, 17 deletions

src/dbus/metatypes.h
src/private/directrenderer.cpp 83 additions, 0 deletions

src/private/directrenderer.cpp
src/private/directrenderer.h 59 additions, 0 deletions

src/private/directrenderer.h

with 335 additions and 97 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