From 3f468f018f418db7555bd543e1d6483a0953fa60 Mon Sep 17 00:00:00 2001 From: Lars Hanisch Date: Sat, 11 Jan 2014 14:13:53 +0100 Subject: remove FirstChannelSwitch workaround, isn't needed anymore --- device.c | 4 +--- device.h | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/device.c b/device.c index 3de30d3..1a57289 100644 --- a/device.c +++ b/device.c @@ -34,7 +34,6 @@ cPvrDevice::cPvrDevice(int DeviceNumber, cDevice *ParentDevice) isClosing(false), readThreadRunning(false), ChannelSettingsDone(false), - FirstChannelSwitch(true), pvrusb2_ready(true), driver(undef), cardname(UNDEF), @@ -502,7 +501,7 @@ bool cPvrDevice::Tune(int freq) bool cPvrDevice::SetInput(int input) { - if (input == CurrentInput && !FirstChannelSwitch) + if (input == CurrentInput) return true; log(pvrDEBUG1, "cPvrDevice::SetInput on /dev/video%d (%s) to %d", number, CARDNAME[cardname], input); if (IOCTL(v4l2_fd, VIDIOC_S_INPUT, &input) != 0) { @@ -926,7 +925,6 @@ bool cPvrDevice::OpenDvr(void) } //end: switch (newInputType) CurrentInputType = newInputType; ChannelSettingsDone = true; - FirstChannelSwitch = false; } //end: if ((!ChannelSettingsDone) if (CurrentInputType == eTelevision) SetVBImode(newLinesPerFrame, PvrSetup.SliceVBI ? V4L2_MPEG_STREAM_VBI_FMT_IVTV : V4L2_MPEG_STREAM_VBI_FMT_NONE); diff --git a/device.h b/device.h index c689850..fecfade 100644 --- a/device.h +++ b/device.h @@ -106,7 +106,6 @@ private: bool isClosing; bool readThreadRunning; bool ChannelSettingsDone; - bool FirstChannelSwitch; bool pvrusb2_ready; eV4l2Driver driver; eV4l2CardName cardname; -- cgit v1.2.3