Pull correction

leadedge · Oct 12, 2020 · 1ec5576 · 1ec5576
1 parent fc27722
commit 1ec5576
Show file tree

Hide file tree

Showing 13 changed files with 139 additions and 1,071 deletions.
diff --git a/source/cam.aps b/source/cam.aps
diff --git a/source/cam.cpp b/source/cam.cpp
diff --git a/source/cam.def b/source/cam.def
@@ -5,4 +5,3 @@ EXPORTS
             DllCanUnloadNow         PRIVATE
             DllRegisterServer       PRIVATE
             DllUnregisterServer     PRIVATE
-			Configure               PRIVATE
diff --git a/source/cam.h b/source/cam.h
@@ -16,6 +16,7 @@
 
 #define DECLARE_PTR(type, ptr, expr) type* ptr = (type*)(expr);
 
+
 // leak checking
 // http://www.codeproject.com/Articles/9815/Visual-Leak-Detector-Enhanced-Memory-Leak-Detectio
 //
@@ -30,36 +31,11 @@
 #include "..\SpoutDX\source\SpoutDX.h"
 #include <streams.h>
 
-//<==================== VS-START ====================>
-#include "dshowutil.h"
-
-// we need a LPCTSTR for the NAME() makros in debug mode
-#define SPOUTCAMNAME "SpoutCam"
-
-extern "C" {
-	DECLARE_INTERFACE_(ICamSettings, IUnknown)
-	{
-		STDMETHOD(put_Settings) (THIS_
-			DWORD dwFps,
-			DWORD dwResolution,
-			DWORD dwMirror, 
-			DWORD dwSwap, 
-			DWORD dwFlip
-			) PURE;
-	};
-}
-
-EXTERN_C const GUID CLSID_SpoutCamPropertyPage;
-EXTERN_C const GUID IID_ICamSettings;
-//<==================== VS-END ======================>
-
 EXTERN_C const GUID CLSID_SpoutCam;
 EXTERN_C const WCHAR SpoutCamName[MAX_PATH];
 
 class CVCamStream;
-class CVCam : public CSource,
-	public ISpecifyPropertyPages,//VS
-	public ICamSettings//VS
+class CVCam : public CSource
 {
 public:
     //////////////////////////////////////////////////////////////////////////
@@ -75,14 +51,6 @@ class CVCam : public CSource,
 
 	STDMETHODIMP JoinFilterGraph(__inout_opt IFilterGraph * pGraph, __in_opt LPCWSTR pName);
 
-	//<==================== VS-START ====================>
-	// ISpecifyPropertyPages interface
-	STDMETHODIMP GetPages(CAUUID *pPages);
-
-	// ICamSettings interface
-	STDMETHODIMP put_Settings(DWORD dwFps, DWORD dwResolution, DWORD dwMirror, DWORD dwSwap, DWORD dwFlip);
-	//<==================== VS-END ======================>
-
 private:
 
     CVCam(LPUNKNOWN lpunk, HRESULT *phr);
@@ -195,15 +163,12 @@ class CVCamStream : public CSourceStream, public IAMStreamConfig, public IKsProp
     HRESULT SetMediaType(const CMediaType *pmt);
     HRESULT OnThreadCreate(void);
 
-	//int m_Fps; //VS removed (not used)
-	//int m_Resolution; //VS removed (not used)
-
+	int m_Fps;
+	int m_Resolution;
 	bool m_bLock;
 
-	HRESULT put_Settings(DWORD dwFps, DWORD dwResolution, DWORD dwMirror, DWORD dwSwap, DWORD dwFlip); //VS
 	void SetFps(DWORD dwFps);
 	void SetResolution(DWORD dwResolution);
-	void ReleaseCamReceiver();
 
 	// ============== IPC functions ==============
 	//

diff --git a/source/camprops.cpp b/source/camprops.cpp
diff --git a/source/camprops.h b/source/camprops.h
diff --git a/source/dialog.aps b/source/dialog.aps