diff --git a/ChangeLog b/ChangeLog index c56b2203..47784b4d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24593,3 +24593,6 @@ * Fixed a regression in rdairplay(1) that caused the time remaining readouts in the Voice Tracker to overlap the Save button when at the minimum window size. +2023-12-27 Fred Gleason + * Fixed a regression in rdcatchd(8) that caused recordings to MPEG + Layer II to fail. diff --git a/lib/rdsettings.cpp b/lib/rdsettings.cpp index b4f8eff5..2367c81b 100644 --- a/lib/rdsettings.cpp +++ b/lib/rdsettings.cpp @@ -55,6 +55,7 @@ void RDSettings::setFormat(Format format) void RDSettings::setFormat(RDCae::AudioCoding coding) { RDSettings::Format fmt=RDSettings::Pcm16; + int layer=0; switch(coding) { case RDCae::Pcm16: @@ -63,14 +64,17 @@ void RDSettings::setFormat(RDCae::AudioCoding coding) case RDCae::MpegL1: fmt=RDSettings::MpegL1; + layer=1; break; case RDCae::MpegL2: - fmt=RDSettings::MpegL2; + fmt=RDSettings::MpegL2Wav; + layer=2; break; case RDCae::MpegL3: - fmt=RDSettings::MpegL2; + fmt=RDSettings::MpegL3; + layer=3; break; case RDCae::Pcm24: @@ -78,6 +82,7 @@ void RDSettings::setFormat(RDCae::AudioCoding coding) break; } setFormat(fmt); + setLayer(layer); } diff --git a/rdcatchd/batch.cpp b/rdcatchd/batch.cpp index 66690363..7e342fe9 100644 --- a/rdcatchd/batch.cpp +++ b/rdcatchd/batch.cpp @@ -453,11 +453,10 @@ bool MainObject::Import(CatchEvent *evt,QString *err_msg) conv->setDestinationFile(RDCut::pathName(evt->cutName())); RDDeck *deck=new RDDeck(rda->station()->name(),evt->channel()); RDSettings *settings=new RDSettings(); - // settings->setFormat(catch_record_coding[evt->channel()-1]); settings->setFormat(deck->defaultFormat()); settings->setChannels(evt->channels()); settings->setSampleRate(rda->system()->sampleRate()); - settings->setBitRate(catch_record_bitrate[evt->channel()-1]); + settings->setBitRate(deck->defaultBitrate()); settings->setNormalizationLevel(evt->normalizeLevel()/100); rda->syslog(LOG_INFO,"started import of %s to cut %s, id=%d", (const char *)evt->tempName().toUtf8(),