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

2021-04-05 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Added the value of the detected CartChunk CutID to the error
	message	generated when rejecting said CutID as invalid when using
	the '--use-cartchunk-cutid' switch in rdimport(1).
	* Added code to print the value of the detected CartChunk CutID
	when using both the '--use-cartchunk-cutid' and '--verbose' flags
	in rdimport(1).

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2021-04-05 15:40:35 -04:00
parent 460509efaf
commit 9fb8606295
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -21373,3 +21373,13 @@
* Cleaned up compilation warnings in rddbmgr(8). * Cleaned up compilation warnings in rddbmgr(8).
* Rebased rddbmgr(8) to use 'QCoreApplication' rather than * Rebased rddbmgr(8) to use 'QCoreApplication' rather than
'QApplication'. 'QApplication'.
2021-04-05 David Klann <dklann@broadcasttool.com>
* Fixed bug in lib/rdwavefile.cpp that copied CartChunk Cut ID
past the end of the first "NULL" character.
2021-04-05 Fred Gleason <fredg@paravelsystems.com>
* Added the value of the detected CartChunk CutID to the error
message generated when rejecting said CutID as invalid when using
the '--use-cartchunk-cutid' switch in rdimport(1).
* Added code to print the value of the detected CartChunk CutID
when using both the '--use-cartchunk-cutid' and '--verbose' flags
in rdimport(1).

4
lib/rdwavefile.cpp
View File

@ -4637,7 +4637,9 @@ QString RDWaveFile::cutString(char *buffer,unsigned start_point,unsigned size)
QString string; QString string;
for(unsigned i=start_point;i<start_point+size;i++) { for(unsigned i=start_point;i<start_point+size;i++) {
string=string.append(buffer[i]); if((0xFF&buffer[i])!=0) {
string=string.append(buffer[i]);
}
} }
return string; return string;

11
utils/rdimport/rdimport.cpp
View File

@ -1075,16 +1075,17 @@ MainObject::Result MainObject::ImportFile(const QString &filename,
// Get CartChunk metadata // Get CartChunk metadata
// //
if(import_use_cartchunk_cutid||found_cart) { if(import_use_cartchunk_cutid||found_cart) {
Log(LOG_INFO," found CartChunk CutID \""+wavedata->cutId()+"\"\n");
*cartnum=0; *cartnum=0;
*cartnum=wavedata->cutId().toUInt(&ok); *cartnum=wavedata->cutId().toInt(&ok);
//sscanf(wavedata->cutId(),"%u",cartnum);
(*cartnum)+=import_cart_number_offset; (*cartnum)+=import_cart_number_offset;
if((!ok)||(*cartnum==0)||(*cartnum>999999)|| if((!ok)||(*cartnum==0)||(*cartnum>999999)||
(effective_group->enforceCartRange()&& (effective_group->enforceCartRange()&&
(!effective_group->cartNumberValid(*cartnum)))) { (!effective_group->cartNumberValid(*cartnum)))) {
Log(LOG_WARNING,QString().sprintf( Log(LOG_WARNING,QString().sprintf(
" File \"%s\" has an invalid or out of range Cart Number, skipping...\n", " File \"%s\" has an invalid or out of range Cart Number \"%s\", skipping...\n",
RDGetBasePart(filename).toUtf8().constData())); RDGetBasePart(filename).toUtf8().constData(),
wavedata->cutId().toUtf8().constData()));
wavefile->closeWave(); wavefile->closeWave();
import_failed_imports++; import_failed_imports++;
import_journal->addFailure(effective_group->name(),filename, import_journal->addFailure(effective_group->name(),filename,