diff --git a/ChangeLog b/ChangeLog index 39c0c330..26c88a69 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21434,3 +21434,5 @@ 2021-04-14 Fred Gleason * Documented the 'MeterPortBaseNumber=' and 'MeterPointRange=' directives in the rd.conf(5) man page. +2021-04-15 Fred Gleason + * Fixed bugs that broke the build when MP4 support was enabled. diff --git a/lib/rdaudioconvert.cpp b/lib/rdaudioconvert.cpp index 8919f402..57f345a9 100644 --- a/lib/rdaudioconvert.cpp +++ b/lib/rdaudioconvert.cpp @@ -775,7 +775,7 @@ RDAudioConvert::ErrorCode RDAudioConvert::Stage1M4A(const QString &dstfile, sf_dst_info.format=SF_FORMAT_WAV|SF_FORMAT_FLOAT; sf_dst_info.channels=wave->getChannels(); 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; goto out_mp4_configbuf; } diff --git a/lib/rdwavefile.cpp b/lib/rdwavefile.cpp index a3ef6250..908094b5 100644 --- a/lib/rdwavefile.cpp +++ b/lib/rdwavefile.cpp @@ -339,7 +339,7 @@ bool RDWaveFile::openWave(RDWaveData *data) assert(dlmp4.load()); format_tag=WAVE_FORMAT_M4A; - MP4FileHandle f = dlmp4.MP4Read(getName()); + MP4FileHandle f = dlmp4.MP4Read(getName().toUtf8()); if(f == MP4_INVALID_FILE_HANDLE) return false; @@ -2477,7 +2477,7 @@ bool RDWaveFile::IsM4A(int fd) #ifdef HAVE_MP4_LIBS if(!dlmp4.load()) return false; - MP4FileHandle f = dlmp4.MP4Read(getName()); + MP4FileHandle f = dlmp4.MP4Read(getName().toUtf8()); bool ret = f != MP4_INVALID_FILE_HANDLE; if(ret) dlmp4.MP4Close(f, 0);