jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-12 22:09:25 +08:00
Code Issues Projects Releases Wiki Activity

OSX: CoreAudio preliminairies

Browse Source 
Refs #57972

Change-Id: Ic595914e590c335f9dfbb968839166dd6b0c568c
This commit is contained in:
Philippe Groarke
2014-10-23 14:38:30 -04:00
committed by Tristan Matthews
parent 55bfb0ed32
commit 54317908fb
5 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
daemon/configure.ac
View File

@ -91,6 +91,11 @@ AM_CONDITIONAL(HAVE_WIN32, test "${SYS}" = "mingw32")
AM_CONDITIONAL(HAVE_WIN64, test "${HAVE_WIN64}" = "1")
AM_CONDITIONAL(HAVE_OSX, test "${HAVE_OSX}" = "1")
dnl FIXME this should be deduced automatically
AC_DEFINE_UNQUOTED([HAVE_COREAUDIO],
`if test "${HAVE_OSX}" = "1"; then echo 1; else echo 0; fi`,
[Define if you have CoreAudio])
dnl Android is linux, but a bit different
AS_IF([test "$SYS" = linux],[
AC_MSG_CHECKING([for an Android system])

1
daemon/src/audio/audiolayer.h
View File

@ -52,6 +52,7 @@
#define PULSEAUDIO_API_STR "pulseaudio"
#define ALSA_API_STR "alsa"
#define JACK_API_STR "jack"
#define COREAUDIO_API_STR "coreaudio"
#define PCM_DEFAULT "default" // Default ALSA plugin
#define PCM_DSNOOP "plug:dsnoop" // Alsa plugin for microphone sharing

11
daemon/src/audio/coreaudio/corelayer.cpp
View File

@ -122,6 +122,17 @@ void CoreLayer::startStream()
return;
}
int CoreLayer::getAudioDeviceIndex(const std::string& name, DeviceType type) const
{
return 0;
}
std::string CoreLayer::getAudioDeviceName(int index, DeviceType type) const
{
return "";
}
void CoreLayer::stopStream()
{
isStarted_ = false;

3
daemon/src/audio/coreaudio/corelayer.h
View File

@ -56,6 +56,9 @@ class CoreLayer : public AudioLayer {
virtual std::vector<std::string> getCaptureDeviceList() const;
virtual std::vector<std::string> getPlaybackDeviceList() const;
virtual int getAudioDeviceIndex(const std::string& name, DeviceType type) const;
virtual std::string getAudioDeviceName(int index, DeviceType type) const;
/**
* Get the index of the audio card for capture
* @return int The index of the card used for capture

12
daemon/src/preferences.cpp
View File

@ -47,6 +47,9 @@
#if HAVE_PULSE
#include "audio/pulseaudio/pulselayer.h"
#endif
#if HAVE_COREAUDIO
#include "audio/coreaudio/corelayer.h"
#endif
#endif /* HAVE_OPENSL */
#include <yaml-cpp/yaml.h>
@ -380,6 +383,15 @@ sfl::AudioLayer* AudioPreference::createAudioLayer()
checkSoundCard(alsaCardring_, sfl::DeviceType::RINGTONE);
return new sfl::AlsaLayer(*this);
#endif
#if HAVE_COREAUDIO
audioApi_ = COREAUDIO_API_STR;
try {
return new sfl::CoreLayer(*this);
} catch (const std::runtime_error &e) {
SFL_WARN("Could not create coreaudio layer. There will be no sound.");
}
#else
return NULL;
#endif