diff options
| author | Johns <johns98@gmx.net> | 2012-01-03 21:31:03 +0100 |
|---|---|---|
| committer | Johns <johns98@gmx.net> | 2012-01-03 21:42:39 +0100 |
| commit | c8e70ec0fe3cda6f9421d45cf180c6ed3d1d052c (patch) | |
| tree | 9da896eaa684fd53131006ef8c0f2c6ff95b0bba /softhddevice.cpp | |
| parent | 5546354cc7051c2d01d153d69e472c609b3e33ab (diff) | |
| download | vdr-plugin-softhddevice-c8e70ec0fe3cda6f9421d45cf180c6ed3d1d052c.tar.gz vdr-plugin-softhddevice-c8e70ec0fe3cda6f9421d45cf180c6ed3d1d052c.tar.bz2 | |
Audio update.
Alsa: report needed down sampling of 3/5/6 to 2 channels.
Moved alsa code into alsa module.
Initial OSS output support.
Diffstat (limited to 'softhddevice.cpp')
| -rw-r--r-- | softhddevice.cpp | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/softhddevice.cpp b/softhddevice.cpp index 5f048b0..97cb12a 100644 --- a/softhddevice.cpp +++ b/softhddevice.cpp @@ -35,6 +35,7 @@ #include "softhddevice.h" extern "C" { #include "video.h" + extern void AudioPoller(void); } ////////////////////////////////////////////////////////////////////////////// @@ -332,6 +333,9 @@ class cSoftHdDevice:public cDevice virtual void GetOsdSize(int &, int &, double &); virtual int PlayVideo(const uchar *, int); //virtual int PlayTsVideo(const uchar *, int); +#ifdef USE_OSS // FIXME: testing only oss + virtual int PlayTsAudio(const uchar *, int); +#endif virtual void SetAudioChannelDevice(int); virtual int GetAudioChannelDevice(void); virtual void SetDigitalAudioDevice(bool); @@ -569,6 +573,20 @@ int cSoftHdDevice::PlayTsVideo(const uchar * Data, int Length) } #endif +#ifdef USE_OSS // FIXME: testing only oss +/// +/// Play a TS audio packet. +/// +/// misuse this function as audio poller +/// +int cSoftHdDevice::PlayTsAudio(const uchar * data, int length) +{ + AudioPoller(); + + return cDevice::PlayTsAudio(data,length); +} +#endif + uchar *cSoftHdDevice::GrabImage(int &size, bool jpeg, int quality, int sizex, int sizey) { |