From 85a662048e4a906ddb40a511f9fa2ab7a7712c80 Mon Sep 17 00:00:00 2001 From: "Charles J. Cliffe" Date: Wed, 29 Aug 2012 17:55:04 -0400 Subject: [PATCH] License change to MIT --- README | 8 +++++++- cpp/BeatDetektor.cpp | 35 +++++++++++++++++++-------------- cpp/BeatDetektor.h | 38 +++++++++++++++++++++--------------- js/beatdetektor.js | 46 ++++++++++++++++++++++---------------------- 4 files changed, 73 insertions(+), 54 deletions(-) diff --git a/README b/README index 1aea879..ad4dfa8 100644 --- a/README +++ b/README @@ -1,2 +1,8 @@ -BeatDetktor BPM detection library by Charles J. Cliffe +BeatDetktor C++ and Javascript BPM detection library + +Copyright (c) 2009 Charles J. Cliffe. + +Distributed under the terms of the MIT License: + + http://opensource.org/licenses/MIT diff --git a/cpp/BeatDetektor.cpp b/cpp/BeatDetektor.cpp index 2fe9c14..05ae9c6 100644 --- a/cpp/BeatDetektor.cpp +++ b/cpp/BeatDetektor.cpp @@ -4,27 +4,34 @@ * * BeatDetektor - CubicFX Visualizer Beat Detection & Analysis Algorithm * - * Created by Charles J. Cliffe on 09-11-30. - * Copyright 2009 Charles J. Cliffe. All rights reserved. + * Copyright (c) 2009 Charles J. Cliffe. * - * BeatDetektor is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * BeatDetektor is distributed under the terms of the MIT License. + * http://opensource.org/licenses/MIT * - * BeatDetektor 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 Lesser General Public License for more details. + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: * - * You should have received a copy of the GNU Lesser General Public License - * along with this program. If not, see . - * - * Visit www.cubicvr.org for BeatDetektor forum and support. + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. */ + + + #include "BeatDetektor.h" void BeatDetektor::process(float timer_seconds, std::vector &fft_data) diff --git a/cpp/BeatDetektor.h b/cpp/BeatDetektor.h index 95b53e6..a44e960 100644 --- a/cpp/BeatDetektor.h +++ b/cpp/BeatDetektor.h @@ -1,31 +1,37 @@ #pragma once /* - * BeatDetektor.h + * BeatDetektor.h * - * BeatDetektor - CubicFX Visualizer Beat Detection & Analysis Algorithm + * BeatDetektor - CubicFX Visualizer Beat Detection & Analysis Algorithm * - * Created by Charles J. Cliffe on 09-11-30. - * Copyright 2009 Charles J. Cliffe. All rights reserved. + * Copyright (c) 2009 Charles J. Cliffe. * - * BeatDetektor is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * BeatDetektor is distributed under the terms of the MIT License. + * http://opensource.org/licenses/MIT * - * BeatDetektor 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 Lesser General Public License for more details. + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: * - * You should have received a copy of the GNU Lesser General Public License - * along with this program. If not, see . - * - * Visit www.cubicvr.org for BeatDetektor forum and support. + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. */ + + /* BeatDetektor class diff --git a/js/beatdetektor.js b/js/beatdetektor.js index 7efa8d6..3a139cd 100644 --- a/js/beatdetektor.js +++ b/js/beatdetektor.js @@ -1,35 +1,35 @@ /* - * BeatDetektor.js + * BeatDetektor.js * - * BeatDetektor - CubicFX Visualizer Beat Detection & Analysis Algorithm - * Javascript port by Charles J. Cliffe and Corban Brook + * BeatDetektor - CubicFX Visualizer Beat Detection & Analysis Algorithm + * Javascript port by Charles J. Cliffe and Corban Brook + * + * Copyright (c) 2009 Charles J. Cliffe. * - * Created by Charles J. Cliffe on 09-11-30. - * Copyright 2009 Charles J. Cliffe. All rights reserved. + * BeatDetektor is distributed under the terms of the MIT License. + * http://opensource.org/licenses/MIT * - * BeatDetektor is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: * - * Please note that only the Javascript version of BeatDetektor is licensed - * under the terms of LGPL version 3; ports of BeatDetektor or derivatives - * in other languages are licensed under the terms of GPL version 3. - * - * BeatDetektor 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program. If not, see . - * - * Please contact cj@cubicproductions.com if you seek alternate - * licensing terms for your project. + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. */ + /* BeatDetektor class