Skip to content

Commit

Permalink
License change to MIT
Browse files Browse the repository at this point in the history
  • Loading branch information
cjcliffe committed Aug 29, 2012
1 parent 7cbf719 commit 85a6620
Show file tree
Hide file tree
Showing 4 changed files with 73 additions and 54 deletions.
8 changes: 7 additions & 1 deletion README
Original file line number Diff line number Diff line change
@@ -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

35 changes: 21 additions & 14 deletions cpp/BeatDetektor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,34 @@
*
* BeatDetektor - CubicFX Visualizer Beat Detection & Analysis Algorithm
*
* Created by Charles J. Cliffe <[email protected]> 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 <http://www.gnu.org/licenses/>.
*
* 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<float> &fft_data)
Expand Down
38 changes: 22 additions & 16 deletions cpp/BeatDetektor.h
Original file line number Diff line number Diff line change
@@ -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 <[email protected]> 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 <http://www.gnu.org/licenses/>.
*
* 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
Expand Down
46 changes: 23 additions & 23 deletions js/beatdetektor.js
Original file line number Diff line number Diff line change
@@ -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 <http://www.gnu.org/licenses/>.
*
* Please contact [email protected] 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
Expand Down

0 comments on commit 85a6620

Please sign in to comment.