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

171
rdhpi/rdhpirecordstream.cpp
View File

@ -115,26 +115,26 @@ QString RDHPIRecordStream::errorString(RDHPIRecordStream::Error err)
QString str;
switch(err) {
case RDHPIRecordStream::Ok:
return QString(tr("Ok"));
break;
case RDHPIRecordStream::Ok:
return QString(tr("Ok"));
break;
case RDHPIRecordStream::NoFile:
return QString(tr("Unable to create/open file"));
break;
case RDHPIRecordStream::NoFile:
return QString(tr("Unable to create/open file"));
break;
case RDHPIRecordStream::NoStream:
return QString(tr("Input stream unavailable"));
break;
case RDHPIRecordStream::NoStream:
return QString(tr("Input stream unavailable"));
break;
case RDHPIRecordStream::AlreadyOpen:
return QString(tr("Stream is already open"));
break;
case RDHPIRecordStream::AlreadyOpen:
return QString(tr("Stream is already open"));
break;
default:
str=QString(tr("Unknown Error:"));
return QString().sprintf("%s %d\n",(const char *)str,err);
break;
default:
str=QString(tr("Unknown Error:"));
return QString().sprintf("%s %d\n",(const char *)str,err);
break;
}
}
@ -221,54 +221,45 @@ bool RDHPIRecordStream::formatSupported(RDWaveFile::Format format)
histream=hpi_stream;
}
switch(format) {
case RDWaveFile::Pcm8:
LogHpi(HPI_FormatCreate(&hformat,getChannels(),
HPI_FORMAT_PCM8_UNSIGNED,
getSamplesPerSec(),getHeadBitRate(),0),
__LINE__);
state=LogHpi(HPI_InStreamQueryFormat(NULL,histream,&hformat),__LINE__);
break;
case RDWaveFile::Pcm8:
LogHpi(HPI_FormatCreate(&hformat,getChannels(),HPI_FORMAT_PCM8_UNSIGNED,
getSamplesPerSec(),getHeadBitRate(),0),__LINE__);
state=LogHpi(HPI_InStreamQueryFormat(NULL,histream,&hformat),__LINE__);
break;
case RDWaveFile::Pcm16:
LogHpi(HPI_FormatCreate(&hformat,getChannels(),
HPI_FORMAT_PCM16_SIGNED,
getSamplesPerSec(),getHeadBitRate(),0),
__LINE__);
state=LogHpi(HPI_InStreamQueryFormat(NULL,histream,&hformat),__LINE__);
break;
case RDWaveFile::Pcm16:
LogHpi(HPI_FormatCreate(&hformat,getChannels(),HPI_FORMAT_PCM16_SIGNED,
getSamplesPerSec(),getHeadBitRate(),0),__LINE__);
state=LogHpi(HPI_InStreamQueryFormat(NULL,histream,&hformat),__LINE__);
break;
case RDWaveFile::Pcm24:
LogHpi(HPI_FormatCreate(&hformat,getChannels(),
HPI_FORMAT_PCM24_SIGNED,
getSamplesPerSec(),getHeadBitRate(),0),
__LINE__);
state=LogHpi(HPI_InStreamQueryFormat(NULL,histream,&hformat),__LINE__);
break;
case RDWaveFile::Pcm24:
LogHpi(HPI_FormatCreate(&hformat,getChannels(),HPI_FORMAT_PCM24_SIGNED,
getSamplesPerSec(),getHeadBitRate(),0),__LINE__);
state=LogHpi(HPI_InStreamQueryFormat(NULL,histream,&hformat),__LINE__);
break;
case RDWaveFile::MpegL1:
LogHpi(HPI_FormatCreate(&hformat,getChannels(),HPI_FORMAT_MPEG_L1,
getSamplesPerSec(),getHeadBitRate(),0),
__LINE__);
state=LogHpi(HPI_InStreamQueryFormat(NULL,histream,&hformat),__LINE__);
break;
case RDWaveFile::MpegL1:
LogHpi(HPI_FormatCreate(&hformat,getChannels(),HPI_FORMAT_MPEG_L1,
getSamplesPerSec(),getHeadBitRate(),0),__LINE__);
state=LogHpi(HPI_InStreamQueryFormat(NULL,histream,&hformat),__LINE__);
break;
case RDWaveFile::MpegL2:
LogHpi(HPI_FormatCreate(&hformat,getChannels(),HPI_FORMAT_MPEG_L2,
getSamplesPerSec(),getHeadBitRate(),0),
__LINE__);
state=LogHpi(HPI_InStreamQueryFormat(NULL,histream,&hformat),__LINE__);
break;
case RDWaveFile::MpegL2:
LogHpi(HPI_FormatCreate(&hformat,getChannels(),HPI_FORMAT_MPEG_L2,
getSamplesPerSec(),getHeadBitRate(),0),__LINE__);
state=LogHpi(HPI_InStreamQueryFormat(NULL,histream,&hformat),__LINE__);
break;
case RDWaveFile::MpegL3:
LogHpi(HPI_FormatCreate(&hformat,getChannels(),HPI_FORMAT_MPEG_L3,
getSamplesPerSec(),getHeadBitRate(),0),
__LINE__);
state=LogHpi(HPI_InStreamQueryFormat(NULL,histream,&hformat),__LINE__);
break;
case RDWaveFile::MpegL3:
LogHpi(HPI_FormatCreate(&hformat,getChannels(),HPI_FORMAT_MPEG_L3,
getSamplesPerSec(),getHeadBitRate(),0),__LINE__);
state=LogHpi(HPI_InStreamQueryFormat(NULL,histream,&hformat),__LINE__);
break;
default:
state=1;
break;
default:
state=1;
break;
}
if(!is_open) {
LogHpi(HPI_InStreamHostBufferFree(NULL,histream),__LINE__);
@ -284,46 +275,46 @@ bool RDHPIRecordStream::formatSupported(RDWaveFile::Format format)
bool RDHPIRecordStream::formatSupported()
{
switch(getFormatTag()) {
case WAVE_FORMAT_PCM:
switch(getBitsPerSample()) {
case 8:
return formatSupported(RDWaveFile::Pcm8);
break;
case WAVE_FORMAT_PCM:
switch(getBitsPerSample()) {
case 8:
return formatSupported(RDWaveFile::Pcm8);
break;
case 16:
return formatSupported(RDWaveFile::Pcm16);
break;
case 16:
return formatSupported(RDWaveFile::Pcm16);
break;
case 24:
return formatSupported(RDWaveFile::Pcm24);
break;
case 24:
return formatSupported(RDWaveFile::Pcm24);
break;
default:
return false;
}
break;
default:
return false;
}
break;
case WAVE_FORMAT_MPEG:
switch(getHeadLayer()) {
case 1:
return formatSupported(RDWaveFile::MpegL1);
break;
case WAVE_FORMAT_MPEG:
switch(getHeadLayer()) {
case 1:
return formatSupported(RDWaveFile::MpegL1);
break;
case 2:
return formatSupported(RDWaveFile::MpegL2);
break;
case 2:
return formatSupported(RDWaveFile::MpegL2);
break;
case 3:
return formatSupported(RDWaveFile::MpegL3);
break;
case 3:
return formatSupported(RDWaveFile::MpegL3);
break;
default:
return false;
}
break;
default:
return false;
}
break;
default:
return false;
default:
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;
switch(src) {
case RDHPISoundCard::Internal:
hpi_err=HPI_SampleClock_SetSource(NULL,
clock_source_control[card],
HPI_SAMPLECLOCK_SOURCE_LOCAL);
break;
case RDHPISoundCard::AesEbu:
case RDHPISoundCard::SpDiff:
hpi_err=LogHpi(HPI_SampleClock_SetSource(NULL,
clock_source_control[card],
HPI_SAMPLECLOCK_SOURCE_AESEBU_SYNC),__LINE__);
break;
case RDHPISoundCard::WordClock:
hpi_err=LogHpi(HPI_SampleClock_SetSource(NULL,
clock_source_control[card],
HPI_SAMPLECLOCK_SOURCE_WORD),
__LINE__);
break;
case RDHPISoundCard::Internal:
hpi_err=HPI_SampleClock_SetSource(NULL,
clock_source_control[card],
HPI_SAMPLECLOCK_SOURCE_LOCAL);
break;
case RDHPISoundCard::AesEbu:
case RDHPISoundCard::SpDiff:
hpi_err=LogHpi(HPI_SampleClock_SetSource(NULL,
clock_source_control[card],
HPI_SAMPLECLOCK_SOURCE_AESEBU_SYNC),__LINE__);
break;
case RDHPISoundCard::WordClock:
hpi_err=LogHpi(HPI_SampleClock_SetSource(NULL,
clock_source_control[card],
HPI_SAMPLECLOCK_SOURCE_WORD),
__LINE__);
break;
}
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)
{
switch(node) {
case RDHPISoundCard::LineIn:
if(HPI_Multiplexer_SetSource(NULL,
input_mux_control[card][port],node,0)!=0) {
return false;
}
break;
case RDHPISoundCard::AesEbuIn:
if(LogHpi(HPI_Multiplexer_SetSource(NULL,
input_mux_control[card][port],node,
input_mux_index[card][port][1]),
__LINE__)!=0) {
return false;
}
break;
default:
return false;
break;
case RDHPISoundCard::LineIn:
if(HPI_Multiplexer_SetSource(NULL,
input_mux_control[card][port],node,0)!=0) {
return false;
}
break;
case RDHPISoundCard::AesEbuIn:
if(LogHpi(HPI_Multiplexer_SetSource(NULL,
input_mux_control[card][port],node,
input_mux_index[card][port][1]),
__LINE__)!=0) {
return false;
}
break;
default:
return false;
break;
}
return true;
}
@ -280,12 +284,13 @@ void RDHPISoundCard::setFadeProfile(RDHPISoundCard::FadeProfile profile)
{
fade_type=profile;
switch(fade_type) {
case RDHPISoundCard::Linear:
hpi_fade_type=HPI_VOLUME_AUTOFADE_LINEAR;
break;
case RDHPISoundCard::Log:
hpi_fade_type=HPI_VOLUME_AUTOFADE_LOG;
break;
case RDHPISoundCard::Linear:
hpi_fade_type=HPI_VOLUME_AUTOFADE_LINEAR;
break;
case RDHPISoundCard::Log:
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
{
switch(node) {
case RDHPISoundCard::LineIn:
return input_port_mux_type[card][port][0];
break;
case RDHPISoundCard::AesEbuIn:
return input_port_mux_type[card][port][1];
break;
default:
return false;
break;
case RDHPISoundCard::LineIn:
return input_port_mux_type[card][port][0];
break;
case RDHPISoundCard::AesEbuIn:
return input_port_mux_type[card][port][1];
break;
default:
return false;
break;
}
}
@ -673,14 +680,14 @@ void RDHPISoundCard::HPIProbe()
timescale_support[i]=false;
}
switch(hpi_adapter_list[i]) {
case 0x5111:
case 0x5211:
input_mux_type[i]=true;
break;
case 0x5111:
case 0x5211:
input_mux_type[i]=true;
break;
default:
input_mux_type[i]=false;
break;
default:
input_mux_type[i]=false;
break;
}
card_input_ports[i]=0;
card_output_ports[i]=0;
@ -803,14 +810,15 @@ void RDHPISoundCard::HPIProbe()
l++,&type,&index),
__LINE__)==0) {
switch(type) {
case HPI_SOURCENODE_LINEIN:
input_port_mux_type[i][j][0]=true;
input_mux_index[i][j][0]=index;
break;
case HPI_SOURCENODE_AESEBU_IN:
input_port_mux_type[i][j][1]=true;
input_mux_index[i][j][1]=index;
break;
case HPI_SOURCENODE_LINEIN:
input_port_mux_type[i][j][0]=true;
input_mux_index[i][j][0]=index;
break;
case HPI_SOURCENODE_AESEBU_IN:
input_port_mux_type[i][j][1]=true;
input_mux_index[i][j][1]=index;
break;
}
}
}