# HG changeset patch # User matthiasm # Date 1397151516 -3600 # Node ID f82a28c2209fafa3a7f6568b08e99192508d178d # Parent 5fb59edfab996f50c8de140873fa7636d92e9ddb# Parent 0ca7c7e21991b7cf5c6c4306af64280947d0b357 merge diff -r 5fb59edfab99 -r f82a28c2209f COPYING --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/COPYING Thu Apr 10 18:38:36 2014 +0100 @@ -0,0 +1,22 @@ + + CHP + Copyright (c) 2014 Queen Mary, University of London + + 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: + + 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 AUTHOR 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. diff -r 5fb59edfab99 -r f82a28c2209f ConstrainedHarmonicPeak.cpp --- a/ConstrainedHarmonicPeak.cpp Thu Apr 10 18:37:55 2014 +0100 +++ b/ConstrainedHarmonicPeak.cpp Thu Apr 10 18:38:36 2014 +0100 @@ -1,3 +1,26 @@ +/* + CHP + Copyright (c) 2014 Queen Mary, University of London + + 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: + + 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 AUTHOR 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 "ConstrainedHarmonicPeak.h" diff -r 5fb59edfab99 -r f82a28c2209f ConstrainedHarmonicPeak.h --- a/ConstrainedHarmonicPeak.h Thu Apr 10 18:37:55 2014 +0100 +++ b/ConstrainedHarmonicPeak.h Thu Apr 10 18:38:36 2014 +0100 @@ -1,3 +1,27 @@ +/* + CHP + Copyright (c) 2014 Queen Mary, University of London + + 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: + + 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 AUTHOR 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. +*/ + #ifndef CONSTRAINEDHARMONICPEAK_H #define CONSTRAINEDHARMONICPEAK_H diff -r 5fb59edfab99 -r f82a28c2209f README --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/README Thu Apr 10 18:38:36 2014 +0100 @@ -0,0 +1,16 @@ + +Constrained Harmonic Peak plugin +================================ + +This is a simple Vamp plugin that returns the peak frequency within a +given frequency range, from a harmonic product spectrum. + +(The whole available frequency range is used in calculating the +harmonic spectrum, but only the peak frequency within the range +specified by the plugin's parameters is returned in the result.) + +It was quickly written to provide a simple way to obtain frequencies +within a user-provided range, for use in the Tony +(http://code.soundsoftware.ac.uk/projects/tony/) pitch annotation +application. + diff -r 5fb59edfab99 -r f82a28c2209f plugins.cpp --- a/plugins.cpp Thu Apr 10 18:37:55 2014 +0100 +++ b/plugins.cpp Thu Apr 10 18:38:36 2014 +0100 @@ -1,3 +1,26 @@ +/* + CHP + Copyright (c) 2014 Queen Mary, University of London + + 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: + + 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 AUTHOR 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 #include diff -r 5fb59edfab99 -r f82a28c2209f win32-build/chp.pro --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/win32-build/chp.pro Thu Apr 10 18:38:36 2014 +0100 @@ -0,0 +1,17 @@ +TEMPLATE = lib + +INCLUDEPATH += ../../../vamp-plugin-sdk/include +LIBS += ../../../vamp-plugin-sdk/lib/libvamp-sdk.a -Wl,--version-script=../win32-build/vamp-plugin.map + +CONFIG -= qt +CONFIG += plugin release warn_on + +TARGET = chp + +SOURCES += \ + ../ConstrainedHarmonicPeak.cpp \ + ../plugins.cpp + +HEADERS += \ + ../ConstrainedHarmonicPeak.h + diff -r 5fb59edfab99 -r f82a28c2209f win32-build/vamp-plugin.map --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/win32-build/vamp-plugin.map Thu Apr 10 18:38:36 2014 +0100 @@ -0,0 +1,4 @@ +{ + global: vampGetPluginDescriptor; + local: *; +};