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

2017-02-07 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Changed the DLL load target for libmad from 'libmad.so' to
	'libmad.so.0' in 'cae/cae.cpp' and 'lib/rdaudioconvert.cpp'.
	* Changed the DLL load target for lame from 'libmp3lame.so' to
	'libmp3lame.so.0' in 'cae/cae.cpp' and 'lib/rdaudioconvert.cpp'.
	* Changed the DLL load target for faad from 'libfaad.so' to
	'libfaad.so.2' in 'cae/cae.cpp' and 'lib/rdmp4.cpp'.
	* Changed the DLL load target for mp4v2 from 'libmp4v2.so' to
	'libmp4v2.so.2' in 'cae/cae.cpp' and 'lib/rdaudioconvert.cpp'.
This commit is contained in:
Fred Gleason 2017-02-07 08:45:05 -05:00
parent 82ec0c73b5
commit af592fa200
4 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -15551,3 +15551,12 @@
test harness to fail when using non-localhost URLs. test harness to fail when using non-localhost URLs.
* Fixed a bug in 'web/tests/editcart.js' that caused the EditCut * Fixed a bug in 'web/tests/editcart.js' that caused the EditCut
test harness to fail when using non-localhost URLs. test harness to fail when using non-localhost URLs.
2017-02-07 Fred Gleason <fredg@paravelsystems.com>
* Changed the DLL load target for libmad from 'libmad.so' to
'libmad.so.0' in 'cae/cae.cpp' and 'lib/rdaudioconvert.cpp'.
* Changed the DLL load target for lame from 'libmp3lame.so' to
'libmp3lame.so.0' in 'cae/cae.cpp' and 'lib/rdaudioconvert.cpp'.
* Changed the DLL load target for faad from 'libfaad.so' to
'libfaad.so.2' in 'cae/cae.cpp' and 'lib/rdmp4.cpp'.
* Changed the DLL load target for mp4v2 from 'libmp4v2.so' to
'libmp4v2.so.2' in 'cae/cae.cpp' and 'lib/rdaudioconvert.cpp'.

10
cae/cae.cpp
View File

@ -2060,7 +2060,7 @@ void QApplication::saveState(QSessionManager &sm) {
bool MainObject::CheckLame() bool MainObject::CheckLame()
{ {
#ifdef HAVE_LAME #ifdef HAVE_LAME
return dlopen("libmp3lame.so",RTLD_LAZY)!=NULL; return dlopen("libmp3lame.so.0",RTLD_LAZY)!=NULL;
#else #else
return false; return false;
#endif // HAVE_LAME #endif // HAVE_LAME
@ -2070,8 +2070,8 @@ bool MainObject::CheckLame()
bool MainObject::CheckMp4Decode() bool MainObject::CheckMp4Decode()
{ {
#ifdef HAVE_MP4_LIBS #ifdef HAVE_MP4_LIBS
return (dlopen("libfaad.so",RTLD_LAZY)!=NULL)&& return (dlopen("libfaad.so.2",RTLD_LAZY)!=NULL)&&
(dlopen("libmp4v2.so",RTLD_LAZY)!=NULL); (dlopen("libmp4v2.so.2",RTLD_LAZY)!=NULL);
#else #else
return false; return false;
#endif // HAVE_MP4_LIBS #endif // HAVE_MP4_LIBS
@ -2081,7 +2081,7 @@ bool MainObject::CheckMp4Decode()
bool MainObject::LoadTwoLame() bool MainObject::LoadTwoLame()
{ {
#ifdef HAVE_TWOLAME #ifdef HAVE_TWOLAME
if((twolame_handle=dlopen("libtwolame.so",RTLD_NOW))==NULL) { if((twolame_handle=dlopen("libtwolame.so.0",RTLD_NOW))==NULL) {
LogLine(RDConfig::LogInfo, LogLine(RDConfig::LogInfo,
"TwoLAME encoder library not found, MPEG L2 encoding not supported"); "TwoLAME encoder library not found, MPEG L2 encoding not supported");
return false; return false;
@ -2168,7 +2168,7 @@ void MainObject::FreeTwoLameEncoder(int card,int stream)
bool MainObject::LoadMad() bool MainObject::LoadMad()
{ {
#ifdef HAVE_MAD #ifdef HAVE_MAD
if((mad_handle=dlopen("libmad.so",RTLD_NOW))==NULL) { if((mad_handle=dlopen("libmad.so.0",RTLD_NOW))==NULL) {
LogLine(RDConfig::LogInfo, LogLine(RDConfig::LogInfo,
"MAD decoder library not found, MPEG L2 decoding not supported"); "MAD decoder library not found, MPEG L2 decoding not supported");
return false; return false;

6
lib/rdaudioconvert.cpp
View File

@ -74,9 +74,9 @@ RDAudioConvert::RDAudioConvert(const QString &station_name,QObject *parent)
// //
// Load MPEG Libraries // Load MPEG Libraries
// //
conv_mad_handle=dlopen("libmad.so",RTLD_LAZY); conv_mad_handle=dlopen("libmad.so.0",RTLD_LAZY);
conv_lame_handle=dlopen("libmp3lame.so",RTLD_LAZY); conv_lame_handle=dlopen("libmp3lame.so.0",RTLD_LAZY);
conv_twolame_handle=dlopen("libtwolame.so",RTLD_LAZY); conv_twolame_handle=dlopen("libtwolame.so.0",RTLD_LAZY);
} }

4
lib/rdmp4.cpp
View File

@ -64,8 +64,8 @@ bool DLMP4::load()
if(loadSuccess) if(loadSuccess)
return true; return true;
neaac_handle = dlopen("libfaad.so",RTLD_LAZY); neaac_handle = dlopen("libfaad.so.2",RTLD_LAZY);
mp4_handle = dlopen("libmp4v2.so",RTLD_LAZY); mp4_handle = dlopen("libmp4v2.so.2",RTLD_LAZY);
if(!neaac_handle || !mp4_handle) if(!neaac_handle || !mp4_handle)
return false; return false;