diff options
| author | scop <scop> | 2005-04-19 18:22:06 +0000 |
|---|---|---|
| committer | scop <scop> | 2005-04-19 18:22:06 +0000 |
| commit | 27a7e3d8157ef93db69b02bc5a187c20013986cb (patch) | |
| tree | a409637a94ac3e01b07a7cbc707a77a578ff1453 /patches | |
| parent | f9c59e544ada17055c3ed15b3d80f0d285c3928d (diff) | |
| download | vdr-plugin-dxr3-27a7e3d8157ef93db69b02bc5a187c20013986cb.tar.gz vdr-plugin-dxr3-27a7e3d8157ef93db69b02bc5a187c20013986cb.tar.bz2 | |
Rediff.
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/vdr-dxr3-wss.patch | 65 |
1 files changed, 35 insertions, 30 deletions
diff --git a/patches/vdr-dxr3-wss.patch b/patches/vdr-dxr3-wss.patch index 097d496..c257e87 100644 --- a/patches/vdr-dxr3-wss.patch +++ b/patches/vdr-dxr3-wss.patch @@ -8,42 +8,47 @@ Note: you'll probably want to apply em8300-adv7170-wss.patch too Index: dxr3interface.c =================================================================== RCS file: /cvsroot/dxr3plugin/dxr3/dxr3interface.c,v -retrieving revision 1.4.2.10 -diff -u -r1.4.2.10 dxr3interface.c ---- dxr3interface.c 23 Mar 2005 18:33:57 -0000 1.4.2.10 -+++ dxr3interface.c 23 Mar 2005 19:48:35 -0000 -@@ -489,18 +489,32 @@ - void cDxr3Interface::SetAspectRatio(uint32_t ratio) +retrieving revision 1.4.2.19 +diff -u -r1.4.2.19 dxr3interface.c +--- dxr3interface.c 19 Apr 2005 18:19:37 -0000 1.4.2.19 ++++ dxr3interface.c 19 Apr 2005 18:20:02 -0000 +@@ -497,20 +497,36 @@ + void cDxr3Interface::SetAspectRatio(uint32_t ratio) { static int requestCounter = 0; + int wssmode; + int aspect; - + Lock(); - if (cDxr3ConfigData::Instance().GetForceLetterBox()) ratio = EM8300_ASPECTRATIO_16_9; -- if (Setup.VideoFormat) ratio = EM8300_ASPECTRATIO_4_3; + if (cDxr3ConfigData::Instance().GetForceLetterBox()) + ratio = EM8300_ASPECTRATIO_16_9; +- if (Setup.VideoFormat) +- ratio = EM8300_ASPECTRATIO_4_3; - if (!m_ExternalReleased && ratio != UNKNOWN_ASPECT_RATIO) - { - if (ratio != m_aspectRatio && requestCounter > 50) - { -+ if (Setup.VideoFormat) -+ { -+ aspect = EM8300_ASPECTRATIO_4_3; + if (!m_ExternalReleased && ratio != UNKNOWN_ASPECT_RATIO) + { + if (ratio != m_aspectRatio && requestCounter > 50) + { ++ if (Setup.VideoFormat) ++ { ++ aspect = EM8300_ASPECTRATIO_4_3; +#ifdef EM8300_IOCTL_SET_WSS -+ if (ratio == EM8300_ASPECTRATIO_16_9) -+ wssmode = EM8300_WSS_16_9; -+ else -+ wssmode = EM8300_WSS_OFF; -+ ioctl(m_fdControl, EM8300_IOCTL_SET_WSS, &wssmode); ++ if (ratio == EM8300_ASPECTRATIO_16_9) ++ wssmode = EM8300_WSS_16_9; ++ else ++ wssmode = EM8300_WSS_OFF; ++ ioctl(m_fdControl, EM8300_IOCTL_SET_WSS, &wssmode); +#endif -+ } -+ else -+ aspect = ratio; - requestCounter = 0; -- if (ioctl(m_fdControl, EM8300_IOCTL_SET_ASPECTRATIO, &ratio) < 0) -+ if (ioctl(m_fdControl, EM8300_IOCTL_SET_ASPECTRATIO, &aspect) < 0) - { - cLog::Instance() << "cDxr3AbsDevice::SetAspectRatio Unable to set aspect ratio\n"; - } ++ } ++ else ++ { ++ aspect = ratio; ++ } ++ + requestCounter = 0; +- if (ioctl(m_fdControl, EM8300_IOCTL_SET_ASPECTRATIO, &ratio) < 0) ++ if (ioctl(m_fdControl, EM8300_IOCTL_SET_ASPECTRATIO, &aspect) < 0) + { + cLog::Instance() << "cDxr3AbsDevice::SetAspectRatio Unable to set aspect ratio\n"; + } |