Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-05-28 22:52:37 +02:00
Code Issues Projects Releases Wiki Activity

2018-03-18 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Updated switch() statement formatting in 'rdhpi/'.
This commit is contained in:
Fred Gleason 2018-03-18 10:56:34 -04:00
parent 25e9d6fb28
commit c1fc523072
4 changed files with 317 additions and 325 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -16612,3 +16612,5 @@
* Incremented the package version to 2.19.0. * Incremented the package version to 2.19.0.
2018-03-17 Fred Gleason <fredg@paravelsystems.com> 2018-03-17 Fred Gleason <fredg@paravelsystems.com>
* Added support for DMA bus-mastering to the HPI driver. * Added support for DMA bus-mastering to the HPI driver.
2018-03-18 Fred Gleason <fredg@paravelsystems.com>
* Updated switch() statement formatting in 'rdhpi/'.

333
rdhpi/rdhpiplaystream.cpp
View File

@ -141,26 +141,26 @@ QString RDHPIPlayStream::errorString(RDHPIPlayStream::Error err)
QString str; QString str;
switch(err) { switch(err) {
case RDHPIPlayStream::Ok: case RDHPIPlayStream::Ok:
return QString(tr("Ok")); return QString(tr("Ok"));
break; break;
case RDHPIPlayStream::NoFile: case RDHPIPlayStream::NoFile:
return QString(tr("No such file or directory")); return QString(tr("No such file or directory"));
break; break;
case RDHPIPlayStream::NoStream: case RDHPIPlayStream::NoStream:
return QString(tr("No output stream available")); return QString(tr("No output stream available"));
break; break;
case RDHPIPlayStream::AlreadyOpen: case RDHPIPlayStream::AlreadyOpen:
return QString(tr("Stream is already open")); return QString(tr("Stream is already open"));
break; break;
default: default:
str=QString(tr("Unknown Error:")); str=QString(tr("Unknown Error:"));
return QString().sprintf("%s %d\n",(const char *)str,err); return QString().sprintf("%s %d\n",(const char *)str,err);
break; break;
} }
} }
@ -206,54 +206,44 @@ bool RDHPIPlayStream::formatSupported(RDWaveFile::Format format)
hostream=hpi_stream; hostream=hpi_stream;
} }
switch(format) { switch(format) {
case RDWaveFile::Pcm16: case RDWaveFile::Pcm16:
LogHpi(HPI_FormatCreate(&hpi_format,getChannels(), LogHpi(HPI_FormatCreate(&hpi_format,getChannels(),
HPI_FORMAT_PCM16_SIGNED, HPI_FORMAT_PCM16_SIGNED,
getSamplesPerSec(),getHeadBitRate(),0), getSamplesPerSec(),getHeadBitRate(),0),__LINE__);
__LINE__); state=LogHpi(HPI_OutStreamQueryFormat(NULL,hostream,&hpi_format),__LINE__);
state=LogHpi(HPI_OutStreamQueryFormat(NULL,hostream,&hpi_format), break;
__LINE__);
break;
case RDWaveFile::Pcm24: case RDWaveFile::Pcm24:
LogHpi(HPI_FormatCreate(&hpi_format,getChannels(), LogHpi(HPI_FormatCreate(&hpi_format,getChannels(),
HPI_FORMAT_PCM24_SIGNED, HPI_FORMAT_PCM24_SIGNED,
getSamplesPerSec(),getHeadBitRate(),0), getSamplesPerSec(),getHeadBitRate(),0),__LINE__);
__LINE__); state=LogHpi(HPI_OutStreamQueryFormat(NULL,hostream,&hpi_format),__LINE__);
state=LogHpi(HPI_OutStreamQueryFormat(NULL,hostream,&hpi_format), break;
__LINE__);
break;
case RDWaveFile::MpegL1: case RDWaveFile::MpegL1:
LogHpi(HPI_FormatCreate(&hpi_format,getChannels(), LogHpi(HPI_FormatCreate(&hpi_format,getChannels(),
HPI_FORMAT_MPEG_L1, HPI_FORMAT_MPEG_L1,
getSamplesPerSec(),getHeadBitRate(),0), getSamplesPerSec(),getHeadBitRate(),0),__LINE__);
__LINE__); state=LogHpi(HPI_OutStreamQueryFormat(NULL,hostream,&hpi_format),__LINE__);
state=LogHpi(HPI_OutStreamQueryFormat(NULL,hostream,&hpi_format), break;
__LINE__);
break;
case RDWaveFile::MpegL2: case RDWaveFile::MpegL2:
LogHpi(HPI_FormatCreate(&hpi_format,getChannels(), LogHpi(HPI_FormatCreate(&hpi_format,getChannels(),
HPI_FORMAT_MPEG_L2, HPI_FORMAT_MPEG_L2,
getSamplesPerSec(),getHeadBitRate(),0), getSamplesPerSec(),getHeadBitRate(),0),__LINE__);
__LINE__); state=LogHpi(HPI_OutStreamQueryFormat(NULL,hostream,&hpi_format),__LINE__);
state=LogHpi(HPI_OutStreamQueryFormat(NULL,hostream,&hpi_format), break;
__LINE__);
break;;
case RDWaveFile::MpegL3: case RDWaveFile::MpegL3:
LogHpi(HPI_FormatCreate(&hpi_format,getChannels(), LogHpi(HPI_FormatCreate(&hpi_format,getChannels(),
HPI_FORMAT_MPEG_L3, HPI_FORMAT_MPEG_L3,
getSamplesPerSec(),getHeadBitRate(),0), getSamplesPerSec(),getHeadBitRate(),0),__LINE__);
__LINE__); state=LogHpi(HPI_OutStreamQueryFormat(NULL,hostream,&hpi_format),__LINE__);
state=LogHpi(HPI_OutStreamQueryFormat(NULL,hostream,&hpi_format), break;
__LINE__);
break;
default: default:
state=1; state=1;
break; break;
} }
if(!is_open) { if(!is_open) {
LogHpi(HPI_OutStreamHostBufferFree(NULL,hostream),__LINE__); LogHpi(HPI_OutStreamHostBufferFree(NULL,hostream),__LINE__);
@ -269,46 +259,46 @@ bool RDHPIPlayStream::formatSupported(RDWaveFile::Format format)
bool RDHPIPlayStream::formatSupported() bool RDHPIPlayStream::formatSupported()
{ {
switch(getFormatTag()) { switch(getFormatTag()) {
case WAVE_FORMAT_PCM: case WAVE_FORMAT_PCM:
switch(getBitsPerSample()) { switch(getBitsPerSample()) {
case 8: case 8:
return formatSupported(RDWaveFile::Pcm8); return formatSupported(RDWaveFile::Pcm8);
break; break;
case 16: case 16:
return formatSupported(RDWaveFile::Pcm16); return formatSupported(RDWaveFile::Pcm16);
break; break;
case 24: case 24:
return formatSupported(RDWaveFile::Pcm24); return formatSupported(RDWaveFile::Pcm24);
break; break;
default: default:
return false; return false;
} }
break; break;
case WAVE_FORMAT_MPEG: case WAVE_FORMAT_MPEG:
switch(getHeadLayer()) { switch(getHeadLayer()) {
case 1: case 1:
return formatSupported(RDWaveFile::MpegL1); return formatSupported(RDWaveFile::MpegL1);
break; break;
case 2: case 2:
return formatSupported(RDWaveFile::MpegL2); return formatSupported(RDWaveFile::MpegL2);
break; break;
case 3: case 3:
return formatSupported(RDWaveFile::MpegL3); return formatSupported(RDWaveFile::MpegL3);
break; break;
default: default:
return false; return false;
} }
break; break;
default: default:
return false; return false;
} }
} }
@ -447,62 +437,62 @@ bool RDHPIPlayStream::play()
return false; return false;
} }
switch(getFormatTag()) { switch(getFormatTag()) {
case WAVE_FORMAT_PCM: case WAVE_FORMAT_PCM:
case WAVE_FORMAT_VORBIS: case WAVE_FORMAT_VORBIS:
switch(getBitsPerSample()) { switch(getBitsPerSample()) {
case 8: case 8:
LogHpi(HPI_FormatCreate(&format,getChannels(), LogHpi(HPI_FormatCreate(&format,getChannels(),HPI_FORMAT_PCM8_UNSIGNED,
HPI_FORMAT_PCM8_UNSIGNED, getSamplesPerSec(),0,0),__LINE__);
getSamplesPerSec(),0,0),__LINE__); break;
break;
case 16: case 16:
LogHpi(HPI_FormatCreate(&format,getChannels(), LogHpi(HPI_FormatCreate(&format,getChannels(),HPI_FORMAT_PCM16_SIGNED,
HPI_FORMAT_PCM16_SIGNED, getSamplesPerSec(),0,0),__LINE__);
getSamplesPerSec(),0,0),__LINE__); break;
break;
case 24: case 24:
LogHpi(HPI_FormatCreate(&format,getChannels(), LogHpi(HPI_FormatCreate(&format,getChannels(),HPI_FORMAT_PCM24_SIGNED,
HPI_FORMAT_PCM24_SIGNED, getSamplesPerSec(),0,0),__LINE__);
getSamplesPerSec(),0,0),__LINE__); break;
break;
case 32: case 32:
LogHpi(HPI_FormatCreate(&format,getChannels(), LogHpi(HPI_FormatCreate(&format,getChannels(),HPI_FORMAT_PCM32_SIGNED,
HPI_FORMAT_PCM32_SIGNED, getSamplesPerSec(),0,0),__LINE__);
getSamplesPerSec(),0,0),__LINE__); break;
break;
default: default:
LogHpi(HPI_AdapterClose(NULL,card_index[card_number]),__LINE__); LogHpi(HPI_AdapterClose(NULL,card_index[card_number]),__LINE__);
return false; return false;
break; }
} break;
break; case WAVE_FORMAT_MPEG:
case WAVE_FORMAT_MPEG: switch(getHeadLayer()) {
switch(getHeadLayer()) { case 1:
case 1: LogHpi(HPI_FormatCreate(&format,getChannels(),HPI_FORMAT_MPEG_L1,
LogHpi(HPI_FormatCreate(&format,getChannels(), getSamplesPerSec(),getHeadBitRate(),
HPI_FORMAT_MPEG_L1,getSamplesPerSec(), getHeadFlags()),__LINE__);
getHeadBitRate(),getHeadFlags()), break;
__LINE__);
break; case 2:
case 2: LogHpi(HPI_FormatCreate(&format,getChannels(),HPI_FORMAT_MPEG_L2,
LogHpi(HPI_FormatCreate(&format,getChannels(), getSamplesPerSec(),getHeadBitRate(),
HPI_FORMAT_MPEG_L2,getSamplesPerSec(), getHeadFlags()),__LINE__);
getHeadBitRate(),getHeadFlags()), break;
__LINE__);
break; case 3:
case 3: LogHpi(HPI_FormatCreate(&format,getChannels(),
LogHpi(HPI_FormatCreate(&format,getChannels(), HPI_FORMAT_MPEG_L3,getSamplesPerSec(),
HPI_FORMAT_MPEG_L3,getSamplesPerSec(), getHeadBitRate(),getHeadFlags()),__LINE__);
getHeadBitRate(),getHeadFlags()), break;
__LINE__);
break; default:
default: LogHpi(HPI_AdapterClose(NULL,card_index[card_number]),__LINE__);
LogHpi(HPI_AdapterClose(NULL,card_index[card_number]),__LINE__); return false;
return false; }
} break;
break;
default: default:
return false; return false;
} }
#if HPI_VER < 0x00030500 #if HPI_VER < 0x00030500
if(LogHpi(HPI_DataCreate(&hpi_data,&format,pdata,fragment_size),__LINE__)!= if(LogHpi(HPI_DataCreate(&hpi_data,&format,pdata,fragment_size),__LINE__)!=
@ -586,14 +576,14 @@ void RDHPIPlayStream::pause()
&data_to_play,&samples_played,&reserved), &data_to_play,&samples_played,&reserved),
__LINE__); __LINE__);
switch(getFormatTag()) { switch(getFormatTag()) {
case WAVE_FORMAT_PCM: case WAVE_FORMAT_PCM:
samples_pending=data_to_play/(getChannels()*getBitsPerSample()/8); samples_pending=data_to_play/(getChannels()*getBitsPerSample()/8);
break; break;
case WAVE_FORMAT_MPEG: case WAVE_FORMAT_MPEG:
samples_pending= samples_pending=
1152*data_to_play/(144*getHeadBitRate()/getSamplesPerSec()); 1152*data_to_play/(144*getHeadBitRate()/getSamplesPerSec());
break; break;
} }
playing=false; playing=false;
is_paused=true; is_paused=true;
@ -673,23 +663,24 @@ bool RDHPIPlayStream::setPosition(unsigned samples)
LogHpi(HPI_OutStreamReset(NULL,hpi_stream),__LINE__); LogHpi(HPI_OutStreamReset(NULL,hpi_stream),__LINE__);
samples_played=0; samples_played=0;
switch(getFormatTag()) { switch(getFormatTag()) {
case WAVE_FORMAT_PCM: case WAVE_FORMAT_PCM:
case WAVE_FORMAT_VORBIS: case WAVE_FORMAT_VORBIS:
samples_skipped= samples_skipped=
(unsigned)((double)getBlockAlign()* (unsigned)((double)getBlockAlign()*
((double)samples/(double)getBlockAlign())); ((double)samples/(double)getBlockAlign()));
seekWave((int)((double)samples_skipped*(double)getBlockAlign()), seekWave((int)((double)samples_skipped*(double)getBlockAlign()),
SEEK_SET); SEEK_SET);
break; break;
case WAVE_FORMAT_MPEG:
samples_skipped= case WAVE_FORMAT_MPEG:
(unsigned)((double)getBlockAlign()* samples_skipped=
((double)samples/(double)getBlockAlign())); (unsigned)((double)getBlockAlign()*
seekWave((int)((double)(getAvgBytesPerSec())* ((double)samples/(double)getBlockAlign()));
((double)(samples_skipped)/ seekWave((int)((double)(getAvgBytesPerSec())*
((double)getSamplesPerSec()))), ((double)(samples_skipped)/
SEEK_SET); ((double)getSamplesPerSec()))),
break; SEEK_SET);
break;
} }
emit position(samples); emit position(samples);
} }

171
rdhpi/rdhpirecordstream.cpp
View File

@ -115,26 +115,26 @@ QString RDHPIRecordStream::errorString(RDHPIRecordStream::Error err)
QString str; QString str;
switch(err) { switch(err) {
case RDHPIRecordStream::Ok: case RDHPIRecordStream::Ok:
return QString(tr("Ok")); return QString(tr("Ok"));
break; break;
case RDHPIRecordStream::NoFile: case RDHPIRecordStream::NoFile:
return QString(tr("Unable to create/open file")); return QString(tr("Unable to create/open file"));
break; break;
case RDHPIRecordStream::NoStream: case RDHPIRecordStream::NoStream:
return QString(tr("Input stream unavailable")); return QString(tr("Input stream unavailable"));
break; break;
case RDHPIRecordStream::AlreadyOpen: case RDHPIRecordStream::AlreadyOpen:
return QString(tr("Stream is already open")); return QString(tr("Stream is already open"));
break; break;
default: default:
str=QString(tr("Unknown Error:")); str=QString(tr("Unknown Error:"));
return QString().sprintf("%s %d\n",(const char *)str,err); return QString().sprintf("%s %d\n",(const char *)str,err);
break; break;
} }
} }
@ -221,54 +221,45 @@ bool RDHPIRecordStream::formatSupported(RDWaveFile::Format format)
histream=hpi_stream; histream=hpi_stream;
} }
switch(format) { switch(format) {
case RDWaveFile::Pcm8: case RDWaveFile::Pcm8:
LogHpi(HPI_FormatCreate(&hformat,getChannels(), LogHpi(HPI_FormatCreate(&hformat,getChannels(),HPI_FORMAT_PCM8_UNSIGNED,
HPI_FORMAT_PCM8_UNSIGNED, getSamplesPerSec(),getHeadBitRate(),0),__LINE__);
getSamplesPerSec(),getHeadBitRate(),0), state=LogHpi(HPI_InStreamQueryFormat(NULL,histream,&hformat),__LINE__);
__LINE__); break;
state=LogHpi(HPI_InStreamQueryFormat(NULL,histream,&hformat),__LINE__);
break;
case RDWaveFile::Pcm16: case RDWaveFile::Pcm16:
LogHpi(HPI_FormatCreate(&hformat,getChannels(), LogHpi(HPI_FormatCreate(&hformat,getChannels(),HPI_FORMAT_PCM16_SIGNED,
HPI_FORMAT_PCM16_SIGNED, getSamplesPerSec(),getHeadBitRate(),0),__LINE__);
getSamplesPerSec(),getHeadBitRate(),0), state=LogHpi(HPI_InStreamQueryFormat(NULL,histream,&hformat),__LINE__);
__LINE__); break;
state=LogHpi(HPI_InStreamQueryFormat(NULL,histream,&hformat),__LINE__);
break;
case RDWaveFile::Pcm24: case RDWaveFile::Pcm24:
LogHpi(HPI_FormatCreate(&hformat,getChannels(), LogHpi(HPI_FormatCreate(&hformat,getChannels(),HPI_FORMAT_PCM24_SIGNED,
HPI_FORMAT_PCM24_SIGNED, getSamplesPerSec(),getHeadBitRate(),0),__LINE__);
getSamplesPerSec(),getHeadBitRate(),0), state=LogHpi(HPI_InStreamQueryFormat(NULL,histream,&hformat),__LINE__);
__LINE__); break;
state=LogHpi(HPI_InStreamQueryFormat(NULL,histream,&hformat),__LINE__);
break;
case RDWaveFile::MpegL1: case RDWaveFile::MpegL1:
LogHpi(HPI_FormatCreate(&hformat,getChannels(),HPI_FORMAT_MPEG_L1, LogHpi(HPI_FormatCreate(&hformat,getChannels(),HPI_FORMAT_MPEG_L1,
getSamplesPerSec(),getHeadBitRate(),0), getSamplesPerSec(),getHeadBitRate(),0),__LINE__);
__LINE__); state=LogHpi(HPI_InStreamQueryFormat(NULL,histream,&hformat),__LINE__);
state=LogHpi(HPI_InStreamQueryFormat(NULL,histream,&hformat),__LINE__); break;
break;
case RDWaveFile::MpegL2: case RDWaveFile::MpegL2:
LogHpi(HPI_FormatCreate(&hformat,getChannels(),HPI_FORMAT_MPEG_L2, LogHpi(HPI_FormatCreate(&hformat,getChannels(),HPI_FORMAT_MPEG_L2,
getSamplesPerSec(),getHeadBitRate(),0), getSamplesPerSec(),getHeadBitRate(),0),__LINE__);
__LINE__); state=LogHpi(HPI_InStreamQueryFormat(NULL,histream,&hformat),__LINE__);
state=LogHpi(HPI_InStreamQueryFormat(NULL,histream,&hformat),__LINE__); break;
break;
case RDWaveFile::MpegL3: case RDWaveFile::MpegL3:
LogHpi(HPI_FormatCreate(&hformat,getChannels(),HPI_FORMAT_MPEG_L3, LogHpi(HPI_FormatCreate(&hformat,getChannels(),HPI_FORMAT_MPEG_L3,
getSamplesPerSec(),getHeadBitRate(),0), getSamplesPerSec(),getHeadBitRate(),0),__LINE__);
__LINE__); state=LogHpi(HPI_InStreamQueryFormat(NULL,histream,&hformat),__LINE__);
state=LogHpi(HPI_InStreamQueryFormat(NULL,histream,&hformat),__LINE__); break;
break;
default: default:
state=1; state=1;
break; break;
} }
if(!is_open) { if(!is_open) {
LogHpi(HPI_InStreamHostBufferFree(NULL,histream),__LINE__); LogHpi(HPI_InStreamHostBufferFree(NULL,histream),__LINE__);
@ -284,46 +275,46 @@ bool RDHPIRecordStream::formatSupported(RDWaveFile::Format format)
bool RDHPIRecordStream::formatSupported() bool RDHPIRecordStream::formatSupported()
{ {
switch(getFormatTag()) { switch(getFormatTag()) {
case WAVE_FORMAT_PCM: case WAVE_FORMAT_PCM:
switch(getBitsPerSample()) { switch(getBitsPerSample()) {
case 8: case 8:
return formatSupported(RDWaveFile::Pcm8); return formatSupported(RDWaveFile::Pcm8);
break; break;
case 16: case 16:
return formatSupported(RDWaveFile::Pcm16); return formatSupported(RDWaveFile::Pcm16);
break; break;
case 24: case 24:
return formatSupported(RDWaveFile::Pcm24); return formatSupported(RDWaveFile::Pcm24);
break; break;
default: default:
return false; return false;
} }
break; break;
case WAVE_FORMAT_MPEG: case WAVE_FORMAT_MPEG:
switch(getHeadLayer()) { switch(getHeadLayer()) {
case 1: case 1:
return formatSupported(RDWaveFile::MpegL1); return formatSupported(RDWaveFile::MpegL1);
break; break;
case 2: case 2:
return formatSupported(RDWaveFile::MpegL2); return formatSupported(RDWaveFile::MpegL2);
break; break;
case 3: case 3:
return formatSupported(RDWaveFile::MpegL3); return formatSupported(RDWaveFile::MpegL3);
break; break;
default: default:
return false; return false;
} }
break; break;
default: default:
return false; return false;
} }
} }

136
rdhpi/rdhpisoundcard.cpp
View File

@ -163,23 +163,25 @@ bool RDHPISoundCard::setClockSource(int card,RDHPISoundCard::ClockSource src)
hpi_err_t hpi_err=0; hpi_err_t hpi_err=0;
switch(src) { switch(src) {
case RDHPISoundCard::Internal: case RDHPISoundCard::Internal:
hpi_err=HPI_SampleClock_SetSource(NULL, hpi_err=HPI_SampleClock_SetSource(NULL,
clock_source_control[card], clock_source_control[card],
HPI_SAMPLECLOCK_SOURCE_LOCAL); HPI_SAMPLECLOCK_SOURCE_LOCAL);
break; break;
case RDHPISoundCard::AesEbu:
case RDHPISoundCard::SpDiff: case RDHPISoundCard::AesEbu:
hpi_err=LogHpi(HPI_SampleClock_SetSource(NULL, case RDHPISoundCard::SpDiff:
clock_source_control[card], hpi_err=LogHpi(HPI_SampleClock_SetSource(NULL,
HPI_SAMPLECLOCK_SOURCE_AESEBU_SYNC),__LINE__); clock_source_control[card],
break; HPI_SAMPLECLOCK_SOURCE_AESEBU_SYNC),__LINE__);
case RDHPISoundCard::WordClock: break;
hpi_err=LogHpi(HPI_SampleClock_SetSource(NULL,
clock_source_control[card], case RDHPISoundCard::WordClock:
HPI_SAMPLECLOCK_SOURCE_WORD), hpi_err=LogHpi(HPI_SampleClock_SetSource(NULL,
__LINE__); clock_source_control[card],
break; HPI_SAMPLECLOCK_SOURCE_WORD),
__LINE__);
break;
} }
return hpi_err==0; return hpi_err==0;
} }
@ -235,23 +237,25 @@ RDHPISoundCard::SourceNode RDHPISoundCard::getInputPortMux(int card,int port)
bool RDHPISoundCard::setInputPortMux(int card,int port,RDHPISoundCard::SourceNode node) bool RDHPISoundCard::setInputPortMux(int card,int port,RDHPISoundCard::SourceNode node)
{ {
switch(node) { switch(node) {
case RDHPISoundCard::LineIn: case RDHPISoundCard::LineIn:
if(HPI_Multiplexer_SetSource(NULL, if(HPI_Multiplexer_SetSource(NULL,
input_mux_control[card][port],node,0)!=0) { input_mux_control[card][port],node,0)!=0) {
return false; return false;
} }
break; break;
case RDHPISoundCard::AesEbuIn:
if(LogHpi(HPI_Multiplexer_SetSource(NULL, case RDHPISoundCard::AesEbuIn:
input_mux_control[card][port],node, if(LogHpi(HPI_Multiplexer_SetSource(NULL,
input_mux_index[card][port][1]), input_mux_control[card][port],node,
__LINE__)!=0) { input_mux_index[card][port][1]),
return false; __LINE__)!=0) {
} return false;
break; }
default: break;
return false;
break; default:
return false;
break;
} }
return true; return true;
} }
@ -280,12 +284,13 @@ void RDHPISoundCard::setFadeProfile(RDHPISoundCard::FadeProfile profile)
{ {
fade_type=profile; fade_type=profile;
switch(fade_type) { switch(fade_type) {
case RDHPISoundCard::Linear: case RDHPISoundCard::Linear:
hpi_fade_type=HPI_VOLUME_AUTOFADE_LINEAR; hpi_fade_type=HPI_VOLUME_AUTOFADE_LINEAR;
break; break;
case RDHPISoundCard::Log:
hpi_fade_type=HPI_VOLUME_AUTOFADE_LOG; case RDHPISoundCard::Log:
break; hpi_fade_type=HPI_VOLUME_AUTOFADE_LOG;
break;
} }
} }
@ -436,15 +441,17 @@ bool RDHPISoundCard::haveInputPortMux(int card,int port) const
bool RDHPISoundCard::queryInputPortMux(int card,int port,SourceNode node) const bool RDHPISoundCard::queryInputPortMux(int card,int port,SourceNode node) const
{ {
switch(node) { switch(node) {
case RDHPISoundCard::LineIn: case RDHPISoundCard::LineIn:
return input_port_mux_type[card][port][0]; return input_port_mux_type[card][port][0];
break; break;
case RDHPISoundCard::AesEbuIn:
return input_port_mux_type[card][port][1]; case RDHPISoundCard::AesEbuIn:
break; return input_port_mux_type[card][port][1];
default: break;
return false;
break; default:
return false;
break;
} }
} }
@ -673,14 +680,14 @@ void RDHPISoundCard::HPIProbe()
timescale_support[i]=false; timescale_support[i]=false;
} }
switch(hpi_adapter_list[i]) { switch(hpi_adapter_list[i]) {
case 0x5111: case 0x5111:
case 0x5211: case 0x5211:
input_mux_type[i]=true; input_mux_type[i]=true;
break; break;
default: default:
input_mux_type[i]=false; input_mux_type[i]=false;
break; break;
} }
card_input_ports[i]=0; card_input_ports[i]=0;
card_output_ports[i]=0; card_output_ports[i]=0;
@ -803,14 +810,15 @@ void RDHPISoundCard::HPIProbe()
l++,&type,&index), l++,&type,&index),
__LINE__)==0) { __LINE__)==0) {
switch(type) { switch(type) {
case HPI_SOURCENODE_LINEIN: case HPI_SOURCENODE_LINEIN:
input_port_mux_type[i][j][0]=true; input_port_mux_type[i][j][0]=true;
input_mux_index[i][j][0]=index; input_mux_index[i][j][0]=index;
break; break;
case HPI_SOURCENODE_AESEBU_IN:
input_port_mux_type[i][j][1]=true; case HPI_SOURCENODE_AESEBU_IN:
input_mux_index[i][j][1]=index; input_port_mux_type[i][j][1]=true;
break; input_mux_index[i][j][1]=index;
break;
} }
} }
} }