slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

QAlsaAudioOutput remove async callback.

Browse Source 
The async callback mechanism in ALSA is prone to deadlock.
There was already a timer fallback mechanism that appears to be
sufficient.

Task-number: QTBUG-39677
Change-Id: I44b59e6b16eea1c9c4eeb6967335ce4f468cf3c4
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
This commit is contained in:
Dyami Caliri
2014-06-17 07:45:34 -07:00
committed by Yoann Lopes
parent a391ad4763
commit a63da4b593
2 changed files with 1 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/alsa/qalsaaudiooutput.h
View File

@@ -107,8 +107,6 @@ public:
private slots:
void userFeed();
void feedback();
void updateAvailable();
bool deviceReady();
signals:
@@ -126,7 +124,6 @@ private:
unsigned int period_time;
snd_pcm_uframes_t buffer_frames;
snd_pcm_uframes_t period_frames;
static void async_callback(snd_async_handler_t *ahandler);
int xrun_recovery(int err);
int setFormat();
@@ -141,7 +138,6 @@ private:
qint64 elapsedTimeOffset;
char* audioBuffer;
snd_pcm_t* handle;
snd_async_handler_t* ahandler;
snd_pcm_access_t access;
snd_pcm_format_t pcmformat;
snd_timestamp_t* timestamp;