Skip to content

Commit

Permalink
Updated license info to reflect GPL-3.0 per VST3 requirements
Browse files Browse the repository at this point in the history
  • Loading branch information
nathanjhood committed Mar 15, 2024
1 parent 7a82065 commit 05cea3b
Show file tree
Hide file tree
Showing 24 changed files with 379 additions and 305 deletions.
41 changes: 16 additions & 25 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,29 +1,20 @@
#[=============================================================================[
This file is part of the StoneyDSP library.
Copyright (c) 2024 - StoneyDSP
Home: https://www.stoneydsp.com
Source: https://github.com/StoneyDSP/StoneyDSP

StoneyDSP is an open source library subject to open-source licensing.

By using StoneyDSP, you agree to the terms of the StoneyDSP End-User License
Agreement and also the StoneyDSP Privacy Policy.

End User License Agreement: www.stoneydsp.com/LICENSE
Privacy Policy: www.stoneydsp.com/privacy-policy

By using StoneyDSP, you must also agree to the terms of both the JUCE 7 End-User
License Agreement and JUCE Privacy Policy.

End User License Agreement: www.juce.com/juce-7-licence
Privacy Policy: www.juce.com/juce-privacy-policy

Or: You may also use this code under the terms of the GPL v3 (see
www.gnu.org/licenses).

STONEYDSP IS PROVIDED "AS IS" WITHOUT ANY WARRANTY, AND ALL WARRANTIES, WHETHER
EXPRESSED OR IMPLIED, INCLUDING MERCHANTABILITY AND FITNESS FOR PURPOSE, ARE
DISCLAIMED.
Simple two-pole equalizer with variable oversampling.
Copyright (c) 2024 - Nathan J. Hood

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
.
]=============================================================================]#

cmake_minimum_required (VERSION 3.22...3.28 FATAL_ERROR)
Expand Down
41 changes: 21 additions & 20 deletions include/StoneyDSP/Biquads.hpp
Original file line number Diff line number Diff line change
@@ -1,13 +1,26 @@
/**
/***************************************************************************//**
* @file Biquads.hpp
* @author ()
* @brief
* @version 0.1
* @date 2024-03-11
*
* @copyright Copyright (c) 2024
* @author Nathan J. Hood (nathanjhood@googlemail.com)
* @brief Simple two-pole equalizer with variable oversampling.
* @version 1.2.0
* @date 2024-03-13
*
*/
* @copyright Copyright (c) 2024 - Nathan J. Hood
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
******************************************************************************/

#pragma once

Expand All @@ -34,12 +47,6 @@
#include "BinaryData.h"
#endif

// #if ! DONT_SET_USING_JUCE_NAMESPACE
// // If your code uses a lot of JUCE classes, then this will obviously save you
// // a lot of typing, but can be disabled by setting DONT_SET_USING_JUCE_NAMESPACE.
// using namespace juce;
// #endif

namespace StoneyDSP
{
/** @addtogroup StoneyDSP
Expand All @@ -65,14 +72,8 @@ namespace ProjectInfo
const int versionNumber = 0x10200;
}

// class AudioPluginAudioProcessor;

/// @} group Biquads
} // namespace Biquads

/// @} group StoneyDSP
} // namespace StoneyDSP

// #include "Biquads/Processor.hpp"
// #include "Biquads/Wrapper.hpp"
// #include "Biquads/Parameters.hpp"
25 changes: 19 additions & 6 deletions include/StoneyDSP/Biquads/Editor.hpp
Original file line number Diff line number Diff line change
@@ -1,13 +1,26 @@
/**
/***************************************************************************//**
* @file Editor.hpp
* @author Nathan J. Hood (nathanjhood@googlemail.com)
* @brief
* @brief Simple two-pole equalizer with variable oversampling.
* @version 1.2.0
* @date 2023-09-07
*
* @copyright Copyright (c) 2023
* @date 2024-03-13
*
*/
* @copyright Copyright (c) 2024 - Nathan J. Hood
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
******************************************************************************/

#pragma once

Expand Down
25 changes: 19 additions & 6 deletions include/StoneyDSP/Biquads/Parameters.hpp
Original file line number Diff line number Diff line change
@@ -1,13 +1,26 @@
/**
/***************************************************************************//**
* @file Parameters.hpp
* @author Nathan J. Hood (nathanjhood@googlemail.com)
* @brief
* @brief Simple two-pole equalizer with variable oversampling.
* @version 1.2.0
* @date 2023-09-07
*
* @copyright Copyright (c) 2023
* @date 2024-03-13
*
*/
* @copyright Copyright (c) 2024 - Nathan J. Hood
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
******************************************************************************/

#pragma once

Expand Down
24 changes: 18 additions & 6 deletions include/StoneyDSP/Biquads/Processor.hpp
Original file line number Diff line number Diff line change
@@ -1,14 +1,26 @@
/**
/***************************************************************************//**
* @file Processor.hpp
* @author Nathan J. Hood (nathanjhood@googlemail.com)
* @brief
* @brief Simple two-pole equalizer with variable oversampling.
* @version 1.2.0
* @date 2023-09-07
*
* @copyright Copyright (c) 2023
* @date 2024-03-13
*
*/
* @copyright Copyright (c) 2024 - Nathan J. Hood
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
******************************************************************************/

#pragma once

Expand Down
25 changes: 19 additions & 6 deletions include/StoneyDSP/Biquads/Wrapper.hpp
Original file line number Diff line number Diff line change
@@ -1,13 +1,26 @@
/**
/***************************************************************************//**
* @file Wrapper.hpp
* @author Nathan J. Hood (nathanjhood@googlemail.com)
* @brief
* @brief Simple two-pole equalizer with variable oversampling.
* @version 1.2.0
* @date 2023-09-07
*
* @copyright Copyright (c) 2023
* @date 2024-03-13
*
*/
* @copyright Copyright (c) 2024 - Nathan J. Hood
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
******************************************************************************/

#pragma once

Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@
"type": "git"
},
"readme": "https://github.com/StoneyDSP/Biquads/README.md",
"license": "MIT",
"license": "GPL-3.0",
"scripts": {
"configure": "cmake -S . -B ./build -DSTONEYDSP_BIQUADS_BUILD_TESTS:BOOL=FALSE -DSTONEYDSP_BIQUADS_BUILD_EXTRAS:BOOL=TRUE -DSTONEYDSP_BIQUADS_BUILD_EXAMPLES:BOOL=TRUE -DCMAKE_INSTALL_PREFIX:PATH=./install -GNinja",
"reconfigure": "cmake --fresh -S . -B ./build -DSTONEYDSP_BIQUADS_BUILD_TESTS:BOOL=FALSE -DSTONEYDSP_BIQUADS_BUILD_EXTRAS:BOOL=TRUE -DSTONEYDSP_BIQUADS_BUILD_EXAMPLES:BOOL=TRUE -DCMAKE_INSTALL_PREFIX:PATH=./install -GNinja",
"configure": "cmake -S . -B ./build -DSTONEYDSP_BIQUADS_BUILD_TESTS:BOOL=TRUE -DSTONEYDSP_BIQUADS_BUILD_EXTRAS:BOOL=TRUE -DSTONEYDSP_BIQUADS_BUILD_EXAMPLES:BOOL=TRUE -DCMAKE_INSTALL_PREFIX:PATH=./install -GNinja",
"reconfigure": "cmake --fresh -S . -B ./build -DSTONEYDSP_BIQUADS_BUILD_TESTS:BOOL=TRUE -DSTONEYDSP_BIQUADS_BUILD_EXTRAS:BOOL=TRUE -DSTONEYDSP_BIQUADS_BUILD_EXAMPLES:BOOL=TRUE -DCMAKE_INSTALL_PREFIX:PATH=./install -GNinja",
"build": "cmake --build ./build",
"postbuild": "cmake --install ./build",
"ctest": "ctest --test-dir ./build --rerun-failed --output-on-failure --verbose",
"cpack": "cpack --config ./build/CPackSourceConfig.cmake -B ./install",
"cdist": "cpack --config ./build/CPackConfig.cmake -B ./install",

"sys:config": "cmake --fresh -S . -B ./build -DSTONEYDSP_BIQUADS_BUILD_TESTS:BOOL=FALSE -DSTONEYDSP_BIQUADS_BUILD_EXTRAS:BOOL=TRUE -DSTONEYDSP_BIQUADS_BUILD_EXAMPLES:BOOL=TRUE -GNinja",
"sys:config": "cmake --fresh -S . -B ./build -DSTONEYDSP_BIQUADS_BUILD_TESTS:BOOL=TRUE -DSTONEYDSP_BIQUADS_BUILD_EXTRAS:BOOL=TRUE -DSTONEYDSP_BIQUADS_BUILD_EXAMPLES:BOOL=TRUE -GNinja",
"sys:install": "cmake --build ./build && cmake --build ./build --target install"
},
"engines": {
Expand Down
41 changes: 16 additions & 25 deletions share/StoneyDSP/Biquads/StoneyDSPBiquadsConfig.cmake.in
Original file line number Diff line number Diff line change
@@ -1,29 +1,20 @@
#[=============================================================================[
This file is part of the StoneyDSP library.
Copyright (c) 2024 - StoneyDSP
Home: https://www.stoneydsp.com
Source: https://github.com/StoneyDSP/StoneyDSP

StoneyDSP is an open source library subject to open-source licensing.

By using StoneyDSP, you agree to the terms of the StoneyDSP End-User License
Agreement and also the StoneyDSP Privacy Policy.

End User License Agreement: www.stoneydsp.com/LICENSE
Privacy Policy: www.stoneydsp.com/privacy-policy

By using StoneyDSP, you must also agree to the terms of both the JUCE 7 End-User
License Agreement and JUCE Privacy Policy.

End User License Agreement: www.juce.com/juce-7-licence
Privacy Policy: www.juce.com/juce-privacy-policy

Or: You may also use this code under the terms of the GPL v3 (see
www.gnu.org/licenses).

STONEYDSP IS PROVIDED "AS IS" WITHOUT ANY WARRANTY, AND ALL WARRANTIES, WHETHER
EXPRESSED OR IMPLIED, INCLUDING MERCHANTABILITY AND FITNESS FOR PURPOSE, ARE
DISCLAIMED.
Simple two-pole equalizer with variable oversampling.
Copyright (c) 2024 - Nathan J. Hood

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
.
]=============================================================================]#

@PACKAGE_INIT@
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
53 changes: 22 additions & 31 deletions share/cmake/Modules/GetGitRef.cmake
Original file line number Diff line number Diff line change
@@ -1,66 +1,57 @@
#[=============================================================================[
This file is part of the StoneyDSP library.
Copyright (c) 2024 - StoneyDSP
Home: https://www.stoneydsp.com
Source: https://github.com/StoneyDSP/StoneyDSP
Simple two-pole equalizer with variable oversampling.
Copyright (c) 2024 - Nathan J. Hood

StoneyDSP is an open source library subject to open-source licensing.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.

By using StoneyDSP, you agree to the terms of the StoneyDSP End-User License
Agreement and also the StoneyDSP Privacy Policy.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.

End User License Agreement: www.stoneydsp.com/LICENSE
Privacy Policy: www.stoneydsp.com/privacy-policy

By using StoneyDSP, you must also agree to the terms of both the JUCE 7 End-User
License Agreement and JUCE Privacy Policy.

End User License Agreement: www.juce.com/juce-7-licence
Privacy Policy: www.juce.com/juce-privacy-policy

Or: You may also use this code under the terms of the GPL v3 (see
www.gnu.org/licenses).

STONEYDSP IS PROVIDED "AS IS" WITHOUT ANY WARRANTY, AND ALL WARRANTIES, WHETHER
EXPRESSED OR IMPLIED, INCLUDING MERCHANTABILITY AND FITNESS FOR PURPOSE, ARE
DISCLAIMED.
You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
.
]=============================================================================]#

#[=============================================================================[
Provides:

STONEYDSP_GIT_COMMIT_REF
STONEYDSP_BIQUADS_GIT_COMMIT_REF

]=============================================================================]#
macro(stoneydsp_get_git_ref)
macro(stoneydsp_biquads_get_git_ref)
find_package(Git REQUIRED)
if(GIT_FOUND)
execute_process(
COMMAND ${GIT_EXECUTABLE} rev-parse --git-dir
WORKING_DIRECTORY ${StoneyDSP_SOURCE_DIR}
WORKING_DIRECTORY ${STONEYDSP_BIQUADS_SOURCE_DIR}
RESULT_VARIABLE test_result
OUTPUT_VARIABLE git_output
)
if(test_result EQUAL 0)
# If we found a '/.git' at the project root, fetch the full path and
# store it as 'git_dir'
get_filename_component(git_dir ${git_output} ABSOLUTE BASE_DIR "${StoneyDSP_SOURCE_DIR}")
get_filename_component(git_dir ${git_output} ABSOLUTE BASE_DIR "${STONEYDSP_BIQUADS_SOURCE_DIR}")
string(STRIP "${git_dir}" git_dir)
execute_process(
COMMAND ${GIT_EXECUTABLE} rev-parse HEAD
WORKING_DIRECTORY ${StoneyDSP_SOURCE_DIR}
WORKING_DIRECTORY ${STONEYDSP_BIQUADS_SOURCE_DIR}
RESULT_VARIABLE test_result
OUTPUT_VARIABLE STONEYDSP_GIT_COMMIT_REF
OUTPUT_VARIABLE STONEYDSP_BIQUADS_GIT_COMMIT_REF
)
if(test_result EQUAL 0)
# If our VCS found a revision number, pass it to cache
string(STRIP "${STONEYDSP_GIT_COMMIT_REF}" STONEYDSP_GIT_COMMIT_REF)
# message(STATUS "STONEYDSP_GIT_COMMIT_REF = ${STONEYDSP_GIT_COMMIT_REF}")
string(STRIP "${STONEYDSP_BIQUADS_GIT_COMMIT_REF}" STONEYDSP_BIQUADS_GIT_COMMIT_REF)
# message(STATUS "STONEYDSP_BIQUADS_GIT_COMMIT_REF = ${STONEYDSP_BIQUADS_GIT_COMMIT_REF}")
endif()

execute_process(
COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref --symbolic-full-name HEAD
WORKING_DIRECTORY ${StoneyDSP_SOURCE_DIR}
WORKING_DIRECTORY ${STONEYDSP_BIQUADS_SOURCE_DIR}
RESULT_VARIABLE test_result
OUTPUT_VARIABLE git_remote
)
Expand Down
Loading

0 comments on commit 05cea3b

Please sign in to comment.