Merge pull request #11 from xenos1337/feature/vpn-capture-privacy

Feature/vpn capture privacy

Author: xenos1337

AirPlayServer/AirPlayServer.ico

@@ -180,6 +180,7 @@ xcopy /y "$(SolutionDir)external\plist\lib\$(PlatformTarget)\*.dll" $(OutDir)</C
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="AirPlayServer.cpp" />
+    <ClCompile Include="CCleanFeedOutput.cpp" />
     <ClCompile Include="CAirServer.cpp" />
     <ClCompile Include="CAirServerCallback.cpp" />
     <ClCompile Include="CAutoLock.cpp" />
@@ -195,6 +196,7 @@ xcopy /y "$(SolutionDir)external\plist\lib\$(PlatformTarget)\*.dll" $(OutDir)</C
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="CAirServer.h" />
+    <ClInclude Include="CCleanFeedOutput.h" />
     <ClInclude Include="CAirServerCallback.h" />
     <ClInclude Include="CAutoLock.h" />
     <ClInclude Include="CImGuiManager.h" />

AirPlayServer/AirPlayServer.vcxproj

@@ -18,6 +18,9 @@
     <ClCompile Include="AirPlayServer.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="CCleanFeedOutput.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="CAirServerCallback.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -59,6 +62,9 @@
     <ClInclude Include="CAirServerCallback.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="CCleanFeedOutput.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="CSDLPlayer.h">
       <Filter>Header Files</Filter>
     </ClInclude>

AirPlayServer/AirPlayServer.vcxproj.filters

@@ -42,7 +42,8 @@ bool getHostName(char hostName[512])
 	return false;
 }
 
-void CAirServer::start(CSDLPlayer* pPlayer, const char* serverName)
+void CAirServer::start(CSDLPlayer* pPlayer, const char* serverName,
+	const char* password)
 {
     stop();
     m_pPlayer = pPlayer;
@@ -57,7 +58,7 @@ void CAirServer::start(CSDLPlayer* pPlayer, const char* serverName)
 	} else {
 		sprintf_s(finalServerName, 1024, "%s", hostName);
 	}
-    m_pServer = fgServerStart(finalServerName, 5001, 7001, m_pCallback);
+    m_pServer = fgServerStart(finalServerName, 5001, 7001, m_pCallback, password);
 }
 
 void CAirServer::stop()
@@ -68,10 +69,10 @@ void CAirServer::stop()
     }
 }
 
-void CAirServer::restart(const char* serverName)
+void CAirServer::restart(const char* serverName, const char* password)
 {
     if (m_pPlayer != NULL) {
-        start(m_pPlayer, serverName);
+        start(m_pPlayer, serverName, password);
     }
 }
 

AirPlayServer/CAirServer.cpp

@@ -11,9 +11,10 @@ class CAirServer
 	~CAirServer();
 
 public:
-	void start(CSDLPlayer* pPlayer, const char* serverName = NULL);
+	void start(CSDLPlayer* pPlayer, const char* serverName = NULL,
+		const char* password = NULL);
 	void stop();
-	void restart(const char* serverName);
+	void restart(const char* serverName, const char* password = NULL);
 	bool isRunning() const { return m_pServer != NULL; }
 	float setVideoScale(float fRatio);
 

AirPlayServer/CAirServer.h

@@ -99,6 +99,11 @@ void CAirServerCallback::setVolume(float volume, const char* remoteName, const c
 	}
 }
 
+bool CAirServerCallback::requestPinApproval(const char* remoteAddress, const char* pin)
+{
+	return m_pPlayer != NULL && m_pPlayer->requestPinApproval(remoteAddress, pin);
+}
+
 double dbDuration = 10000;
 double dbPosition = 0;
 void CAirServerCallback::videoGetPlayInfo(double* duration, double* position, double* rate)

AirPlayServer/CAirServerCallback.cpp

@@ -23,11 +23,11 @@ class CAirServerCallback : public IAirServerCallback
 
 	// Audio volume control (volume in dB: 0.0 = max, -144.0 = mute)
 	virtual void setVolume(float volume, const char* remoteName, const char* remoteDeviceId);
+	virtual bool requestPinApproval(const char* remoteAddress, const char* pin);
 
 	virtual void log(int level, const char* msg);
 
 protected:
 	CSDLPlayer* m_pPlayer;
 	char m_chRemoteDeviceId[128];
 };
-