Skip to content

Commit

Permalink
Merge branch 'github-meta'
Browse files Browse the repository at this point in the history
  • Loading branch information
cannam committed May 23, 2019
2 parents c4f6023 + d92aef3 commit a155483
Show file tree
Hide file tree
Showing 5 changed files with 138 additions and 241 deletions.
79 changes: 79 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@

Contributing
============

The qm-dsp library is maintained in a Github repository at
https://github.com/c4dm/qm-dsp.


Reporting bugs
--------------

Please use Github issues for bug reports. Try to make them as specific
as possible. For example, describe an input that triggers some
particular behaviour, and tell us how that behaviour differs from what
you expected.

If your bug can be reproduced by processing an audio file using one of
the QM Vamp Plugins (https://github.com/c4dm/qm-vamp-plugins), which
are built using this library, that might be a good way to illustrate
the problem.


Pull requests
-------------

We're happy to see pull requests, and can pull them directly in some
circumstances.

* Please make sure your change compiles without warnings and passes
the existing tests.

* Please follow the code style guidelines (see below).

* Please make it as easy as possible to verify the behaviour of the
pull request, for example by adding a new test in the `tests`
directory. This library has only limited test coverage, but we
would like to expand it, and prefer not to make changes unless they
are backed by tests.

* Please provide your changes under terms which permit Queen Mary
University of London to relicense the code for commercial
purposes. The qm-dsp library as a whole is provided under the GPL,
but QM also make commercial licences available separately, and
cannot accept any pull request whose copyright status would prevent
that. In practice, this means any non-trivial change not
originating from QM must be explicitly licensed using a BSD-like
licence text, either in the source file itself or in an
accompanying file. See `thread/BlockAllocator.h` for an example of
typical language.

Please note also that fixes which change the behaviour of the existing
QM Vamp Plugins will need particularly close scrutiny - these are
reasonably widely used and, even where they have defects, changes may
cause problems for users and will at least need to be documented with
the plugins. For this reason it may take some time for such changes to
be reviewed or integrated.


Code style
----------

* C++ code must compile with the C++98 standard, except for the unit
tests which are C++14

* Classes are named `LikeThis` - functions, methods, and local
variables `likeThis` - class member variables `m_likeThis`

* Indentation is four spaces at a time (no tabs)

* The opening brace for a block goes at the end of the line, except
at the start of a function or class definition where it gets a line
of its own

* Please use braces around any conditional or loop block that
occupies its own line

Some of the older code in this library does not follow these
guidelines - usually this means the code needs to be updated.

58 changes: 58 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@

QM-DSP library
==============

This is a C++ library of functions for Digital Signal Processing and
Music Informatics purposes developed at Queen Mary, University of
London.

It is used by [QM Vamp Plugins](http://isophonics.net/QMVampPlugins)
amongst other things.

Despite the assertive name "qm-dsp", it is not "the official QM DSP
library", just one library for DSP that happens to have been written
at QM. It got this name because nothing else was using it at the time.


Compiling the library
---------------------

- Linux: `make -f build/linux/Makefile.linux64`

- Mac: `make -f build/osx/Makefile.osx`

- Windows (MSVC): Use the project file `build/msvc/QMDSP.vcxproj`

To build and run unit tests as well, add the `test` target to your
Make invocation, e.g. `make -f build/linux/Makefile.linux64
test`. Tests require the Boost library.


Licence
-------

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 2 of the License, or (at
your option) any later version. See the file COPYING included with
this distribution for more information.

This code is Copyright (c) 2006-2019 Queen Mary, University of London,
with the following exceptions:

- `ext/kissfft` - Copyright (c) 2003-2010 Mark Borgerding

- `maths/pca/pca.c` - Fionn Murtagh, from StatLib, used with permission

- `maths/Polyfit.h` - by Allen Miller, David J Taylor and others;
also for Delphi in the the JEDI Math Library, under the Mozilla Public
License

- `thread/BlockAllocator.h` - derived from FSB Allocator by Juha
Nieminen, under a BSD-style license

See individual files for further authorship details.

If you wish to use this code in a proprietary application or product
for which the terms of the GPL are not appropriate, please contact QM
Innovation https://www.qminnovation.co.uk/ for licensing terms.
38 changes: 0 additions & 38 deletions README.txt

This file was deleted.

2 changes: 1 addition & 1 deletion build/linux/Makefile.linux64
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

CFLAGS := -DNDEBUG -Wall -Wextra -Werror=implicit-function-declaration -O3 -fPIC -msse -msse2 -mfpmath=sse -ftree-vectorize -DUSE_PTHREADS

CXXFLAGS := $(CFLAGS)
CXXFLAGS := $(CFLAGS) -std=c++98

include build/general/Makefile.inc

202 changes: 0 additions & 202 deletions qm-dsp.pro.user

This file was deleted.

0 comments on commit a155483

Please sign in to comment.