mirror of
				https://github.com/jojo61/vdr-plugin-softhdcuvid.git
				synced 2025-03-01 10:39:28 +00:00 
			
		
		
		
	Fix Audio for NUC11
This commit is contained in:
		
							
								
								
									
										19
									
								
								audio.c
									
									
									
									
									
								
							
							
						
						
									
										19
									
								
								audio.c
									
									
									
									
									
								
							@@ -1951,7 +1951,7 @@ void AudioSetVolume(int volume) {
 | 
				
			|||||||
    }
 | 
					    }
 | 
				
			||||||
    AudioAmplifier = volume;
 | 
					    AudioAmplifier = volume;
 | 
				
			||||||
    if (!AudioSoftVolume) {
 | 
					    if (!AudioSoftVolume) {
 | 
				
			||||||
        AudioUsedModule->SetVolume(volume);
 | 
					        //AudioUsedModule->SetVolume(volume);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -2173,6 +2173,22 @@ found:
 | 
				
			|||||||
    AudioDoingInit = 1;
 | 
					    AudioDoingInit = 1;
 | 
				
			||||||
    AudioRingInit();
 | 
					    AudioRingInit();
 | 
				
			||||||
    AudioUsedModule->Init();
 | 
					    AudioUsedModule->Init();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#if 1
 | 
				
			||||||
 | 
					    for (u = 0; u < AudioRatesMax; ++u) {
 | 
				
			||||||
 | 
					       
 | 
				
			||||||
 | 
					        AudioChannelMatrix[u][1]=AudioChannelMatrix[u][2]=AudioChannelMatrix[u][3]=AudioChannelMatrix[u][4]=\
 | 
				
			||||||
 | 
					        AudioChannelMatrix[u][5]=AudioChannelMatrix[u][6]=AudioChannelMatrix[u][7]=AudioChannelMatrix[u][8]=2;
 | 
				
			||||||
 | 
					        //printf("audio: %6dHz supports %d %d %d %d %d %d %d %d channels\n", AudioRatesTable[u],
 | 
				
			||||||
 | 
					        //    AudioChannelMatrix[u][1], AudioChannelMatrix[u][2], AudioChannelMatrix[u][3], AudioChannelMatrix[u][4],
 | 
				
			||||||
 | 
					        //    AudioChannelMatrix[u][5], AudioChannelMatrix[u][6], AudioChannelMatrix[u][7], AudioChannelMatrix[u][8]);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    AudioChannelsInHw[1]=AudioChannelsInHw[3]=AudioChannelsInHw[4]=AudioChannelsInHw[5]=AudioChannelsInHw[6]=AudioChannelsInHw[7]=AudioChannelsInHw[8]=0;
 | 
				
			||||||
 | 
					    AudioChannelsInHw[2]=2;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#else
 | 
				
			||||||
    //
 | 
					    //
 | 
				
			||||||
    //	Check which channels/rates/formats are supported
 | 
					    //	Check which channels/rates/formats are supported
 | 
				
			||||||
    //	FIXME: we force 44.1Khz and 48Khz must be supported equal
 | 
					    //	FIXME: we force 44.1Khz and 48Khz must be supported equal
 | 
				
			||||||
@@ -2294,6 +2310,7 @@ found:
 | 
				
			|||||||
             AudioChannelMatrix[u][1], AudioChannelMatrix[u][2], AudioChannelMatrix[u][3], AudioChannelMatrix[u][4],
 | 
					             AudioChannelMatrix[u][1], AudioChannelMatrix[u][2], AudioChannelMatrix[u][3], AudioChannelMatrix[u][4],
 | 
				
			||||||
             AudioChannelMatrix[u][5], AudioChannelMatrix[u][6], AudioChannelMatrix[u][7], AudioChannelMatrix[u][8]);
 | 
					             AudioChannelMatrix[u][5], AudioChannelMatrix[u][6], AudioChannelMatrix[u][7], AudioChannelMatrix[u][8]);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
#ifdef USE_AUDIO_THREAD
 | 
					#ifdef USE_AUDIO_THREAD
 | 
				
			||||||
    if (AudioUsedModule->Thread) { // supports threads
 | 
					    if (AudioUsedModule->Thread) { // supports threads
 | 
				
			||||||
        AudioInitThread();
 | 
					        AudioInitThread();
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -61,7 +61,7 @@ extern void ToggleLUT();
 | 
				
			|||||||
/// vdr-plugin version number.
 | 
					/// vdr-plugin version number.
 | 
				
			||||||
/// Makefile extracts the version number for generating the file name
 | 
					/// Makefile extracts the version number for generating the file name
 | 
				
			||||||
/// for the distribution archive.
 | 
					/// for the distribution archive.
 | 
				
			||||||
static const char *const VERSION = "3.7.1"
 | 
					static const char *const VERSION = "3.7.2"
 | 
				
			||||||
#ifdef GIT_REV
 | 
					#ifdef GIT_REV
 | 
				
			||||||
                                   "-GIT" GIT_REV
 | 
					                                   "-GIT" GIT_REV
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user