mirror of
https://github.com/vdr-projects/vdr.git
synced 2025-03-01 10:50:46 +00:00
177b875945
- Removed leftover LSMOD=... line from 'runvdr'. - Modified the Makefile to copy additional libraries a plugin might provide (suggested by Wayne Keer). See PLUGINS.html for details. - Fixed handling Transfer Mode when replaying Dolby Digital audio and the option '-a' was given (based on a patch from Werner Fink). To avoid having to increment the API version, several #if checks have been introduced around this. These will be removed once the API version actually needs to be incremented. - Fixed deleting the 'skinDescriptions' in cMenuSetupOSD::~cMenuSetupOSD() (thanks to Tobias Grimm). - Fixed calculating the start time of repeated timers with "first day" (thanks to Udo Richter). - Now setting a timer's cached start time to 0 after a call to Skip() (thanks to Udo Richter). - Fixed handling the running status of EPG events in case the "Schedule" menu is currently open (i.e. a write lock on the schedules data can't be achieved). - Fixed handling VPS timers in case the EPG event hasn't been 'seen' in a while. - Fixed calculating the cache size in cUnbufferedFile::Read() (thanks to Artur Skawina). - Removed -fPIC from VDR's and libsi's Makefile (suggested by Prakash Punnoor). - Modifed the device selection to better handle timer conflicts (reported by Christian Wieninger). - Avoiding a compiler warning in libsi's TypeLoop::operator[]. - Now processing the "frequency list descriptor" (based on a patch from Anssi Hannula). - Improved the repeat function for LIRC remote controls (thanks to Joerg Riechardt). - Fixed moving channels, which sometimes stopped the current replay session (reported by Mirko Dölle). - Fixed deleting channels in case the current channel's number changes (reported by Mirko Dölle).
113 lines
2.6 KiB
C
113 lines
2.6 KiB
C
/*
|
|
* audio.c: The basic audio interface
|
|
*
|
|
* See the main source file 'vdr.c' for copyright information and
|
|
* how to reach the author.
|
|
*
|
|
* $Id: audio.c 1.4 2006/05/20 10:02:08 kls Exp $
|
|
*/
|
|
|
|
#include "audio.h"
|
|
#include <stdlib.h>
|
|
// TODO remove the following if APIVERSNUM > 10400
|
|
#include "config.h"
|
|
#if APIVERSNUM != 10400
|
|
#warning ******* API version changed - remove old stuff
|
|
#endif
|
|
// TODO
|
|
#include "dvbdevice.h"
|
|
|
|
// --- cAudio ----------------------------------------------------------------
|
|
|
|
cAudio::cAudio(void)
|
|
{
|
|
Audios.Add(this);
|
|
}
|
|
|
|
cAudio::~cAudio()
|
|
{
|
|
}
|
|
|
|
// --- cAudios ---------------------------------------------------------------
|
|
|
|
cAudios Audios;
|
|
|
|
void cAudios::PlayAudio(const uchar *Data, int Length, uchar Id)
|
|
{
|
|
for (cAudio *audio = First(); audio; audio = Next(audio))
|
|
audio->Play(Data, Length, Id);
|
|
}
|
|
|
|
void cAudios::MuteAudio(bool On)
|
|
{
|
|
for (cAudio *audio = First(); audio; audio = Next(audio))
|
|
audio->Mute(On);
|
|
}
|
|
|
|
void cAudios::ClearAudio(void)
|
|
{
|
|
for (cAudio *audio = First(); audio; audio = Next(audio))
|
|
audio->Clear();
|
|
}
|
|
|
|
// --- cExternalAudio --------------------------------------------------------
|
|
|
|
cExternalAudio::cExternalAudio(const char *Command)
|
|
{
|
|
command = strdup(Command);
|
|
mute = false;
|
|
}
|
|
|
|
cExternalAudio::~cExternalAudio()
|
|
{
|
|
free(command);
|
|
}
|
|
|
|
void cExternalAudio::Play(const uchar *Data, int Length, uchar Id)
|
|
{
|
|
if (command && !mute) {
|
|
if (pipe || pipe.Open(command, "w")) {
|
|
if (0x80 <= Id && Id <= 0x87 || Id == 0xBD) { // AC3
|
|
#if APIVERSNUM == 10400
|
|
extern int cDvbDevice__setTransferModeForDolbyDigital;
|
|
cDvbDevice__setTransferModeForDolbyDigital = 2;
|
|
cDvbDevice::SetTransferModeForDolbyDigital(false);
|
|
#else
|
|
#warning ******* API version changed - remove old stuff
|
|
cDvbDevice::SetTransferModeForDolbyDigital(2);
|
|
#endif
|
|
int written = Data[8] + 9; // skips the PES header
|
|
if (Id != 0xBD)
|
|
written += 4; // skips AC3 bytes
|
|
Length -= written;
|
|
while (Length > 0) {
|
|
int w = fwrite(Data + written, 1, Length, pipe);
|
|
if (w < 0) {
|
|
LOG_ERROR;
|
|
break;
|
|
}
|
|
Length -= w;
|
|
written += w;
|
|
}
|
|
}
|
|
}
|
|
else {
|
|
esyslog("ERROR: can't open pipe to audio command '%s'", command);
|
|
free(command);
|
|
command = NULL;
|
|
}
|
|
}
|
|
}
|
|
|
|
void cExternalAudio::Mute(bool On)
|
|
{
|
|
mute = On;
|
|
if (mute)
|
|
Clear();
|
|
}
|
|
|
|
void cExternalAudio::Clear(void)
|
|
{
|
|
pipe.Close();
|
|
}
|