Update licensing information

jecassis · Feb 22, 2024 · 15114bd · 15114bd
1 parent ee96d63
commit 15114bd
Show file tree

Hide file tree

Showing 28 changed files with 472 additions and 100 deletions.
diff --git a/LICENSE.txt b/LICENSE.txt
diff --git a/LICENSE.md → LICENSES.md b/LICENSE.md → LICENSES.md
@@ -25,18 +25,12 @@ The following licenses are specific to code used by the foobar2000 MilkDrop 2 Vi
 
 This license applies to the following files or to files in the following directories:
 
-<!--- `foo_vis_milk2.sln` (foobar2000 Component Visual Studio Solution) -->
 - `foo_vis_milk2/` (MilkDrop 2 Visualization Component)
-<!--- `foo_vis_milk2/foo_vis_milk2.vcxproj` (foobar2000 Component DLL Project Definition) -->
-<!--- `foo_vis_milk2/foo_vis_milk2.vcxproj.filters` (foobar2000 Component DLL Project File Categorization) -->
-<!--- `vis_milk2/vis_milk2.vcxproj` (MilkDrop 2 Library Project Definition) -->
-<!--- `vis_milk2/vis_milk2.vcxproj.filters` (MilkDrop 2 Library Project File Categorization) -->
+- `vis_milk2/framework.h` (MilkDrop 2 Library Project Header)
 - `.github/workflows/build.yml` (GitHub Actions CI Workflow)
 - `tools/build-fb2k_component.ps1` (foobar2000 Component Packaging Script)
 - `external/fb2ksdk.patch` (foobar2000 2.0 SDK Patch)
 - `external/pmeel.patch` (projectM-eval Patch)
-<!--- `external/eel2/eel2.vcxproj` (NS-EEL2 Project Definition) -->
-<!--- `external/eel2/eel2.vcxproj.filters` (NS-EEL2 Project File Categorization) -->
 
 ```text
 Copyright (c) 2023-2024 Jimmy Cassis

diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ Refer to the [build pipeline](.github/workflows/build.yml) jobs for a step-by-st
 
 See [CHANGELOG](CHANGELOG.md) for additional details.
 
-See [LICENSE](LICENSE.md) to become thoroughly confused.
+See [LICENSES](LICENSES.md) to become thoroughly confused.
 
 ## Features
 

diff --git a/foo_vis_milk2/config.h b/foo_vis_milk2/config.h
@@ -1,9 +1,9 @@
 /*
- *  config.h - MilkDrop 2 visualization component's configuration header
- *             file.
+ * config.h - MilkDrop 2 visualization component's configuration header
+ *            file.
  *
- *  Copyright (c) 2023-2024 Jimmy Cassis
- *  SPDX-License-Identifier: MPL-2.0
+ * Copyright (c) 2023-2024 Jimmy Cassis
+ * SPDX-License-Identifier: MPL-2.0
  */
 
 #pragma once

diff --git a/foo_vis_milk2/foo_vis_milk2.vcxproj b/foo_vis_milk2/foo_vis_milk2.vcxproj
@@ -477,7 +477,8 @@
   </ItemGroup>
   <ItemGroup>
     <Text Include="..\CHANGELOG.md" />
-    <Text Include="..\LICENSE.md" />
+    <Text Include="..\LICENSE.txt" />
+    <Text Include="..\LICENSES.md" />
     <Text Include="..\README.md" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

diff --git a/foo_vis_milk2/foo_vis_milk2.vcxproj.filters b/foo_vis_milk2/foo_vis_milk2.vcxproj.filters
@@ -106,7 +106,10 @@
     <Text Include="..\CHANGELOG.md">
       <Filter>Documentation Files</Filter>
     </Text>
-    <Text Include="..\LICENSE.md">
+    <Text Include="..\LICENSE.txt">
+      <Filter>Documentation Files</Filter>
+    </Text>
+    <Text Include="..\LICENSES.md">
       <Filter>Documentation Files</Filter>
     </Text>
     <Text Include="..\README.md">

diff --git a/foo_vis_milk2/main.cpp b/foo_vis_milk2/main.cpp
@@ -1,20 +1,27 @@
 /*
- *  main.cpp - Sets the MilkDrop 2 visualization component's file name
- *             and version.
+ * main.cpp - Sets the MilkDrop 2 visualization component's file name
+ *            and version.
  *
- *  Copyright (c) 2023-2024 Jimmy Cassis
- *  SPDX-License-Identifier: MPL-2.0
+ * Copyright (c) 2023-2024 Jimmy Cassis
+ * SPDX-License-Identifier: MPL-2.0
  */
 
 #include "pch.h"
 #include "version.h"
 
 #ifdef _DEBUG
 #define APPLICATION_SOURCE_URLS \
-    " * " PLUGIN_WEB_URL "\n" \
-    " * " APPLICATION_SOURCE_URL
+    APPLICATION_FILE_NAME " is released under the Mozilla Public License (MPL) version 2.0. Component source code can be obtained from:\n" \
+    " * " APPLICATION_SOURCE_URL " (Mozilla Public License 2.0, BSD 3-Clause License, MIT License)\n" \
+    " * " PLUGIN_WEB_URL " (Nullsoft BSD License)\n" \
+    " * https://www.foobar2000.org/SDK (foobar2000 SDK License, zlib License)\n" \
+    " * https://wtl.sourceforge.io/ (Microsoft Public License)\n" \
+    " * https://www.cockos.com/EEL2/ (zlib License)\n" \
+    " * https://github.com/projectM-visualizer/projectm-eval (MIT License)\n" \
+    " * https://github.com/microsoft/DirectXTK (MIT License)\n" \
+    " * https://developer.microsoft.com/en-us/windows/downloads/windows-sdk/ (Proprietary License)"
 #else
-#define APPLICATION_SOURCE_URLS " * " PLUGIN_WEB_URL
+#define APPLICATION_SOURCE_URLS "Documentation and source code can be obtained from:\n * " PLUGIN_WEB_URL
 #endif
 
 // clang-format off
@@ -23,10 +30,10 @@ DECLARE_COMPONENT_VERSION("MilkDrop 2 Visualisation", APPLICATION_VERSION,
                           APPLICATION_FILE_NAME " " APPLICATION_VERSION "\n"
                           "Copyright (c) " APPLICATION_COPYRIGHT ". All rights reserved.\n\n"
                           "MilkDrop 2.25k\n"
-                          "Copyright (c) 2005-2013 Nullsoft, Inc. All rights reserved.\n\n"
-                          "foobar2000 plugin and DirectX 11 port by " APPLICATION_COMPANY_NAME ".\n"
+                          "Copyright (c) 2005-2013 Nullsoft, Inc.\n"
+                          "Copyright (c) 2021-" APPLICATION_COPYRIGHT ".\nAll rights reserved.\n\n"
+                          "foobar2000 component and DirectX 11 port by " APPLICATION_COMPANY_NAME ".\n"
                           "Built with foobar2000 SDK " STR(FOOBAR2000_SDK_VERSION) " on " __DATE__ " " __TIME__ " " STR(BUILD_TIMEZONE) ".\n\n"
-                          "Documentation and source code can be obtained from:\n"
                           APPLICATION_SOURCE_URLS)
 // clang-format on
 

diff --git a/foo_vis_milk2/pch.cpp b/foo_vis_milk2/pch.cpp
@@ -1,8 +1,8 @@
 /*
- *  pch.cpp - Pre-compiled header's source file.
+ * pch.cpp - Pre-compiled header's source file.
  *
- *  Copyright (c) 2023-2024 Jimmy Cassis
- *  SPDX-License-Identifier: MPL-2.0
+ * Copyright (c) 2023-2024 Jimmy Cassis
+ * SPDX-License-Identifier: MPL-2.0
  */
 
 #include "pch.h"
diff --git a/foo_vis_milk2/pch.h b/foo_vis_milk2/pch.h
@@ -1,8 +1,8 @@
 /*
- *  pch.h - Pre-compiled header file.
+ * pch.h - Pre-compiled header file.
  *
- *  Copyright (c) 2023-2024 Jimmy Cassis
- *  SPDX-License-Identifier: MPL-2.0
+ * Copyright (c) 2023-2024 Jimmy Cassis
+ * SPDX-License-Identifier: MPL-2.0
  */
 
 #pragma once

diff --git a/foo_vis_milk2/preferences.cpp b/foo_vis_milk2/preferences.cpp
@@ -1,10 +1,10 @@
 /*
- *  preferences.cpp - Configuration settings for the MilkDrop 2
- *                    visualization component accessible through a
- *                    preferences page and advanced preferences.
+ * preferences.cpp - Configuration settings for the MilkDrop 2
+ *                   visualization component accessible through a
+ *                   preferences page and advanced preferences.
  *
- *  Copyright (c) 2023-2024 Jimmy Cassis
- *  SPDX-License-Identifier: MPL-2.0
+ * Copyright (c) 2023-2024 Jimmy Cassis
+ * SPDX-License-Identifier: MPL-2.0
  */
 
 #include "pch.h"

diff --git a/foo_vis_milk2/settings.h b/foo_vis_milk2/settings.h
@@ -1,8 +1,8 @@
 /*
- *  settings.h - Defines common settings structure.
+ * settings.h - Defines common settings structure.
  *
- *  Copyright (c) 2023-2024 Jimmy Cassis
- *  SPDX-License-Identifier: MPL-2.0
+ * Copyright (c) 2023-2024 Jimmy Cassis
+ * SPDX-License-Identifier: MPL-2.0
  */
 
 #pragma once

diff --git a/foo_vis_milk2/steptimer.h b/foo_vis_milk2/steptimer.h
@@ -1,9 +1,9 @@
 /*
- *  steptimer.h - A high-resolution timer that provides elapsed time
- *                information.
+ * steptimer.h - A high-resolution timer that provides elapsed time
+ *               information.
  *
- *  Copyright (c) Microsoft Corporation
- *  SPDX-License-Identifier: MIT
+ * Copyright (c) Microsoft Corporation
+ * SPDX-License-Identifier: MIT
  */
 
 #pragma once

diff --git a/foo_vis_milk2/ui_element.cpp b/foo_vis_milk2/ui_element.cpp
@@ -1,8 +1,8 @@
 /*
- *  ui_element.cpp - Implements the MilkDrop 2 visualization component.
+ * ui_element.cpp - Implements the MilkDrop 2 visualization component.
  *
- *  Copyright (c) 2023-2024 Jimmy Cassis
- *  SPDX-License-Identifier: MPL-2.0
+ * Copyright (c) 2023-2024 Jimmy Cassis
+ * SPDX-License-Identifier: MPL-2.0
  */
 
 #include "pch.h"

diff --git a/vis_milk2/colorps.hlsl b/vis_milk2/colorps.hlsl
@@ -1,8 +1,8 @@
 /*
- *  colorps.hlsl - Color pixel shader.
+ * colorps.hlsl - Color pixel shader.
  *
- *  Copyright (c) 2021-2024 Jimmy Cassis
- *  SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2021-2024 Jimmy Cassis
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 struct PS_INPUT

diff --git a/vis_milk2/constanttable.cpp b/vis_milk2/constanttable.cpp
@@ -1,8 +1,8 @@
 /*
- *  constanttable.cpp - Direct3D 11 constant table.
+ * constanttable.cpp - Direct3D 11 constant table.
  *
- *  Copyright (c) 2021-2024 Jimmy Cassis
- *  SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2021-2024 Jimmy Cassis
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "pch.h"

diff --git a/vis_milk2/constanttable.h b/vis_milk2/constanttable.h
@@ -1,8 +1,8 @@
 /*
- *  constanttable.h - Direct3D 11 constant table header.
+ * constanttable.h - Direct3D 11 constant table header.
  *
- *  Copyright (c) 2021-2024 Jimmy Cassis
- *  SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2021-2024 Jimmy Cassis
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #pragma once

diff --git a/vis_milk2/d3d11shim.cpp b/vis_milk2/d3d11shim.cpp
@@ -1,11 +1,11 @@
 /*
- *  d3d11shim.cpp - Direct3D 9 to Direct3D 11 conversion functions.
- *                  References:
- *                  - https://learn.microsoft.com/en-us/windows/win32/direct3d10/d3d10-graphics-programming-guide-d3d9-to-d3d10-considerations
- *                  - https://learn.microsoft.com/en-us/windows/win32/direct3d11/d3d11-programming-guide-migrating
+ * d3d11shim.cpp - Direct3D 9 to Direct3D 11 conversion functions.
+ *                 References:
+ *                 - https://learn.microsoft.com/en-us/windows/win32/direct3d10/d3d10-graphics-programming-guide-d3d9-to-d3d10-considerations
+ *                 - https://learn.microsoft.com/en-us/windows/win32/direct3d11/d3d11-programming-guide-migrating
  *
- *  Copyright (c) 2021-2024 Jimmy Cassis
- *  SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2021-2024 Jimmy Cassis
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "pch.h"

diff --git a/vis_milk2/d3d11shim.h b/vis_milk2/d3d11shim.h
@@ -1,8 +1,8 @@
 /*
- *  d3d11shim.h - Direct3D 9 to Direct3D 11 conversion functions header.
+ * d3d11shim.h - Direct3D 9 to Direct3D 11 conversion functions header.
  *
- *  Copyright (c) 2021-2024 Jimmy Cassis
- *  SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2021-2024 Jimmy Cassis
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #pragma once

diff --git a/vis_milk2/defaultvs.hlsl b/vis_milk2/defaultvs.hlsl
@@ -1,8 +1,8 @@
 /*
- *  defaultvs.hlsl - Default vertex shader.
+ * defaultvs.hlsl - Default vertex shader.
  *
- *  Copyright (c) 2021-2024 Jimmy Cassis
- *  SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2021-2024 Jimmy Cassis
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 cbuffer cbTransforms : register(b0)

diff --git a/vis_milk2/defines.h b/vis_milk2/defines.h
@@ -85,7 +85,7 @@
 // launch their default browser to display this page.
 // ***Note that the button will be invisible (on the config panel)
 // at runtime if this string is empty.***
-#define PLUGIN_WEB_URL "http://www.geisswerks.com/milkdrop/"
+#define PLUGIN_WEB_URL "https://www.geisswerks.com/milkdrop/"
 
 // The following two strings - AUTHOR_NAME and COPYRIGHT - will be used
 // in a little box in the config panel, to identify the author and copyright

diff --git a/vis_milk2/deviceresources.cpp b/vis_milk2/deviceresources.cpp
@@ -1,9 +1,9 @@
 /*
- *  deviceresources.cpp - Wrapper for the Direct3D 11 device and swap chain
- *                        (requires DirectX 11.1 Runtime).
+ * deviceresources.cpp - Wrapper for the Direct3D 11 device and swap chain
+ *                       (requires DirectX 11.1 Runtime).
  *
- *  Copyright (c) Microsoft Corporation
- *  SPDX-License-Identifier: MIT
+ * Copyright (c) Microsoft Corporation
+ * SPDX-License-Identifier: MIT
  */
 
 #include "pch.h"

diff --git a/vis_milk2/deviceresources.h b/vis_milk2/deviceresources.h
@@ -1,8 +1,8 @@
 /*
- *  deviceresources.h - Wrapper for the Direct3D 11 device and swap chain.
+ * deviceresources.h - Wrapper for the Direct3D 11 device and swap chain.
  *
- *  Copyright (c) Microsoft Corporation
- *  SPDX-License-Identifier: MIT
+ * Copyright (c) Microsoft Corporation
+ * SPDX-License-Identifier: MIT
  */
 
 #pragma once

diff --git a/vis_milk2/diffuseps.hlsl b/vis_milk2/diffuseps.hlsl
@@ -1,8 +1,8 @@
 /*
- *  diffuseps.hlsl - Diffuse pixel shader.
+ * diffuseps.hlsl - Diffuse pixel shader.
  *
- *  Copyright (c) 2021-2024 Jimmy Cassis
- *  SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2021-2024 Jimmy Cassis
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 Texture2D    g_Texture0 : register(t0);

diff --git a/vis_milk2/framework.h b/vis_milk2/framework.h
@@ -1,8 +1,8 @@
 /*
- *  framework.h - Common headers for MilkDrop 2 library.
+ * framework.h - Common headers for MilkDrop 2 library.
  *
- *  Copyright (c) 2023-2024 Jimmy Cassis
- *  SPDX-License-Identifier: MPL-2.0
+ * Copyright (c) 2023-2024 Jimmy Cassis
+ * SPDX-License-Identifier: MPL-2.0
  */
 
 #pragma once
@@ -52,24 +52,16 @@
 #include <DirectXMath.h>
 
 #include <algorithm>
-//#include <atomic>
 #include <cassert>
 #include <clocale>
 #include <cmath>
-//#include <cstddef>
-//#include <cstdint>
-//#include <cstdio>
-//#include <cstring>
-//#include <cwchar>
 #include <exception>
-//#include <iterator>
 #include <list>
 #include <memory>
 #include <set>
 #include <stdexcept>
 #include <string>
 #include <system_error>
-//#include <tuple>
 #include <vector>
 
 #ifdef NS_EEL2

diff --git a/vis_milk2/pch.cpp b/vis_milk2/pch.cpp
@@ -1,8 +1,8 @@
 /*
- *  pch.cpp - Pre-compiled header's source file.
+ * pch.cpp - Pre-compiled header's source file.
  *
- *  Copyright (c) 2021-2024 Jimmy Cassis
- *  SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2021-2024 Jimmy Cassis
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #include "pch.h"
diff --git a/vis_milk2/pch.h b/vis_milk2/pch.h
@@ -1,8 +1,8 @@
 /*
- *  pch.h - Pre-compiled header file.
+ * pch.h - Pre-compiled header file.
  *
- *  Copyright (c) 2021-2024 Jimmy Cassis
- *  SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2021-2024 Jimmy Cassis
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef PCH_H

diff --git a/vis_milk2/texture0ps.hlsl b/vis_milk2/texture0ps.hlsl
@@ -1,8 +1,8 @@
 /*
- *  texture0ps.hlsl - Texture pixel shader.
+ * texture0ps.hlsl - Texture pixel shader.
  *
- *  Copyright (c) 2021-2024 Jimmy Cassis
- *  SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2021-2024 Jimmy Cassis
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 Texture2D    g_Texture0 : register(t0);