mirror of
https://projects.vdr-developer.org/git/vdr-plugin-softhddevice.git
synced 2023-10-10 19:16:51 +02:00
Fix bug: AudioEnqueue crash without sound card.
This commit is contained in:
parent
da5c5cd5fd
commit
3812fa8d38
@ -1,3 +1,8 @@
|
||||
User johns
|
||||
Date:
|
||||
|
||||
Fix bug: AudioEnqueue crash without sound card.
|
||||
|
||||
User johns
|
||||
Date: Sun Mar 4 22:35:36 CET 2012
|
||||
|
||||
|
11
audio.c
11
audio.c
@ -701,7 +701,7 @@ static void AlsaThread(void)
|
||||
*/
|
||||
static void AlsaThreadEnqueue(const void *samples, int count)
|
||||
{
|
||||
if (!AlsaRingBuffer || !AlsaPCMHandle || !AudioSampleRate) {
|
||||
if (!AlsaRingBuffer || !AlsaPCMHandle) {
|
||||
Debug(3, "audio/alsa: enqueue not ready\n");
|
||||
return;
|
||||
}
|
||||
@ -1552,7 +1552,7 @@ static void OssThread(void)
|
||||
*/
|
||||
static void OssThreadEnqueue(const void *samples, int count)
|
||||
{
|
||||
if (!OssRingBuffer || OssPcmFildes == -1 || !AudioSampleRate) {
|
||||
if (!OssRingBuffer || OssPcmFildes == -1) {
|
||||
Debug(3, "audio/oss: enqueue not ready\n");
|
||||
return;
|
||||
}
|
||||
@ -2080,7 +2080,9 @@ static void *AudioPlayHandlerThread(void *dummy)
|
||||
} while (!AudioRunning);
|
||||
|
||||
Debug(3, "audio: ----> %d ms\n", (AudioUsedBytes() * 1000)
|
||||
/ (AudioSampleRate * AudioChannels * AudioBytesProSample));
|
||||
/ (!AudioSampleRate
|
||||
|| !AudioChannels +
|
||||
AudioSampleRate * AudioChannels * AudioBytesProSample));
|
||||
|
||||
pthread_mutex_unlock(&AudioMutex);
|
||||
|
||||
@ -2182,6 +2184,9 @@ static const AudioModule *AudioModules[] = {
|
||||
*/
|
||||
void AudioEnqueue(const void *samples, int count)
|
||||
{
|
||||
if (!AudioSampleRate || !AudioChannels) {
|
||||
return; // not setup
|
||||
}
|
||||
if (0) {
|
||||
static uint32_t last;
|
||||
static uint32_t tick;
|
||||
|
Loading…
Reference in New Issue
Block a user