Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-05-13 15:38:58 +02:00
Code Issues Projects Releases Wiki Activity

Fixed conflict in 'ChangeLog'

Browse Source
This commit is contained in:
Fred Gleason 2018-11-26 12:03:21 -05:00
commit 448420c763
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -18062,3 +18062,5 @@
* Fixed regression with rdairplay(1) loading previous log. * Fixed regression with rdairplay(1) loading previous log.
2018-11-25 Patrick Linstruth <patrick@deltecent.com> 2018-11-25 Patrick Linstruth <patrick@deltecent.com>
* Optimized RDAudioPort SQL queries. * Optimized RDAudioPort SQL queries.
2018-11-26 Patrick Linstruth <patrick@deltecent.com>
* Fixed bug where requested port could overrun HPI_MAX_NODES.

24
rdhpi/rdhpisoundcard.cpp
View File

@ -189,36 +189,60 @@ bool RDHPISoundCard::setClockSource(int card,RDHPISoundCard::ClockSource src)
bool RDHPISoundCard::haveTimescaling(int card) const bool RDHPISoundCard::haveTimescaling(int card) const
{ {
if(card>=HPI_MAX_ADAPTERS) {
return false;
}
return timescale_support[card]; return timescale_support[card];
} }
bool RDHPISoundCard::haveInputVolume(int card,int stream,int port) const bool RDHPISoundCard::haveInputVolume(int card,int stream,int port) const
{ {
if(card>=HPI_MAX_ADAPTERS||stream>=HPI_MAX_STREAMS||port>=HPI_MAX_NODES) {
return false;
}
return input_stream_volume[card][stream][port]; return input_stream_volume[card][stream][port];
} }
bool RDHPISoundCard::haveOutputVolume(int card,int stream,int port) const bool RDHPISoundCard::haveOutputVolume(int card,int stream,int port) const
{ {
if(card>=HPI_MAX_ADAPTERS||stream>=HPI_MAX_STREAMS||port>=HPI_MAX_NODES) {
return false;
}
return output_stream_volume[card][stream][port]; return output_stream_volume[card][stream][port];
} }
bool RDHPISoundCard::haveInputLevel(int card,int port) const bool RDHPISoundCard::haveInputLevel(int card,int port) const
{ {
if(card>=HPI_MAX_ADAPTERS||port>=HPI_MAX_NODES) {
return false;
}
return input_port_level[card][port]; return input_port_level[card][port];
} }
bool RDHPISoundCard::haveOutputLevel(int card,int port) const bool RDHPISoundCard::haveOutputLevel(int card,int port) const
{ {
if(card>=HPI_MAX_ADAPTERS||port>=HPI_MAX_NODES) {
return false;
}
return output_port_level[card][port]; return output_port_level[card][port];
} }
bool RDHPISoundCard::haveInputStreamVOX(int card,int stream) const bool RDHPISoundCard::haveInputStreamVOX(int card,int stream) const
{ {
if(card>=HPI_MAX_ADAPTERS||stream>=HPI_MAX_STREAMS) {
return false;
}
return input_stream_vox[card][stream]; return input_stream_vox[card][stream];
} }