Needed changes before multi-monitor support

include/grabber/windows/DX/DxGrabber.h

@@ -18,13 +18,59 @@
 	#include <vector>
 	#include <map>
 	#include <chrono>
+	#include <list>
+	#include <algorithm>
 #endif
 
 // util includes
 #include <utils/PixelFormat.h>
 #include <base/Grabber.h>
 #include <utils/Components.h>
 
+template <class T> void SafeRelease(T** ppT)
+{
+	if (*ppT)
+	{
+		(*ppT)->Release();
+		*ppT = NULL;
+	}
+}
+
+struct DisplayHandle
+{
+	QString name;
+	int actualDivide = -1, actualWidth = 0, actualHeight = 0;
+	uint targetMonitorNits = 0;
+	ID3D11Texture2D* d3dConvertTexture = nullptr;
+	ID3D11RenderTargetView* d3dRenderTargetView = nullptr;
+	ID3D11ShaderResourceView* d3dConvertTextureView = nullptr;
+	ID3D11VertexShader* d3dVertexShader = nullptr;
+	ID3D11PixelShader* d3dPixelShader = nullptr;
+	ID3D11Buffer* d3dBuffer = nullptr;
+	ID3D11SamplerState* d3dSampler = nullptr;
+	ID3D11InputLayout* d3dVertexLayout = nullptr;
+	IDXGIOutputDuplication* d3dDuplicate = nullptr;
+	ID3D11Texture2D* d3dSourceTexture = nullptr;
+	DXGI_OUTDUPL_DESC surfaceProperties;
+
+	DisplayHandle() = default;
+	DisplayHandle(const DisplayHandle&) = delete;
+	~DisplayHandle()
+	{
+		SafeRelease(&d3dRenderTargetView);
+		SafeRelease(&d3dSourceTexture);
+		SafeRelease(&d3dConvertTextureView);
+		SafeRelease(&d3dConvertTexture);
+		SafeRelease(&d3dVertexShader);
+		SafeRelease(&d3dVertexLayout);
+		SafeRelease(&d3dPixelShader);
+		SafeRelease(&d3dSampler);
+		SafeRelease(&d3dBuffer);
+		SafeRelease(&d3dDuplicate);
+		printf("SmartPointer is removing: DisplayHandle for %s\n", QSTRING_CSTR(name));
+	};
+};
+
 class DxGrabber : public Grabber
 {
 	Q_OBJECT
@@ -56,6 +102,9 @@ public slots:
 	void restart();
 
 private:
+
+	void captureFrame(DisplayHandle& display);
+
 	QString GetSharedLut();
 
 	void enumerateDevices(bool silent);
@@ -70,29 +119,18 @@ public slots:
 
 	bool initDirectX(QString selectedDeviceName);
 
-	bool initShaders();
-	HRESULT deepScaledCopy(ID3D11Texture2D* source);
+	bool initShaders(DisplayHandle& display);
+	HRESULT deepScaledCopy(DisplayHandle& display, ID3D11Texture2D* source);
 
 	QString					_configurationPath;
 	QTimer*					_timer;
 	QTimer*					_retryTimer;
 	int						_warningCounter;
-	int						_actualDivide;
 	bool					_wideGamut;
 
 	bool					_dxRestartNow;
+	std::list<std::unique_ptr<DisplayHandle>> _handles;
 	ID3D11Device*			_d3dDevice;
 	ID3D11DeviceContext*	_d3dContext;
-	ID3D11Buffer*			_d3dBuffer;
-	ID3D11SamplerState*		_d3dSampler;
-	ID3D11InputLayout*		_d3dVertexLayout;
-	ID3D11VertexShader*		_d3dVertexShader;
-	ID3D11PixelShader*		_d3dPixelShader;
-	ID3D11Texture2D*		_d3dSourceTexture;
-	ID3D11Texture2D*		_d3dConvertTexture;
-	ID3D11ShaderResourceView* _d3dConvertTextureView;
-	ID3D11RenderTargetView* _d3dRenderTargetView;
-	IDXGIOutputDuplication* _d3dDuplicate;
-	DXGI_OUTDUPL_DESC		_surfaceProperties;
 	Image<ColorRgb>			_cacheImage;
 };