Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-05-19 14:43:30 +02:00
Code Issues Projects Releases Wiki Activity

2022-11-15 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a bug in rdcatchd(8) that caused record events to be
	captured with the incorrect sampling rate.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2022-11-15 14:55:04 -05:00
parent 96de66481b
commit 1b38ed8ea8
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -20951,3 +20951,6 @@
2022-11-15 Fred Gleason <fredg@paravelsystems.com> 2022-11-15 Fred Gleason <fredg@paravelsystems.com>
* Applied a PR from Robert Chipperfield that broke waveform * Applied a PR from Robert Chipperfield that broke waveform
generation on ARM architectures. generation on ARM architectures.
2022-11-15 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in rdcatchd(8) that caused record events to be
captured with the incorrect sampling rate.

2
lib/rdcae.cpp
View File

@ -222,7 +222,7 @@ void RDCae::loadRecord(int card,int stream,QString name,
int bit_rate) int bit_rate)
{ {
// printf("RDCae::loadRecord(%d,%d,%s,%d,%d,%d,%d)\n", // printf("RDCae::loadRecord(%d,%d,%s,%d,%d,%d,%d)\n",
// card,stream,(const char *)name,coding,chan,samp_rate,bit_rate); // card,stream,(const char *)name,coding,chan,samp_rate,bit_rate);
SendCommand(QString().sprintf("LR %d %d %d %d %d %d %s!", SendCommand(QString().sprintf("LR %d %d %d %d %d %d %s!",
card,stream,(int)coding,chan,samp_rate, card,stream,(int)coding,chan,samp_rate,
bit_rate,(const char *)name)); bit_rate,(const char *)name));

7
rdcatchd/rdcatchd.cpp
View File

@ -1310,7 +1310,8 @@ bool MainObject::StartRecording(int event)
cut_name, cut_name,
format, format,
catch_events[event].channels(), catch_events[event].channels(),
catch_events[event].sampleRate(), // catch_events[event].sampleRate(),
rda->system()->sampleRate(),
catch_events[event].bitrate()); catch_events[event].bitrate());
rda->cae()->record(catch_record_card[deck-1],catch_record_stream[deck-1], rda->cae()->record(catch_record_card[deck-1],catch_record_stream[deck-1],
length,0); length,0);
@ -1351,7 +1352,7 @@ bool MainObject::StartRecording(int event)
break; break;
} }
cut->setChannels(catch_events[event].channels()); cut->setChannels(catch_events[event].channels());
cut->setSampleRate(catch_events[event].sampleRate()); cut->setSampleRate(rda->system()->sampleRate());
cut->setBitRate(catch_events[event].bitrate()); cut->setBitRate(catch_events[event].bitrate());
cut->setPlayCounter(0); cut->setPlayCounter(0);
cut->setSegueStartPoint(-1); cut->setSegueStartPoint(-1);
@ -2330,7 +2331,7 @@ void MainObject::CheckInRecording(QString cutname,CatchEvent *evt,
RDCut *cut=new RDCut(cutname); RDCut *cut=new RDCut(cutname);
RDSettings *s=new RDSettings(); RDSettings *s=new RDSettings();
s->setFormat((RDSettings::Format)evt->format()); s->setFormat((RDSettings::Format)evt->format());
s->setSampleRate(evt->sampleRate()); s->setSampleRate(rda->system()->sampleRate());
s->setBitRate(evt->bitrate()); s->setBitRate(evt->bitrate());
s->setChannels(evt->channels()); s->setChannels(evt->channels());
cut->checkInRecording(rda->config()->stationName(),"", cut->checkInRecording(rda->config()->stationName(),"",