diff --git a/ChangeLog b/ChangeLog index a046c337..3616fe91 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16737,3 +16737,6 @@ * Added a 'LogType' value to the 'RDNotification::Type enumeration. * Added support for notifications to rdlogedit(1). +2018-03-24 Fred Gleason + * Regularized code formatting for switch() statements in + 'rdlogedit/'. diff --git a/rdlogedit/edit_chain.cpp b/rdlogedit/edit_chain.cpp index 73448bb8..b7a4e803 100644 --- a/rdlogedit/edit_chain.cpp +++ b/rdlogedit/edit_chain.cpp @@ -179,22 +179,21 @@ EditChain::EditChain(RDLogLine *line,QWidget *parent) } timeChangedData(edit_time_edit->time()); switch(edit_logline->graceTime()) { - case -1: - edit_grace_group->setButton(1); - graceClickedData(1); - break; + case -1: + edit_grace_group->setButton(1); + graceClickedData(1); + break; - case 0: - edit_grace_group->setButton(0); - graceClickedData(0); - break; + case 0: + edit_grace_group->setButton(0); + graceClickedData(0); + break; - default: - edit_grace_group->setButton(2); - edit_grace_box->setTime(QTime().addMSecs(edit_logline->graceTime())); - //edit_grace_box->setValue(edit_logline->graceTime()); - graceClickedData(2); - break; + default: + edit_grace_group->setButton(2); + edit_grace_box->setTime(QTime().addMSecs(edit_logline->graceTime())); + graceClickedData(2); + break; } edit_transtype_box->setCurrentItem(edit_logline->transType()); edit_label_edit->setText(edit_logline->markerLabel()); @@ -257,17 +256,17 @@ void EditChain::timeToggledData(bool state) void EditChain::graceClickedData(int id) { switch(id) { - case 0: - edit_grace_box->setDisabled(true); - break; + case 0: + edit_grace_box->setDisabled(true); + break; - case 1: - edit_grace_box->setDisabled(true); - break; + case 1: + edit_grace_box->setDisabled(true); + break; - case 2: - edit_grace_box->setEnabled(true); - break; + case 2: + edit_grace_box->setEnabled(true); + break; } } @@ -324,18 +323,17 @@ void EditChain::okData() edit_logline->setTimeType(RDLogLine::Hard); edit_logline->setStartTime(RDLogLine::Logged,edit_time_edit->time()); switch(edit_grace_group->selectedId()) { - case 0: - edit_logline->setGraceTime(0); - break; + case 0: + edit_logline->setGraceTime(0); + break; - case 1: - edit_logline->setGraceTime(-1); - break; + case 1: + edit_logline->setGraceTime(-1); + break; - case 2: - edit_logline->setGraceTime(QTime().msecsTo(edit_grace_box->time())); - //edit_logline->setGraceTime(edit_grace_box->value()); - break; + case 2: + edit_logline->setGraceTime(QTime().msecsTo(edit_grace_box->time())); + break; } } else { diff --git a/rdlogedit/edit_log.cpp b/rdlogedit/edit_log.cpp index 1c4b1f09..79253139 100644 --- a/rdlogedit/edit_log.cpp +++ b/rdlogedit/edit_log.cpp @@ -797,55 +797,55 @@ void EditLog::insertMarkerButtonData() id=item->text(13).toInt(); AddMeta *meta=new AddMeta(this); switch((RDLogLine::Type)meta->exec()) { - case RDLogLine::Marker: - edit_log_event->insert(line,1); - edit_log_event->logLine(line)->setType(RDLogLine::Marker); - edit_marker=new EditMarker(edit_log_event->logLine(line),this); - ret=edit_marker->exec(); - if(ret>=0) { - edit_log_event->refresh(line); - SetLogModified(true); - } - else { - edit_log_event->remove(line,1); - } - delete edit_marker; - break; + case RDLogLine::Marker: + edit_log_event->insert(line,1); + edit_log_event->logLine(line)->setType(RDLogLine::Marker); + edit_marker=new EditMarker(edit_log_event->logLine(line),this); + ret=edit_marker->exec(); + if(ret>=0) { + edit_log_event->refresh(line); + SetLogModified(true); + } + else { + edit_log_event->remove(line,1); + } + delete edit_marker; + break; - case RDLogLine::Track: - edit_log_event->insert(line,1); - edit_log_event->logLine(line)->setType(RDLogLine::Track); - edit_log_event->logLine(line)->setTransType(RDLogLine::Segue); - edit_log_event->logLine(line)->setMarkerComment(tr("Voice Track")); - edit_track=new EditTrack(edit_log_event->logLine(line),this); - ret=edit_track->exec(); - if(ret>=0) { - edit_log_event->refresh(line); - SetLogModified(true); - } - else { - edit_log_event->remove(line,1); - } - delete edit_track; - break; + case RDLogLine::Track: + edit_log_event->insert(line,1); + edit_log_event->logLine(line)->setType(RDLogLine::Track); + edit_log_event->logLine(line)->setTransType(RDLogLine::Segue); + edit_log_event->logLine(line)->setMarkerComment(tr("Voice Track")); + edit_track=new EditTrack(edit_log_event->logLine(line),this); + ret=edit_track->exec(); + if(ret>=0) { + edit_log_event->refresh(line); + SetLogModified(true); + } + else { + edit_log_event->remove(line,1); + } + delete edit_track; + break; - case RDLogLine::Chain: - edit_log_event->insert(line,1); - edit_log_event->logLine(line)->setType(RDLogLine::Chain); - edit_chain=new EditChain(edit_log_event->logLine(line),this); - ret=edit_chain->exec(); - if(ret>=0) { - edit_log_event->refresh(line); - SetLogModified(true); - } - else { - edit_log_event->remove(line,1); - } - delete edit_chain; - break; + case RDLogLine::Chain: + edit_log_event->insert(line,1); + edit_log_event->logLine(line)->setType(RDLogLine::Chain); + edit_chain=new EditChain(edit_log_event->logLine(line),this); + ret=edit_chain->exec(); + if(ret>=0) { + edit_log_event->refresh(line); + SetLogModified(true); + } + else { + edit_log_event->remove(line,1); + } + delete edit_chain; + break; - default: - break; + default: + break; } RefreshList(); UpdateTracks(); @@ -903,45 +903,45 @@ void EditLog::editButtonData() return; } switch(edit_log_event->logLine(line)->type()) { - case RDLogLine::Cart: - case RDLogLine::Macro: - edit_cart= - new EditLogLine(edit_log_event->logLine(line),edit_filter,edit_group, - edit_schedcode,edit_service_box->currentText(), - &edit_group_list,edit_log_event,line,this); - if(edit_cart->exec()>=0) { - edit_log_event->refresh(item->text(14).toInt()); - SetLogModified(true); - } - delete edit_cart; - break; + case RDLogLine::Cart: + case RDLogLine::Macro: + edit_cart= + new EditLogLine(edit_log_event->logLine(line),edit_filter,edit_group, + edit_schedcode,edit_service_box->currentText(), + &edit_group_list,edit_log_event,line,this); + if(edit_cart->exec()>=0) { + edit_log_event->refresh(item->text(14).toInt()); + SetLogModified(true); + } + delete edit_cart; + break; - case RDLogLine::Marker: - edit_marker=new EditMarker(edit_log_event->logLine(line),this); - if(edit_marker->exec()>=0) { - SetLogModified(true); - } - delete edit_marker; - break; + case RDLogLine::Marker: + edit_marker=new EditMarker(edit_log_event->logLine(line),this); + if(edit_marker->exec()>=0) { + SetLogModified(true); + } + delete edit_marker; + break; - case RDLogLine::Track: - edit_track=new EditTrack(edit_log_event->logLine(line),this); - if(edit_track->exec()>=0) { - SetLogModified(true); - } - delete edit_track; - break; + case RDLogLine::Track: + edit_track=new EditTrack(edit_log_event->logLine(line),this); + if(edit_track->exec()>=0) { + SetLogModified(true); + } + delete edit_track; + break; - case RDLogLine::Chain: - edit_chain=new EditChain(edit_log_event->logLine(line),this); - if(edit_chain->exec()>=0) { - SetLogModified(true); - } - delete edit_chain; - break; + case RDLogLine::Chain: + edit_chain=new EditChain(edit_log_event->logLine(line),this); + if(edit_chain->exec()>=0) { + SetLogModified(true); + } + delete edit_chain; + break; - default: - break; + default: + break; } RefreshList(); SelectRecord(id); @@ -1252,23 +1252,23 @@ void EditLog::cancelData() { if(edit_changed) { switch(QMessageBox::question(this, - tr("RDLogEdit"), - tr("The log has been modified.\nDo you want to save your changes?"), + tr("RDLogEdit"), + tr("The log has been modified.\nDo you want to save your changes?"), QMessageBox::Yes,QMessageBox::No, QMessageBox::Cancel)) { - case QMessageBox::Yes: - if(!ValidateSvc()) { - QMessageBox::warning(this,tr("Invalid Carts"), - tr("The log contains carts that are disabled\nfor the selected service!")); + case QMessageBox::Yes: + if(!ValidateSvc()) { + QMessageBox::warning(this,tr("Invalid Carts"), + tr("The log contains carts that are disabled\nfor the selected service!")); return; - } - SaveLog(); - break; + } + SaveLog(); + break; - case QMessageBox::Cancel: - case QMessageBox::NoButton: - return; - break; + case QMessageBox::Cancel: + case QMessageBox::NoButton: + return; + break; } } #ifndef WIN32 @@ -1441,198 +1441,186 @@ void EditLog::RefreshLine(RDListViewItem *item) edit_log_event->refresh(line); RDLogLine *logline=edit_log_event->logLine(line); switch(logline->timeType()) { - case RDLogLine::Hard: - item->setText(1,QString("T")+edit_log_event-> - logLine(line)->startTime(RDLogLine::Logged). - toString("hh:mm:ss.zzz").left(10)); - break; + case RDLogLine::Hard: + item->setText(1,QString("T")+edit_log_event-> + logLine(line)->startTime(RDLogLine::Logged). + toString("hh:mm:ss.zzz").left(10)); + break; - default: - if(logline-> - startTime(RDLogLine::Predicted).isNull()) { - item->setText(1,edit_log_event-> - blockStartTime(line). - toString("hh:mm:ss.zzz").left(10)); - } - else { - item->setText(1,edit_log_event-> - logLine(line)->startTime(RDLogLine::Predicted). - toString("hh:mm:ss.zzz").left(10)); - } - /* - if(logline-> - startTime(RDLogLine::Logged).isNull()) { - item->setText(1,edit_log_event-> - blockStartTime(line). - toString("hh:mm:ss.zzz").left(10)); - } - else { - item->setText(1,edit_log_event-> - logLine(line)->startTime(RDLogLine::Logged). - toString("hh:mm:ss.zzz").left(10)); - } - */ - break; + default: + if(logline-> + startTime(RDLogLine::Predicted).isNull()) { + item->setText(1,edit_log_event-> + blockStartTime(line). + toString("hh:mm:ss.zzz").left(10)); + } + else { + item->setText(1,edit_log_event-> + logLine(line)->startTime(RDLogLine::Predicted). + toString("hh:mm:ss.zzz").left(10)); + } + break; } switch(logline->transType()) { - case RDLogLine::Play: - item->setText(2,tr("PLAY")); - item->setTextColor(2,item->textColor(1),QFont::Normal); - break; - case RDLogLine::Stop: - item->setText(2,tr("STOP")); - item->setTextColor(2,item->textColor(1),QFont::Normal); - break; - case RDLogLine::Segue: - item->setText(2,tr("SEGUE")); - if(logline->hasCustomTransition()) { - item->setTextColor(2,RD_CUSTOM_TRANSITION_COLOR,QFont::Bold); - } - else { - item->setTextColor(2,item->textColor(1),QFont::Normal); - } - break; + case RDLogLine::Play: + item->setText(2,tr("PLAY")); + item->setTextColor(2,item->textColor(1),QFont::Normal); + break; - default: - break; + case RDLogLine::Stop: + item->setText(2,tr("STOP")); + item->setTextColor(2,item->textColor(1),QFont::Normal); + break; + + case RDLogLine::Segue: + item->setText(2,tr("SEGUE")); + if(logline->hasCustomTransition()) { + item->setTextColor(2,RD_CUSTOM_TRANSITION_COLOR,QFont::Bold); + } + else { + item->setTextColor(2,item->textColor(1),QFont::Normal); + } + break; + + default: + break; } switch(logline->type()) { - case RDLogLine::Cart: - switch(logline->source()) { - case RDLogLine::Tracker: - item->setPixmap(0,*edit_track_cart_map); - break; + case RDLogLine::Cart: + switch(logline->source()) { + case RDLogLine::Tracker: + item->setPixmap(0,*edit_track_cart_map); + break; - default: - item->setPixmap(0,*edit_playout_map); - break; - } - item->setText(3,QString(). - sprintf("%06u",logline->cartNumber())); - if(logline->title().isEmpty()) { - item->setText(4,""); - item->setText(5,tr("[cart not found]")); - } - else { - item->setText(4,logline->groupName()); - item->setTextColor(4,logline->groupColor(),QFont::Bold); - if((logline->source()!=RDLogLine::Tracker)|| - logline->originUser().isEmpty()|| - (!logline->originDateTime().isValid())) { - item->setText(6,logline->title()); - } - else { - item->setText(6,QString(). - sprintf("%s -- %s %s", - (const char *)logline->title(), - (const char *)logline->originUser(), - (const char *)logline->originDateTime(). - toString("M/d hh:mm"))); - } - } - item-> - setText(5,RDGetTimeLength(logline->forcedLength(),false,false)); - item->setText(7,logline->artist()); - item->setText(8,logline->client()); - item->setText(9,logline->agency()); - item->setText(12,logline->extData()); - break; + default: + item->setPixmap(0,*edit_playout_map); + break; + } + item->setText(3,QString(). + sprintf("%06u",logline->cartNumber())); + if(logline->title().isEmpty()) { + item->setText(4,""); + item->setText(5,tr("[cart not found]")); + } + else { + item->setText(4,logline->groupName()); + item->setTextColor(4,logline->groupColor(),QFont::Bold); + if((logline->source()!=RDLogLine::Tracker)|| + logline->originUser().isEmpty()|| + (!logline->originDateTime().isValid())) { + item->setText(6,logline->title()); + } + else { + item->setText(6,QString(). + sprintf("%s -- %s %s", + (const char *)logline->title(), + (const char *)logline->originUser(), + (const char *)logline->originDateTime(). + toString("M/d hh:mm"))); + } + } + item-> + setText(5,RDGetTimeLength(logline->forcedLength(),false,false)); + item->setText(7,logline->artist()); + item->setText(8,logline->client()); + item->setText(9,logline->agency()); + item->setText(12,logline->extData()); + break; - case RDLogLine::Macro: - item->setPixmap(0,*edit_macro_map); - item->setText(3,QString(). - sprintf("%06u",logline->cartNumber())); - if(logline->title().isEmpty()) { - item->setText(4,""); - item->setText(6,tr("[cart not found]")); - } - else { - item->setText(4,logline->groupName()); - item->setTextColor(4,logline->groupColor(),QFont::Bold); - item->setText(6,logline->title()); - } - item-> - setText(5,RDGetTimeLength(logline->forcedLength(),false,false)); - item->setText(7,logline->artist()); - item->setText(8,logline->client()); - item->setText(9,logline->agency()); - item->setText(12,logline->extData()); - break; + case RDLogLine::Macro: + item->setPixmap(0,*edit_macro_map); + item->setText(3,QString(). + sprintf("%06u",logline->cartNumber())); + if(logline->title().isEmpty()) { + item->setText(4,""); + item->setText(6,tr("[cart not found]")); + } + else { + item->setText(4,logline->groupName()); + item->setTextColor(4,logline->groupColor(),QFont::Bold); + item->setText(6,logline->title()); + } + item->setText(5,RDGetTimeLength(logline->forcedLength(),false,false)); + item->setText(7,logline->artist()); + item->setText(8,logline->client()); + item->setText(9,logline->agency()); + item->setText(12,logline->extData()); + break; - case RDLogLine::Marker: - item->setPixmap(0,*edit_notemarker_map); - item->setText(3,tr("MARKER")); - item->setText(4,""); - item->setText(6,RDTruncateAfterWord(edit_log_event-> - logLine(line)->markerComment(),5,true)); - item->setText(10,logline->markerLabel()); - item->setText(12,logline->extData()); - break; + case RDLogLine::Marker: + item->setPixmap(0,*edit_notemarker_map); + item->setText(3,tr("MARKER")); + item->setText(4,""); + item->setText(6,RDTruncateAfterWord(edit_log_event-> + logLine(line)->markerComment(),5,true)); + item->setText(10,logline->markerLabel()); + item->setText(12,logline->extData()); + break; - case RDLogLine::Track: - item->setPixmap(0,*edit_mic16_map); - item->setText(3,tr("TRACK")); - item->setText(4,""); - item->setText(6,RDTruncateAfterWord(edit_log_event-> - logLine(line)->markerComment(),5,true)); - item->setText(12,logline->extData()); - break; + case RDLogLine::Track: + item->setPixmap(0,*edit_mic16_map); + item->setText(3,tr("TRACK")); + item->setText(4,""); + item->setText(6,RDTruncateAfterWord(edit_log_event-> + logLine(line)->markerComment(),5,true)); + item->setText(12,logline->extData()); + break; - case RDLogLine::Chain: - item->setPixmap(0,*edit_chain_map); - item->setText(3,tr("LOG CHAIN")); - item->setText(4,""); - item->setText(6,logline->markerLabel()); - item->setText(7,RDTruncateAfterWord(edit_log_event-> - logLine(line)->markerComment(),5,true)); - item->setText(12,logline->extData()); - break; + case RDLogLine::Chain: + item->setPixmap(0,*edit_chain_map); + item->setText(3,tr("LOG CHAIN")); + item->setText(4,""); + item->setText(6,logline->markerLabel()); + item->setText(7,RDTruncateAfterWord(edit_log_event-> + logLine(line)->markerComment(),5,true)); + item->setText(12,logline->extData()); + break; - case RDLogLine::MusicLink: - item->setPixmap(0,*edit_music_map); - item->setText(3,tr("LINK")); - item->setText(4,""); - item->setText(6,tr("[music import]")); - item->setText(12,tr("Link Start")+": "+ - logline->linkStartTime().toString("hh:mm:ss")+", "+ - tr("Len")+": "+ - RDGetTimeLength(logline->linkLength(),false,false)); - break; + case RDLogLine::MusicLink: + item->setPixmap(0,*edit_music_map); + item->setText(3,tr("LINK")); + item->setText(4,""); + item->setText(6,tr("[music import]")); + item->setText(12,tr("Link Start")+": "+ + logline->linkStartTime().toString("hh:mm:ss")+", "+ + tr("Len")+": "+ + RDGetTimeLength(logline->linkLength(),false,false)); + break; - case RDLogLine::TrafficLink: - item->setPixmap(0,*edit_traffic_map); - item->setText(3,tr("LINK")); - item->setText(4,""); - item->setText(6,tr("[traffic import]")); - item->setText(12,tr("Link Start")+": "+ - logline->linkStartTime().toString("hh:mm:ss")+", "+ - tr("Len")+": "+ - RDGetTimeLength(logline->linkLength(),false,false)); - break; + case RDLogLine::TrafficLink: + item->setPixmap(0,*edit_traffic_map); + item->setText(3,tr("LINK")); + item->setText(4,""); + item->setText(6,tr("[traffic import]")); + item->setText(12,tr("Link Start")+": "+ + logline->linkStartTime().toString("hh:mm:ss")+", "+ + tr("Len")+": "+ + RDGetTimeLength(logline->linkLength(),false,false)); + break; - default: - break; + default: + break; } switch(logline->source()) { - case RDLogLine::Manual: - item->setText(11,tr("Manual")); - break; + case RDLogLine::Manual: + item->setText(11,tr("Manual")); + break; - case RDLogLine::Traffic: - item->setText(11,tr("Traffic")); - break; + case RDLogLine::Traffic: + item->setText(11,tr("Traffic")); + break; - case RDLogLine::Music: - item->setText(11,tr("Music")); - break; + case RDLogLine::Music: + item->setText(11,tr("Music")); + break; - case RDLogLine::Template: - item->setText(11,tr("RDLogManager")); - break; + case RDLogLine::Template: + item->setText(11,tr("RDLogManager")); + break; - case RDLogLine::Tracker: - item->setText(11,tr("Voice Tracker")); - break; + case RDLogLine::Tracker: + item->setText(11,tr("Voice Tracker")); + break; } item->setText(13,QString().sprintf("%d",logline->id())); UpdateColor(item,logline); @@ -1707,50 +1695,50 @@ bool EditLog::UpdateColor(RDListViewItem *item,RDLogLine *logline) QDateTime now=QDateTime(QDate::currentDate(),QTime::currentTime()); switch(logline->type()) { - case RDLogLine::Cart: - switch(logline->validity(now)) { - case RDCart::AlwaysValid: - if(edit_group_list.isGroupValid(item->text(4))|| - item->text(4).isEmpty()) { - item->setBackgroundColor(palette().color(QPalette::Active, - QColorGroup::Base)); - } - else { - item->setBackgroundColor(RD_CART_INVALID_SERVICE_COLOR); - ret=false; - } - break; + case RDLogLine::Cart: + switch(logline->validity(now)) { + case RDCart::AlwaysValid: + if(edit_group_list.isGroupValid(item->text(4))|| + item->text(4).isEmpty()) { + item->setBackgroundColor(palette().color(QPalette::Active, + QColorGroup::Base)); + } + else { + item->setBackgroundColor(RD_CART_INVALID_SERVICE_COLOR); + ret=false; + } + break; - case RDCart::ConditionallyValid: - item->setBackgroundColor(RD_CART_CONDITIONAL_COLOR); - break; + case RDCart::ConditionallyValid: + item->setBackgroundColor(RD_CART_CONDITIONAL_COLOR); + break; - case RDCart::FutureValid: - item->setBackgroundColor(RD_CART_FUTURE_COLOR); - break; + case RDCart::FutureValid: + item->setBackgroundColor(RD_CART_FUTURE_COLOR); + break; - case RDCart::EvergreenValid: - item->setBackgroundColor(RD_CART_EVERGREEN_COLOR); - break; + case RDCart::EvergreenValid: + item->setBackgroundColor(RD_CART_EVERGREEN_COLOR); + break; - case RDCart::NeverValid: - item->setBackgroundColor(RD_CART_ERROR_COLOR); - item->setText(6,tr("[INVALID CART]")); - break; - } - break; + case RDCart::NeverValid: + item->setBackgroundColor(RD_CART_ERROR_COLOR); + item->setText(6,tr("[INVALID CART]")); + break; + } + break; - default: - if(edit_group_list.isGroupValid(item->text(4))|| - item->text(4).isEmpty()) { - item->setBackgroundColor(palette().color(QPalette::Active, - QColorGroup::Base)); - } - else { - item->setBackgroundColor(RD_CART_INVALID_SERVICE_COLOR); - ret=false; - } - break; + default: + if(edit_group_list.isGroupValid(item->text(4))|| + item->text(4).isEmpty()) { + item->setBackgroundColor(palette().color(QPalette::Active, + QColorGroup::Base)); + } + else { + item->setBackgroundColor(RD_CART_INVALID_SERVICE_COLOR); + ret=false; + } + break; } return ret; } diff --git a/rdlogedit/edit_logline.cpp b/rdlogedit/edit_logline.cpp index a879cd6e..6aaeba99 100644 --- a/rdlogedit/edit_logline.cpp +++ b/rdlogedit/edit_logline.cpp @@ -214,21 +214,21 @@ EditLogLine::EditLogLine(RDLogLine *line,QString *filter,QString *group, } timeChangedData(edit_time_edit->time()); switch(edit_logline->graceTime()) { - case -1: - edit_grace_group->setButton(1); - graceClickedData(1); - break; + case -1: + edit_grace_group->setButton(1); + graceClickedData(1); + break; - case 0: - edit_grace_group->setButton(0); - graceClickedData(0); - break; + case 0: + edit_grace_group->setButton(0); + graceClickedData(0); + break; - default: - edit_grace_group->setButton(2); - graceClickedData(2); - edit_grace_edit->setTime(QTime().addMSecs(edit_logline->graceTime())); - break; + default: + edit_grace_group->setButton(2); + graceClickedData(2); + edit_grace_edit->setTime(QTime().addMSecs(edit_logline->graceTime())); + break; } edit_transtype_box->setCurrentItem(edit_logline->transType()); if(edit_logline->segueStartPoint(RDLogLine::LogPointer)<0 @@ -322,17 +322,17 @@ void EditLogLine::timeToggledData(bool state) void EditLogLine::graceClickedData(int id) { switch(id) { - case 0: - edit_grace_edit->setDisabled(true); - break; + case 0: + edit_grace_edit->setDisabled(true); + break; - case 1: - edit_grace_edit->setDisabled(true); - break; + case 1: + edit_grace_edit->setDisabled(true); + break; - case 2: - edit_grace_edit->setEnabled(true); - break; + case 2: + edit_grace_edit->setEnabled(true); + break; } } @@ -364,17 +364,17 @@ void EditLogLine::okData() edit_logline->setTimeType(RDLogLine::Hard); edit_logline->setStartTime(RDLogLine::Logged,edit_time_edit->time()); switch(edit_grace_group->selectedId()) { - case 0: - edit_logline->setGraceTime(0); - break; + case 0: + edit_logline->setGraceTime(0); + break; - case 1: - edit_logline->setGraceTime(-1); - break; + case 1: + edit_logline->setGraceTime(-1); + break; - case 2: - edit_logline->setGraceTime(QTime().msecsTo(edit_grace_edit->time())); - break; + case 2: + edit_logline->setGraceTime(QTime().msecsTo(edit_grace_edit->time())); + break; } } else { diff --git a/rdlogedit/edit_marker.cpp b/rdlogedit/edit_marker.cpp index a817ddfe..eb3034ad 100644 --- a/rdlogedit/edit_marker.cpp +++ b/rdlogedit/edit_marker.cpp @@ -161,22 +161,21 @@ EditMarker::EditMarker(RDLogLine *line,QWidget *parent) } timeChangedData(edit_time_edit->time()); switch(edit_logline->graceTime()) { - case -1: - edit_grace_group->setButton(1); - graceClickedData(1); - break; + case -1: + edit_grace_group->setButton(1); + graceClickedData(1); + break; - case 0: - edit_grace_group->setButton(0); - graceClickedData(0); - break; + case 0: + edit_grace_group->setButton(0); + graceClickedData(0); + break; - default: - edit_grace_group->setButton(2); - edit_grace_box->setTime(QTime().addMSecs(edit_logline->graceTime())); - //edit_grace_box->setValue(edit_logline->graceTime()); - graceClickedData(2); - break; + default: + edit_grace_group->setButton(2); + edit_grace_box->setTime(QTime().addMSecs(edit_logline->graceTime())); + graceClickedData(2); + break; } edit_transtype_box->setCurrentItem(edit_logline->transType()); edit_comment_edit->setText(edit_logline->markerComment()); @@ -239,17 +238,17 @@ void EditMarker::timeToggledData(bool state) void EditMarker::graceClickedData(int id) { switch(id) { - case 0: - edit_grace_box->setDisabled(true); - break; + case 0: + edit_grace_box->setDisabled(true); + break; - case 1: - edit_grace_box->setDisabled(true); - break; + case 1: + edit_grace_box->setDisabled(true); + break; - case 2: - edit_grace_box->setEnabled(true); - break; + case 2: + edit_grace_box->setEnabled(true); + break; } } @@ -274,18 +273,17 @@ void EditMarker::okData() edit_logline->setTimeType(RDLogLine::Hard); edit_logline->setStartTime(RDLogLine::Logged,edit_time_edit->time()); switch(edit_grace_group->selectedId()) { - case 0: - edit_logline->setGraceTime(0); - break; + case 0: + edit_logline->setGraceTime(0); + break; - case 1: - edit_logline->setGraceTime(-1); - break; + case 1: + edit_logline->setGraceTime(-1); + break; - case 2: - edit_logline->setGraceTime(QTime().msecsTo(edit_grace_box->time())); - //edit_logline->setGraceTime(edit_grace_box->value()); - break; + case 2: + edit_logline->setGraceTime(QTime().msecsTo(edit_grace_box->time())); + break; } } else { diff --git a/rdlogedit/edit_track.cpp b/rdlogedit/edit_track.cpp index d2a42054..b2e8df1d 100644 --- a/rdlogedit/edit_track.cpp +++ b/rdlogedit/edit_track.cpp @@ -151,22 +151,21 @@ EditTrack::EditTrack(RDLogLine *line,QWidget *parent) } timeChangedData(edit_time_edit->time()); switch(edit_logline->graceTime()) { - case -1: - edit_grace_group->setButton(1); - graceClickedData(1); - break; + case -1: + edit_grace_group->setButton(1); + graceClickedData(1); + break; - case 0: - edit_grace_group->setButton(0); - graceClickedData(0); - break; + case 0: + edit_grace_group->setButton(0); + graceClickedData(0); + break; - default: - edit_grace_group->setButton(2); - edit_grace_box->setTime(QTime().addMSecs(edit_logline->graceTime())); - //edit_grace_box->setValue(edit_logline->graceTime()); - graceClickedData(2); - break; + default: + edit_grace_group->setButton(2); + edit_grace_box->setTime(QTime().addMSecs(edit_logline->graceTime())); + graceClickedData(2); + break; } edit_transtype_box->setCurrentItem(edit_logline->transType()); edit_comment_edit->setText(edit_logline->markerComment()); @@ -228,17 +227,17 @@ void EditTrack::timeToggledData(bool state) void EditTrack::graceClickedData(int id) { switch(id) { - case 0: - edit_grace_box->setDisabled(true); - break; + case 0: + edit_grace_box->setDisabled(true); + break; - case 1: - edit_grace_box->setDisabled(true); - break; + case 1: + edit_grace_box->setDisabled(true); + break; - case 2: - edit_grace_box->setEnabled(true); - break; + case 2: + edit_grace_box->setEnabled(true); + break; } } @@ -263,18 +262,17 @@ void EditTrack::okData() edit_logline->setTimeType(RDLogLine::Hard); edit_logline->setStartTime(RDLogLine::Logged,edit_time_edit->time()); switch(edit_grace_group->selectedId()) { - case 0: - edit_logline->setGraceTime(0); - break; + case 0: + edit_logline->setGraceTime(0); + break; - case 1: - edit_logline->setGraceTime(-1); - break; + case 1: + edit_logline->setGraceTime(-1); + break; - case 2: - edit_logline->setGraceTime(QTime().msecsTo(edit_grace_box->time())); - //edit_logline->setGraceTime(edit_grace_box->value()); - break; + case 2: + edit_logline->setGraceTime(QTime().msecsTo(edit_grace_box->time())); + break; } } else { diff --git a/rdlogedit/import_track.cpp b/rdlogedit/import_track.cpp index e4eeef71..aa58be8b 100644 --- a/rdlogedit/import_track.cpp +++ b/rdlogedit/import_track.cpp @@ -184,12 +184,12 @@ void ImportTrack::cancelData() void ImportTrack::keyPressEvent(QKeyEvent *e) { switch(e->key()) { - case Qt::Key_Escape: - cancelData(); - break; + case Qt::Key_Escape: + cancelData(); + break; - default: - QWidget::keyPressEvent(e); - break; + default: + QWidget::keyPressEvent(e); + break; } } diff --git a/rdlogedit/list_reports.cpp b/rdlogedit/list_reports.cpp index 88fbfc83..07035ee8 100644 --- a/rdlogedit/list_reports.cpp +++ b/rdlogedit/list_reports.cpp @@ -147,16 +147,16 @@ void ListReports::generateData() QString report; switch(list_reports_box->currentItem()) { - case 0: // Event Report - GenerateLogReport(&report); - break; + case 0: // Event Report + GenerateLogReport(&report); + break; - case 1: // XLoad Report - GenerateExceptionReport(&report,list_date_edit->date()); - break; + case 1: // XLoad Report + GenerateExceptionReport(&report,list_date_edit->date()); + break; - default: - return; + default: + return; } if(!report.isEmpty()) { RDTextFile(report); @@ -241,65 +241,64 @@ void ListReports::GenerateLogReport(QString *report) (const char *)RDLogLine::transText(logline->transType()).left(5)); switch(logline->type()) { - case RDLogLine::Cart: - case RDLogLine::Macro: - *report+=QString().sprintf("%06u ",logline->cartNumber()); - *report+=QString().sprintf("%-10s ", - (const char *)logline->groupName()); - *report+=QString().sprintf("%8s ",(const char *) - RDGetTimeLength(logline->forcedLength(), - false,false)); - *report+= - QString().sprintf("%-33s ", - (const char *)logline->title().left(33)); - *report+= - QString().sprintf("%-30s ", - (const char *)logline->artist().left(30)); - break; + case RDLogLine::Cart: + case RDLogLine::Macro: + *report+=QString().sprintf("%06u ",logline->cartNumber()); + *report+=QString().sprintf("%-10s ", + (const char *)logline->groupName()); + *report+=QString().sprintf("%8s ",(const char *) + RDGetTimeLength(logline->forcedLength(), + false,false)); + *report+= + QString().sprintf("%-33s ", + (const char *)logline->title().left(33)); + *report+= + QString().sprintf("%-30s ", + (const char *)logline->artist().left(30)); + break; - case RDLogLine::Marker: - case RDLogLine::Track: - *report+=" "; - *report+=" "; - *report+=" :00 "; - *report+= - QString().sprintf("%-30s ", - (const char *)logline->markerComment().left(30)); - *report+=" "; - break; + case RDLogLine::Marker: + case RDLogLine::Track: + *report+=" "; + *report+=" "; + *report+=" :00 "; + *report+= + QString().sprintf("%-30s ", + (const char *)logline->markerComment().left(30)); + *report+=" "; + break; - case RDLogLine::TrafficLink: - *report+=" "; - *report+=" "; - *report+=" :00 "; - *report+="Traffic Import "; - *report+=" "; - break; + case RDLogLine::TrafficLink: + *report+=" "; + *report+=" "; + *report+=" :00 "; + *report+="Traffic Import "; + *report+=" "; + break; - case RDLogLine::MusicLink: - *report+=" "; - *report+=" "; - *report+=" :00 "; - *report+="Music Import "; - *report+=" "; - break; + case RDLogLine::MusicLink: + *report+=" "; + *report+=" "; + *report+=" :00 "; + *report+="Music Import "; + *report+=" "; + break; - case RDLogLine::Chain: - *report+=" "; - *report+=" "; - *report+=" "; - *report+= - QString().sprintf("%-30s ", - (const char *)logline->markerLabel().left(30)); - *report+=" "; - break; - break; + case RDLogLine::Chain: + *report+=" "; + *report+=" "; + *report+=" "; + *report+= + QString().sprintf("%-30s ", + (const char *)logline->markerLabel().left(30)); + *report+=" "; + break; - case RDLogLine::OpenBracket: - case RDLogLine::CloseBracket: - case RDLogLine::UnknownType: - break; + case RDLogLine::OpenBracket: + case RDLogLine::CloseBracket: + case RDLogLine::UnknownType: + break; } // diff --git a/rdlogedit/log_listview.cpp b/rdlogedit/log_listview.cpp index 6590b716..75401dba 100644 --- a/rdlogedit/log_listview.cpp +++ b/rdlogedit/log_listview.cpp @@ -87,23 +87,16 @@ void LogListView::contentsMousePressEvent(QMouseEvent *e) QListView::contentsMousePressEvent(e); log_menu_item=(RDListViewItem *)selectedItem(); switch(e->button()) { - case QMouseEvent::RightButton: - //log_menu->setGeometry(log_parent->geometry().x()+ - // geometry().x()+e->pos().x()+2, - // log_parent->geometry().y()+ - // geometry().y()+e->pos().y()+ - // header()->geometry().height()+2, - // log_menu->sizeHint().width(), - // log_menu->sizeHint().height()); - log_menu->setGeometry(e->globalX(),e->globalY(), - log_menu->sizeHint().width(), - log_menu->sizeHint().height()); + case QMouseEvent::RightButton: + log_menu->setGeometry(e->globalX(),e->globalY(), + log_menu->sizeHint().width(), + log_menu->sizeHint().height()); + + log_menu->exec(); + break; - log_menu->exec(); - break; - - default: - e->ignore(); - break; + default: + e->ignore(); + break; } } diff --git a/rdlogedit/voice_tracker.cpp b/rdlogedit/voice_tracker.cpp index ca7b8a2e..01edb36d 100644 --- a/rdlogedit/voice_tracker.cpp +++ b/rdlogedit/voice_tracker.cpp @@ -565,36 +565,45 @@ int VoiceTracker::exec() void VoiceTracker::keyPressEvent(QKeyEvent *e) { switch(e->key()) { - case Qt::Key_Less: - if(!edit_wave_name[0].isEmpty() && !TransportActive()) - DragTrack(0,400); - else - if(!edit_wave_name[1].isEmpty() && !TransportActive()) - DragTrack(1,400); - else - if(!edit_wave_name[2].isEmpty() && !TransportActive()) - DragTrack(2,400); + case Qt::Key_Less: + if(!edit_wave_name[0].isEmpty() && !TransportActive()) { + DragTrack(0,400); + } + else { + if(!edit_wave_name[1].isEmpty() && !TransportActive()) { + DragTrack(1,400); + } + else { + if(!edit_wave_name[2].isEmpty() && !TransportActive()) { + DragTrack(2,400); + } + } + } + break; - break; - - case Qt::Key_Greater: - if(!edit_wave_name[0].isEmpty() && !TransportActive()) - DragTrack(0,-400); - else - if(!edit_wave_name[1].isEmpty() && !TransportActive()) - DragTrack(1,-400); - else - if(!edit_wave_name[2].isEmpty() && !TransportActive()) - DragTrack(2,-400); - break; - - case Qt::Key_Shift: - edit_shift_pressed=true; - break; + case Qt::Key_Greater: + if(!edit_wave_name[0].isEmpty() && !TransportActive()) { + DragTrack(0,-400); + } + else { + if(!edit_wave_name[1].isEmpty() && !TransportActive()) { + DragTrack(1,-400); + } + else { + if(!edit_wave_name[2].isEmpty() && !TransportActive()) { + DragTrack(2,-400); + } + } + } + break; + + case Qt::Key_Shift: + edit_shift_pressed=true; + break; - default: - QWidget::keyPressEvent(e); - break; + default: + QWidget::keyPressEvent(e); + break; } } @@ -602,13 +611,13 @@ void VoiceTracker::keyPressEvent(QKeyEvent *e) void VoiceTracker::keyReleaseEvent(QKeyEvent *e) { switch(e->key()) { - case Qt::Key_Shift: - edit_shift_pressed=false; - break; + case Qt::Key_Shift: + edit_shift_pressed=false; + break; - default: - QWidget::keyPressEvent(e); - break; + default: + QWidget::keyPressEvent(e); + break; } } @@ -944,42 +953,42 @@ void VoiceTracker::track2Data() void VoiceTracker::finishedData() { switch(edit_deck_state) { - case VoiceTracker::DeckIdle: - if(track_changed) { - SaveTrack(track_line); - } - break; + case VoiceTracker::DeckIdle: + if(track_changed) { + SaveTrack(track_line); + } + break; - case VoiceTracker::DeckTrack1: + case VoiceTracker::DeckTrack1: + track_aborting=true; + stopData(); + rda->cae()->unloadRecord(edit_input_card,edit_input_port); + edit_deck_state=VoiceTracker::DeckIdle; + resetData(); + break; + + case VoiceTracker::DeckTrack2: + if(rda->logeditConf()->enableSecondStart()) { + if(edit_wave_name[2].isEmpty()|| + ((edit_logline[2]->transType()!=RDLogLine::Segue))) { + FinishTrack(); + } + else { track_aborting=true; stopData(); - rda->cae()->unloadRecord(edit_input_card,edit_input_port); + rda->cae()->stopRecord(edit_input_card,edit_input_port); edit_deck_state=VoiceTracker::DeckIdle; resetData(); - break; - - case VoiceTracker::DeckTrack2: - if(rda->logeditConf()->enableSecondStart()) { - if(edit_wave_name[2].isEmpty()|| - ((edit_logline[2]->transType()!=RDLogLine::Segue))) { - FinishTrack(); - } - else { - track_aborting=true; - stopData(); - rda->cae()->stopRecord(edit_input_card,edit_input_port); - edit_deck_state=VoiceTracker::DeckIdle; - resetData(); - } - } - else { - FinishTrack(); - } - break; + } + } + else { + FinishTrack(); + } + break; - case VoiceTracker::DeckTrack3: - FinishTrack(); - break; + case VoiceTracker::DeckTrack3: + FinishTrack(); + break; } UpdateRemaining(); UpdateControls(); @@ -1586,29 +1595,29 @@ void VoiceTracker::stateChangedData(int id,RDPlayDeck::State state) } } switch(state) { - case RDPlayDeck::Playing: - case RDPlayDeck::Stopping: - if(!track_meter_timer->isActive()) { - track_meter_timer->start(RD_METER_UPDATE_INTERVAL); - } - UpdateControls(); - break; + case RDPlayDeck::Playing: + case RDPlayDeck::Stopping: + if(!track_meter_timer->isActive()) { + track_meter_timer->start(RD_METER_UPDATE_INTERVAL); + } + UpdateControls(); + break; - default: - if(!TransportActive()) { - track_meter_timer->stop(); - track_meter->setLeftPeakBar(-10000); - track_meter->setRightPeakBar(-10000); - edit_scrolling=false; - for(unsigned i=0;i<3;i++) { - edit_scroll_pos[i]=-1; - edit_segue_start_offset[i]=0; - } - } - RenderTransition(((RDListViewItem *)track_log_list->selectedItem())-> - line()); - UpdateControls(); - break; + default: + if(!TransportActive()) { + track_meter_timer->stop(); + track_meter->setLeftPeakBar(-10000); + track_meter->setRightPeakBar(-10000); + edit_scrolling=false; + for(unsigned i=0;i<3;i++) { + edit_scroll_pos[i]=-1; + edit_segue_start_offset[i]=0; + } + } + RenderTransition(((RDListViewItem *)track_log_list->selectedItem())-> + line()); + UpdateControls(); + break; } } @@ -1644,50 +1653,50 @@ void VoiceTracker::positionData(int id,int msecs) edit_scroll_pos[id]=msecs; msecs+=edit_logline[id]->startPoint(); switch(edit_deck_state) { - case VoiceTracker::DeckIdle: - break; + case VoiceTracker::DeckIdle: + break; - case VoiceTracker::DeckTrack1: - if(edit_sliding) { - edit_wave_origin[0]=edit_wave_origin[2]- - edit_logline[2]->startPoint()+msecs; - track_redraw[0]=true; - } - break; + case VoiceTracker::DeckTrack1: + if(edit_sliding) { + edit_wave_origin[0]=edit_wave_origin[2]- + edit_logline[2]->startPoint()+msecs; + track_redraw[0]=true; + } + break; - case VoiceTracker::DeckTrack2: - switch(id) { - case 0: - if(!edit_scrolling) { - edit_wave_origin[0]=edit_wave_origin[2]- - edit_logline[2]->startPoint()+msecs; - } - edit_wave_origin[1]=edit_wave_origin[0]- - edit_segue_start_point[0]; - break; + case VoiceTracker::DeckTrack2: + switch(id) { + case 0: + if(!edit_scrolling) { + edit_wave_origin[0]=edit_wave_origin[2]- + edit_logline[2]->startPoint()+msecs; + } + edit_wave_origin[1]=edit_wave_origin[0]- + edit_segue_start_point[0]; + break; - case 1: - if(!edit_scrolling) { - edit_wave_origin[1]=edit_wave_origin[2]+msecs- - edit_logline[2]->startPoint(); - } - edit_wave_origin[0]= - edit_wave_origin[1]+edit_segue_start_point[0]; - break; - } - track_redraw[0]=true; - track_redraw[1]=true; - break; + case 1: + if(!edit_scrolling) { + edit_wave_origin[1]=edit_wave_origin[2]+msecs- + edit_logline[2]->startPoint(); + } + edit_wave_origin[0]= + edit_wave_origin[1]+edit_segue_start_point[0]; + break; + } + track_redraw[0]=true; + track_redraw[1]=true; + break; - case VoiceTracker::DeckTrack3: - if((id==0)||(id==1)) { - track_redraw[0]=true; - track_redraw[1]=true; - } - else { - return; - } - break; + case VoiceTracker::DeckTrack3: + if((id==0)||(id==1)) { + track_redraw[0]=true; + track_redraw[1]=true; + } + else { + return; + } + break; } if(edit_scrolling&&(edit_scroll_diff>=0)) { @@ -1743,37 +1752,35 @@ void VoiceTracker::positionData(int id,int msecs) void VoiceTracker::segueStartData(int id) { switch(edit_deck_state) { - case VoiceTracker::DeckIdle: - for(int i=id+1;i<3;i++) { - if(!edit_wave_name[i].isEmpty()) { - if(edit_logline[i]->transType()==RDLogLine::Stop) { - stopData(); - } - else { - StartNext(id); - } - return; - } + case VoiceTracker::DeckIdle: + for(int i=id+1;i<3;i++) { + if(!edit_wave_name[i].isEmpty()) { + if(edit_logline[i]->transType()==RDLogLine::Stop) { + stopData(); } - break; - - case VoiceTracker::DeckTrack1: - edit_sliding=true; - - if(!edit_wave_name[2].isEmpty()) { - edit_wave_origin[2]= - edit_wave_origin[0]-edit_deck[0]->currentPosition()- - edit_logline[0]->startPoint()+ - edit_logline[2]->startPoint(); + else { + StartNext(id); } + return; + } + } + break; - break; + case VoiceTracker::DeckTrack1: + edit_sliding=true; + if(!edit_wave_name[2].isEmpty()) { + edit_wave_origin[2]= + edit_wave_origin[0]-edit_deck[0]->currentPosition()- + edit_logline[0]->startPoint()+ + edit_logline[2]->startPoint(); + } + break; - case VoiceTracker::DeckTrack2: - break; + case VoiceTracker::DeckTrack2: + break; - case VoiceTracker::DeckTrack3: - break; + case VoiceTracker::DeckTrack3: + break; } } @@ -2085,23 +2092,23 @@ void VoiceTracker::mousePressEvent(QMouseEvent *e) return; } switch(e->button()) { - case QMouseEvent::LeftButton: - edit_current_track=GetClick(e,edit_previous_point); - break; + case QMouseEvent::LeftButton: + edit_current_track=GetClick(e,edit_previous_point); + break; - case QMouseEvent::RightButton: - edit_rightclick_track=GetClick(e,edit_previous_point); - edit_rightclick_pos=edit_previous_point->x(); - if(edit_rightclick_track>=0) { - track_menu->setGeometry(e->globalX(),e->globalY()+20, - track_menu->sizeHint().width(), - track_menu->sizeHint().height()); - track_menu->exec(); - } - break; + case QMouseEvent::RightButton: + edit_rightclick_track=GetClick(e,edit_previous_point); + edit_rightclick_pos=edit_previous_point->x(); + if(edit_rightclick_track>=0) { + track_menu->setGeometry(e->globalX(),e->globalY()+20, + track_menu->sizeHint().width(), + track_menu->sizeHint().height()); + track_menu->exec(); + } + break; - default: - break; + default: + break; } } @@ -2109,36 +2116,36 @@ void VoiceTracker::mousePressEvent(QMouseEvent *e) void VoiceTracker::mouseReleaseEvent(QMouseEvent *e) { switch(e->button()) { - case QMouseEvent::LeftButton: - if(edit_current_track>=0) { - track_meter->setLeftPeakBar(-10000); - track_meter->setRightPeakBar(-10000); - } - edit_current_track=-1; - break; + case QMouseEvent::LeftButton: + if(edit_current_track>=0) { + track_meter->setLeftPeakBar(-10000); + track_meter->setRightPeakBar(-10000); + } + edit_current_track=-1; + break; - case QMouseEvent::RightButton: - edit_rightclick_track=-1; - break; + case QMouseEvent::RightButton: + edit_rightclick_track=-1; + break; - case QMouseEvent::MidButton: - if(e->y()startPoint())/TRACKER_MSECS_PER_PIXEL)+250); - } - else { - if(e->y()<(TRACKER_Y_ORIGIN+2*TRACKER_Y_HEIGHT)) { - DragTrack(0,((edit_wave_origin[1]-edit_logline[1]->startPoint())/TRACKER_MSECS_PER_PIXEL)+250); - } - else { - if(e->y()<(TRACKER_Y_ORIGIN+3*TRACKER_Y_HEIGHT)) { - DragTrack(0,((edit_wave_origin[2]-edit_logline[2]->startPoint())/TRACKER_MSECS_PER_PIXEL)+250); - } - } - } - break; + case QMouseEvent::MidButton: + if(e->y()startPoint())/TRACKER_MSECS_PER_PIXEL)+250); + } + else { + if(e->y()<(TRACKER_Y_ORIGIN+2*TRACKER_Y_HEIGHT)) { + DragTrack(0,((edit_wave_origin[1]-edit_logline[1]->startPoint())/TRACKER_MSECS_PER_PIXEL)+250); + } + else { + if(e->y()<(TRACKER_Y_ORIGIN+3*TRACKER_Y_HEIGHT)) { + DragTrack(0,((edit_wave_origin[2]-edit_logline[2]->startPoint())/TRACKER_MSECS_PER_PIXEL)+250); + } + } + } + break; - default: - break; + default: + break; } } @@ -2164,20 +2171,20 @@ void VoiceTracker::mouseMoveEvent(QMouseEvent *e) } if(track_current_target==VoiceTracker::TargetSize) { switch(edit_logline[trackno]->transType()) { - case RDLogLine::Segue: - cursor=track_hand_cursor; - break; + case RDLogLine::Segue: + cursor=track_hand_cursor; + break; - case RDLogLine::Play: - case RDLogLine::Stop: - case RDLogLine::NoTrans: - if(trackno==0) { - cursor=track_hand_cursor; - } - else { - cursor=track_arrow_cursor; - } - break; + case RDLogLine::Play: + case RDLogLine::Stop: + case RDLogLine::NoTrans: + if(trackno==0) { + cursor=track_hand_cursor; + } + else { + cursor=track_arrow_cursor; + } + break; } } } @@ -2520,92 +2527,92 @@ void VoiceTracker::RefreshLine(RDListViewItem *item) return; } switch(logline->type()) { - case RDLogLine::Cart: - switch(logline->source()) { - case RDLogLine::Tracker: - item->setPixmap(0,*edit_track_cart_map); - break; + case RDLogLine::Cart: + switch(logline->source()) { + case RDLogLine::Tracker: + item->setPixmap(0,*edit_track_cart_map); + break; - default: - item->setPixmap(0,*edit_playout_map); - break; - } - item->setText(3,QString().sprintf("%06u",logline->cartNumber())); - item->setText(5,RDGetTimeLength(logline->forcedLength())); - if(logline->title().isEmpty()) { - item->setText(4,""); - item->setText(6,tr("[cart not found]")); - } - else { - item->setText(4,logline->groupName()); - if(logline->originUser().isEmpty()|| - (!logline->originDateTime().isValid())) { - item->setText(6,logline->title()); - } - else { - item->setText(6,QString(). - sprintf("%s -- %s %s", - (const char *)logline->title(), - (const char *)logline->originUser(), - (const char *)logline->originDateTime(). - toString("M/d hh:mm"))); - } - } - item->setText(7,logline->artist()); - item->setText(8,logline->album()); - item->setText(9,logline->label()); - break; + default: + item->setPixmap(0,*edit_playout_map); + break; + } + item->setText(3,QString().sprintf("%06u",logline->cartNumber())); + item->setText(5,RDGetTimeLength(logline->forcedLength())); + if(logline->title().isEmpty()) { + item->setText(4,""); + item->setText(6,tr("[cart not found]")); + } + else { + item->setText(4,logline->groupName()); + if(logline->originUser().isEmpty()|| + (!logline->originDateTime().isValid())) { + item->setText(6,logline->title()); + } + else { + item->setText(6,QString(). + sprintf("%s -- %s %s", + (const char *)logline->title(), + (const char *)logline->originUser(), + (const char *)logline->originDateTime(). + toString("M/d hh:mm"))); + } + } + item->setText(7,logline->artist()); + item->setText(8,logline->album()); + item->setText(9,logline->label()); + break; - case RDLogLine::Macro: - item->setPixmap(0,*edit_macro_map); - item->setText(3,QString().sprintf("%06u",logline->cartNumber())); - item->setText(5,RDGetTimeLength(logline->forcedLength())); - if(logline->title().isEmpty()) { - item->setText(4,""); - item->setText(6,tr("[cart not found]")); - } - else { - item->setText(4,logline->groupName()); - item->setText(6,logline->title()); - } - item->setText(7,logline->artist()); - item->setText(8,logline->album()); - item->setText(9,logline->label()); - break; + case RDLogLine::Macro: + item->setPixmap(0,*edit_macro_map); + item->setText(3,QString().sprintf("%06u",logline->cartNumber())); + item->setText(5,RDGetTimeLength(logline->forcedLength())); + if(logline->title().isEmpty()) { + item->setText(4,""); + item->setText(6,tr("[cart not found]")); + } + else { + item->setText(4,logline->groupName()); + item->setText(6,logline->title()); + } + item->setText(7,logline->artist()); + item->setText(8,logline->album()); + item->setText(9,logline->label()); + break; - case RDLogLine::Marker: - item->setPixmap(0,*edit_notemarker_map); - item->setText(3,tr("MARKER")); - item->setText(6,RDTruncateAfterWord(logline->markerComment(),5,true)); - break; + case RDLogLine::Marker: + item->setPixmap(0,*edit_notemarker_map); + item->setText(3,tr("MARKER")); + item->setText(6,RDTruncateAfterWord(logline->markerComment(),5,true)); + break; - case RDLogLine::Chain: - item->setPixmap(0,*edit_chain_map); - item->setText(3,tr("LOG CHAIN")); - item->setText(6,logline->markerLabel()); - item->setText(7,RDTruncateAfterWord(logline->markerComment(),5,true)); - break; + case RDLogLine::Chain: + item->setPixmap(0,*edit_chain_map); + item->setText(3,tr("LOG CHAIN")); + item->setText(6,logline->markerLabel()); + item->setText(7,RDTruncateAfterWord(logline->markerComment(),5,true)); + break; - case RDLogLine::Track: - item->setPixmap(0,*edit_mic16_map); - item->setText(3,tr("TRACK")); - item->setText(6,RDTruncateAfterWord(logline->markerComment(),5,true)); - break; + case RDLogLine::Track: + item->setPixmap(0,*edit_mic16_map); + item->setText(3,tr("TRACK")); + item->setText(6,RDTruncateAfterWord(logline->markerComment(),5,true)); + break; - case RDLogLine::MusicLink: - item->setPixmap(0,*edit_music_map); - item->setText(3,tr("LINK")); - item->setText(6,tr("[music import]")); - break; + case RDLogLine::MusicLink: + item->setPixmap(0,*edit_music_map); + item->setText(3,tr("LINK")); + item->setText(6,tr("[music import]")); + break; - case RDLogLine::TrafficLink: - item->setPixmap(0,*edit_traffic_map); - item->setText(3,tr("LINK")); - item->setText(6,tr("[traffic import]")); - break; + case RDLogLine::TrafficLink: + item->setPixmap(0,*edit_traffic_map); + item->setText(3,tr("LINK")); + item->setText(6,tr("[traffic import]")); + break; - default: - break; + default: + break; } if(!logline->startTime(RDLogLine::Logged).isNull()) { if(logline->timeType()==RDLogLine::Hard) { @@ -2618,28 +2625,28 @@ void VoiceTracker::RefreshLine(RDListViewItem *item) } } switch(logline->transType()) { - case RDLogLine::Play: - item->setText(2,tr("PLAY")); - item->setTextColor(2,item->textColor(1),QFont::Normal); - break; + case RDLogLine::Play: + item->setText(2,tr("PLAY")); + item->setTextColor(2,item->textColor(1),QFont::Normal); + break; - case RDLogLine::Segue: - item->setText(2,tr("SEGUE")); - if(logline->hasCustomTransition()) { - item->setTextColor(2,RD_CUSTOM_TRANSITION_COLOR,QFont::Bold); - } - else { - item->setTextColor(2,item->textColor(1),QFont::Normal); - } - break; + case RDLogLine::Segue: + item->setText(2,tr("SEGUE")); + if(logline->hasCustomTransition()) { + item->setTextColor(2,RD_CUSTOM_TRANSITION_COLOR,QFont::Bold); + } + else { + item->setTextColor(2,item->textColor(1),QFont::Normal); + } + break; - case RDLogLine::Stop: - item->setText(2,tr("STOP")); - item->setTextColor(2,item->textColor(1),QFont::Normal); - break; + case RDLogLine::Stop: + item->setText(2,tr("STOP")); + item->setTextColor(2,item->textColor(1),QFont::Normal); + break; - default: - break; + default: + break; } } @@ -2738,76 +2745,72 @@ void VoiceTracker::DragTrack(int trackno,int xdiff) int tdiff=xdiff*TRACKER_MSECS_PER_PIXEL; int tend=0; switch(trackno) { - case 1: - if(!edit_wave_name[0].isEmpty()) { - if((edit_wave_origin[1]-edit_logline[1]->startPoint()-tdiff)> - (edit_wave_origin[0]-edit_logline[0]->startPoint())) { - tdiff=(edit_wave_origin[1]-edit_logline[1]->startPoint())- - (edit_wave_origin[0]-edit_logline[0]->startPoint()); - } - tend=edit_wave_origin[0]- - edit_logline[0]->segueEndPoint()+ - edit_logline[1]->startPoint()+100; - if((edit_wave_origin[1]-tdiff) - setSegueStartPoint(edit_logline[0]->segueStartPoint()+tdiff, - RDLogLine::LogPointer); - edit_logline[0]-> - setAverageSegueLength(edit_logline[0]-> - segueStartPoint()- - edit_logline[0]-> - startPoint()); - } - break; + case 1: + if(!edit_wave_name[0].isEmpty()) { + if((edit_wave_origin[1]-edit_logline[1]->startPoint()-tdiff)> + (edit_wave_origin[0]-edit_logline[0]->startPoint())) { + tdiff=(edit_wave_origin[1]-edit_logline[1]->startPoint())- + (edit_wave_origin[0]-edit_logline[0]->startPoint()); + } + tend=edit_wave_origin[0]- + edit_logline[0]->segueEndPoint()+ + edit_logline[1]->startPoint()+100; + if((edit_wave_origin[1]-tdiff) + setSegueStartPoint(edit_logline[0]->segueStartPoint()+tdiff, + RDLogLine::LogPointer); + edit_logline[0]-> + setAverageSegueLength(edit_logline[0]-> + segueStartPoint()- + edit_logline[0]-> + startPoint()); + } + break; - case 2: - if(edit_wave_name[1].isEmpty()) { - if(!edit_wave_name[0].isEmpty()) { - if((edit_wave_origin[2]-edit_logline[2]->startPoint()-tdiff)> - (edit_wave_origin[0]-edit_logline[0]->startPoint())) { - tdiff=(edit_wave_origin[2]-edit_logline[2]->startPoint())- - (edit_wave_origin[0]-edit_logline[0]->startPoint()); - } - tend=edit_wave_origin[0]- - edit_logline[0]->segueEndPoint()+ - edit_logline[2]->startPoint()+100; - if((edit_wave_origin[2]-tdiff) - setSegueStartPoint(edit_logline[0]->segueStartPoint()+tdiff, - RDLogLine::LogPointer); - edit_logline[0]-> - setAverageSegueLength(edit_logline[0]-> - segueStartPoint()- - edit_logline[0]-> - startPoint()); - } + case 2: + if(edit_wave_name[1].isEmpty()) { + if(!edit_wave_name[0].isEmpty()) { + if((edit_wave_origin[2]-edit_logline[2]->startPoint()-tdiff)> + (edit_wave_origin[0]-edit_logline[0]->startPoint())) { + tdiff=(edit_wave_origin[2]-edit_logline[2]->startPoint())- + (edit_wave_origin[0]-edit_logline[0]->startPoint()); } - else { - if((edit_wave_origin[2]-edit_logline[2]->startPoint()-tdiff)> - (edit_wave_origin[1]-edit_logline[1]->startPoint())) { - tdiff=(edit_wave_origin[2]-edit_logline[2]->startPoint())- - (edit_wave_origin[1]-edit_logline[1]->startPoint()); - } - tend=edit_wave_origin[1]- - edit_logline[1]->segueEndPoint()+ - edit_logline[2]->startPoint()+100; - if((edit_wave_origin[2]-tdiff) - setSegueStartPoint(edit_logline[1]->segueStartPoint()+tdiff, - RDLogLine::LogPointer); - edit_logline[1]-> - setAverageSegueLength(edit_logline[1]-> - segueStartPoint()- - edit_logline[1]-> - startPoint()); + tend=edit_wave_origin[0]- + edit_logline[0]->segueEndPoint()+ + edit_logline[2]->startPoint()+100; + if((edit_wave_origin[2]-tdiff) + setSegueStartPoint(edit_logline[0]->segueStartPoint()+tdiff, + RDLogLine::LogPointer); + edit_logline[0]-> + setAverageSegueLength(edit_logline[0]->segueStartPoint()- + edit_logline[0]->startPoint()); + } + } + else { + if((edit_wave_origin[2]-edit_logline[2]->startPoint()-tdiff)> + (edit_wave_origin[1]-edit_logline[1]->startPoint())) { + tdiff=(edit_wave_origin[2]-edit_logline[2]->startPoint())- + (edit_wave_origin[1]-edit_logline[1]->startPoint()); + } + tend=edit_wave_origin[1]- + edit_logline[1]->segueEndPoint()+ + edit_logline[2]->startPoint()+100; + if((edit_wave_origin[2]-tdiff) + setSegueStartPoint(edit_logline[1]->segueStartPoint()+tdiff, + RDLogLine::LogPointer); + edit_logline[1]-> + setAverageSegueLength(edit_logline[1]->segueStartPoint()- + edit_logline[1]->startPoint()); + } + break; } // @@ -2877,161 +2880,163 @@ void VoiceTracker::DragTarget(int trackno,const QPoint &pt) UpdateControls(); } switch(track_current_target) { - case VoiceTracker::FadedownPoint: - edit_logline[trackno]-> - setDuckDownGain((TRACKER_GAIN_MARGIN-pt.y())*TRACKER_MB_PER_PIXEL); - if(edit_logline[trackno]->duckDownGain()>TRACKER_MAX_GAIN) { - edit_logline[trackno]->setDuckDownGain(TRACKER_MAX_GAIN); - } - if(edit_logline[trackno]->duckDownGain()setDuckDownGain(TRACKER_MIN_GAIN); - } - case VoiceTracker::TrackFadedownPoint: - if((edit_logline[trackno]->fadedownPoint()<=0 || - edit_logline[trackno]->fadedownPoint()>=edit_logline[trackno]->endPoint()) - && edit_logline[trackno]->fadedownGain()==0) { - edit_logline[trackno]->setFadedownGain(RD_FADE_DEPTH); - } - edit_logline[trackno]->setSegueGain(0); - if(edit_logline[trackno]->fadedownPoint(RDLogLine::LogPointer)<0) { - edit_logline[trackno]->setFadedownGain(RD_FADE_DEPTH); - } - if(trackno<2) { - if((edit_logline[trackno+1]->transType()==RDLogLine::Segue) - && (!track_loaded)) { - edit_logline[trackno]->setEndPoint( - edit_logline[trackno]->segueEndPoint(),RDLogLine::LogPointer); - } - } - edit_logline[trackno]-> - setFadedownPoint(pt.x()*TRACKER_MSECS_PER_PIXEL+ - edit_wave_origin[trackno],RDLogLine::LogPointer); - if(edit_logline[trackno]->fadedownPoint()>edit_logline[trackno]-> - endPoint()) { - edit_logline[trackno]->setFadedownPoint(edit_logline[trackno]-> - endPoint(),RDLogLine::LogPointer); - } - if(edit_logline[trackno]->fadedownPoint()< - edit_logline[trackno]->fadeupPoint()) { - edit_logline[trackno]-> - setFadedownPoint(edit_logline[trackno]->fadeupPoint(), - RDLogLine::LogPointer);; - } - if(edit_logline[trackno]->fadedownPoint(RDLogLine::CartPointer)>=0 - && edit_logline[trackno]->fadedownPoint()> - edit_logline[trackno]->fadedownPoint(RDLogLine::CartPointer)) { - edit_logline[trackno]-> - setFadedownPoint(edit_logline[trackno]->fadedownPoint(RDLogLine::CartPointer), - RDLogLine::LogPointer); - } - DrawTrackMap(trackno); - WriteTrackMap(trackno); - track_meter->setLeftPeakBar(edit_logline[trackno]->duckDownGain()-1600); - track_meter->setRightPeakBar(edit_logline[trackno]->duckDownGain()-1600); - if(edit_logline[trackno+1]!=NULL) { - edit_logline[trackno+1]->setHasCustomTransition(true); - } - break; + case VoiceTracker::FadedownPoint: + edit_logline[trackno]-> + setDuckDownGain((TRACKER_GAIN_MARGIN-pt.y())*TRACKER_MB_PER_PIXEL); + if(edit_logline[trackno]->duckDownGain()>TRACKER_MAX_GAIN) { + edit_logline[trackno]->setDuckDownGain(TRACKER_MAX_GAIN); + } + if(edit_logline[trackno]->duckDownGain()setDuckDownGain(TRACKER_MIN_GAIN); + } + + case VoiceTracker::TrackFadedownPoint: + if((edit_logline[trackno]->fadedownPoint()<=0 || + edit_logline[trackno]->fadedownPoint()>=edit_logline[trackno]->endPoint()) + && edit_logline[trackno]->fadedownGain()==0) { + edit_logline[trackno]->setFadedownGain(RD_FADE_DEPTH); + } + edit_logline[trackno]->setSegueGain(0); + if(edit_logline[trackno]->fadedownPoint(RDLogLine::LogPointer)<0) { + edit_logline[trackno]->setFadedownGain(RD_FADE_DEPTH); + } + if(trackno<2) { + if((edit_logline[trackno+1]->transType()==RDLogLine::Segue) + && (!track_loaded)) { + edit_logline[trackno]->setEndPoint( + edit_logline[trackno]->segueEndPoint(),RDLogLine::LogPointer); + } + } + edit_logline[trackno]-> + setFadedownPoint(pt.x()*TRACKER_MSECS_PER_PIXEL+ + edit_wave_origin[trackno],RDLogLine::LogPointer); + if(edit_logline[trackno]->fadedownPoint()>edit_logline[trackno]-> + endPoint()) { + edit_logline[trackno]->setFadedownPoint(edit_logline[trackno]-> + endPoint(),RDLogLine::LogPointer); + } + if(edit_logline[trackno]->fadedownPoint()< + edit_logline[trackno]->fadeupPoint()) { + edit_logline[trackno]-> + setFadedownPoint(edit_logline[trackno]->fadeupPoint(), + RDLogLine::LogPointer);; + } + if(edit_logline[trackno]->fadedownPoint(RDLogLine::CartPointer)>=0 + && edit_logline[trackno]->fadedownPoint()> + edit_logline[trackno]->fadedownPoint(RDLogLine::CartPointer)) { + edit_logline[trackno]-> + setFadedownPoint(edit_logline[trackno]->fadedownPoint(RDLogLine::CartPointer), + RDLogLine::LogPointer); + } + DrawTrackMap(trackno); + WriteTrackMap(trackno); + track_meter->setLeftPeakBar(edit_logline[trackno]->duckDownGain()-1600); + track_meter->setRightPeakBar(edit_logline[trackno]->duckDownGain()-1600); + if(edit_logline[trackno+1]!=NULL) { + edit_logline[trackno+1]->setHasCustomTransition(true); + } + break; - case VoiceTracker::FadedownGain: - case VoiceTracker::TrackFadedownGain: - if(edit_logline[trackno]->fadedownPoint()>edit_logline[trackno]->endPoint() - || edit_logline[trackno]->fadedownPoint()<0) { - edit_logline[trackno]->setFadedownPoint(edit_logline[trackno]->endPoint(),RDLogLine::LogPointer); - } - edit_logline[trackno]-> - setFadedownGain((TRACKER_GAIN_MARGIN-pt.y())*TRACKER_MB_PER_PIXEL); - if(edit_logline[trackno]->fadedownGain()>TRACKER_MAX_GAIN) { - edit_logline[trackno]->setFadedownGain(TRACKER_MAX_GAIN); - } - if(edit_logline[trackno]->fadedownGain()setFadedownGain(TRACKER_MIN_GAIN); - } - if(edit_logline[trackno]->fadedownPoint(RDLogLine::CartPointer)>=0 - && edit_logline[trackno]->fadedownPoint(RDLogLine::CartPointer)< - edit_logline[trackno]->endPoint() - ) { - edit_logline[trackno]->setFadedownGain(RD_FADE_DEPTH); - } - DrawTrackMap(trackno); - WriteTrackMap(trackno); - track_meter->setLeftPeakBar(edit_logline[trackno]->fadedownGain()-1600); - track_meter->setRightPeakBar(edit_logline[trackno]->fadedownGain()-1600); - if(edit_logline[trackno+1]!=NULL) { - edit_logline[trackno+1]->setHasCustomTransition(true); - } - break; + case VoiceTracker::FadedownGain: + case VoiceTracker::TrackFadedownGain: + if(edit_logline[trackno]->fadedownPoint()>edit_logline[trackno]->endPoint() + || edit_logline[trackno]->fadedownPoint()<0) { + edit_logline[trackno]->setFadedownPoint(edit_logline[trackno]->endPoint(),RDLogLine::LogPointer); + } + edit_logline[trackno]-> + setFadedownGain((TRACKER_GAIN_MARGIN-pt.y())*TRACKER_MB_PER_PIXEL); + if(edit_logline[trackno]->fadedownGain()>TRACKER_MAX_GAIN) { + edit_logline[trackno]->setFadedownGain(TRACKER_MAX_GAIN); + } + if(edit_logline[trackno]->fadedownGain()setFadedownGain(TRACKER_MIN_GAIN); + } + if(edit_logline[trackno]->fadedownPoint(RDLogLine::CartPointer)>=0 + && edit_logline[trackno]->fadedownPoint(RDLogLine::CartPointer)< + edit_logline[trackno]->endPoint() + ) { + edit_logline[trackno]->setFadedownGain(RD_FADE_DEPTH); + } + DrawTrackMap(trackno); + WriteTrackMap(trackno); + track_meter->setLeftPeakBar(edit_logline[trackno]->fadedownGain()-1600); + track_meter->setRightPeakBar(edit_logline[trackno]->fadedownGain()-1600); + if(edit_logline[trackno+1]!=NULL) { + edit_logline[trackno+1]->setHasCustomTransition(true); + } + break; - case VoiceTracker::FadeupPoint: - edit_logline[trackno]-> - setDuckUpGain((TRACKER_GAIN_MARGIN-pt.y())*TRACKER_MB_PER_PIXEL); - if(edit_logline[trackno]->duckUpGain()>TRACKER_MAX_GAIN) { - edit_logline[trackno]->setDuckUpGain(TRACKER_MAX_GAIN); - } - if(edit_logline[trackno]->duckUpGain()setDuckUpGain(TRACKER_MIN_GAIN); - } - case VoiceTracker::TrackFadeupPoint: - if(edit_logline[trackno]->fadeupPoint()<=edit_logline[trackno]->startPoint() - && edit_logline[trackno]->fadeupGain()==0) { - edit_logline[trackno]->setFadeupGain(RD_FADE_DEPTH); - } - if(edit_logline[trackno]->fadeupPoint(RDLogLine::LogPointer)<0) { - edit_logline[trackno]->setFadeupGain(RD_FADE_DEPTH); - } - edit_logline[trackno]-> - setFadeupPoint(pt.x()*TRACKER_MSECS_PER_PIXEL+ - edit_wave_origin[trackno],RDLogLine::LogPointer); - if(edit_logline[trackno]->fadeupPoint()> - edit_logline[trackno]->fadedownPoint() - && edit_logline[trackno]->fadedownPoint()>=0) { - edit_logline[trackno]->setFadeupPoint(edit_logline[trackno]-> - fadedownPoint(),RDLogLine::LogPointer); - } - if(edit_logline[trackno]->fadeupPoint() - startPoint()) { - edit_logline[trackno]->setFadeupPoint(edit_logline[trackno]-> - startPoint(),RDLogLine::LogPointer); - } - if(edit_logline[trackno]->fadeupPoint()< - edit_logline[trackno]->fadeupPoint(RDLogLine::CartPointer)) { - edit_logline[trackno]-> - setFadeupPoint(edit_logline[trackno]->fadeupPoint(RDLogLine::CartPointer), - RDLogLine::LogPointer); - } - DrawTrackMap(trackno); - WriteTrackMap(trackno); - track_meter->setLeftPeakBar(edit_logline[trackno]->duckUpGain()-1600); - track_meter->setRightPeakBar(edit_logline[trackno]->duckUpGain()-1600); - edit_logline[trackno]->setHasCustomTransition(true); - break; + case VoiceTracker::FadeupPoint: + edit_logline[trackno]-> + setDuckUpGain((TRACKER_GAIN_MARGIN-pt.y())*TRACKER_MB_PER_PIXEL); + if(edit_logline[trackno]->duckUpGain()>TRACKER_MAX_GAIN) { + edit_logline[trackno]->setDuckUpGain(TRACKER_MAX_GAIN); + } + if(edit_logline[trackno]->duckUpGain()setDuckUpGain(TRACKER_MIN_GAIN); + } - case VoiceTracker::FadeupGain: - case VoiceTracker::TrackFadeupGain: - if(edit_logline[trackno]->fadeupPoint()startPoint()) { - edit_logline[trackno]->setFadeupPoint(edit_logline[trackno]->startPoint(),RDLogLine::LogPointer); - } - edit_logline[trackno]-> - setFadeupGain((TRACKER_GAIN_MARGIN-pt.y())*TRACKER_MB_PER_PIXEL); - if(edit_logline[trackno]->fadeupGain()>TRACKER_MAX_GAIN) { - edit_logline[trackno]->setFadeupGain(TRACKER_MAX_GAIN); - } - if(edit_logline[trackno]->fadeupGain()setFadeupGain(TRACKER_MIN_GAIN); - } - if(edit_logline[trackno]->fadeupPoint(RDLogLine::CartPointer)> - edit_logline[trackno]->startPoint()) { - edit_logline[trackno]->setFadeupGain(RD_FADE_DEPTH); - } - DrawTrackMap(trackno); - WriteTrackMap(trackno); - track_meter->setLeftPeakBar(edit_logline[trackno]->fadeupGain()-1600); - track_meter->setRightPeakBar(edit_logline[trackno]->fadeupGain()-1600); - edit_logline[trackno]->setHasCustomTransition(true); - break; + case VoiceTracker::TrackFadeupPoint: + if(edit_logline[trackno]->fadeupPoint()<=edit_logline[trackno]->startPoint() + && edit_logline[trackno]->fadeupGain()==0) { + edit_logline[trackno]->setFadeupGain(RD_FADE_DEPTH); + } + if(edit_logline[trackno]->fadeupPoint(RDLogLine::LogPointer)<0) { + edit_logline[trackno]->setFadeupGain(RD_FADE_DEPTH); + } + edit_logline[trackno]-> + setFadeupPoint(pt.x()*TRACKER_MSECS_PER_PIXEL+ + edit_wave_origin[trackno],RDLogLine::LogPointer); + if(edit_logline[trackno]->fadeupPoint()> + edit_logline[trackno]->fadedownPoint() + && edit_logline[trackno]->fadedownPoint()>=0) { + edit_logline[trackno]->setFadeupPoint(edit_logline[trackno]-> + fadedownPoint(),RDLogLine::LogPointer); + } + if(edit_logline[trackno]->fadeupPoint() + startPoint()) { + edit_logline[trackno]->setFadeupPoint(edit_logline[trackno]-> + startPoint(),RDLogLine::LogPointer); + } + if(edit_logline[trackno]->fadeupPoint()< + edit_logline[trackno]->fadeupPoint(RDLogLine::CartPointer)) { + edit_logline[trackno]-> + setFadeupPoint(edit_logline[trackno]->fadeupPoint(RDLogLine::CartPointer), + RDLogLine::LogPointer); + } + DrawTrackMap(trackno); + WriteTrackMap(trackno); + track_meter->setLeftPeakBar(edit_logline[trackno]->duckUpGain()-1600); + track_meter->setRightPeakBar(edit_logline[trackno]->duckUpGain()-1600); + edit_logline[trackno]->setHasCustomTransition(true); + break; - case VoiceTracker::TargetSize: - break; + case VoiceTracker::FadeupGain: + case VoiceTracker::TrackFadeupGain: + if(edit_logline[trackno]->fadeupPoint()startPoint()) { + edit_logline[trackno]->setFadeupPoint(edit_logline[trackno]->startPoint(),RDLogLine::LogPointer); + } + edit_logline[trackno]-> + setFadeupGain((TRACKER_GAIN_MARGIN-pt.y())*TRACKER_MB_PER_PIXEL); + if(edit_logline[trackno]->fadeupGain()>TRACKER_MAX_GAIN) { + edit_logline[trackno]->setFadeupGain(TRACKER_MAX_GAIN); + } + if(edit_logline[trackno]->fadeupGain()setFadeupGain(TRACKER_MIN_GAIN); + } + if(edit_logline[trackno]->fadeupPoint(RDLogLine::CartPointer)> + edit_logline[trackno]->startPoint()) { + edit_logline[trackno]->setFadeupGain(RD_FADE_DEPTH); + } + DrawTrackMap(trackno); + WriteTrackMap(trackno); + track_meter->setLeftPeakBar(edit_logline[trackno]->fadeupGain()-1600); + track_meter->setRightPeakBar(edit_logline[trackno]->fadeupGain()-1600); + edit_logline[trackno]->setHasCustomTransition(true); + break; + + case VoiceTracker::TargetSize: + break; } track_changed=true; RDListViewItem *item=NULL; @@ -3541,40 +3546,40 @@ void VoiceTracker::DrawRubberBand(RDWavePainter *wp,int trackno) } wp->moveTo(xpos,ypos); switch(trackno) { - case 1: - DrawTarget(wp,VoiceTracker::TrackFadeupGain,trackno,xpos,ypos); - break; + case 1: + DrawTarget(wp,VoiceTracker::TrackFadeupGain,trackno,xpos,ypos); + break; - case 2: - DrawTarget(wp,VoiceTracker::FadeupGain,trackno,xpos,ypos); - break; + case 2: + DrawTarget(wp,VoiceTracker::FadeupGain,trackno,xpos,ypos); + break; } xpos=(edit_logline[trackno]->fadeupPoint()- edit_wave_origin[trackno])/TRACKER_MSECS_PER_PIXEL; switch(trackno) { - case 0: - ypos=TRACKER_GAIN_MARGIN- - draw_duckdown_gain/TRACKER_MB_PER_PIXEL; - break; + case 0: + ypos=TRACKER_GAIN_MARGIN- + draw_duckdown_gain/TRACKER_MB_PER_PIXEL; + break; - case 1: - ypos=TRACKER_GAIN_MARGIN; - break; + case 1: + ypos=TRACKER_GAIN_MARGIN; + break; - case 2: - ypos=TRACKER_GAIN_MARGIN- - draw_duckup_gain/TRACKER_MB_PER_PIXEL; - break; + case 2: + ypos=TRACKER_GAIN_MARGIN- + draw_duckup_gain/TRACKER_MB_PER_PIXEL; + break; } wp->lineTo(xpos,ypos); switch(trackno) { - case 1: - DrawTarget(wp,VoiceTracker::TrackFadeupPoint,trackno,xpos,ypos); - break; + case 1: + DrawTarget(wp,VoiceTracker::TrackFadeupPoint,trackno,xpos,ypos); + break; - case 2: - DrawTarget(wp,VoiceTracker::FadeupPoint,trackno,xpos,ypos); - break; + case 2: + DrawTarget(wp,VoiceTracker::FadeupPoint,trackno,xpos,ypos); + break; } // @@ -3596,13 +3601,13 @@ void VoiceTracker::DrawRubberBand(RDWavePainter *wp,int trackno) // // Fade Down switch(trackno) { - case 0: - DrawTarget(wp,VoiceTracker::FadedownPoint,trackno,xpos,ypos); - break; + case 0: + DrawTarget(wp,VoiceTracker::FadedownPoint,trackno,xpos,ypos); + break; - case 1: - DrawTarget(wp,VoiceTracker::TrackFadedownPoint,trackno,xpos,ypos); - break; + case 1: + DrawTarget(wp,VoiceTracker::TrackFadedownPoint,trackno,xpos,ypos); + break; } xpos=(draw_end_point- edit_wave_origin[trackno])/TRACKER_MSECS_PER_PIXEL; @@ -3622,13 +3627,13 @@ void VoiceTracker::DrawRubberBand(RDWavePainter *wp,int trackno) } wp->lineTo(xpos,ypos); switch(trackno) { - case 0: - DrawTarget(wp,VoiceTracker::FadedownGain,trackno,xpos,ypos); - break; + case 0: + DrawTarget(wp,VoiceTracker::FadedownGain,trackno,xpos,ypos); + break; - case 1: - DrawTarget(wp,VoiceTracker::TrackFadedownGain,trackno,xpos,ypos); - break; + case 1: + DrawTarget(wp,VoiceTracker::TrackFadedownGain,trackno,xpos,ypos); + break; } } @@ -3649,19 +3654,19 @@ void VoiceTracker::WriteTrackMap(int trackno) { QPainter *p=new QPainter(this); switch(trackno) { - case 0: - p->drawPixmap(TRACKER_X_ORIGIN,TRACKER_Y_ORIGIN,*edit_wave_map[0]); - break; + case 0: + p->drawPixmap(TRACKER_X_ORIGIN,TRACKER_Y_ORIGIN,*edit_wave_map[0]); + break; - case 1: - p->drawPixmap(TRACKER_X_ORIGIN,TRACKER_Y_HEIGHT+TRACKER_Y_ORIGIN, - *edit_wave_map[1]); - break; + case 1: + p->drawPixmap(TRACKER_X_ORIGIN,TRACKER_Y_HEIGHT+TRACKER_Y_ORIGIN, + *edit_wave_map[1]); + break; - case 2: - p->drawPixmap(TRACKER_X_ORIGIN,TRACKER_Y_HEIGHT*2+TRACKER_Y_ORIGIN, - *edit_wave_map[2]); - break; + case 2: + p->drawPixmap(TRACKER_X_ORIGIN,TRACKER_Y_HEIGHT*2+TRACKER_Y_ORIGIN, + *edit_wave_map[2]); + break; } p->end(); delete p; @@ -3722,143 +3727,143 @@ void VoiceTracker::UpdateControls() if(track_loaded) { if(logline->type()==RDLogLine::Track) { // Unfinished Track switch(edit_deck_state) { - case VoiceTracker::DeckIdle: - if(edit_wave_name[0].isEmpty()) { - track_track1_button->setEnabled(!track_group->name().isEmpty()); - track_track1_button->setText(tr("Import")); - track_track1_button->setPalette(track_record_palette); - track_record_button->setEnabled(!track_group->name().isEmpty()); - track_record_button->setText(tr("Record")); - track_record_button->setFocus(); - } - else { - if((logline->transType()==RDLogLine::Segue)) { - track_track1_button-> - setEnabled(!track_group->name().isEmpty()); - track_track1_button->setText(tr("Start")); - track_track1_button->setPalette(track_start_palette); - track_track1_button->setFocus(); - track_record_button-> - setEnabled(!track_group->name().isEmpty()); - track_record_button->setText(tr("Import")); - } - else { - track_track1_button-> - setEnabled(!track_group->name().isEmpty()); - track_track1_button->setText(tr("Import")); - track_track1_button->setPalette(track_record_palette); - track_record_button-> - setEnabled(!track_group->name().isEmpty()); - track_record_button->setText(tr("Record")); - track_record_button->setFocus(); - } - } - track_track2_button->setDisabled(true); - track_finished_button->setPalette(track_done_palette); - track_finished_button->setText(tr("Save")); - track_finished_button->setEnabled(track_changed); - track_reset_button-> - setEnabled(real_logline->hasCustomTransition()); - track_post_button->setDisabled(true); - track_play_button->setEnabled(true); - track_stop_button->setEnabled(true); - track_next_button->setEnabled(transport_idle); - track_previous_button->setEnabled(transport_idle); - track_insert_button->setEnabled(transport_idle&&CanInsertTrack()); - track_delete_button->setEnabled(transport_idle&&CanDeleteTrack()); - track_close_button->setEnabled(true); - track_log_list->setEnabled(transport_idle); - break; - - case VoiceTracker::DeckTrack1: - track_track1_button->setDisabled(true); + case VoiceTracker::DeckIdle: + if(edit_wave_name[0].isEmpty()) { + track_track1_button->setEnabled(!track_group->name().isEmpty()); + track_track1_button->setText(tr("Import")); + track_track1_button->setPalette(track_record_palette); + track_record_button->setEnabled(!track_group->name().isEmpty()); + track_record_button->setText(tr("Record")); + track_record_button->setFocus(); + } + else { + if((logline->transType()==RDLogLine::Segue)) { + track_track1_button-> + setEnabled(!track_group->name().isEmpty()); track_track1_button->setText(tr("Start")); track_track1_button->setPalette(track_start_palette); - track_record_button->setEnabled(true); + track_track1_button->setFocus(); + track_record_button-> + setEnabled(!track_group->name().isEmpty()); + track_record_button->setText(tr("Import")); + } + else { + track_track1_button-> + setEnabled(!track_group->name().isEmpty()); + track_track1_button->setText(tr("Import")); + track_track1_button->setPalette(track_record_palette); + track_record_button-> + setEnabled(!track_group->name().isEmpty()); track_record_button->setText(tr("Record")); track_record_button->setFocus(); - track_track2_button->setDisabled(true); - track_finished_button->setPalette(track_abort_palette); - track_finished_button->setText(tr("Abort")); - track_finished_button->setEnabled(true); - track_reset_button->setDisabled(true); - track_post_button->setDisabled(true); - track_play_button->setDisabled(true); - track_stop_button->setDisabled(true); - track_next_button->setDisabled(true); - track_previous_button->setDisabled(true); - track_insert_button->setDisabled(true); - track_delete_button->setDisabled(true); - track_close_button->setDisabled(true); - track_log_list->setDisabled(true); - break; + } + } + track_track2_button->setDisabled(true); + track_finished_button->setPalette(track_done_palette); + track_finished_button->setText(tr("Save")); + track_finished_button->setEnabled(track_changed); + track_reset_button-> + setEnabled(real_logline->hasCustomTransition()); + track_post_button->setDisabled(true); + track_play_button->setEnabled(true); + track_stop_button->setEnabled(true); + track_next_button->setEnabled(transport_idle); + track_previous_button->setEnabled(transport_idle); + track_insert_button->setEnabled(transport_idle&&CanInsertTrack()); + track_delete_button->setEnabled(transport_idle&&CanDeleteTrack()); + track_close_button->setEnabled(true); + track_log_list->setEnabled(transport_idle); + break; + + case VoiceTracker::DeckTrack1: + track_track1_button->setDisabled(true); + track_track1_button->setText(tr("Start")); + track_track1_button->setPalette(track_start_palette); + track_record_button->setEnabled(true); + track_record_button->setText(tr("Record")); + track_record_button->setFocus(); + track_track2_button->setDisabled(true); + track_finished_button->setPalette(track_abort_palette); + track_finished_button->setText(tr("Abort")); + track_finished_button->setEnabled(true); + track_reset_button->setDisabled(true); + track_post_button->setDisabled(true); + track_play_button->setDisabled(true); + track_stop_button->setDisabled(true); + track_next_button->setDisabled(true); + track_previous_button->setDisabled(true); + track_insert_button->setDisabled(true); + track_delete_button->setDisabled(true); + track_close_button->setDisabled(true); + track_log_list->setDisabled(true); + break; - case VoiceTracker::DeckTrack2: - track_track1_button->setDisabled(true); - track_track1_button->setText(tr("Start")); - track_track1_button->setPalette(track_start_palette); - track_record_button->setDisabled(true); - track_record_button->setText(tr("Record")); - if(edit_wave_name[2].isEmpty()) { - track_finished_button->setPalette(track_done_palette); - track_finished_button->setText(tr("Save")); - track_finished_button->setFocus(); - track_track2_button->setDisabled(true); + case VoiceTracker::DeckTrack2: + track_track1_button->setDisabled(true); + track_track1_button->setText(tr("Start")); + track_track1_button->setPalette(track_start_palette); + track_record_button->setDisabled(true); + track_record_button->setText(tr("Record")); + if(edit_wave_name[2].isEmpty()) { + track_finished_button->setPalette(track_done_palette); + track_finished_button->setText(tr("Save")); + track_finished_button->setFocus(); + track_track2_button->setDisabled(true); + } + else { + if((edit_logline[2]->transType()==RDLogLine::Segue)) { + if(rda->logeditConf()->enableSecondStart()) { + track_finished_button->setPalette(track_abort_palette); + track_finished_button->setText(tr("Abort")); } else { - if((edit_logline[2]->transType()==RDLogLine::Segue)) { - if(rda->logeditConf()->enableSecondStart()) { - track_finished_button->setPalette(track_abort_palette); - track_finished_button->setText(tr("Abort")); - } - else { - track_finished_button->setPalette(track_done_palette); - track_finished_button->setText(tr("Save")); - } - track_track2_button->setEnabled(true); - } - else { - track_finished_button->setText(tr("Save")); - track_finished_button->setPalette(track_done_palette); - track_track2_button->setDisabled(true); - } - track_track2_button->setFocus(); + track_finished_button->setPalette(track_done_palette); + track_finished_button->setText(tr("Save")); } - track_finished_button->setEnabled(true); - track_reset_button->setDisabled(true); - track_insert_button->setDisabled(true); - track_delete_button->setDisabled(true); - track_post_button->setDisabled(true); - track_play_button->setDisabled(true); - track_stop_button->setDisabled(true); - track_next_button->setDisabled(true); - track_previous_button->setDisabled(true); - track_close_button->setDisabled(true); - track_log_list->setDisabled(true); - break; - - case VoiceTracker::DeckTrack3: - track_track1_button->setDisabled(true); - track_track1_button->setText(tr("Start")); - track_track1_button->setPalette(track_start_palette); - track_record_button->setDisabled(true); - track_record_button->setText(tr("Record")); - track_track2_button->setDisabled(true); - track_finished_button->setPalette(track_done_palette); + track_track2_button->setEnabled(true); + } + else { track_finished_button->setText(tr("Save")); - track_finished_button->setEnabled(true); - track_finished_button->setFocus(); - track_reset_button->setDisabled(true); - track_post_button->setDisabled(true); - track_insert_button->setDisabled(true); - track_delete_button->setDisabled(true); - track_play_button->setDisabled(true); - track_stop_button->setDisabled(true); - track_next_button->setDisabled(true); - track_previous_button->setDisabled(true); - track_close_button->setDisabled(true); - track_log_list->setDisabled(true); - break; + track_finished_button->setPalette(track_done_palette); + track_track2_button->setDisabled(true); + } + track_track2_button->setFocus(); + } + track_finished_button->setEnabled(true); + track_reset_button->setDisabled(true); + track_insert_button->setDisabled(true); + track_delete_button->setDisabled(true); + track_post_button->setDisabled(true); + track_play_button->setDisabled(true); + track_stop_button->setDisabled(true); + track_next_button->setDisabled(true); + track_previous_button->setDisabled(true); + track_close_button->setDisabled(true); + track_log_list->setDisabled(true); + break; + + case VoiceTracker::DeckTrack3: + track_track1_button->setDisabled(true); + track_track1_button->setText(tr("Start")); + track_track1_button->setPalette(track_start_palette); + track_record_button->setDisabled(true); + track_record_button->setText(tr("Record")); + track_track2_button->setDisabled(true); + track_finished_button->setPalette(track_done_palette); + track_finished_button->setText(tr("Save")); + track_finished_button->setEnabled(true); + track_finished_button->setFocus(); + track_reset_button->setDisabled(true); + track_post_button->setDisabled(true); + track_insert_button->setDisabled(true); + track_delete_button->setDisabled(true); + track_play_button->setDisabled(true); + track_stop_button->setDisabled(true); + track_next_button->setDisabled(true); + track_previous_button->setDisabled(true); + track_close_button->setDisabled(true); + track_log_list->setDisabled(true); + break; } } else { // Completed Track @@ -4128,14 +4133,14 @@ void VoiceTracker::CheckChanges() switch(QMessageBox::question(this,tr("Segue Changed"), tr("Save segue changes?"), QMessageBox::Yes,QMessageBox::No)) { - case QMessageBox::Yes: - finishedData(); - break; + case QMessageBox::Yes: + finishedData(); + break; - case QMessageBox::No: - case QMessageBox::NoButton: - PopSegues(); - break; + case QMessageBox::No: + case QMessageBox::NoButton: + PopSegues(); + break; } } track_changed=false;