diff --git a/HISTORY b/HISTORY index ea1ec5f1..4c4044da 100644 --- a/HISTORY +++ b/HISTORY @@ -6875,3 +6875,5 @@ Video Disk Recorder Revision History - Added some missing 'const' to cDevice (thanks to Joachim Wilke). - Fixed handling the PrimaryLimit when requesting a device for live viewing (reported by Uwe Scheffler). +- Removed superfluous calls to SetVideoFormat() from device constructors. This + function is called in cDevice::SetPrimaryDevice(), anyway. diff --git a/PLUGINS/src/dvbsddevice/dvbsdffdevice.c b/PLUGINS/src/dvbsddevice/dvbsdffdevice.c index 17f842b6..cc6af339 100644 --- a/PLUGINS/src/dvbsddevice/dvbsdffdevice.c +++ b/PLUGINS/src/dvbsddevice/dvbsdffdevice.c @@ -3,7 +3,7 @@ * * See the README file for copyright information and how to reach the author. * - * $Id: dvbsdffdevice.c 2.30 2011/08/27 11:33:57 kls Exp $ + * $Id: dvbsdffdevice.c 2.31 2012/02/15 13:15:05 kls Exp $ */ #include "dvbsdffdevice.h" @@ -66,10 +66,6 @@ cDvbSdFfDevice::cDvbSdFfDevice(int Adapter, int Frontend, bool OutputOnly) fclose(f); } devVideoIndex = devVideoOffset >= 0 ? devVideoOffset++ : -1; - - // Video format: - - SetVideoFormat(Setup.VideoFormat); } cDvbSdFfDevice::~cDvbSdFfDevice() diff --git a/device.c b/device.c index 04cc7b5a..526f867f 100644 --- a/device.c +++ b/device.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: device.c 2.48 2012/02/15 12:14:32 kls Exp $ + * $Id: device.c 2.49 2012/02/15 13:15:19 kls Exp $ */ #include "device.h" @@ -82,8 +82,6 @@ cDevice::cDevice(void) SetDescription("receiver on device %d", CardIndex() + 1); - SetVideoFormat(Setup.VideoFormat); - mute = false; volume = Setup.CurrentVolume;