aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJacques Samain <jsamain+fdio@cisco.com>2017-07-25 17:31:53 +0200
committerJacques Samain <jsamain+fdio@cisco.com>2017-07-25 17:31:53 +0200
commit642e885184ba337ccb067a8c0e94a4fcacef2625 (patch)
tree11291f8b67a1847256e5415da353bc0ed439da46
parent0e275345e28c34f2c6b91a75f44ac93034ae477c (diff)
Correcting issue on MacOS
Change-Id: I32f020248df0e77c2ee08a48fc0fd97a6a9bcb07 Signed-off-by: Jacques Samain <jsamain+fdio@cisco.com>
-rw-r--r--Managers/MultimediaManager.cpp2
-rw-r--r--UI/DASHPlayer.cpp18
2 files changed, 10 insertions, 10 deletions
diff --git a/Managers/MultimediaManager.cpp b/Managers/MultimediaManager.cpp
index 997fc6de..1b759f4b 100644
--- a/Managers/MultimediaManager.cpp
+++ b/Managers/MultimediaManager.cpp
@@ -706,7 +706,7 @@ float MultimediaManager::getSegmentDuration()
return this->segmentDuration;
}
-static void* MultimediaManager::DoMPDFetching (void* data)
+void* MultimediaManager::DoMPDFetching (void* data)
{
MultimediaManager *manager = (MultimediaManager*) data;
uint32_t currTime = TimeResolver::getCurrentTimeInSec();
diff --git a/UI/DASHPlayer.cpp b/UI/DASHPlayer.cpp
index 31db2165..331748b5 100644
--- a/UI/DASHPlayer.cpp
+++ b/UI/DASHPlayer.cpp
@@ -296,16 +296,16 @@ void DASHPlayer::notifyStatistics(int segNum, uint32_t bitrate, int fps, uint32_
void DASHPlayer::updateSlider(qint64 value)
{
this->position = this->offset + (uint64_t)value;
- if (this->position <= this->gui->getDurationMilliseconds()){
- this->segment = (this->offset + value)/this->segmentDuration;
- this->gui->setAnaliticsValues(std::get<0>(this->mStats[segment])/1000000,
- std::get<2>(this->mStats[segment]),
- (uint32_t)this->qualityDownloading,
- (double)this->multimediaManager->getBufferLevel());
- this->gui->getProgressBar()->setProperty("value", 1.0*(this->position)/(1.0*this->gui->getDurationMilliseconds()));
- this->gui->getNowLabel()->setProperty("text", QVariant(msec2string(this->position).c_str()));
- this->gui->pauseIfBuffering(this->offset + value);
+ this->segment = (this->offset + value)/this->segmentDuration;
+ this->gui->setAnaliticsValues(std::get<0>(this->mStats[segment])/1000000,
+ std::get<2>(this->mStats[segment]),
+ (uint32_t)this->qualityDownloading,
+ (double)this->multimediaManager->getBufferLevel());
+ if (this->gui->getDurationMilliseconds() && this->position <= this->gui->getDurationMilliseconds()){
+ this->gui->getProgressBar()->setProperty("value", 1.0*(this->position)/(1.0*this->gui->getDurationMilliseconds()));
}
+ this->gui->getNowLabel()->setProperty("text", QVariant(msec2string(this->position).c_str()));
+ this->gui->pauseIfBuffering(this->offset + value);
}
void DASHPlayer::initSlider()