frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Fixed locking the Channels list in cDisplayChannel, where the lock was still held when Flush() was called

Browse Source
This commit is contained in:
Klaus Schmidinger 2018-05-06 09:41:03 +02:00
parent 820a0ddb8a
commit d380b57d28
3 changed files with 43 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONTRIBUTORS
View File

@ -3316,6 +3316,8 @@ Matthias Senzel <matthias.senzel@t-online.de>
after starting the editing process after starting the editing process
for reporting a problem with setting the initial offset of the cursor in a list menu for reporting a problem with setting the initial offset of the cursor in a list menu
for reporting a high CPU load during replay with active progress display for reporting a high CPU load during replay with active progress display
for reporting that the lock on the Channels list in cDisplayChannel was still held
when Flush() was called
Marek Nazarko <mnazarko@gmail.com> Marek Nazarko <mnazarko@gmail.com>
for translating OSD texts to the Polish language for translating OSD texts to the Polish language

4
HISTORY
View File

@ -9348,7 +9348,7 @@ Video Disk Recorder Revision History
Senzel). Senzel).
- Official release. - Official release.
2018-04-28: Version 2.4.1 2018-05-06: Version 2.4.1
- Fixed handling the tfRecording flag in the SVDRP commands MODT and UPDT (reported - Fixed handling the tfRecording flag in the SVDRP commands MODT and UPDT (reported
by Johann Friedrichs). by Johann Friedrichs).
@ -9359,3 +9359,5 @@ Video Disk Recorder Revision History
been changed to Skins.QueueMessage(), and cSkins::ProcessQueuedMessages() is now called been changed to Skins.QueueMessage(), and cSkins::ProcessQueuedMessages() is now called
unconditionally in the main loop, and checks whether the current cSkinDisplay object unconditionally in the main loop, and checks whether the current cSkinDisplay object
(if any) implements SetMessage(). (if any) implements SetMessage().
- Fixed locking the Channels list in cDisplayChannel, where the lock was still held
when Flush() was called (reported by Matthias Senzel).

71
menu.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: menu.c 4.75 2018/04/28 12:09:45 kls Exp $ * $Id: menu.c 4.76 2018/05/06 09:30:11 kls Exp $
*/ */
#include "menu.h" #include "menu.h"
@ -4626,14 +4626,17 @@ cDisplayChannel::cDisplayChannel(int Number, bool Switched)
cOsdProvider::OsdSizeChanged(osdState); // just to get the current state cOsdProvider::OsdSizeChanged(osdState); // just to get the current state
positioner = NULL; positioner = NULL;
channel = NULL; channel = NULL;
LOCK_CHANNELS_READ; {
channel = Channels->GetByNumber(Number); LOCK_CHANNELS_READ;
lastPresent = lastFollowing = NULL; channel = Channels->GetByNumber(Number);
if (channel) { lastPresent = lastFollowing = NULL;
DisplayChannel(); if (channel) {
DisplayInfo(); DisplayChannel();
DisplayInfo();
}
}
if (channel)
displayChannel->Flush(); displayChannel->Flush();
}
lastTime.Set(); lastTime.Set();
} }
@ -4868,31 +4871,33 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key)
} }
}; };
if (positioner || !timeout || lastTime.Elapsed() < (uint64_t)(Setup.ChannelInfoTime * 1000)) { if (positioner || !timeout || lastTime.Elapsed() < (uint64_t)(Setup.ChannelInfoTime * 1000)) {
LOCK_CHANNELS_READ; {
if (Key == kNone && !number && group < 0 && !NewChannel && channel && channel->Number() != cDevice::CurrentChannel()) { LOCK_CHANNELS_READ;
// makes sure a channel switch through the SVDRP CHAN command is displayed if (Key == kNone && !number && group < 0 && !NewChannel && channel && channel->Number() != cDevice::CurrentChannel()) {
channel = Channels->GetByNumber(cDevice::CurrentChannel()); // makes sure a channel switch through the SVDRP CHAN command is displayed
Refresh(); channel = Channels->GetByNumber(cDevice::CurrentChannel());
lastTime.Set(); Refresh();
} lastTime.Set();
DisplayInfo(); }
if (NewChannel) { DisplayInfo();
SetTrackDescriptions(NewChannel->Number()); // to make them immediately visible in the channel display if (NewChannel) {
Channels->SwitchTo(NewChannel->Number()); SetTrackDescriptions(NewChannel->Number()); // to make them immediately visible in the channel display
SetTrackDescriptions(NewChannel->Number()); // switching the channel has cleared them Channels->SwitchTo(NewChannel->Number());
channel = NewChannel; SetTrackDescriptions(NewChannel->Number()); // switching the channel has cleared them
} channel = NewChannel;
const cPositioner *Positioner = cDevice::ActualDevice()->Positioner(); }
bool PositionerMoving = Positioner && Positioner->IsMoving(); const cPositioner *Positioner = cDevice::ActualDevice()->Positioner();
SetNeedsFastResponse(PositionerMoving); bool PositionerMoving = Positioner && Positioner->IsMoving();
if (!PositionerMoving) { SetNeedsFastResponse(PositionerMoving);
if (positioner) if (!PositionerMoving) {
lastTime.Set(); // to keep the channel display up a few seconds after the target position has been reached if (positioner)
Positioner = NULL; lastTime.Set(); // to keep the channel display up a few seconds after the target position has been reached
} Positioner = NULL;
if (Positioner || positioner) // making sure we call SetPositioner(NULL) if there is a switch from "with" to "without" positioner }
displayChannel->SetPositioner(Positioner); if (Positioner || positioner) // making sure we call SetPositioner(NULL) if there is a switch from "with" to "without" positioner
positioner = Positioner; displayChannel->SetPositioner(Positioner);
positioner = Positioner;
}
displayChannel->Flush(); displayChannel->Flush();
return osContinue; return osContinue;
} }