Replace ATL uuid attributes with declspec uuid

The ATL attributes are deprecated in VS2015 Update 3

7 files changed, 11 insertions, 22 deletions

diff --git a/common/includes/IGraphRebuildDelegate.h b/common/includes/IGraphRebuildDelegate.h
index 9c5458b5..b5920e2f 100644
--- a/common/includes/IGraphRebuildDelegate.h
+++ b/common/includes/IGraphRebuildDelegate.h
@@ -23,8 +23,7 @@
 DEFINE_GUID(IID_IGraphRebuildDelegate, 
 0x17989414, 0xc927, 0x4d73, 0xab, 0x6c, 0x19, 0xdf, 0x37, 0x60, 0x2a, 0xc4);
 
-[uuid("17989414-C927-4D73-AB6C-19DF37602AC4")]
-interface IGraphRebuildDelegate : public IUnknown
+interface __declspec(uuid("17989414-C927-4D73-AB6C-19DF37602AC4")) IGraphRebuildDelegate : public IUnknown
 {
   // Called by the splitter to let the player know that a certain pin needs to be rebuild.
   //
diff --git a/common/includes/ILAVPinInfo.h b/common/includes/ILAVPinInfo.h
index 1911d918..a5385f36 100644
--- a/common/includes/ILAVPinInfo.h
+++ b/common/includes/ILAVPinInfo.h
@@ -23,8 +23,7 @@
 DEFINE_GUID(IID_ILAVPinInfo,
 0xfd220bf4, 0x3f26, 0x4ad4, 0xa4, 0xa9, 0x34, 0x8c, 0x12, 0x73, 0xa1, 0x41);
 
-[uuid("FD220BF4-3F26-4AD4-A4A9-348C1273A141")]
-interface ILAVPinInfo : public IUnknown
+interface __declspec(uuid("FD220BF4-3F26-4AD4-A4A9-348C1273A141")) ILAVPinInfo : public IUnknown
 {
   // Get a set of flags that convey a special information for this kind of stream
   STDMETHOD_(DWORD,GetStreamFlags)() PURE;
diff --git a/common/includes/IMediaSample3D.h b/common/includes/IMediaSample3D.h
index 51db24f5..10d76bd2 100644
--- a/common/includes/IMediaSample3D.h
+++ b/common/includes/IMediaSample3D.h
@@ -4,8 +4,7 @@
 
 #pragma once
 
-[uuid("E92D790E-BF54-43C4-B394-8CA0A41BF9EC")]
-interface IMediaSample3D : public IMediaSample2
+interface __declspec(uuid("E92D790E-BF54-43C4-B394-8CA0A41BF9EC")) IMediaSample3D : public IMediaSample2
 {
   STDMETHOD(Enable3D)() = 0;
   STDMETHOD(GetPointer3D)(BYTE **ppBuffer) = 0;
diff --git a/common/includes/IMediaSideData.h b/common/includes/IMediaSideData.h
index 0667c497..c97a4ddd 100644
--- a/common/includes/IMediaSideData.h
+++ b/common/includes/IMediaSideData.h
@@ -10,8 +10,7 @@
 // This interface should be implemented in IMediaSample objects and accessed through IUnknown
 // It allows binary side data to be attached to the media samples and delivered with them
 // Restrictions: Only one side data per type can be attached
-[uuid("F940AE7F-48EB-4377-806C-8FC48CAB2292")]
-interface IMediaSideData : public IUnknown
+interface __declspec(uuid("F940AE7F-48EB-4377-806C-8FC48CAB2292")) IMediaSideData : public IUnknown
 {
   // Set the side data identified by guidType to the data provided
   // The provided data will be copied and stored internally
diff --git a/common/includes/LAVSplitterSettings.h b/common/includes/LAVSplitterSettings.h
index 40ecd19d..01ecb01f 100644
--- a/common/includes/LAVSplitterSettings.h
+++ b/common/includes/LAVSplitterSettings.h
@@ -32,8 +32,7 @@ typedef enum LAVSubtitleMode {
   LAVSubtitleMode_Advanced
 } LAVSubtitleMode;
 
-[uuid("774A919D-EA95-4A87-8A1E-F48ABE8499C7")]
-interface ILAVFSettings : public IUnknown
+interface __declspec(uuid("774A919D-EA95-4A87-8A1E-F48ABE8499C7")) ILAVFSettings : public IUnknown
 {
   // Switch to Runtime Config mode. This will reset all settings to default, and no changes to the settings will be saved
   // You can use this to programmatically configure LAV Splitter without interfering with the users settings in the registry.
diff --git a/common/includes/LAVSplitterSettingsInternal.h b/common/includes/LAVSplitterSettingsInternal.h
index f19083d6..423a0d81 100644
--- a/common/includes/LAVSplitterSettingsInternal.h
+++ b/common/includes/LAVSplitterSettingsInternal.h
@@ -39,8 +39,7 @@ public:
 DEFINE_GUID(IID_ILAVFSettingsInternal, 0x72b2c5fa, 0xa7a5, 
 0x4463, 0x9c, 0x1b, 0x9f, 0x47, 0x49, 0xc3, 0x5c, 0x79);
 
-[uuid("72b2c5fa-a7a5-4463-9c1b-9f4749c35c79")]
-interface ILAVFSettingsInternal : public ILAVFSettings
+interface __declspec(uuid("72b2c5fa-a7a5-4463-9c1b-9f4749c35c79")) ILAVFSettingsInternal : public ILAVFSettings
 {
   // Query if the current filter graph requires VC1 Correction
   STDMETHOD_(BOOL,IsVC1CorrectionRequired)() = 0;
diff --git a/common/includes/SubRenderIntf.h b/common/includes/SubRenderIntf.h
index 8bdf5df0..e002db6d 100644
--- a/common/includes/SubRenderIntf.h
+++ b/common/includes/SubRenderIntf.h
@@ -183,8 +183,7 @@ interface ISubRenderFrame;
 
 // Base interface for both ISubRenderConsumer and ISubRenderProvider.
 
-[uuid("7CFD3728-235E-4430-9A2D-9F25F426BD70")]
-interface ISubRenderOptions : public IUnknown
+interface __declspec(uuid("7CFD3728-235E-4430-9A2D-9F25F426BD70")) ISubRenderOptions : public IUnknown
 {
   // Allows one party to get information from the other party.
   // The memory for strings and binary data is allocated by the callee
@@ -249,8 +248,7 @@ interface ISubRenderOptions : public IUnknown
 
 // This interface is exposed by every subtitle consumer.
 
-[uuid("9DF90966-FE9F-4F0E-881E-DAF8A572D900")]
-interface ISubRenderConsumer : public ISubRenderOptions
+interface __declspec(uuid("9DF90966-FE9F-4F0E-881E-DAF8A572D900")) ISubRenderConsumer : public ISubRenderOptions
 {
   // Called by the subtitle renderer to ask the merit of the consumer.
   // Recommended merits:
@@ -292,8 +290,7 @@ interface ISubRenderConsumer : public ISubRenderOptions
   STDMETHOD(DeliverFrame)(REFERENCE_TIME start, REFERENCE_TIME stop, LPVOID context, ISubRenderFrame *subtitleFrame) = 0;
 };
 
-[uuid("1A1737C8-2BF8-4BEA-97EA-3AB4FA8F7AC9")]
-interface ISubRenderConsumer2 : public ISubRenderConsumer
+interface __declspec(uuid("1A1737C8-2BF8-4BEA-97EA-3AB4FA8F7AC9")) ISubRenderConsumer2 : public ISubRenderConsumer
 {
   // Called by the subtitle renderer e.g. when the user switches to a
   // different subtitle track. The consumer should immediately release
@@ -309,8 +306,7 @@ interface ISubRenderConsumer2 : public ISubRenderConsumer
 // The subtitle renderer provides the consumer with this interface, when
 // calling the "ISubRenderConsumer.Connect()" method.
 
-[uuid("20752113-C883-455A-BA7B-ABA4E9115CA8")]
-interface ISubRenderProvider : public ISubRenderOptions
+interface __declspec(uuid("20752113-C883-455A-BA7B-ABA4E9115CA8")) ISubRenderProvider : public ISubRenderOptions
 {
   // Called by the consumer to request a rendered subtitle frame.
   // The subtitle renderer will deliver the frame when it is completed, by
@@ -338,8 +334,7 @@ interface ISubRenderProvider : public ISubRenderOptions
 
 // This interface is the reply to a consumer's frame render request.
 
-[uuid("81746AB5-9407-4B43-A014-1FAAC340F973")]
-interface ISubRenderFrame : public IUnknown
+interface __declspec(uuid("81746AB5-9407-4B43-A014-1FAAC340F973")) ISubRenderFrame : public IUnknown
 {
   // "GetOutputRect()" specifies for which video rect the subtitles were
   // rendered. If the subtitle renderer doesn't scale the subtitles at all,