diff options
| author | Christian Gmeiner <christian.gmeiner@gmail.com> | 2009-01-11 13:04:17 +0100 |
|---|---|---|
| committer | Christian Gmeiner <christian.gmeiner@gmail.com> | 2009-01-11 13:04:17 +0100 |
| commit | 0040b84139b6f08f08f696c3c91dde9bc0cf2f86 (patch) | |
| tree | 6bc890c82632667cf35a7180ba0cbdcd513beabe /dxr3interface.c | |
| parent | e752053e52c3205beb418a22f614cb0fefe352fd (diff) | |
| download | vdr-plugin-dxr3-0040b84139b6f08f08f696c3c91dde9bc0cf2f86.tar.gz vdr-plugin-dxr3-0040b84139b6f08f08f696c3c91dde9bc0cf2f86.tar.bz2 | |
simplify Dxr3Open
We dont need to give the used cardnum as param for Dxr3Open, as Dxr3Open
will get the used cardnum by its own.
Diffstat (limited to 'dxr3interface.c')
| -rw-r--r-- | dxr3interface.c | 51 |
1 files changed, 9 insertions, 42 deletions
diff --git a/dxr3interface.c b/dxr3interface.c index 9a10035..91d6601 100644 --- a/dxr3interface.c +++ b/dxr3interface.c @@ -42,29 +42,6 @@ static const char *DEV_DXR3_OSS = "_ma"; static const char *DEV_DXR3_CONT = ""; // ================================== -//! helper function to generate name -static const char *Dxr3Name(const char *Name, int n) -{ - static char buffer[PATH_MAX]; - snprintf(buffer, sizeof(buffer), "/dev/em8300%s-%d", Name, n); - return buffer; -} - -// ================================== -//! helper function to open card #n -static int Dxr3Open(const char *Name, int n, int Mode) -{ - const char *FileName = Dxr3Name(Name, n); - int fd = open(FileName, Mode); - - if (fd == -1) - { - esyslog("dxr3: unable to open %s: %m", FileName); - } - return fd; -} - -// ================================== //! constructor cDxr3Interface::cDxr3Interface() : m_fdControl(-1), m_fdVideo(-1), m_fdAudio(-1), m_fdSpu(-1) @@ -674,8 +651,7 @@ void cDxr3Interface::PlayAudioLpcmFrame(uint8_t* pBuf, int length) void cDxr3Interface::ClaimDevices() { // open control stream - m_fdControl = Dxr3Open(DEV_DXR3_CONT, cDxr3ConfigData::Instance().GetDxr3Card(), - O_WRONLY | O_SYNC); + m_fdControl = Dxr3Open(DEV_DXR3_CONT, O_WRONLY | O_SYNC); if (m_fdControl == -1) { esyslog("dxr3: please verify that the em8300 modules are loaded"); @@ -686,12 +662,9 @@ void cDxr3Interface::ClaimDevices() UploadMicroCode(); ///< open multimedia streams - m_fdVideo = Dxr3Open(DEV_DXR3_VIDEO, cDxr3ConfigData::Instance().GetDxr3Card(), - O_WRONLY | O_SYNC); - m_fdAudio = Dxr3Open(DEV_DXR3_OSS, cDxr3ConfigData::Instance().GetDxr3Card(), - O_WRONLY | O_SYNC); - m_fdSpu = Dxr3Open(DEV_DXR3_OSD, cDxr3ConfigData::Instance().GetDxr3Card(), - O_WRONLY | O_SYNC); + m_fdVideo = Dxr3Open(DEV_DXR3_VIDEO, O_WRONLY | O_SYNC); + m_fdAudio = Dxr3Open(DEV_DXR3_OSS, O_WRONLY | O_SYNC); + m_fdSpu = Dxr3Open(DEV_DXR3_OSD, O_WRONLY | O_SYNC); // everything ok? if (m_fdVideo == -1 || m_fdAudio == -1 || m_fdSpu == -1) @@ -791,16 +764,12 @@ void cDxr3Interface::ExternalReopenDevices() if (m_ExternalReleased) { // open control stream - m_fdControl = Dxr3Open(DEV_DXR3_CONT, cDxr3ConfigData::Instance().GetDxr3Card(), - O_WRONLY | O_SYNC); + m_fdControl = Dxr3Open(DEV_DXR3_CONT, O_WRONLY | O_SYNC); // open 'multimedia' streams - m_fdVideo = Dxr3Open(DEV_DXR3_VIDEO, cDxr3ConfigData::Instance().GetDxr3Card(), - O_WRONLY | O_SYNC); - m_fdAudio = Dxr3Open(DEV_DXR3_OSS, cDxr3ConfigData::Instance().GetDxr3Card(), - O_WRONLY | O_SYNC); - m_fdSpu = Dxr3Open(DEV_DXR3_OSD, cDxr3ConfigData::Instance().GetDxr3Card(), - O_WRONLY | O_SYNC); + m_fdVideo = Dxr3Open(DEV_DXR3_VIDEO, O_WRONLY | O_SYNC); + m_fdAudio = Dxr3Open(DEV_DXR3_OSS, O_WRONLY | O_SYNC); + m_fdSpu = Dxr3Open(DEV_DXR3_OSD, O_WRONLY | O_SYNC); if (m_fdControl == -1 || m_fdVideo == -1 || m_fdAudio == -1 || m_fdSpu == -1) @@ -870,9 +839,7 @@ void cDxr3Interface::ReOpenAudio() delete m_pClock; close(m_fdAudio); - m_fdAudio = Dxr3Open("_ma", - cDxr3ConfigData::Instance().GetDxr3Card(), - O_WRONLY | O_SYNC); + m_fdAudio = Dxr3Open(DEV_DXR3_OSS, O_WRONLY | O_SYNC); uint32_t tmpAudioDataRate = m_audioDataRate; uint32_t tmpAudioChannelCount = m_audioChannelCount; |