mirror of
				https://github.com/vdr-projects/vdr.git
				synced 2025-03-01 10:50:46 +00:00 
			
		
		
		
	Fixed channel switching in case of an active 'Transfer Mode' on the primary device
This commit is contained in:
		
							
								
								
									
										2
									
								
								HISTORY
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								HISTORY
									
									
									
									
									
								
							@@ -1637,3 +1637,5 @@ Video Disk Recorder Revision History
 | 
			
		||||
- Fixed switching audio tracks in 'Transfer Mode' on the primary DVB device
 | 
			
		||||
  (thanks to Steffen Barszus and Stefan Huelswitt for reporting this one and
 | 
			
		||||
  helping to fix it).
 | 
			
		||||
- Fixed channel switching in case of an active 'Transfer Mode' on the primary
 | 
			
		||||
  device ('Transfer Mode' is now launched with priority '-1').
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										3
									
								
								device.c
									
									
									
									
									
								
							
							
						
						
									
										3
									
								
								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 1.30 2002/10/26 09:43:11 kls Exp $
 | 
			
		||||
 * $Id: device.c 1.31 2002/10/26 10:23:20 kls Exp $
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
#include "device.h"
 | 
			
		||||
@@ -321,7 +321,6 @@ bool cDevice::SwitchChannel(int Direction)
 | 
			
		||||
  if (Direction) {
 | 
			
		||||
     int n = CurrentChannel() + Direction;
 | 
			
		||||
     int first = n;
 | 
			
		||||
     PrimaryDevice()->StopReplay(); // otherwise a running Transfer Mode would block channels
 | 
			
		||||
     cChannel *channel;
 | 
			
		||||
     while ((channel = Channels.GetByNumber(n, Direction)) != NULL) {
 | 
			
		||||
           // try only channels which are currently available
 | 
			
		||||
 
 | 
			
		||||
@@ -4,7 +4,7 @@
 | 
			
		||||
 * See the main source file 'vdr.c' for copyright information and
 | 
			
		||||
 * how to reach the author.
 | 
			
		||||
 *
 | 
			
		||||
 * $Id: transfer.c 1.5 2002/10/13 16:08:44 kls Exp $
 | 
			
		||||
 * $Id: transfer.c 1.6 2002/10/26 10:17:17 kls Exp $
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
#include "transfer.h"
 | 
			
		||||
@@ -17,7 +17,7 @@
 | 
			
		||||
// --- cTransfer -------------------------------------------------------------
 | 
			
		||||
 | 
			
		||||
cTransfer::cTransfer(int VPid, int APid1, int APid2, int DPid1, int DPid2)
 | 
			
		||||
:cReceiver(0, 0, 5, VPid, APid1, APid2, DPid1, DPid2)
 | 
			
		||||
:cReceiver(0, -1, 5, VPid, APid1, APid2, DPid1, DPid2)
 | 
			
		||||
{
 | 
			
		||||
  ringBuffer = new cRingBufferLinear(VIDEOBUFSIZE, true);
 | 
			
		||||
  remux = new cRemux(VPid, APid1, APid2, DPid1, DPid2);
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user