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

2019-08-21 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Refactored code to eliminate 'QSqlQuery::value: not positioned
	on a valid record' errors when starting rdairplay(1).
This commit is contained in:
Fred Gleason 2019-08-21 15:40:08 -04:00
parent 602373c3e2
commit 51c915010c
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -18935,3 +18935,6 @@
2019-08-21 Fred Gleason <fredg@paravelsystems.com>
* Added code to dump the parent query to STDERR when an invalid
'RDSqlQuery::value()' is requested.
2019-08-21 Fred Gleason <fredg@paravelsystems.com>
* Refactored code to eliminate 'QSqlQuery::value: not positioned
on a valid record' errors when starting rdairplay(1).

21
rdairplay/loglinebox.cpp
View File

@ -430,7 +430,12 @@ void LogLineBox::setEvent(int line,RDLogLine::TransType next_type,
case RDLogLine::Cart:
line_comment_label->hide();
cart=new RDCart(logline->cartNumber());
cut=new RDCut(logline->cartNumber(),logline->cutNumber());
if(logline->cutNumber()>0) {
cut=new RDCut(logline->cartNumber(),logline->cutNumber());
}
else {
cut=NULL;
}
if(!cart->exists()) {
line_cart_label->
setText(QString().sprintf("%06u",logline->cartNumber()));
@ -453,15 +458,15 @@ void LogLineBox::setEvent(int line,RDLogLine::TransType next_type,
break;
}
setBackgroundColor(QColor(LOGLINEBOX_MISSING_COLOR));
delete cart;
delete cut;
}
else {
if(((cart->forcedLength()==0)&&(cart->type()==RDCart::Audio))||
(line_logline->state()==RDLogLine::NoCut)) {
line_cart_label->
setText(QString().sprintf("%06u",logline->cartNumber()));
line_description_label->setText(cut->description());
if(cut!=NULL) {
line_description_label->setText(cut->description());
}
line_artist_label->setText(tr("[NO AUDIO AVAILABLE]"));
line_cut_label->clear();
line_group_label->clear();
@ -474,8 +479,6 @@ void LogLineBox::setEvent(int line,RDLogLine::TransType next_type,
line_icon_label->setPixmap(*line_playout_map);
line_title_label->setText(logline->title());
setBackgroundColor(QColor(LOGLINEBOX_MISSING_COLOR));
delete cart;
delete cut;
}
else {
line_cart_label->
@ -557,13 +560,15 @@ void LogLineBox::setEvent(int line,RDLogLine::TransType next_type,
line_cut_label->clear();
line_outcue_label->setText(tr("[NO VALID CUT AVAILABLE]"));
}
delete cart;
delete cut;
setMode(line_mode);
line_title_label->show();
line_artist_label->show();
}
}
delete cart;
if(cut!=NULL) {
delete cut;
}
break;
case RDLogLine::Marker: