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

2019-10-22 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Added an 'RDStringToHex()' function to 'lib/rd.conf.cpp'.
	* Fixed bugs in 'RDWaveFile' that caused strings of null characters
	to be written into unfilled CartChunk string fields.
This commit is contained in:
Fred Gleason 2019-10-22 19:00:53 -05:00
parent fa844c7094
commit e62c5fcb00
4 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -19223,3 +19223,7 @@
dialog in rdlogedit(1).
2019-10-21 Fred Gleason <fredg@paravelsystems.com>
* Incremented the package version to 3.1.0int1.
2019-10-22 Fred Gleason <fredg@paravelsystems.com>
* Added an 'RDStringToHex()' function to 'lib/rd.conf.cpp'.
* Fixed bugs in 'RDWaveFile' that caused strings of null characters
to be written into unfilled CartChunk string fields.

13
lib/rdconf.cpp
View File

@ -1209,6 +1209,19 @@ QByteArray RDStringToData(const QString &str)
}
QString RDStringToHex(const QString &str)
{
QByteArray bytes=str.toUtf8();
QString ret="";
for(int i=0;i<bytes.length();i++) {
ret+=QString().sprintf("%02X ",0xFF&bytes[i]);
}
return ret;
}
QList<pid_t> RDGetPids(const QString &program)
{
QList<pid_t> pids;

1
lib/rdconf.h
View File

@ -110,6 +110,7 @@ bool RDProcessActive(const QString &cmd);
bool RDProcessActive(const QStringList &cmds);
bool RDModulesActive();
QByteArray RDStringToData(const QString &str);
QString RDStringToHex(const QString &str);
QList<pid_t> RDGetPids(const QString &program);
#endif // RDCONF_H

32
lib/rdwavefile.cpp
View File

@ -2740,20 +2740,20 @@ bool RDWaveFile::GetCart(int fd)
if(wave_data!=NULL) {
wave_data->setMetadataFound(true);
wave_data->setTitle(cart_title);
wave_data->setArtist(cart_artist);
wave_data->setTitle(QString(cart_title).remove(QChar(0)));
wave_data->setArtist(QString(cart_artist).remove(QChar(0)));
wave_data->setCutId(cart_cut_id);
wave_data->setClient(cart_client_id);
wave_data->setCategory(cart_category);
wave_data->setClassification(cart_classification);
wave_data->setOutCue(cart_out_cue);
wave_data->setClient(QString(cart_client_id).remove(QChar(0)));
wave_data->setCategory(QString(cart_category).remove(QChar(0)));
wave_data->setClassification(QString(cart_classification).remove(QChar(0)));
wave_data->setOutCue(QString(cart_out_cue).remove(QChar(0)));
wave_data->setStartDate(cart_start_date);
wave_data->setStartTime(cart_start_time);
wave_data->setEndDate(cart_end_date);
wave_data->setEndTime(cart_end_time);
wave_data->setUserDefined(cart_user_def);
wave_data->setUrl(cart_url);
wave_data->setTagText(cart_tag_text);
wave_data->setUserDefined(QString(cart_user_def).remove(QChar(0)));
wave_data->setUrl(QString(cart_url).remove(QChar(0)));
wave_data->setTagText(QString(cart_tag_text).remove(QChar(0)));
for(int i=0;i<MAX_TIMERS;i++) {
if((cart_timer_label[i]=="SEGs")||(cart_timer_label[i]=="SEC1")) {
wave_data->setSegueStartPos((int)(1000.0*((double)cart_timer_sample[i])/
@ -2831,12 +2831,12 @@ bool RDWaveFile::GetBext(int fd)
if(wave_data!=NULL) {
wave_data->setMetadataFound(true);
wave_data->setDescription(bext_description);
wave_data->setOriginator(bext_originator);
wave_data->setOriginatorReference(bext_originator_ref);
wave_data->setDescription(bext_description.remove(QChar(0)));
wave_data->setOriginator(bext_originator.remove(QChar(0)));
wave_data->setOriginatorReference(bext_originator_ref.remove(QChar(0)));
wave_data->setOriginationDate(bext_origination_date);
wave_data->setOriginationTime(bext_origination_time);
wave_data->setCodingHistory(bext_coding_history);
wave_data->setCodingHistory(bext_coding_history.remove(QChar(0)));
}
return true;
}
@ -2984,9 +2984,9 @@ bool RDWaveFile::GetScot(int fd)
}
if(wave_data!=NULL) {
wave_data->setMetadataFound(true);
wave_data->setTitle(scot_title.stripWhiteSpace());
wave_data->setArtist(scot_artist.stripWhiteSpace());
wave_data->setUserDefined(scot_etc.stripWhiteSpace());
wave_data->setTitle(scot_title.remove(QChar(0)).trimmed());
wave_data->setArtist(scot_artist.remove(QChar(0)).trimmed());
wave_data->setUserDefined(scot_etc.remove(QChar(0)).trimmed());
wave_data->setReleaseYear(scot_year);
wave_data->setCutId(QString().sprintf("%u",cartnum));
wave_data->setTalkStartPos(0);