aboutsummaryrefslogtreecommitdiffstats
path: root/Managers/MultimediaStream.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Managers/MultimediaStream.cpp')
-rw-r--r--Managers/MultimediaStream.cpp37
1 files changed, 10 insertions, 27 deletions
diff --git a/Managers/MultimediaStream.cpp b/Managers/MultimediaStream.cpp
index 4b5b66fe..86cde35d 100644
--- a/Managers/MultimediaStream.cpp
+++ b/Managers/MultimediaStream.cpp
@@ -19,22 +19,20 @@ using namespace libdash::framework::mpd;
using namespace dash::mpd;
MultimediaStream::MultimediaStream(StreamType type, MPDWrapper *mpdWrapper, uint32_t bufferSize, bool icnEnabled, double icnAlpha, bool nodecoding, float beta, float drop) :
- type (type),
- segmentBufferSize (bufferSize),
- dashManager (NULL),
- mpdWrapper (mpdWrapper),
- icn (icnEnabled),
- icnAlpha (icnAlpha),
- noDecoding (nodecoding),
- beta (beta),
- drop (drop)
-{
-// InitializeCriticalSection (&this->monitorMutex);
+ type (type),
+ segmentBufferSize (bufferSize),
+ dashManager (NULL),
+ mpdWrapper (mpdWrapper),
+ icn (icnEnabled),
+ icnAlpha (icnAlpha),
+ noDecoding (nodecoding),
+ beta (beta),
+ drop (drop)
+{
this->init();
}
MultimediaStream::~MultimediaStream ()
{
-// DestroyCriticalSection (&this->monitorMutex);
this->stop();
delete this->dashManager;
}
@@ -106,15 +104,6 @@ void MultimediaStream::clear()
this->dashManager->clear();
}
-void MultimediaStream::addFrame(QImage *frame)
-{
-}
-
-QImage* MultimediaStream::getFrame()
-{
- return NULL;
-}
-
void MultimediaStream::attachStreamObserver(IStreamObserver *observer)
{
this->observers.push_back(observer);
@@ -210,12 +199,6 @@ void MultimediaStream::notifyBufferChange(uint32_t bufferfill, int maxC)
this->dashManager->onBufferStateChanged(libdash::framework::buffer::VIDEO, bufferfill, maxC);
}
-void MultimediaStream::updateMPD (IMPD* mpd)
-{
-// this->mpd = mpd;
-// this->dashManager->updateMPD(mpd);
-}
-
void MultimediaStream::fetchMPD()
{
for(size_t i=0; i < this->observers.size(); i++)