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

2021-04-15 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed bugs that broke the build when MP4 support was enabled.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2021-04-15 08:58:41 -04:00
parent b216723f01
commit 92d1699a9d
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -21434,3 +21434,5 @@
2021-04-14 Fred Gleason <fredg@paravelsystems.com> 2021-04-14 Fred Gleason <fredg@paravelsystems.com>
* Documented the 'MeterPortBaseNumber=' and 'MeterPointRange=' * Documented the 'MeterPortBaseNumber=' and 'MeterPointRange='
directives in the rd.conf(5) man page. directives in the rd.conf(5) man page.
2021-04-15 Fred Gleason <fredg@paravelsystems.com>
* Fixed bugs that broke the build when MP4 support was enabled.

2
lib/rdaudioconvert.cpp
View File

@ -775,7 +775,7 @@ RDAudioConvert::ErrorCode RDAudioConvert::Stage1M4A(const QString &dstfile,
sf_dst_info.format=SF_FORMAT_WAV|SF_FORMAT_FLOAT; sf_dst_info.format=SF_FORMAT_WAV|SF_FORMAT_FLOAT;
sf_dst_info.channels=wave->getChannels(); sf_dst_info.channels=wave->getChannels();
sf_dst_info.samplerate=wave->getSamplesPerSec(); sf_dst_info.samplerate=wave->getSamplesPerSec();
if((sf_dst=sf_open(dstfile,SFM_WRITE,&sf_dst_info))==NULL) { if((sf_dst=sf_open(dstfile.toUtf8(),SFM_WRITE,&sf_dst_info))==NULL) {
ret = RDAudioConvert::ErrorNoDestination; ret = RDAudioConvert::ErrorNoDestination;
goto out_mp4_configbuf; goto out_mp4_configbuf;
} }

4
lib/rdwavefile.cpp
View File

@ -339,7 +339,7 @@ bool RDWaveFile::openWave(RDWaveData *data)
assert(dlmp4.load()); assert(dlmp4.load());
format_tag=WAVE_FORMAT_M4A; format_tag=WAVE_FORMAT_M4A;
MP4FileHandle f = dlmp4.MP4Read(getName()); MP4FileHandle f = dlmp4.MP4Read(getName().toUtf8());
if(f == MP4_INVALID_FILE_HANDLE) if(f == MP4_INVALID_FILE_HANDLE)
return false; return false;
@ -2477,7 +2477,7 @@ bool RDWaveFile::IsM4A(int fd)
#ifdef HAVE_MP4_LIBS #ifdef HAVE_MP4_LIBS
if(!dlmp4.load()) if(!dlmp4.load())
return false; return false;
MP4FileHandle f = dlmp4.MP4Read(getName()); MP4FileHandle f = dlmp4.MP4Read(getName().toUtf8());
bool ret = f != MP4_INVALID_FILE_HANDLE; bool ret = f != MP4_INVALID_FILE_HANDLE;
if(ret) if(ret)
dlmp4.MP4Close(f, 0); dlmp4.MP4Close(f, 0);