rename GetFrame() to GetLastFrame().

This commit is contained in:
hecomi
2017-01-06 16:14:10 +09:00
parent 12726d85dc
commit 0833b965e9
5 changed files with 8 additions and 8 deletions
@@ -203,7 +203,7 @@ ComPtr<IDXGIOutputDuplication> Duplicator::GetDuplication()
} }
const Duplicator::Frame& Duplicator::GetFrame() const const Duplicator::Frame& Duplicator::GetLastFrame() const
{ {
std::lock_guard<std::mutex> lock(mutex_); std::lock_guard<std::mutex> lock(mutex_);
return lastFrame_; return lastFrame_;
@@ -59,7 +59,7 @@ public:
Monitor* GetMonitor() const; Monitor* GetMonitor() const;
Microsoft::WRL::ComPtr<ID3D11Device> GetDevice(); Microsoft::WRL::ComPtr<ID3D11Device> GetDevice();
Microsoft::WRL::ComPtr<IDXGIOutputDuplication> GetDuplication(); Microsoft::WRL::ComPtr<IDXGIOutputDuplication> GetDuplication();
const Frame& GetFrame() const; const Frame& GetLastFrame() const;
private: private:
void InitializeDevice(); void InitializeDevice();
@@ -70,9 +70,9 @@ void Monitor::Finalize()
void Monitor::Render() void Monitor::Render()
{ {
const auto& frame = duplicator_->GetFrame(); const auto& frame = duplicator_->GetLastFrame();
const auto texture = frame.texture; const auto texture = frame.texture;
const auto& frameInfo = frame.info; const auto frameInfo = frame.info; // clone
if (!texture) return; if (!texture) return;
@@ -243,28 +243,28 @@ int Monitor::GetHeight() const
int Monitor::GetMoveRectCount() const int Monitor::GetMoveRectCount() const
{ {
const auto& metaData = duplicator_->GetFrame().metaData; const auto& metaData = duplicator_->GetLastFrame().metaData;
return metaData.moveRectSize / sizeof(DXGI_OUTDUPL_MOVE_RECT); return metaData.moveRectSize / sizeof(DXGI_OUTDUPL_MOVE_RECT);
} }
DXGI_OUTDUPL_MOVE_RECT* Monitor::GetMoveRects() const DXGI_OUTDUPL_MOVE_RECT* Monitor::GetMoveRects() const
{ {
const auto& metaData = duplicator_->GetFrame().metaData; const auto& metaData = duplicator_->GetLastFrame().metaData;
return metaData.buffer.As<DXGI_OUTDUPL_MOVE_RECT>(); return metaData.buffer.As<DXGI_OUTDUPL_MOVE_RECT>();
} }
int Monitor::GetDirtyRectCount() const int Monitor::GetDirtyRectCount() const
{ {
const auto& metaData = duplicator_->GetFrame().metaData; const auto& metaData = duplicator_->GetLastFrame().metaData;
return metaData.dirtyRectSize / sizeof(RECT); return metaData.dirtyRectSize / sizeof(RECT);
} }
RECT* Monitor::GetDirtyRects() const RECT* Monitor::GetDirtyRects() const
{ {
const auto& metaData = duplicator_->GetFrame().metaData; const auto& metaData = duplicator_->GetLastFrame().metaData;
return metaData.buffer.As<RECT>(metaData.moveRectSize); return metaData.buffer.As<RECT>(metaData.moveRectSize);
} }