mirror of
				https://github.com/vdr-projects/vdr.git
				synced 2025-03-01 10:50:46 +00:00 
			
		
		
		
	Fixed determining the priority of the primary device in case it is neither replaying nor receiving a live channel
This commit is contained in:
		
							
								
								
									
										2
									
								
								HISTORY
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								HISTORY
									
									
									
									
									
								
							@@ -7629,3 +7629,5 @@ Video Disk Recorder Revision History
 | 
			
		||||
- Added '-p' to the cp command in the install-conf target of the Makefile (thanks to
 | 
			
		||||
  Ville Skytt<74>).
 | 
			
		||||
- Added missing 'const' to cDevice::HasProgramme() and cDevice::HasLock().
 | 
			
		||||
- Fixed determining the priority of the primary device in case it is neither replaying
 | 
			
		||||
  nor receiving a live channel.
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										4
									
								
								device.c
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								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.72 2013/02/16 13:05:06 kls Exp $
 | 
			
		||||
 * $Id: device.c 2.73 2013/02/16 14:39:30 kls Exp $
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
#include "device.h"
 | 
			
		||||
@@ -1537,7 +1537,7 @@ int cDevice::PlayTs(const uchar *Data, int Length, bool VideoOnly)
 | 
			
		||||
int cDevice::Priority(void) const
 | 
			
		||||
{
 | 
			
		||||
  int priority = IDLEPRIORITY;
 | 
			
		||||
  if (IsPrimaryDevice() && !Replaying() && ActualDevice() == PrimaryDevice())
 | 
			
		||||
  if (IsPrimaryDevice() && !Replaying() && HasProgramme())
 | 
			
		||||
     priority = TRANSFERPRIORITY; // we use the same value here, no matter whether it's actual Transfer Mode or real live viewing
 | 
			
		||||
  cMutexLock MutexLock(&mutexReceiver);
 | 
			
		||||
  for (int i = 0; i < MAXRECEIVERS; i++) {
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user