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

Fixed conflict in ChangeLog

Browse Source
This commit is contained in:
Fred Gleason 2016-04-26 15:58:34 -04:00
commit 41dc317857
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -15087,3 +15087,6 @@
2016-04-26 Fred Gleason <fredg@paravelsystems.com> 2016-04-26 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in 'rdlibrary/edit_cart.cpp' that threw a segfault * Fixed a bug in 'rdlibrary/edit_cart.cpp' that threw a segfault
when attempting to open multiple carts simultaneously. when attempting to open multiple carts simultaneously.
2016-04-26 Brian McGlynn <brian.mcglynn@geneseemedia.net>
* Updated lib/rdcae.cpp to return error code when file does not exist
in /var/snd

7
lib/rdcae.cpp
View File

@ -147,6 +147,13 @@ bool RDCae::loadPlay(int card,QString name,int *stream,int *handle)
} }
cae_handle[card][*stream]=*handle; cae_handle[card][*stream]=*handle;
cae_pos[card][*stream]=0xFFFFFFFF; cae_pos[card][*stream]=0xFFFFFFFF;
// CAE Daemon sends back a stream of -1 if there is an issue with allocating it
// such as file missing, etc.
if(*stream < 0) {
return false;
}
return true; return true;
} }