replaced NAN with qSNaN for better compiler compatibility
This commit is contained in:
@@ -64,9 +64,9 @@ SpeedDialog::SpeedDialog(QWidget *parent) : QDialog(parent) {
|
||||
void SpeedDialog::run() {
|
||||
bool enable_frame_rate = false;
|
||||
|
||||
default_frame_rate = NAN;
|
||||
current_frame_rate = NAN;
|
||||
current_percent = NAN;
|
||||
default_frame_rate = qSNaN();
|
||||
current_frame_rate = qSNaN();
|
||||
current_percent = qSNaN();
|
||||
default_length = -1;
|
||||
current_length = -1;
|
||||
|
||||
@@ -96,10 +96,10 @@ void SpeedDialog::run() {
|
||||
if (enable_frame_rate) {
|
||||
// check if frame rate is equal to default
|
||||
if (!qIsNaN(default_frame_rate) && !qFuzzyCompare(media_frame_rate, default_frame_rate)) {
|
||||
default_frame_rate = NAN;
|
||||
default_frame_rate = qSNaN();
|
||||
}
|
||||
if (!qIsNaN(current_frame_rate) && !qFuzzyCompare(media_frame_rate*c->speed, current_frame_rate)) {
|
||||
current_frame_rate = NAN;
|
||||
current_frame_rate = qSNaN();
|
||||
}
|
||||
} else {
|
||||
default_frame_rate = media_frame_rate;
|
||||
@@ -124,7 +124,7 @@ void SpeedDialog::run() {
|
||||
default_length = -1;
|
||||
}
|
||||
if (!qIsNaN(current_percent) && !qFuzzyCompare(clip_percent, current_percent)) {
|
||||
current_percent = NAN;
|
||||
current_percent = qSNaN();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -25,7 +25,7 @@ Viewer::Viewer(QWidget *parent) :
|
||||
viewer_widget = ui->openGLWidget;
|
||||
update_sequence();
|
||||
|
||||
ui->currentTimecode->set_default_value(NAN);
|
||||
ui->currentTimecode->set_default_value(qSNaN());
|
||||
ui->currentTimecode->set_value(0, false);
|
||||
ui->currentTimecode->set_display_type(LABELSLIDER_FRAMENUMBER);
|
||||
connect(ui->currentTimecode, SIGNAL(valueChanged()), this, SLOT(update_playhead()));
|
||||
|
||||
+1
-1
@@ -212,7 +212,7 @@ double Clip::getMediaFrameRate() {
|
||||
case MEDIA_TYPE_SEQUENCE: return static_cast<Sequence*>(media)->frame_rate;
|
||||
}
|
||||
if (sequence != NULL) return sequence->frame_rate;
|
||||
return NAN;
|
||||
return qSNaN();
|
||||
}
|
||||
|
||||
int Clip::getWidth() {
|
||||
|
||||
Reference in New Issue
Block a user