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

2021-10-07 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a bug in rdimport(1) that caused premature validation
	of metadata.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2021-10-07 15:19:40 -04:00
parent b4f66743a1
commit 554e07fcaa
3 changed files with 3 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -20818,3 +20818,6 @@
cause the play length of MPEG-encoded to be incorrectly calculated.
2021-10-06 Fred Gleason <fredg@paravelsystems.com>
* Added an 'rdwavefile_test' test harness in 'tests/'.
2021-10-07 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in rdimport(1) that caused premature validation
of metadata.

23
lib/rdwavefile.cpp
View File

@ -418,7 +418,6 @@ bool RDWaveFile::openWave(RDWaveData *data)
format_chunk=true;
wave_type=RDWaveFile::Ogg;
ReadNormalizeLevel(wave_file_name);
ValidateMetadata();
return true;
#else
return false;
@ -488,7 +487,6 @@ bool RDWaveFile::openWave(RDWaveData *data)
break;
}
lseek(wave_file.handle(),data_start,SEEK_SET);
ValidateMetadata();
return true;
}
@ -4622,27 +4620,6 @@ void RDWaveFile::GrowAlloc(size_t size)
}
void RDWaveFile::ValidateMetadata()
{
if(wave_data==NULL) {
return;
}
if(!wave_data->metadataFound()) {
return;
}
if(wave_data->startPos()<0) {
wave_data->setStartPos(0);
}
if(wave_data->endPos()<0) {
wave_data->setEndPos(ext_time_length);
}
if((wave_data->segueStartPos()>=0)&&(wave_data->segueEndPos()<0)) {
wave_data->setSegueEndPos(wave_data->endPos());
}
}
#ifdef HAVE_VORBIS
int RDWaveFile::WriteOggPage(ogg_page *page)
{

1
lib/rdwavefile.h
View File

@ -1069,7 +1069,6 @@ class RDWaveFile
bool ReadNormalizeLevel(QString wave_file_name);
bool ReadEnergyFile(QString wave_file_name);
void GrowAlloc(size_t size);
void ValidateMetadata();
#ifdef HAVE_VORBIS
int WriteOggPage(ogg_page *page);
#endif // HAVE_VORBIS