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

pulseaudio: cleanup

Browse Source
This commit is contained in:
Tristan Matthews
2013-08-12 18:23:33 -04:00
parent f308f54265
commit 04ac126d9e
1 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
daemon/src/audio/pulseaudio/pulselayer.cpp
View File

@ -224,8 +224,10 @@ std::vector<std::string> PulseLayer::getCaptureDeviceList() const
{ {
const unsigned n = sourceList_.size(); const unsigned n = sourceList_.size();
std::vector<std::string> names(n); std::vector<std::string> names(n);
for(unsigned i=0; i<n; i++)
for (unsigned i = 0; i < n; i++)
names[i] = sourceList_[i].name; names[i] = sourceList_[i].name;
return names; return names;
} }
@ -233,8 +235,10 @@ std::vector<std::string> PulseLayer::getPlaybackDeviceList() const
{ {
const unsigned n = sinkList_.size(); const unsigned n = sinkList_.size();
std::vector<std::string> names(n); std::vector<std::string> names(n);
for(unsigned i=0; i<n; i++)
for (unsigned i = 0; i < n; i++)
names[i] = sinkList_[i].name; names[i] = sinkList_[i].name;
return names; return names;
} }
@ -252,7 +256,9 @@ int PulseLayer::getAudioDeviceIndex(const std::string& name) const
const PaDeviceInfos* PulseLayer::getDeviceInfos(const std::vector<PaDeviceInfos>& list, const std::string& name) const const PaDeviceInfos* PulseLayer::getDeviceInfos(const std::vector<PaDeviceInfos>& list, const std::string& name) const
{ {
std::vector<PaDeviceInfos>::const_iterator dev_info = std::find_if(list.begin(), list.end(), PaDeviceInfos::nameComparator(name)); std::vector<PaDeviceInfos>::const_iterator dev_info = std::find_if(list.begin(), list.end(), PaDeviceInfos::nameComparator(name));
if(dev_info == list.end()) return NULL;
if (dev_info == list.end()) return NULL;
return &(*dev_info); return &(*dev_info);
} }
@ -266,6 +272,7 @@ std::string PulseLayer::getAudioDeviceName(int index, PCMType type) const
ERROR("Index %d out of range", index); ERROR("Index %d out of range", index);
return ""; return "";
} }
return sinkList_[index].name; return sinkList_[index].name;
case SFL_PCM_CAPTURE: case SFL_PCM_CAPTURE:
@ -273,6 +280,7 @@ std::string PulseLayer::getAudioDeviceName(int index, PCMType type) const
ERROR("Index %d out of range", index); ERROR("Index %d out of range", index);
return ""; return "";
} }
return sourceList_[index].name; return sourceList_[index].name;
default: default:
@ -295,10 +303,12 @@ void PulseLayer::createStreams(pa_context* c)
// Create playback stream // Create playback stream
const PaDeviceInfos* dev_infos = getDeviceInfos(sinkList_, playbackDevice); const PaDeviceInfos* dev_infos = getDeviceInfos(sinkList_, playbackDevice);
if(dev_infos == NULL) {
if (dev_infos == NULL) {
dev_infos = &sinkList_[0]; dev_infos = &sinkList_[0];
DEBUG("Prefered playback device not found in device list, selecting %s instead.", dev_infos->name.c_str()); DEBUG("Prefered playback device not found in device list, selecting %s instead.", dev_infos->name.c_str());
} }
playback_ = new AudioStream(c, mainloop_, "SFLphone playback", PLAYBACK_STREAM, sampleRate_, dev_infos); playback_ = new AudioStream(c, mainloop_, "SFLphone playback", PLAYBACK_STREAM, sampleRate_, dev_infos);
pa_stream_set_write_callback(playback_->pulseStream(), playback_callback, this); pa_stream_set_write_callback(playback_->pulseStream(), playback_callback, this);
@ -306,10 +316,12 @@ void PulseLayer::createStreams(pa_context* c)
// Create capture stream // Create capture stream
dev_infos = getDeviceInfos(sourceList_, captureDevice); dev_infos = getDeviceInfos(sourceList_, captureDevice);
if(dev_infos == NULL) {
if (dev_infos == NULL) {
dev_infos = &sourceList_[0]; dev_infos = &sourceList_[0];
DEBUG("Prefered capture device not found in device list, selecting %s instead.", dev_infos->name.c_str()); DEBUG("Prefered capture device not found in device list, selecting %s instead.", dev_infos->name.c_str());
} }
record_ = new AudioStream(c, mainloop_, "SFLphone capture", CAPTURE_STREAM, sampleRate_, dev_infos); record_ = new AudioStream(c, mainloop_, "SFLphone capture", CAPTURE_STREAM, sampleRate_, dev_infos);
pa_stream_set_read_callback(record_->pulseStream() , capture_callback, this); pa_stream_set_read_callback(record_->pulseStream() , capture_callback, this);
@ -317,10 +329,12 @@ void PulseLayer::createStreams(pa_context* c)
// Create ringtone stream // Create ringtone stream
dev_infos = getDeviceInfos(sinkList_, ringtoneDevice); dev_infos = getDeviceInfos(sinkList_, ringtoneDevice);
if(dev_infos == NULL) {
if (dev_infos == NULL) {
dev_infos = &sinkList_[0]; dev_infos = &sinkList_[0];
DEBUG("Prefered ringtone device not found in device list, selecting %s instead.", dev_infos->name.c_str()); DEBUG("Prefered ringtone device not found in device list, selecting %s instead.", dev_infos->name.c_str());
} }
ringtone_ = new AudioStream(c, mainloop_, "SFLphone ringtone", RINGTONE_STREAM, sampleRate_, dev_infos); ringtone_ = new AudioStream(c, mainloop_, "SFLphone ringtone", RINGTONE_STREAM, sampleRate_, dev_infos);
pa_stream_set_write_callback(ringtone_->pulseStream(), ringtone_callback, this); pa_stream_set_write_callback(ringtone_->pulseStream(), ringtone_callback, this);
@ -399,16 +413,16 @@ void PulseLayer::writeToSpeaker()
return; return;
size_t writableBytes = ret; size_t writableBytes = ret;
size_t writableSamples = writableBytes/sample_size; const size_t writableSamples = writableBytes / sample_size;
notifyIncomingCall(); notifyIncomingCall();
size_t urgentSamples = urgentRingBuffer_.availableForGet(MainBuffer::DEFAULT_ID); size_t urgentSamples = urgentRingBuffer_.availableForGet(MainBuffer::DEFAULT_ID);
size_t urgentBytes = urgentSamples*sample_size; size_t urgentBytes = urgentSamples * sample_size;
if (urgentSamples > writableSamples) { if (urgentSamples > writableSamples) {
urgentSamples = writableSamples; urgentSamples = writableSamples;
urgentBytes = urgentSamples*sample_size; urgentBytes = urgentSamples * sample_size;
} }
SFLAudioSample *data = 0; SFLAudioSample *data = 0;