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

2023-12-27 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a regression in rdcatchd(8) that caused recordings to MPEG
	Layer II to fail.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2023-12-27 16:53:00 -05:00
parent b3b7676c9a
commit 3c16e0f5fa
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -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 <fredg@paravelsystems.com>
* Fixed a regression in rdcatchd(8) that caused recordings to MPEG
Layer II to fail.

9
lib/rdsettings.cpp
View File

@@ -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);
}

3
rdcatchd/batch.cpp
View File

@@ -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(),