summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfred <fred@home.lan>2011-04-09 09:45:24 (GMT)
committer fred <fred@home.lan>2011-04-09 09:45:24 (GMT)
commit79dab6f905616cb5107858c4fa428ad6dbf44ae4 (patch)
tree4dce5c017238c9571e9a6ea268235ab06879ad3d
parentaf2f15ae15be9d0958eaec044ccfee39c12a4a4e (diff)
There was a bug in qfreej frame rate init
-rw-r--r--qt/QqWidget.cpp14
-rw-r--r--qt/QqWidget.h4
2 files changed, 4 insertions, 14 deletions
diff --git a/qt/QqWidget.cpp b/qt/QqWidget.cpp
index b86ee6c..b9faee5 100644
--- a/qt/QqWidget.cpp
+++ b/qt/QqWidget.cpp
@@ -51,21 +51,11 @@ QqWidget::QqWidget(Context *freej, QqTabWidget* tabWidget, Qfreej* qfreej, QStri
{
qLayer->start(); //launches JSyncThread::start()
-/* if (qLayer->frame_rate > 50) //pb de determination de FPS
- {
- std::cout << "--------- qfreej : frame_rate problem : " << qLayer->frame_rate << " FPS" << std::endl;
- qLayer->fps.set(qLayer->frame_rate / 10);
- normalFps = qLayer->frame_rate / 10;
- actualFps = qLayer->frame_rate / 10;
- }
- else
- {*/
- qLayer->fps.set(qLayer->frame_rate);
+// qLayer->fps.set(qLayer->frame_rate);
normalFps = qLayer->frame_rate;
actualFps = qLayer->frame_rate;
fpsP = 100;
qDebug() << "--- actualFps :" << actualFps;
-// }
tabWidget->addTab(this, qLayer->get_filename());
qLayer->move(freej->screen->layers.len()); //put the layer at the end of the list
m_tabWidg = tabWidget;
@@ -540,7 +530,7 @@ void QqWidget::changeFps(int val)
{
if (val != 50)
{
- actualFps = ((float)val / 50.0) * normalFps;
+ actualFps = ((double)val / 50.0) * normalFps;
qLayer->fps.set(actualFps);
slowFps->setStyleSheet("background: red");
}
diff --git a/qt/QqWidget.h b/qt/QqWidget.h
index 59e5f12..b52bd72 100644
--- a/qt/QqWidget.h
+++ b/qt/QqWidget.h
@@ -57,8 +57,8 @@ private:
QPushButton *textButton;
QPushButton *slowButton;
QSlider *slowFps;
- float normalFps;
- float actualFps;
+ double normalFps;
+ double actualFps;
int fpsP;
QPushButton *playButton;
bool isPlaying;