From 0833b965e930e2fe1834d587eb11abf012c6acd5 Mon Sep 17 00:00:00 2001
From: hecomi <dimentity@gmail.com>
Date: Fri, 6 Jan 2017 16:14:10 +0900
Subject: [PATCH] rename GetFrame() to GetLastFrame().

---
 .../Plugins/x86/uDesktopDuplication.dll       | Bin 77312 -> 77312 bytes
 .../Plugins/x86_64/uDesktopDuplication.dll    | Bin 93696 -> 93696 bytes
 .../uDesktopDuplication/Duplicator.cpp        |   2 +-
 .../uDesktopDuplication/Duplicator.h          |   2 +-
 .../uDesktopDuplication/Monitor.cpp           |  12 ++++++------
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Assets/uDesktopDuplication/Plugins/x86/uDesktopDuplication.dll b/Assets/uDesktopDuplication/Plugins/x86/uDesktopDuplication.dll
index ccd306da93c56b1a588695bd2ae3358c8350a304..179a1457744886fe5ef303c90f0516fe70facf5d 100644
GIT binary patch
delta 122
zcmZp;!_shvWdS48Z0F5Pj6(OUW;^FcFaQA)5SIh-jNd@~93;ZP0F&bZvPFPc;13YL
z0Lg&lCi~r&0vVHa--tsrR5HNG_xpXX3A<VLCLIc$12WEe^Ty}J{2(Q2-*1@#0E&ep
AP5=M^

delta 122
zcmZp;!_shvWdS2osnTX9MxlFFrAqk`3_!pH#N|Ld<2MjL2Z=B+z~p#<Y!M(9_yfc*
zKr$e?$$s~xK*nU<H{uYDNGRKJ((|Lw@|??0-uFIo0U77AdE@h9evlHi@3+hVSE?h(

diff --git a/Assets/uDesktopDuplication/Plugins/x86_64/uDesktopDuplication.dll b/Assets/uDesktopDuplication/Plugins/x86_64/uDesktopDuplication.dll
index db8b992444262022847020e1e3d72f35fffedf6f..f144eea64b5dc1026252c533a265264628d7ba6c 100644
GIT binary patch
delta 127
zcmZp;!`g6%bpr<@Q-kwnF2+;;ts0#3BN%{y35ZL9*hP_%!G)I*B*Xxd;{mcofOrp3
zZVy~;Iv*pW6wsXQT8xZxJferZ79Mx&y5qAgd#Tx7(H}j`Kn>2@V|f|BtAZ4T88fc3
F0ssp$9>f3u

delta 127
zcmZp;!`g6%bpr<@Q<~CdF2+;;t<se8BN%{y35ZL9*hP_%!G)I*B*Xxd;{mcofOrp3
zZVy~;Iv*pW6wsXQT8xZxJfiC+Tu|7!+1r23`-G?`F7N7DfErx3$MQ0MR|P2wGiF?6
F1pu;A9h?9F

diff --git a/Plugins/uDesktopDuplication/uDesktopDuplication/Duplicator.cpp b/Plugins/uDesktopDuplication/uDesktopDuplication/Duplicator.cpp
index 7138f50..065d7dc 100644
--- a/Plugins/uDesktopDuplication/uDesktopDuplication/Duplicator.cpp
+++ b/Plugins/uDesktopDuplication/uDesktopDuplication/Duplicator.cpp
@@ -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_);
     return lastFrame_;
diff --git a/Plugins/uDesktopDuplication/uDesktopDuplication/Duplicator.h b/Plugins/uDesktopDuplication/uDesktopDuplication/Duplicator.h
index c682a41..1d24c1a 100644
--- a/Plugins/uDesktopDuplication/uDesktopDuplication/Duplicator.h
+++ b/Plugins/uDesktopDuplication/uDesktopDuplication/Duplicator.h
@@ -59,7 +59,7 @@ public:
     Monitor* GetMonitor() const;
     Microsoft::WRL::ComPtr<ID3D11Device> GetDevice();
     Microsoft::WRL::ComPtr<IDXGIOutputDuplication> GetDuplication();
-    const Frame& GetFrame() const;
+    const Frame& GetLastFrame() const;
 
 private:
     void InitializeDevice();
diff --git a/Plugins/uDesktopDuplication/uDesktopDuplication/Monitor.cpp b/Plugins/uDesktopDuplication/uDesktopDuplication/Monitor.cpp
index cc96916..b0cf818 100644
--- a/Plugins/uDesktopDuplication/uDesktopDuplication/Monitor.cpp
+++ b/Plugins/uDesktopDuplication/uDesktopDuplication/Monitor.cpp
@@ -70,9 +70,9 @@ void Monitor::Finalize()
 
 void Monitor::Render()
 {
-    const auto& frame = duplicator_->GetFrame();
+    const auto& frame = duplicator_->GetLastFrame();
     const auto texture = frame.texture;
-    const auto& frameInfo = frame.info;
+    const auto frameInfo = frame.info; // clone
 
 	if (!texture) return;
 
@@ -243,28 +243,28 @@ int Monitor::GetHeight() 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);
 }
 
 
 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>();
 }
 
 
 int Monitor::GetDirtyRectCount() const
 {
-    const auto& metaData = duplicator_->GetFrame().metaData;
+    const auto& metaData = duplicator_->GetLastFrame().metaData;
     return metaData.dirtyRectSize / sizeof(RECT);
 }
 
 
 RECT* Monitor::GetDirtyRects() const
 {
-    const auto& metaData = duplicator_->GetFrame().metaData;
+    const auto& metaData = duplicator_->GetLastFrame().metaData;
     return metaData.buffer.As<RECT>(metaData.moveRectSize);
 }