diff options
| author | Christian Gmeiner <christian.gmeiner@gmail.com> | 2009-10-16 13:14:45 +0200 |
|---|---|---|
| committer | Christian Gmeiner <christian.gmeiner@gmail.com> | 2009-10-16 13:14:45 +0200 |
| commit | aabe7bd5eac3bd7d467a57b9a8ef3b66d2b07556 (patch) | |
| tree | 74ac78f9d4631f2160eff9b51432ea29f3d33085 | |
| parent | 870cd860523cbedcbc84cdf924a30f24fbdb23ce (diff) | |
| download | vdr-plugin-dxr3-aabe7bd5eac3bd7d467a57b9a8ef3b66d2b07556.tar.gz vdr-plugin-dxr3-aabe7bd5eac3bd7d467a57b9a8ef3b66d2b07556.tar.bz2 | |
simplify en/disabling of the spu unit
| -rw-r--r-- | dxr3interface.c | 25 | ||||
| -rw-r--r-- | dxr3interface.h | 1 |
2 files changed, 2 insertions, 24 deletions
diff --git a/dxr3interface.c b/dxr3interface.c index 16f151d..a0cd6e9 100644 --- a/dxr3interface.c +++ b/dxr3interface.c @@ -128,17 +128,7 @@ void cDxr3Interface::EnableSPU() Lock(); - if (m_spuMode != ioval) - { - if (ioctl(m_fdControl, EM8300_IOCTL_SET_SPUMODE, &ioval) == -1) - { - esyslog("dxr3: unable to enable subpicture mode: %m"); - } - else - { - m_spuMode = ioval; - } - } + CHECK(ioctl(m_fdControl, EM8300_IOCTL_SET_SPUMODE, &ioval)); Unlock(); } @@ -151,17 +141,7 @@ void cDxr3Interface::DisableSPU() Lock(); - if (m_spuMode != ioval) - { - if (ioctl(m_fdControl, EM8300_IOCTL_SET_SPUMODE, &ioval) == -1) - { - esyslog("dxr3: unable to disable subpicture mode: %m"); - } - else - { - m_spuMode = ioval; - } - } + CHECK(ioctl(m_fdControl, EM8300_IOCTL_SET_SPUMODE, &ioval)); Unlock(); } @@ -423,7 +403,6 @@ void cDxr3Interface::ClaimDevices() m_horizontal = 720; m_vertical = 576; m_aspectRatio = UNKNOWN_ASPECT_RATIO; - m_spuMode = EM8300_SPUMODE_OFF; // configure device based on settings ConfigureDevice(); diff --git a/dxr3interface.h b/dxr3interface.h index 1c76d2a..d19f02a 100644 --- a/dxr3interface.h +++ b/dxr3interface.h @@ -151,7 +151,6 @@ private: uint32_t m_aspectRatio; ///< current used aspect ratio uint32_t m_horizontal; ///< horizontal size of current videostream uint32_t m_vertical; ///< vertical size of current videostream - uint32_t m_spuMode; bool m_AudioActive; ///< is audio active? bool m_VideoActive; ///< is video active? |