mirror of
				https://github.com/vdr-projects/vdr.git
				synced 2025-03-01 10:50:46 +00:00 
			
		
		
		
	Fixed cDvbDevice::SetAudioTrackDevice() to avoid a blank screen after switching back to live mode if a recording is currently active on the primary device
This commit is contained in:
		
							
								
								
									
										5
									
								
								HISTORY
									
									
									
									
									
								
							
							
						
						
									
										5
									
								
								HISTORY
									
									
									
									
									
								
							@@ -3373,3 +3373,8 @@ Video Disk Recorder Revision History
 | 
				
			|||||||
  residual data in replay and Transfer Mode (thanks to Werner Fink for pointing this
 | 
					  residual data in replay and Transfer Mode (thanks to Werner Fink for pointing this
 | 
				
			||||||
  out).
 | 
					  out).
 | 
				
			||||||
- Added MPEG1 replay capability to cPesAssembler (thanks to Stefan Huelswitt).
 | 
					- Added MPEG1 replay capability to cPesAssembler (thanks to Stefan Huelswitt).
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					2005-02-08: Version 1.3.21
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					- Fixed cDvbDevice::SetAudioTrackDevice() to avoid a blank screen after switching
 | 
				
			||||||
 | 
					  back to live mode if a recording is currently active on the primary device.
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										6
									
								
								config.h
									
									
									
									
									
								
							
							
						
						
									
										6
									
								
								config.h
									
									
									
									
									
								
							@@ -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: config.h 1.212 2005/02/05 10:43:22 kls Exp $
 | 
					 * $Id: config.h 1.213 2005/02/08 11:22:14 kls Exp $
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#ifndef __CONFIG_H
 | 
					#ifndef __CONFIG_H
 | 
				
			||||||
@@ -20,8 +20,8 @@
 | 
				
			|||||||
#include "i18n.h"
 | 
					#include "i18n.h"
 | 
				
			||||||
#include "tools.h"
 | 
					#include "tools.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define VDRVERSION  "1.3.20"
 | 
					#define VDRVERSION  "1.3.21"
 | 
				
			||||||
#define VDRVERSNUM   10320  // Version * 10000 + Major * 100 + Minor
 | 
					#define VDRVERSNUM   10321  // Version * 10000 + Major * 100 + Minor
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define MAXPRIORITY 99
 | 
					#define MAXPRIORITY 99
 | 
				
			||||||
#define MAXLIFETIME 99
 | 
					#define MAXLIFETIME 99
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -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: dvbdevice.c 1.117 2005/02/06 12:30:14 kls Exp $
 | 
					 * $Id: dvbdevice.c 1.118 2005/02/08 11:20:30 kls Exp $
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "dvbdevice.h"
 | 
					#include "dvbdevice.h"
 | 
				
			||||||
@@ -866,8 +866,10 @@ void cDvbDevice::SetAudioTrackDevice(eTrackType Type)
 | 
				
			|||||||
  const tTrackId *TrackId = GetTrack(Type);
 | 
					  const tTrackId *TrackId = GetTrack(Type);
 | 
				
			||||||
  if (TrackId && TrackId->id) {
 | 
					  if (TrackId && TrackId->id) {
 | 
				
			||||||
     if (IS_AUDIO_TRACK(Type)) {
 | 
					     if (IS_AUDIO_TRACK(Type)) {
 | 
				
			||||||
        pidHandles[ptAudio].pid = TrackId->id;
 | 
					        if (pidHandles[ptAudio].pid) {
 | 
				
			||||||
        SetPid(&pidHandles[ptAudio], ptAudio, true);
 | 
					           pidHandles[ptAudio].pid = TrackId->id;
 | 
				
			||||||
 | 
					           SetPid(&pidHandles[ptAudio], ptAudio, true);
 | 
				
			||||||
 | 
					           }
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
     else if (IS_DOLBY_TRACK(Type)) {
 | 
					     else if (IS_DOLBY_TRACK(Type)) {
 | 
				
			||||||
        // Currently this works only in Transfer Mode
 | 
					        // Currently this works only in Transfer Mode
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user