diff options
| -rw-r--r-- | pvrinput.c | 10 | ||||
| -rw-r--r-- | udev.c | 12 |
2 files changed, 14 insertions, 8 deletions
@@ -6,7 +6,7 @@ #endif #endif -static const char *VERSION = "2014-01-11"; +static const char *VERSION = "2015-11-07"; static const char *DESCRIPTION = tr("use Hauppauge PVR as input device"); static const char *MAINMENUENTRY = tr("PVR picture settings"); @@ -86,7 +86,13 @@ const char *cPluginPvrInput::MainMenuEntry(void) cOsdObject *cPluginPvrInput::MainMenuAction(void) { - cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel()); +#if VDRVERSNUM > 20300 + LOCK_CHANNELS_READ + const cChannels *vdrchannels = Channels; +#else + cChannels *vdrchannels = &Channels; +#endif + const cChannel *channel = vdrchannels->GetByNumber(cDevice::CurrentChannel()); #if VDRVERSNUM < 10713 if (channel && channel->IsPlug()) return new cPvrMenuMain(); @@ -79,14 +79,14 @@ pvrinput::cUdevListEntry *pvrinput::cUdevDevice::GetDevlinksList(void) const const char *pvrinput::cUdevDevice::GetDevnode(void) const { if (device == NULL) - return false; + return NULL; return udev_device_get_devnode(device); } const char *pvrinput::cUdevDevice::GetDevpath(void) const { if (device == NULL) - return false; + return NULL; return udev_device_get_devpath(device); } @@ -103,28 +103,28 @@ pvrinput::cUdevDevice *pvrinput::cUdevDevice::GetParent(void) const const char *pvrinput::cUdevDevice::GetPropertyValue(const char *Key) const { if (device == NULL) - return false; + return NULL; return udev_device_get_property_value(device, Key); } const char *pvrinput::cUdevDevice::GetSubsystem(void) const { if (device == NULL) - return false; + return NULL; return udev_device_get_subsystem(device); } const char *pvrinput::cUdevDevice::GetSysname(void) const { if (device == NULL) - return false; + return NULL; return udev_device_get_sysname(device); } const char *pvrinput::cUdevDevice::GetSyspath(void) const { if (device == NULL) - return false; + return NULL; return udev_device_get_syspath(device); } |