Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-07-28 14:39:32 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'deltecent-hpi-timescale'

Browse Source
This commit is contained in:
Fred Gleason 2018-10-16 18:21:30 -04:00
commit 72c2b39ca5
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -17780,3 +17780,7 @@
* Added rddbconfig(8). * Added rddbconfig(8).
2018-10-16 Fred Gleason <fredg@paravelsystems.com> 2018-10-16 Fred Gleason <fredg@paravelsystems.com>
* Added a 'Rivendell->Configuration' menu entry for rddbconfig(8). * Added a 'Rivendell->Configuration' menu entry for rddbconfig(8).
2018-10-16 Patrick Linstruth <patrick@deltecent.com>
* Fixed a bug that caused a gratuitious 'INALID_FUNC' error to
be sent to syslog when used with an ASI card without timescaling
support.

2
rdhpi/rdhpiplaystream.cpp
View File

@ -413,9 +413,11 @@ bool RDHPIPlayStream::play()
return false; return false;
} }
if((!playing)&&(!is_paused)) { if((!playing)&&(!is_paused)) {
if(sound_card->haveTimescaling(card_number)) {
LogHpi(HPI_OutStreamSetTimeScale(NULL,hpi_stream, LogHpi(HPI_OutStreamSetTimeScale(NULL,hpi_stream,
(uint16_t)((RD_TIMESCALE_DIVISOR/(double)play_speed)* (uint16_t)((RD_TIMESCALE_DIVISOR/(double)play_speed)*
HPI_OSTREAM_TIMESCALE_UNITS)),__LINE__); HPI_OSTREAM_TIMESCALE_UNITS)),__LINE__);
}
if(LogHpi(HPI_OutStreamGetInfoEx(NULL,hpi_stream, if(LogHpi(HPI_OutStreamGetInfoEx(NULL,hpi_stream,
&state,&buffer_size,&data_to_play, &state,&buffer_size,&data_to_play,
&samples_played,&reserved),__LINE__)!=0) { &samples_played,&reserved),__LINE__)!=0) {