Fixed compiling issues after merge

Author: Vladimir Morosev

windows/wrapper/impl_webrtc_AudioDeviceWasapi.cc renamed to windows/wrapper/impl_webrtc_AudioDeviceWasapi.cpp

@@ -21,12 +21,8 @@
 //
 #define PROPERTY_MIXERMODE  L"MixerMode"
 
-#include <wrapper/impl_org_webRtc_pre_include.h>
-#include "typedefs.h"
-#include <wrapper/impl_org_webRtc_post_include.h>
-
 namespace webrtc {
-  private enum class AudioMixerMode
+  enum class AudioMixerMode
   {
     Mic = 0,
     Loopback = 1,

windows/wrapper/impl_webrtc_MRCAudioEffectDefinition.cc renamed to windows/wrapper/impl_webrtc_MRCAudioEffectDefinition.cpp

@@ -18,7 +18,7 @@ namespace webrtc {
   {
     try
     {
-      return static_cast<U>(safe_cast<T>(winrt::unbox_value<T>(propertySet.Lookup(key))));
+      return static_cast<U>(static_cast<T>(winrt::unbox_value<T>(propertySet.Lookup(key))));
     }
     catch (winrt::hresult_out_of_bounds const& /*e*/)
     {

windows/wrapper/impl_webrtc_MRCAudioEffectDefinition.h

@@ -61,10 +61,6 @@
 //
 #define PROPERTY_MAX_VSBUFFER 30U
 
-#include <wrapper/impl_org_webRtc_pre_include.h>
-#include "typedefs.h"
-#include <wrapper/impl_org_webRtc_post_include.h>
-
 namespace webrtc {
   class MrcVideoEffectDefinition : public winrt::implements<MrcVideoEffectDefinition, winrt::Windows::Media::Effects::IVideoEffectDefinition>
   {

windows/wrapper/impl_webrtc_MRCEffectTemplate.h

@@ -156,8 +156,8 @@ Windows::Foundation::Collections::IVectorView< float > Org::WebRtc::implementati
   hr = pSample->GetUnknown(MFSampleExtension_Spatial_CameraCoordinateSystem, __uuidof(ABI::Windows::Perception::Spatial::ISpatialCoordinateSystem), spUnknown.put_void());
   if (!SUCCEEDED(hr))
     return result;
-  if (!spUnknown.try_as(spSpatialCoordinateSystem))
-    return result;
+  //if (!spUnknown.try_as(spSpatialCoordinateSystem))
+  //  return result;
   hr = pSample->GetBlob(MFSampleExtension_Spatial_CameraViewTransform,
     (UINT8*)(&viewMatrix),
     sizeof(viewMatrix),
@@ -202,8 +202,8 @@ Windows::Foundation::Collections::IVectorView< float > Org::WebRtc::implementati
   hr = pSample->GetUnknown(MFSampleExtension_Spatial_CameraCoordinateSystem, __uuidof(ABI::Windows::Perception::Spatial::ISpatialCoordinateSystem), spUnknown.put_void());
   if (!SUCCEEDED(hr))
     return result;
-  if (!spUnknown.try_as(spSpatialCoordinateSystem))
-    return result;
+  //if (!spUnknown.try_as(spSpatialCoordinateSystem))
+  //  return result;
   hr = pSample->GetBlob(MFSampleExtension_Spatial_CameraProjectionTransform,
     (UINT8*)(&projectionMatrix),
     sizeof(projectionMatrix),