From 109586571a3cd6b011b6c2e348e3403a0d37c081 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sat, 28 Apr 2012 10:56:05 +0200 Subject: [PATCH] cControl::Control() now has an additional boolean parameter, which can be set to true to get the current player control even if it is hidden --- HISTORY | 4 +++- player.c | 6 +++--- player.h | 7 +++++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/HISTORY b/HISTORY index 86ead1fa..fff94671 100644 --- a/HISTORY +++ b/HISTORY @@ -7052,7 +7052,7 @@ Video Disk Recorder Revision History - Fixed handling IDLEPRIORITY in cDvbDevice::ProvidesChannel() (thanks to Frank Schmirler). -2012-04-26: Version 1.7.28 +2012-04-28: Version 1.7.28 - Fixed cPixmapMemory::DrawEllipse() for quadrants -1 and -4. - Fixed getting the maximum short channel name length in case there are no short names @@ -7089,3 +7089,5 @@ Video Disk Recorder Revision History function if no buffer has been allocated (reported by Marcus Roscher). - Fixed the SVDRP command UPDR, which didn't update the global recordings list (reported by Lars Hanisch). +- cControl::Control() now has an additional boolean parameter, which can be set to + true to get the current player control even if it is hidden. diff --git a/player.c b/player.c index c96fc1ab..fa4235c8 100644 --- a/player.c +++ b/player.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: player.c 1.12 2007/07/20 15:25:24 kls Exp $ + * $Id: player.c 2.1 2012/04/28 10:56:00 kls Exp $ */ #include "player.h" @@ -60,10 +60,10 @@ cOsdObject *cControl::GetInfo(void) return NULL; } -cControl *cControl::Control(void) +cControl *cControl::Control(bool Hidden) { cMutexLock MutexLock(&mutex); - return (control && !control->hidden) ? control : NULL; + return (control && (!control->hidden || Hidden)) ? control : NULL; } void cControl::Launch(cControl *Control) diff --git a/player.h b/player.h index 77d00d5e..c38c7d7d 100644 --- a/player.h +++ b/player.h @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: player.h 2.4 2009/03/08 12:29:10 kls Exp $ + * $Id: player.h 2.5 2012/04/28 10:56:00 kls Exp $ */ #ifndef __PLAYER_H @@ -92,7 +92,10 @@ public: static void Launch(cControl *Control); static void Attach(void); static void Shutdown(void); - static cControl *Control(void); + static cControl *Control(bool Hidden = false); + ///< Returns the current replay control (if any) in case it is currently + ///< visible. If Hidden is true, the control will be returned even if it is + ///< currently hidden. }; #endif //__PLAYER_H