Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-07-25 00:48:16 +02:00
Code Issues Projects Releases Wiki Activity

2019-06-05 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a bug that caused exported PCM24 WAV files to indicate
	an incorrect 'dwLevelReference' value in the cart chunk.
This commit is contained in:
Fred Gleason 2019-06-05 19:38:52 -04:00
parent 900f101d7b
commit b238398377
2 changed files with 26 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -18742,3 +18742,6 @@
2019-06-05 Fred Gleason <fredg@paravelsystems.com> 2019-06-05 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug that caused exported WAV files to use invalid default * Fixed a bug that caused exported WAV files to use invalid default
date expressions in the cart chunk. date expressions in the cart chunk.
2019-06-05 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug that caused exported PCM24 WAV files to indicate
an incorrect 'dwLevelReference' value in the cart chunk.

61
lib/rdwavefile.cpp
View File

@ -122,16 +122,6 @@ RDWaveFile::RDWaveFile(QString file_name)
cart_category=""; cart_category="";
cart_classification=""; cart_classification="";
cart_out_cue=""; cart_out_cue="";
/*
cart_start_date=QDate::currentDate();
cart_start_time=QTime::currentTime();
cart_end_date=QDate(CART_DEFAULT_END_YEAR,
CART_DEFAULT_END_MONTH,
CART_DEFAULT_END_DAY);
cart_end_time=QTime(CART_DEFAULT_END_HOUR,
CART_DEFAULT_END_MINUTE,
CART_DEFAULT_END_SECOND);
*/
cart_producer_app_id=""; cart_producer_app_id="";
cart_producer_app_ver=""; cart_producer_app_ver="";
cart_user_def=""; cart_user_def="";
@ -507,9 +497,6 @@ bool RDWaveFile::openWave(RDWaveData *data)
lseek(wave_file.handle(),data_start,SEEK_SET); lseek(wave_file.handle(),data_start,SEEK_SET);
ValidateMetadata(); ValidateMetadata();
// lseek(wave_file.handle(),SEEK_SET,0x845);
// printf("PTR: 0x%04X\n",lseek(wave_file.handle(),SEEK_CUR,0));
return true; return true;
} }
@ -844,16 +831,6 @@ void RDWaveFile::closeWave(int samples)
cart_start_time=QTime(); cart_start_time=QTime();
cart_end_date=QDate(); cart_end_date=QDate();
cart_end_time=QTime(); cart_end_time=QTime();
/*
cart_start_date=QDate::currentDate();
cart_start_time=QTime::currentTime();
cart_end_date=QDate(CART_DEFAULT_END_YEAR,
CART_DEFAULT_END_MONTH,
CART_DEFAULT_END_DAY);
cart_end_time=QTime(CART_DEFAULT_END_HOUR,
CART_DEFAULT_END_MINUTE,
CART_DEFAULT_END_SECOND);
*/
cart_producer_app_id=""; cart_producer_app_id="";
cart_producer_app_ver=""; cart_producer_app_ver="";
cart_user_def=""; cart_user_def="";
@ -4301,21 +4278,29 @@ bool RDWaveFile::MakeFmt()
} }
if(format_tag==WAVE_FORMAT_PCM) { if(format_tag==WAVE_FORMAT_PCM) {
switch(bits_per_sample) { switch(bits_per_sample) {
case 8: case 8:
block_align=channels; block_align=channels;
break; cart_level_ref=0x80;
case 16: break;
block_align=2*channels;
break; case 16:
case 24: block_align=2*channels;
block_align=3*channels; cart_level_ref=0x8000;
break; break;
case 32:
block_align=4*channels; case 24:
break; block_align=3*channels;
default: cart_level_ref=0x800000;
return false; break;
break;
case 32:
block_align=4*channels;
cart_level_ref=0x80000000;
break;
default:
return false;
break;
} }
avg_bytes_per_sec=block_align*samples_per_sec; avg_bytes_per_sec=block_align*samples_per_sec;
cb_size=0; cb_size=0;