Remove unused method

pull/10/head
michal.szwaj 2018-02-17 22:00:37 +01:00
parent 54f160c8c8
commit 242a10d8fd
5 changed files with 8 additions and 18 deletions

View File

@ -44,7 +44,6 @@ public:
virtual bool init() = 0;
virtual void write(uint64_t timestamp, const aasdk::common::DataConstBuffer& buffer) = 0;
virtual void stop() = 0;
virtual bool isActive() const = 0;
virtual aasdk::proto::enums::VideoFPS::Enum getVideoFPS() const = 0;
virtual aasdk::proto::enums::VideoResolution::Enum getVideoResolution() const = 0;
virtual size_t getScreenDPI() const = 0;

View File

@ -48,7 +48,6 @@ public:
bool init() override;
void write(uint64_t timestamp, const aasdk::common::DataConstBuffer& buffer) override;
void stop() override;
bool isActive() const override;
private:
bool createComponents();
@ -57,7 +56,7 @@ private:
bool enablePortBuffers();
bool setFullscreen();
mutable std::mutex mutex_;
std::mutex mutex_;
bool isActive_;
bool portSettingsChanged_;
ILCLIENT_T* client_;

View File

@ -43,7 +43,6 @@ public:
bool init() override;
void write(uint64_t timestamp, const aasdk::common::DataConstBuffer& buffer) override;
void stop() override;
bool isActive() const override;
signals:
void startPlayback();
@ -58,7 +57,7 @@ private:
SequentialBuffer videoBuffer_;
std::unique_ptr<QVideoWidget> videoWidget_;
std::unique_ptr<QMediaPlayer> mediaPlayer_;
mutable std::mutex mutex_;
std::mutex mutex_;
};
}

View File

@ -202,13 +202,6 @@ void OMXVideoOutput::stop()
}
}
bool OMXVideoOutput::isActive() const
{
std::lock_guard<decltype(mutex_)> lock(mutex_);
return isActive_;
}
bool OMXVideoOutput::createComponents()
{
if(ilclient_create_component(client_, &components_[VideoComponent::DECODER], "video_decode", static_cast<ILCLIENT_CREATE_FLAGS_T>(ILCLIENT_DISABLE_ALL_PORTS | ILCLIENT_ENABLE_INPUT_BUFFERS)) != 0)

View File

@ -50,6 +50,7 @@ void QtVideoOutput::createVideoOutput()
bool QtVideoOutput::open()
{
std::lock_guard<decltype(mutex_)> lock(mutex_);
return videoBuffer_.open(QIODevice::ReadWrite);
}
@ -59,12 +60,6 @@ bool QtVideoOutput::init()
return true;
}
bool QtVideoOutput::isActive() const
{
std::lock_guard<decltype(mutex_)> lock(mutex_);
return videoWidget_ != nullptr && videoWidget_->isVisible();
}
void QtVideoOutput::stop()
{
emit stopPlayback();
@ -73,11 +68,14 @@ void QtVideoOutput::stop()
void QtVideoOutput::write(uint64_t, const aasdk::common::DataConstBuffer& buffer)
{
std::lock_guard<decltype(mutex_)> lock(mutex_);
videoBuffer_.write(reinterpret_cast<const char*>(buffer.cdata), buffer.size);
}
void QtVideoOutput::onStartPlayback()
{
std::lock_guard<decltype(mutex_)> lock(mutex_);
videoWidget_->setAspectRatioMode(Qt::IgnoreAspectRatio);
videoWidget_->setFocus();
videoWidget_->setWindowFlags(Qt::WindowStaysOnTopHint);
@ -91,6 +89,8 @@ void QtVideoOutput::onStartPlayback()
void QtVideoOutput::onStopPlayback()
{
std::lock_guard<decltype(mutex_)> lock(mutex_);
videoWidget_->hide();
mediaPlayer_->stop();
}