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

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

Browse Source 
* Renamed the 'RDWaveData::introStartPos()' method to
	'RDWaveData::talkStartPos()'.
	* Renamed the 'RDWaveData::setIntroStartPos()' method to
	'RDWaveData::setTalkStartPos()'.
	* Renamed the 'RDWaveData::introEndPos()' method to
	'RDWaveData::talkEndPos()'.
	* Renamed the 'RDWaveData::setIntroEndPos()' method to
	'RDWaveData::setTalkEndPos()'.
This commit is contained in:
Fred Gleason 2019-03-06 11:14:13 -05:00
parent d024d27474
commit 3c363ff5f5
8 changed files with 72 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -18520,3 +18520,12 @@
* Added an 'RDWaveData::validateMarkers()' method. * Added an 'RDWaveData::validateMarkers()' method.
* Added an 'RDWaveData::validateDateTime()' method. * Added an 'RDWaveData::validateDateTime()' method.
* Removed the 'RDWaveData::checkDateTimes()' method. * Removed the 'RDWaveData::checkDateTimes()' method.
2019-03-06 Fred Gleason <fredg@paravelsystems.com>
* Renamed the 'RDWaveData::introStartPos()' method to
'RDWaveData::talkStartPos()'.
* Renamed the 'RDWaveData::setIntroStartPos()' method to
'RDWaveData::setTalkStartPos()'.
* Renamed the 'RDWaveData::introEndPos()' method to
'RDWaveData::talkEndPos()'.
* Renamed the 'RDWaveData::setIntroEndPos()' method to
'RDWaveData::setTalkEndPos()'.

4
importers/nexgen_filter.cpp
View File

@ -518,8 +518,8 @@ void MainObject::ProcessXmlLine(const QString &line,RDWaveData *data,
} }
if(tag=="intro_3") { if(tag=="intro_3") {
if(value.toInt()>0) { if(value.toInt()>0) {
data->setIntroStartPos(0); data->setTalkStartPos(0);
data->setIntroEndPos(value.toInt()); data->setTalkEndPos(value.toInt());
} }
} }
if(tag=="hookstart") { if(tag=="hookstart") {

4
lib/rdcart.cpp
View File

@ -2000,12 +2000,12 @@ unsigned RDCart::readXml(std::vector<RDWaveData> *data,const QString &xml)
cartdata.setMetadataFound(true); cartdata.setMetadataFound(true);
} }
if(f0[i].contains("<talkStartPoint>")) { if(f0[i].contains("<talkStartPoint>")) {
data->back().setIntroStartPos(GetXmlValue("talkStartPoint",f0[i]). data->back().setTalkStartPos(GetXmlValue("talkStartPoint",f0[i]).
toInt()); toInt());
cartdata.setMetadataFound(true); cartdata.setMetadataFound(true);
} }
if(f0[i].contains("<talkEndPoint>")) { if(f0[i].contains("<talkEndPoint>")) {
data->back().setIntroEndPos(GetXmlValue("talkEndPoint",f0[i]).toInt()); data->back().setTalkEndPos(GetXmlValue("talkEndPoint",f0[i]).toInt());
cartdata.setMetadataFound(true); cartdata.setMetadataFound(true);
} }
if(f0[i].contains("<hookStartPoint>")) { if(f0[i].contains("<hookStartPoint>")) {

20
lib/rdcut.cpp
View File

@ -996,8 +996,8 @@ void RDCut::getMetadata(RDWaveData *data) const
data->setDaypartEndTime(q->value(9).toTime()); data->setDaypartEndTime(q->value(9).toTime());
data->setSegueStartPos(q->value(10).toInt()); data->setSegueStartPos(q->value(10).toInt());
data->setSegueEndPos(q->value(11).toInt()); data->setSegueEndPos(q->value(11).toInt());
data->setIntroStartPos(q->value(12).toInt()); data->setTalkStartPos(q->value(12).toInt());
data->setIntroEndPos(q->value(13).toInt()); data->setTalkEndPos(q->value(13).toInt());
data->setStartPos(q->value(14).toInt()); data->setStartPos(q->value(14).toInt());
data->setEndPos(q->value(15).toInt()); data->setEndPos(q->value(15).toInt());
data->setHookStartPos(q->value(16).toInt()); data->setHookStartPos(q->value(16).toInt());
@ -1045,25 +1045,25 @@ void RDCut::setMetadata(RDWaveData *data) const
if(data->endPos()>=0) { if(data->endPos()>=0) {
sql+=QString().sprintf("END_POINT=%d,",data->endPos()); sql+=QString().sprintf("END_POINT=%d,",data->endPos());
} }
if((data->introStartPos()==data->startPos())&& if((data->talkStartPos()==data->startPos())&&
(data->introEndPos()==data->endPos())) { (data->talkEndPos()==data->endPos())) {
sql+="TALK_START_POINT=-1,TALK_END_POINT=-1,"; sql+="TALK_START_POINT=-1,TALK_END_POINT=-1,";
} }
else { else {
if(data->introStartPos()>=0) { if(data->talkStartPos()>=0) {
if(data->introStartPos()<data->startPos()) { if(data->talkStartPos()<data->startPos()) {
sql+=QString().sprintf("TALK_START_POINT=%d,",data->startPos()); sql+=QString().sprintf("TALK_START_POINT=%d,",data->startPos());
} }
else { else {
sql+=QString().sprintf("TALK_START_POINT=%d,",data->introStartPos()); sql+=QString().sprintf("TALK_START_POINT=%d,",data->talkStartPos());
} }
} }
if(data->introEndPos()>=0) { if(data->talkEndPos()>=0) {
if((data->introEndPos()>data->endPos())&&(data->endPos()!=-1)) { if((data->talkEndPos()>data->endPos())&&(data->endPos()!=-1)) {
sql+=QString().sprintf("TALK_END_POINT=%d,",data->endPos()); sql+=QString().sprintf("TALK_END_POINT=%d,",data->endPos());
} }
else { else {
sql+=QString().sprintf("TALK_END_POINT=%d,",data->introEndPos()); sql+=QString().sprintf("TALK_END_POINT=%d,",data->talkEndPos());
} }
} }
} }

48
lib/rdwavedata.cpp
View File

@ -2,7 +2,7 @@
// //
// A Container Class for Audio Meta Data. // A Container Class for Audio Meta Data.
// //
// (C) Copyright 2002-2006,2016 Fred Gleason <fredg@paravelsystems.com> // (C) Copyright 2002-2019 Fred Gleason <fredg@paravelsystems.com>
// //
// This program is free software; you can redistribute it and/or modify // This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU Library General Public License // it under the terms of the GNU Library General Public License
@ -641,27 +641,27 @@ void RDWaveData::setEvergreen(bool state)
} }
int RDWaveData::introStartPos() const int RDWaveData::talkStartPos() const
{ {
return data_intro_start_pos; return data_talk_start_pos;
} }
void RDWaveData::setIntroStartPos(int msec) void RDWaveData::setTalkStartPos(int msec)
{ {
data_intro_start_pos=msec; data_talk_start_pos=msec;
} }
int RDWaveData::introEndPos() const int RDWaveData::talkEndPos() const
{ {
return data_intro_end_pos; return data_talk_end_pos;
} }
void RDWaveData::setIntroEndPos(int msec) void RDWaveData::setTalkEndPos(int msec)
{ {
data_intro_end_pos=msec; data_talk_end_pos=msec;
} }
@ -974,24 +974,24 @@ bool RDWaveData::validateMarkers(int msec)
// //
// Talk Markers // Talk Markers
// //
if((introStartPos()==startPos())&&(introEndPos()==endPos())) { if((talkStartPos()==startPos())&&(talkEndPos()==endPos())) {
setIntroStartPos(-1); setTalkStartPos(-1);
setIntroEndPos(-1); setTalkEndPos(-1);
modified=true; modified=true;
} }
if((introStartPos()<0)||(introEndPos()<0)||(introStartPos()>introEndPos())) { if((talkStartPos()<0)||(talkEndPos()<0)||(talkStartPos()>talkEndPos())) {
setIntroStartPos(-1); setTalkStartPos(-1);
setIntroEndPos(-1); setTalkEndPos(-1);
modified=true; modified=true;
} }
else { else {
if(introEndPos()>endPos()) { if(talkEndPos()>endPos()) {
setIntroEndPos(endPos()); setTalkEndPos(endPos());
modified=true; modified=true;
} }
if(introStartPos()>endPos()) { if(talkStartPos()>endPos()) {
setIntroStartPos(-1); setTalkStartPos(-1);
setIntroEndPos(-1); setTalkEndPos(-1);
modified=true; modified=true;
} }
} }
@ -1212,8 +1212,8 @@ QString RDWaveData::dump() const
ret+=QString().sprintf("segueStartPos: %d\n",segueStartPos()); ret+=QString().sprintf("segueStartPos: %d\n",segueStartPos());
ret+=QString().sprintf("segueEndPos: %d\n",segueEndPos()); ret+=QString().sprintf("segueEndPos: %d\n",segueEndPos());
ret+=QString().sprintf("segueGain: %d\n",segueGain()); ret+=QString().sprintf("segueGain: %d\n",segueGain());
ret+=QString().sprintf("introStartPos: %d\n",introStartPos()); ret+=QString().sprintf("talkStartPos: %d\n",talkStartPos());
ret+=QString().sprintf("introEndPos: %d\n",introEndPos()); ret+=QString().sprintf("talkEndPos: %d\n",talkEndPos());
ret+=QString().sprintf("hookStartPos: %d\n",hookStartPos()); ret+=QString().sprintf("hookStartPos: %d\n",hookStartPos());
ret+=QString().sprintf("hookEndPos: %d\n",hookEndPos()); ret+=QString().sprintf("hookEndPos: %d\n",hookEndPos());
ret+=QString().sprintf("fadeUpPos: %d\n",fadeUpPos()); ret+=QString().sprintf("fadeUpPos: %d\n",fadeUpPos());
@ -1280,8 +1280,8 @@ void RDWaveData::clear()
} }
data_weight=1; data_weight=1;
data_evergreen=false; data_evergreen=false;
data_intro_start_pos=-1; data_talk_start_pos=-1;
data_intro_end_pos=-1; data_talk_end_pos=-1;
data_segue_start_pos=-1; data_segue_start_pos=-1;
data_segue_end_pos=-1; data_segue_end_pos=-1;
data_segue_gain=-3000; data_segue_gain=-3000;

19
lib/rdwavedata.h
View File

@ -2,7 +2,7 @@
// //
// A Container Class for Audio Meta Data. // A Container Class for Audio Meta Data.
// //
// (C) Copyright 2002-2006,2016 Fred Gleason <fredg@paravelsystems.com> // (C) Copyright 2002-2019 Fred Gleason <fredg@paravelsystems.com>
// //
// This program is free software; you can redistribute it and/or modify // This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU Library General Public License // it under the terms of the GNU Library General Public License
@ -137,10 +137,10 @@ class RDWaveData
void setWeight(int weight); void setWeight(int weight);
bool evergreen() const; bool evergreen() const;
void setEvergreen(bool state); void setEvergreen(bool state);
int introStartPos() const; int talkStartPos() const;
void setIntroStartPos(int msec); void setTalkStartPos(int msec);
int introEndPos() const; int talkEndPos() const;
void setIntroEndPos(int msec); void setTalkEndPos(int msec);
int segueStartPos() const; int segueStartPos() const;
void setSegueStartPos(int msec); void setSegueStartPos(int msec);
int segueEndPos() const; int segueEndPos() const;
@ -250,8 +250,8 @@ class RDWaveData
bool data_evergreen; bool data_evergreen;
bool data_day_of_week[7]; bool data_day_of_week[7];
int data_weight; int data_weight;
int data_intro_start_pos; int data_talk_start_pos;
int data_intro_end_pos; int data_talk_end_pos;
int data_segue_start_pos; int data_segue_start_pos;
int data_segue_end_pos; int data_segue_end_pos;
int data_segue_gain; int data_segue_gain;
@ -261,11 +261,6 @@ class RDWaveData
int data_hook_end_pos; int data_hook_end_pos;
int data_fade_up_pos; int data_fade_up_pos;
int data_fade_down_pos; int data_fade_down_pos;
/*
int data_intro_length;
int data_segue_length;
int data_full_length;
*/
int data_beats_per_minute; int data_beats_per_minute;
QString data_tmci_song_id; QString data_tmci_song_id;
QDate data_origination_date; QDate data_origination_date;

32
lib/rdwavefile.cpp
View File

@ -2777,16 +2777,16 @@ bool RDWaveFile::GetCart(int fd)
((double)getSamplesPerSec()))); ((double)getSamplesPerSec())));
} }
if(cart_timer_label[i]=="INTs") { if(cart_timer_label[i]=="INTs") {
wave_data->setIntroStartPos((int)(1000.0*((double)cart_timer_sample[i])/ wave_data->setTalkStartPos((int)(1000.0*((double)cart_timer_sample[i])/
((double)getSamplesPerSec()))); ((double)getSamplesPerSec())));
} }
if(cart_timer_label[i]=="INTe") { if(cart_timer_label[i]=="INTe") {
wave_data->setIntroEndPos((int)(1000.0*((double)cart_timer_sample[i])/ wave_data->setTalkEndPos((int)(1000.0*((double)cart_timer_sample[i])/
((double)getSamplesPerSec()))); ((double)getSamplesPerSec())));
} }
if((cart_timer_label[i]=="INT ")||(cart_timer_label[i]=="INT1")) { if((cart_timer_label[i]=="INT ")||(cart_timer_label[i]=="INT1")) {
wave_data->setIntroStartPos(0); wave_data->setTalkStartPos(0);
wave_data->setIntroEndPos((int)(1000.0*((double)cart_timer_sample[i])/ wave_data->setTalkEndPos((int)(1000.0*((double)cart_timer_sample[i])/
((double)getSamplesPerSec()))); ((double)getSamplesPerSec())));
} }
if(cart_timer_label[i]=="AUDs") { if(cart_timer_label[i]=="AUDs") {
@ -3002,8 +3002,8 @@ bool RDWaveFile::GetScot(int fd)
wave_data->setUserDefined(scot_etc.stripWhiteSpace()); wave_data->setUserDefined(scot_etc.stripWhiteSpace());
wave_data->setReleaseYear(scot_year); wave_data->setReleaseYear(scot_year);
wave_data->setCutId(QString().sprintf("%u",cartnum)); wave_data->setCutId(QString().sprintf("%u",cartnum));
wave_data->setIntroStartPos(0); wave_data->setTalkStartPos(0);
wave_data->setIntroEndPos(scot_intro_length); wave_data->setTalkEndPos(scot_intro_length);
if(segue_start>0) { if(segue_start>0) {
wave_data->setSegueStartPos(getExtTimeLength()-10*segue_start); wave_data->setSegueStartPos(getExtTimeLength()-10*segue_start);
wave_data->setSegueEndPos(getExtTimeLength()); wave_data->setSegueEndPos(getExtTimeLength());
@ -3122,8 +3122,8 @@ bool RDWaveFile::GetAv10(int fd)
if(label=="IN") { // AV Intro if(label=="IN") { // AV Intro
if(ok) { if(ok) {
if(wave_data!=NULL) { if(wave_data!=NULL) {
wave_data->setIntroStartPos(wave_data->startPos()); wave_data->setTalkStartPos(wave_data->startPos());
wave_data->setIntroEndPos(1000*arg.toInt()); wave_data->setTalkEndPos(1000*arg.toInt());
wave_data->setMetadataFound(true); wave_data->setMetadataFound(true);
} }
} }
@ -3312,8 +3312,8 @@ bool RDWaveFile::ReadListElement(unsigned char *buffer,unsigned *offset,
wave_data->setMetadataFound(true); wave_data->setMetadataFound(true);
} }
if(!strcmp(tag,"tint")) { if(!strcmp(tag,"tint")) {
wave_data->setIntroStartPos(0); wave_data->setTalkStartPos(0);
wave_data->setIntroEndPos(RDSetTimeLength(((char *)buffer)+(*offset))); wave_data->setTalkEndPos(RDSetTimeLength(((char *)buffer)+(*offset)));
wave_data->setMetadataFound(true); wave_data->setMetadataFound(true);
} }
if(!strcmp(tag,"ttim")) { if(!strcmp(tag,"ttim")) {
@ -3413,8 +3413,8 @@ void RDWaveFile::ReadTmcTag(const QString tag,const QString value)
wave_data->setMetadataFound(true); wave_data->setMetadataFound(true);
} }
if(tag=="INTRO") { if(tag=="INTRO") {
wave_data->setIntroStartPos(0); wave_data->setTalkStartPos(0);
wave_data->setIntroEndPos(RDSetTimeLength(value.stripWhiteSpace())); wave_data->setTalkEndPos(RDSetTimeLength(value.stripWhiteSpace()));
wave_data->setMetadataFound(true); wave_data->setMetadataFound(true);
} }
if(tag=="AUX") { if(tag=="AUX") {
@ -4428,15 +4428,15 @@ bool RDWaveFile::MakeCart(unsigned ptr_offset)
FrameOffset(wave_data->segueEndPos()-ptr_offset_msecs)); FrameOffset(wave_data->segueEndPos()-ptr_offset_msecs));
timer++; timer++;
} }
if((wave_data->introStartPos()>=0)&& if((wave_data->talkStartPos()>=0)&&
(wave_data->introEndPos()>wave_data->introStartPos())) { (wave_data->talkEndPos()>wave_data->talkStartPos())) {
sprintf((char *)cart_chunk_data+684+timer*MAX_TIMERS,"INTs"); sprintf((char *)cart_chunk_data+684+timer*MAX_TIMERS,"INTs");
WriteDword(cart_chunk_data,688+timer*MAX_TIMERS, WriteDword(cart_chunk_data,688+timer*MAX_TIMERS,
FrameOffset(wave_data->introStartPos()-ptr_offset_msecs)); FrameOffset(wave_data->talkStartPos()-ptr_offset_msecs));
timer++; timer++;
sprintf((char *)cart_chunk_data+684+timer*MAX_TIMERS,"INTe"); sprintf((char *)cart_chunk_data+684+timer*MAX_TIMERS,"INTe");
WriteDword(cart_chunk_data,688+timer*MAX_TIMERS, WriteDword(cart_chunk_data,688+timer*MAX_TIMERS,
FrameOffset(wave_data->introEndPos()-ptr_offset_msecs)); FrameOffset(wave_data->talkEndPos()-ptr_offset_msecs));
timer++; timer++;
} }
if((wave_data->startPos()>=0)&& if((wave_data->startPos()>=0)&&

4
utils/rddiscimport/metarecord.cpp
View File

@ -297,8 +297,8 @@ void MetaRecord::getMetadata(RDWaveData *data,int track_len)
data->setPublisher(meta_publisher); data->setPublisher(meta_publisher);
data->setIsrc(meta_isrc); data->setIsrc(meta_isrc);
data->setLicensingOrganization(meta_license); data->setLicensingOrganization(meta_license);
data->setIntroStartPos(0); data->setTalkStartPos(0);
data->setIntroEndPos(meta_intro_length); data->setTalkEndPos(meta_intro_length);
if(meta_segue_start>=0) { if(meta_segue_start>=0) {
data->setSegueStartPos(meta_segue_start); data->setSegueStartPos(meta_segue_start);
data->setSegueEndPos(track_len); data->setSegueEndPos(track_len);