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

Merge branch 'deltecent-issue193-rdhpi' into stable

Browse Source
This commit is contained in:
Fred Gleason 2018-05-25 21:17:43 +00:00
commit 60d54598db
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -16909,3 +16909,6 @@
2018-05-25 Fred Gleason <fredg@paravelsystems.com> 2018-05-25 Fred Gleason <fredg@paravelsystems.com>
* Merged pull request #000191, "Add RLM to update metadata on TuneIn." * Merged pull request #000191, "Add RLM to update metadata on TuneIn."
* Updated the 'rlm_tunein' plug-in to support vlogs. * Updated the 'rlm_tunein' plug-in to support vlogs.
2018-05-25 Fred Gleason <fredg@paravelsystems.com>
* Merged pull request #000194, "Fixed bug in GetStream() where
return value from HPI_OutStreamOpen was ignored".

15
rdhpi/rdhpiplaystream.cpp
View File

@ -789,15 +789,14 @@ int RDHPIPlayStream::GetStream()
#ifdef RDHPIPLAYSTREAM_USE_LOCAL_MUTEX #ifdef RDHPIPLAYSTREAM_USE_LOCAL_MUTEX
for(int i=0;i<sound_card->getCardOutputStreams(card_number);i++) { for(int i=0;i<sound_card->getCardOutputStreams(card_number);i++) {
if(++stream_mutex[card_number][i]==1) { if(++stream_mutex[card_number][i]==1) {
LogHpi(HPI_OutStreamOpen(NULL,card_index[card_number],i,&hpi_stream), if(LogHpi(HPI_OutStreamOpen(NULL,card_index[card_number],i,&hpi_stream),
__LINE__); __LINE__)==0) {
if(HPI_OutStreamHostBufferAllocate(NULL,hpi_stream,dma_buffer_size)); if(HPI_OutStreamHostBufferAllocate(NULL,hpi_stream,dma_buffer_size));
stream_number=i; stream_number=i;
return stream_number; return stream_number;
} }
else {
stream_mutex[card_number][i]--;
} }
stream_mutex[card_number][i]--;
} }
return -1; return -1;
#else #else