Mercurial > hg > opencollidoscope
changeset 5:75b744078d66
added license
line wrap: on
line diff
--- a/CollidoscopeApp/include/AudioEngine.h Wed Jul 13 12:31:37 2016 +0200 +++ b/CollidoscopeApp/include/AudioEngine.h Wed Jul 13 16:06:46 2016 +0200 @@ -1,3 +1,24 @@ +/* + + Copyright (C) 2016 Queen Mary University of London + Author: Fiore Martin + + This file is part of Collidoscope. + + Collidoscope 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 <http://www.gnu.org/licenses/>. +*/ + #pragma once #include <array>
--- a/CollidoscopeApp/include/BufferToWaveRecorderNode.h Wed Jul 13 12:31:37 2016 +0200 +++ b/CollidoscopeApp/include/BufferToWaveRecorderNode.h Wed Jul 13 16:06:46 2016 +0200 @@ -1,3 +1,48 @@ +/* + + Copyright (C) 2016 Queen Mary University of London + Author: Fiore Martin + + This file is part of Collidoscope. + + Collidoscope 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 <http://www.gnu.org/licenses/>. + + This file incorporates work covered by the following copyright and permission notice: + + Copyright (c) 2014, The Cinder Project + + This code is intended to be used with the Cinder C++ library, http://libcinder.org + + Redistribution and use in source and binary forms, with or without modification, are permitted provided that + the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this list of conditions and + the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and + the following disclaimer in the documentation and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED + WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR + ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED + TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + +*/ + #pragma once #include "cinder/Cinder.h" @@ -8,7 +53,7 @@ #include "Messages.h" -typedef std::shared_ptr<class BufferToWaveRecorderNode> BufferToWaveRecorderNodeRef; +typedef std::shared_ptr<class BufferToWaveRecorderNode> BufferToWaveRecorderNodeRef; typedef ci::audio::dsp::RingBufferT<RecordWaveMsg> RecordWaveMsgRingBuffer; @@ -43,14 +88,14 @@ void setNumSeconds(double numSeconds, bool shrinkToFit = false); //! Returns the length of the recording buffer in frames. - size_t getNumFrames() const { return mRecorderBuffer.getNumFrames(); } + size_t getNumFrames() const { return mRecorderBuffer.getNumFrames(); } //! Returns the length of the recording buffer in seconds. - double getNumSeconds() const; + double getNumSeconds() const; //! \brief Returns a copy of the recored samples, up to the current write position. //! //! This method is non locking, and as such any resizing calls must be performed on the same thread or be otherwise synchronized. - ci::audio::BufferRef getRecordedCopy() const; + ci::audio::BufferRef getRecordedCopy() const; //! \brief Writes the currently recorded samples to a file at \a filePath //! @@ -69,17 +114,17 @@ protected: - void initialize() override; - void process(ci::audio::Buffer *buffer) override; + void initialize() override; + void process(ci::audio::Buffer *buffer) override; void initBuffers(size_t numFrames); static const float kMinAudioVal; static const float kMaxAudioVal; - ci::audio::BufferDynamic mRecorderBuffer; - ci::audio::BufferDynamicRef mCopiedBuffer; - std::atomic<uint64_t> mLastOverrun; + ci::audio::BufferDynamic mRecorderBuffer; + ci::audio::BufferDynamicRef mCopiedBuffer; + std::atomic<uint64_t> mLastOverrun; RecordWaveMsgRingBuffer mRingBuffer;
--- a/CollidoscopeApp/include/Chunk.h Wed Jul 13 12:31:37 2016 +0200 +++ b/CollidoscopeApp/include/Chunk.h Wed Jul 13 16:06:46 2016 +0200 @@ -1,3 +1,26 @@ +/* + + Copyright (C) 2015 Fiore Martin + Copyright (C) 2016 Queen Mary University of London + Author: Fiore Martin + + This file is part of Collidoscope. + + Collidoscope 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 <http://www.gnu.org/licenses/>. + +*/ + #pragma once @@ -26,7 +49,7 @@ /** * Constructor, takes as argument the index of this chunk in the wave */ - Chunk( size_t index ); + Chunk( size_t index ); /** * Sets the top value of this chunk. The value is passed in audio coordinates : [-1.0, 1.0] @@ -49,9 +72,9 @@ * Reset this chunks. When a chunk is reset it starts shrinking until it disappears. * */ - void reset(){ - mResetting = true; - } + void reset(){ + mResetting = true; + } /** * Called in the graphic loop. It update this chunk. @@ -72,16 +95,16 @@ /** * Informs this chunk that it's the first chunk of the selection. */ - void setAsSelectionStart(bool start){ - isSelectionStart = start; - } + void setAsSelectionStart(bool start){ + isSelectionStart = start; + } /** * Informs this chunk that it's the last chunk of the selection. */ - void setAsSelectionEnd(bool end){ - isSelectionEnd = end; - } + void setAsSelectionEnd(bool end){ + isSelectionEnd = end; + } private:
--- a/CollidoscopeApp/include/Config.h Wed Jul 13 12:31:37 2016 +0200 +++ b/CollidoscopeApp/include/Config.h Wed Jul 13 16:06:46 2016 +0200 @@ -1,3 +1,24 @@ +/* + + Copyright (C) 2016 Queen Mary University of London + Author: Fiore Martin + + This file is part of Collidoscope. + + Collidoscope 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 <http://www.gnu.org/licenses/>. +*/ + #pragma once #include <string>
--- a/CollidoscopeApp/include/DrawInfo.h Wed Jul 13 12:31:37 2016 +0200 +++ b/CollidoscopeApp/include/DrawInfo.h Wed Jul 13 16:06:46 2016 +0200 @@ -1,3 +1,24 @@ +/* + + Copyright (C) 2016 Queen Mary University of London + Author: Fiore Martin + + This file is part of Collidoscope. + + Collidoscope 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 <http://www.gnu.org/licenses/>. +*/ + #pragma once #include "cinder/Area.h" @@ -40,7 +61,7 @@ * Maps a value in the audio space [-1.0, 1.0] to a position on the y axis of this DrawInf's bounding area. * */ - float audioToHeigt(float audioSample) const { + float audioToHeigt(float audioSample) const { /* clip into range [-1.1] */ if (audioSample < -1.0f) { audioSample = -1.0f; @@ -50,11 +71,11 @@ } /* map from [-1,1] to [0,1] */ - float ratio = (audioSample - (-1.0f)) * 0.5f; // 2 = 1 - (-1) + float ratio = (audioSample - (-1.0f)) * 0.5f; // 2 = 1 - (-1) - /* get bottom and add the scaled height */ + /* get bottom and add the scaled height */ return ratio * mSelectionBarHeight; //remove bounds.getY1() bound only needed for size of tier - } + } float getMaxChunkHeight() const { @@ -80,22 +101,22 @@ /** * Flips y according to the index of the wave. It is needed because the second wave in collidoscope is upside down from the orientation oftthe screen. */ - int flipY(int y) const + int flipY(int y) const { if ( mWaveIndex == 0) - return mWindowHeight - y; + return mWindowHeight - y; else return y; - } + } /** * Returns x. not used at he moment. * */ - int flipX(int x) const + int flipX(int x) const { return x; - } + } // how much the wave is shrunk on the y axis with respect to the wave's tier
--- a/CollidoscopeApp/include/EnvASR.h Wed Jul 13 12:31:37 2016 +0200 +++ b/CollidoscopeApp/include/EnvASR.h Wed Jul 13 16:06:46 2016 +0200 @@ -1,3 +1,24 @@ +/* + + Copyright (C) 2016 Queen Mary University of London + Author: Fiore Martin + + This file is part of Collidoscope. + + Collidoscope 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 <http://www.gnu.org/licenses/>. +*/ + #pragma once namespace collidoscope {
--- a/CollidoscopeApp/include/Log.h Wed Jul 13 12:31:37 2016 +0200 +++ b/CollidoscopeApp/include/Log.h Wed Jul 13 16:06:46 2016 +0200 @@ -1,3 +1,24 @@ +/* + + Copyright (C) 2016 Queen Mary University of London + Author: Fiore Martin + + This file is part of Collidoscope. + + Collidoscope 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 <http://www.gnu.org/licenses/>. +*/ + #pragma once
--- a/CollidoscopeApp/include/MIDI.h Wed Jul 13 12:31:37 2016 +0200 +++ b/CollidoscopeApp/include/MIDI.h Wed Jul 13 16:06:46 2016 +0200 @@ -1,3 +1,24 @@ +/* + + Copyright (C) 2016 Queen Mary University of London + Author: Fiore Martin + + This file is part of Collidoscope. + + Collidoscope 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 <http://www.gnu.org/licenses/>. +*/ + #pragma once #include "RtMidi.h"
--- a/CollidoscopeApp/include/Messages.h Wed Jul 13 12:31:37 2016 +0200 +++ b/CollidoscopeApp/include/Messages.h Wed Jul 13 16:06:46 2016 +0200 @@ -1,3 +1,24 @@ +/* + + Copyright (C) 2016 Queen Mary University of London + Author: Fiore Martin + + This file is part of Collidoscope. + + Collidoscope 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 <http://www.gnu.org/licenses/>. +*/ + #pragma once /**
--- a/CollidoscopeApp/include/Oscilloscope.h Wed Jul 13 12:31:37 2016 +0200 +++ b/CollidoscopeApp/include/Oscilloscope.h Wed Jul 13 16:06:46 2016 +0200 @@ -1,3 +1,24 @@ +/* + + Copyright (C) 2016 Queen Mary University of London + Author: Fiore Martin + + This file is part of Collidoscope. + + Collidoscope 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 <http://www.gnu.org/licenses/>. +*/ + #pragma once #include "cinder/gl/gl.h"
--- a/CollidoscopeApp/include/PGranular.h Wed Jul 13 12:31:37 2016 +0200 +++ b/CollidoscopeApp/include/PGranular.h Wed Jul 13 16:06:46 2016 +0200 @@ -1,3 +1,24 @@ +/* + + Copyright (C) 2016 Queen Mary University of London + Author: Fiore Martin + + This file is part of Collidoscope. + + Collidoscope 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 <http://www.gnu.org/licenses/>. +*/ + #pragma once #include <array>
--- a/CollidoscopeApp/include/PGranularNode.h Wed Jul 13 12:31:37 2016 +0200 +++ b/CollidoscopeApp/include/PGranularNode.h Wed Jul 13 16:06:46 2016 +0200 @@ -1,3 +1,24 @@ +/* + + Copyright (C) 2016 Queen Mary University of London + Author: Fiore Martin + + This file is part of Collidoscope. + + Collidoscope 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 <http://www.gnu.org/licenses/>. +*/ + #pragma once #include "cinder/Cinder.h" @@ -54,9 +75,9 @@ protected: - void initialize() override; + void initialize() override; - void process( ci::audio::Buffer *buffer ) override; + void process( ci::audio::Buffer *buffer ) override; private:
--- a/CollidoscopeApp/include/ParticleController.h Wed Jul 13 12:31:37 2016 +0200 +++ b/CollidoscopeApp/include/ParticleController.h Wed Jul 13 16:06:46 2016 +0200 @@ -1,3 +1,26 @@ +/* + + Copyright (C) 2015 Fiore Martin + Copyright (C) 2016 Queen Mary University of London + Author: Fiore Martin + + This file is part of Collidoscope. + + Collidoscope 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 <http://www.gnu.org/licenses/>. + +*/ + #pragma once #include "cinder/gl/gl.h"
--- a/CollidoscopeApp/include/Resources.h Wed Jul 13 12:31:37 2016 +0200 +++ b/CollidoscopeApp/include/Resources.h Wed Jul 13 16:06:46 2016 +0200 @@ -1,3 +1,24 @@ +/* + + Copyright (C) 2016 Queen Mary University of London + Author: Fiore Martin + + This file is part of Collidoscope. + + Collidoscope 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 <http://www.gnu.org/licenses/>. +*/ + #pragma once #include "cinder/CinderResources.h"
--- a/CollidoscopeApp/include/RingBufferPack.h Wed Jul 13 12:31:37 2016 +0200 +++ b/CollidoscopeApp/include/RingBufferPack.h Wed Jul 13 16:06:46 2016 +0200 @@ -1,3 +1,24 @@ +/* + + Copyright (C) 2016 Queen Mary University of London + Author: Fiore Martin + + This file is part of Collidoscope. + + Collidoscope 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 <http://www.gnu.org/licenses/>. +*/ + #pragma once #include "cinder/audio/dsp/RingBuffer.h"
--- a/CollidoscopeApp/include/Wave.h Wed Jul 13 12:31:37 2016 +0200 +++ b/CollidoscopeApp/include/Wave.h Wed Jul 13 16:06:46 2016 +0200 @@ -1,3 +1,25 @@ +/* + + Copyright (C) 2015 Fiore Martin + Copyright (C) 2016 Queen Mary University of London + Author: Fiore Martin + + This file is part of Collidoscope. + + Collidoscope 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 <http://www.gnu.org/licenses/>. + +*/ #pragma once @@ -45,7 +67,7 @@ */ class Wave { - friend class ParticleController; + friend class ParticleController; public: @@ -53,9 +75,9 @@ * The selection of the wave that is controlled by the big horizontal knob * */ - class Selection { - - public: + class Selection { + + public: Selection( Wave * w, Color color ); @@ -63,39 +85,39 @@ void setStart( size_t start ); /** Sets the size of selection. size is the number of chunks the selection is made of */ - void setSize( size_t size ); - + void setSize( size_t size ); + /** Particle spread is used to calculate the size of the cloud of particles */ void inline setParticleSpread( float spread ){ mParticleSpread = spread; - } + } - size_t getStart(void) const { return mSelectionStart; } - + size_t getStart(void) const { return mSelectionStart; } + size_t getEnd(void) const { return mSelectionEnd; } - size_t inline getSize(void) const { - if (mNull) - return 0; - else - return 1 + mSelectionEnd - mSelectionStart; - } + size_t inline getSize(void) const { + if (mNull) + return 0; + else + return 1 + mSelectionEnd - mSelectionStart; + } - float inline getParticleSpread() const { return mParticleSpread; } + float inline getParticleSpread() const { return mParticleSpread; } /** When selection is null no selection is showed on the wave */ - inline void setToNull(){ + inline void setToNull(){ mParticleSpread = 1.0f; - mNull = true; - } + mNull = true; + } - inline bool isNull() const{ - return mNull; - } + inline bool isNull() const{ + return mNull; + } - inline const Color & getColor() const{ - return mColor; - } + inline const Color & getColor() const{ + return mColor; + } private: @@ -111,58 +133,58 @@ Wave * mWave; - }; // class Selection + }; // class Selection - + #ifdef USE_PARTICLES - ParticleController mParticleController; + ParticleController mParticleController; #endif - + - /* Maps id of the synth to cursor. There is one cursor for each Synth being played */ - std::map < SynthID, Cursor > mCursors; + /* Maps id of the synth to cursor. There is one cursor for each Synth being played */ + std::map < SynthID, Cursor > mCursors; /** Holds the positions of the cursor, namely on which chunk the cursor is currently */ - std::vector<int> mCursorsPos; + std::vector<int> mCursorsPos; public: - + // value used to identify the loop for cursor position static const int kLoopNote = -1; - static const cinder::Color CURSOR_CLR; - /* must be in sync with supercollider durationFactor ControlSpec max */ - static const int MAX_DURATION = 8; + static const cinder::Color CURSOR_CLR; + /* must be in sync with supercollider durationFactor ControlSpec max */ + static const int MAX_DURATION = 8; #ifdef USE_PARTICLES - static const int PARTICLESIZE_COEFF = 40; + static const int PARTICLESIZE_COEFF = 40; #endif /** Resetting a wave makes it shrink until it disappears. Each time a new sample is recorder the wave is reset * \param onlyChunks if false the selection is also set to null, if true only the chunks are reset */ - void reset(bool onlyChunks); + void reset(bool onlyChunks); /** sets top and bottom values for the chunk. * \a bottom and \a top are in audio coordinates [-1.0, 1.0] */ - void setChunk(size_t index, float bottom, float top); + void setChunk(size_t index, float bottom, float top); - const Chunk & getChunk(size_t index); + const Chunk & getChunk(size_t index); /** places the cursor on the wave. Every cursor is associated to a synth voice of the audio engine. * The synth id identifies uniquely the cursor in the internal map of the wave. * If the cursor doesn't exist it is created */ inline void setCursorPos( SynthID id, int pos, const DrawInfo& di ){ - Cursor & cursor = mCursors[id]; - cursor.pos = pos; - cursor.lastUpdate = ci::app::getElapsedSeconds(); + Cursor & cursor = mCursors[id]; + cursor.pos = pos; + cursor.lastUpdate = ci::app::getElapsedSeconds(); #ifdef USE_PARTICLES - // The idea is that, if the duration is greater than 1.0, the cursor continues in form of particles - // The smaller the selection the more particles; the bigger the duration the more particles - if (mSelection.getParticleSpread() > 1.0f){ - /* amountCoeff ranges from 1/8 to 1 */ + // The idea is that, if the duration is greater than 1.0, the cursor continues in form of particles + // The smaller the selection the more particles; the bigger the duration the more particles + if (mSelection.getParticleSpread() > 1.0f){ + /* amountCoeff ranges from 1/8 to 1 */ const float amountCoeff = (mSelection.getParticleSpread() / MAX_DURATION); /* get radom point within seleciton as center of the particle */ @@ -173,33 +195,33 @@ centrePoint.y = di.flipY( di.audioToHeigt(0.0) ); const float wavePixelLen = mNumChunks * ( 2 + Chunk::kWidth); - centrePoint.x *= float(di.getWindowWidth()) / wavePixelLen; + centrePoint.x *= float(di.getWindowWidth()) / wavePixelLen; - mParticleController.addParticles( + mParticleController.addParticles( std::max( 1, (int)(amountCoeff * ParticleController::kMaxParticleAdd * mFilterCoeff) ), // amount of particles to add - centrePoint, + centrePoint, mSelection.getParticleSpread() * PARTICLESIZE_COEFF // size of the cloud - ); - } + ); + } #endif - - } + + } void update( double secondsPerChunk, const DrawInfo& di ); void removeCursor( SynthID id ) { mCursors.erase( id ); } /** Sets the transparency of this wave. \a alpha ranges from 0 to 1 */ - inline void setselectionAlpha(float alpha){ mFilterCoeff = alpha;} + inline void setselectionAlpha(float alpha){ mFilterCoeff = alpha;} void draw( const DrawInfo& di ); - Selection& getSelection() { return mSelection; }; + Selection& getSelection() { return mSelection; }; - size_t getSize() const{ return mChunks.size(); } + size_t getSize() const{ return mChunks.size(); } - void setScopePoint(int index, float audioVal); + void setScopePoint(int index, float audioVal); Wave( size_t numChunks, Color selectionColor );
--- a/CollidoscopeApp/src/AudioEngine.cpp Wed Jul 13 12:31:37 2016 +0200 +++ b/CollidoscopeApp/src/AudioEngine.cpp Wed Jul 13 16:06:46 2016 +0200 @@ -1,3 +1,25 @@ +/* + + Copyright (C) 2016 Queen Mary University of London + Author: Fiore Martin + + This file is part of Collidoscope. + + Collidoscope 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 <http://www.gnu.org/licenses/>. + +*/ + #include "AudioEngine.h" #include "cinder/app/App.h" //FIXME remove App.h include
--- a/CollidoscopeApp/src/BufferToWaveRecorderNode.cpp Wed Jul 13 12:31:37 2016 +0200 +++ b/CollidoscopeApp/src/BufferToWaveRecorderNode.cpp Wed Jul 13 16:06:46 2016 +0200 @@ -1,3 +1,48 @@ +/* + + Copyright (C) 2016 Queen Mary University of London + Author: Fiore Martin + + This file is part of Collidoscope. + + Collidoscope 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 <http://www.gnu.org/licenses/>. + + This file incorporates work covered by the following copyright and permission notice: + + Copyright (c) 2014, The Cinder Project + + This code is intended to be used with the Cinder C++ library, http://libcinder.org + + Redistribution and use in source and binary forms, with or without modification, are permitted provided that + the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this list of conditions and + the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and + the following disclaimer in the documentation and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED + WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR + ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED + TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + +*/ + #include "BufferToWaveRecorderNode.h" #include "cinder/audio/Context.h" #include "cinder/audio/Target.h"
--- a/CollidoscopeApp/src/Chunk.cpp Wed Jul 13 12:31:37 2016 +0200 +++ b/CollidoscopeApp/src/Chunk.cpp Wed Jul 13 16:06:46 2016 +0200 @@ -1,3 +1,27 @@ +/* + + Copyright (C) 2015 Fiore Martin + Copyright (C) 2016 Queen Mary University of London + Author: Fiore Martin + + This file is part of Collidoscope. + + Collidoscope 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 <http://www.gnu.org/licenses/>. + +*/ + + #include "Chunk.h" #include "DrawInfo.h" @@ -45,7 +69,7 @@ void Chunk::draw( const DrawInfo& di, ci::gl::BatchRef &batch ){ using namespace ci; - + gl::pushModelMatrix(); const float chunkHeight = mAnimate * mAudioTop * di.getMaxChunkHeight(); @@ -65,7 +89,7 @@ void Chunk::drawBar( const DrawInfo& di, ci::gl::BatchRef &batch ){ - using namespace ci; + using namespace ci; gl::pushModelMatrix(); @@ -81,4 +105,4 @@ const float Chunk::kWidth = 7.0f; -const float Chunk::kHalfWidth = 3.5f; \ No newline at end of file +const float Chunk::kHalfWidth = 3.5f;
--- a/CollidoscopeApp/src/CollidoscopeApp.cpp Wed Jul 13 12:31:37 2016 +0200 +++ b/CollidoscopeApp/src/CollidoscopeApp.cpp Wed Jul 13 16:06:46 2016 +0200 @@ -1,3 +1,24 @@ +/* + + Copyright (C) 2016 Queen Mary University of London + Author: Fiore Martin + + This file is part of Collidoscope. + + Collidoscope 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 <http://www.gnu.org/licenses/>. +*/ + #include "cinder/app/App.h" #include "cinder/app/RendererGl.h" #include "cinder/gl/gl.h" @@ -22,20 +43,20 @@ class CollidoscopeApp : public App { public: - void setup() override; + void setup() override; void setupGraphics(); void receiveCommands(); - void keyDown( KeyEvent event ) override; - void update() override; - void draw() override; + void keyDown( KeyEvent event ) override; + void update() override; + void draw() override; void resize() override; - Config mConfig; + Config mConfig; collidoscope::MIDI mMIDI; AudioEngine mAudioEngine; - + array< shared_ptr< Wave >, NUM_WAVES > mWaves; array< shared_ptr< DrawInfo >, NUM_WAVES > mDrawInfos; array< shared_ptr< Oscilloscope >, NUM_WAVES > mOscilloscopes; @@ -186,9 +207,9 @@ }; break; - case 'm' : - mAudioEngine.setGrainDurationCoeff(0, 8); - break; + case 'm' : + mAudioEngine.setGrainDurationCoeff(0, 8); + break; case 'n': { mAudioEngine.setGrainDurationCoeff( 0, 1 ); @@ -293,7 +314,7 @@ void CollidoscopeApp::draw() { - gl::clear( Color( 0, 0, 0 ) ); + gl::clear( Color( 0, 0, 0 ) ); for ( int i = 0; i < NUM_WAVES; i++ ){ if ( i == 1 ){ @@ -388,7 +409,7 @@ mWaves[waveIdx]->getSelection().setSize( numSelectionChunks ); // how many samples in one selection ? - size_t selectionSize = mWaves[waveIdx]->getSelection().getSize() * (mConfig.getWaveLen() * mAudioEngine.getSampleRate() / mConfig.getNumChunks()); + size_t selectionSize = mWaves[waveIdx]->getSelection().getSize() * (mConfig.getWaveLen() * mAudioEngine.getSampleRate() / mConfig.getNumChunks()); mAudioEngine.setSelectionSize( waveIdx, selectionSize ); };
--- a/CollidoscopeApp/src/Config.cpp Wed Jul 13 12:31:37 2016 +0200 +++ b/CollidoscopeApp/src/Config.cpp Wed Jul 13 16:06:46 2016 +0200 @@ -1,3 +1,24 @@ +/* + + Copyright (C) 2016 Queen Mary University of London + Author: Fiore Martin + + This file is part of Collidoscope. + + Collidoscope 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 <http://www.gnu.org/licenses/>. +*/ + #include "Config.h"
--- a/CollidoscopeApp/src/Log.cpp Wed Jul 13 12:31:37 2016 +0200 +++ b/CollidoscopeApp/src/Log.cpp Wed Jul 13 16:06:46 2016 +0200 @@ -1,3 +1,24 @@ +/* + + Copyright (C) 2016 Queen Mary University of London + Author: Fiore Martin + + This file is part of Collidoscope. + + Collidoscope 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 <http://www.gnu.org/licenses/>. +*/ + #include "cinder/Log.h"
--- a/CollidoscopeApp/src/MIDI.cpp Wed Jul 13 12:31:37 2016 +0200 +++ b/CollidoscopeApp/src/MIDI.cpp Wed Jul 13 16:06:46 2016 +0200 @@ -1,3 +1,24 @@ +/* + + Copyright (C) 2016 Queen Mary University of London + Author: Fiore Martin + + This file is part of Collidoscope. + + Collidoscope 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 <http://www.gnu.org/licenses/>. +*/ + #include "MIDI.h" #include "Config.h"
--- a/CollidoscopeApp/src/PGranularNode.cpp Wed Jul 13 12:31:37 2016 +0200 +++ b/CollidoscopeApp/src/PGranularNode.cpp Wed Jul 13 16:06:46 2016 +0200 @@ -1,3 +1,24 @@ +/* + + Copyright (C) 2016 Queen Mary University of London + Author: Fiore Martin + + This file is part of Collidoscope. + + Collidoscope 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 <http://www.gnu.org/licenses/>. +*/ + #include "PGranularNode.h" #include "cinder/audio/Context.h"
--- a/CollidoscopeApp/src/ParticleController.cpp Wed Jul 13 12:31:37 2016 +0200 +++ b/CollidoscopeApp/src/ParticleController.cpp Wed Jul 13 16:06:46 2016 +0200 @@ -1,3 +1,26 @@ +/* + + Copyright (C) 2015 Fiore Martin + Copyright (C) 2016 Queen Mary University of London + Author: Fiore Martin + + This file is part of Collidoscope. + + Collidoscope 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 <http://www.gnu.org/licenses/>. + +*/ + #include "ParticleController.h" #include "cinder/Rand.h"
--- a/CollidoscopeApp/src/Wave.cpp Wed Jul 13 12:31:37 2016 +0200 +++ b/CollidoscopeApp/src/Wave.cpp Wed Jul 13 16:06:46 2016 +0200 @@ -1,3 +1,26 @@ +/* + + Copyright (C) 2015 Fiore Martin + Copyright (C) 2016 Queen Mary University of London + Author: Fiore Martin + + This file is part of Collidoscope. + + Collidoscope 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 <http://www.gnu.org/licenses/>. + +*/ + #include "Wave.h" #include "DrawInfo.h" @@ -6,15 +29,15 @@ Wave::Wave( size_t numChunks, Color selectionColor ): mNumChunks( numChunks ), - mSelection( this, selectionColor ), - mColor(Color(0.5f, 0.5f, 0.5f)), + mSelection( this, selectionColor ), + mColor(Color(0.5f, 0.5f, 0.5f)), mFilterCoeff( 1.0f ) { - mChunks.reserve( numChunks ); + mChunks.reserve( numChunks ); - for ( size_t i = 0; i < numChunks; i++ ){ - mChunks.emplace_back( i ); - } + for ( size_t i = 0; i < numChunks; i++ ){ + mChunks.emplace_back( i ); + } // init cinder batch drawing auto lambert = gl::ShaderDef().color(); @@ -24,27 +47,27 @@ void Wave::reset( bool onlyChunks ) { - for (size_t i = 0; i < getSize(); i++){ - mChunks[i].reset(); - } + for (size_t i = 0; i < getSize(); i++){ + mChunks[i].reset(); + } - if (onlyChunks) - return; + if (onlyChunks) + return; - mSelection.setToNull(); + mSelection.setToNull(); } void Wave::setChunk(size_t index, float bottom, float top) { - Chunk &c = mChunks[index]; - c.setTop(top); - c.setBottom(bottom); + Chunk &c = mChunks[index]; + c.setTop(top); + c.setBottom(bottom); } inline const Chunk & Wave::getChunk(size_t index) { - return mChunks[index]; + return mChunks[index]; } void Wave::update( double secondsPerChunk, const DrawInfo& di ) { @@ -89,30 +112,30 @@ void Wave::draw( const DrawInfo& di ){ - /* ########### draw the particles ########## */ + /* ########### draw the particles ########## */ #ifdef USE_PARTICLES - mParticleController.draw(); + mParticleController.draw(); #endif - /* ########### draw the wave ########## */ - /* scale the wave to fit the window */ - gl::pushModelView(); + /* ########### draw the wave ########## */ + /* scale the wave to fit the window */ + gl::pushModelView(); - - const float wavePixelLen = ( mNumChunks * ( 2 + Chunk::kWidth ) ); - /* scale the x-axis for the wave to fit the window precisely */ - gl::scale( ((float)di.getWindowWidth() ) / wavePixelLen , 1.0f); - /* draw the chunks */ - if (mSelection.isNull()){ - /* no selection: all chunks the same color */ - gl::color(mColor); - for (size_t i = 0; i < getSize(); i++){ - mChunks[i].draw( di, mChunkBatch ); - } - } + + const float wavePixelLen = ( mNumChunks * ( 2 + Chunk::kWidth ) ); + /* scale the x-axis for the wave to fit the window precisely */ + gl::scale( ((float)di.getWindowWidth() ) / wavePixelLen , 1.0f); + /* draw the chunks */ + if (mSelection.isNull()){ + /* no selection: all chunks the same color */ + gl::color(mColor); + for (size_t i = 0; i < getSize(); i++){ + mChunks[i].draw( di, mChunkBatch ); + } + } else{ // Selection not null - gl::color(this->mColor); + gl::color(this->mColor); // update the array with cursor positions mCursorsPos.clear(); @@ -120,48 +143,48 @@ mCursorsPos.push_back( cursor.second.pos ); } - gl::enableAlphaBlending(); + gl::enableAlphaBlending(); - const float selectionAlpha = 0.5f + mFilterCoeff * 0.5f; + const float selectionAlpha = 0.5f + mFilterCoeff * 0.5f; - for (size_t i = 0; i < getSize(); i++){ - /* when in selection use selection color */ - - if (i == mSelection.getStart()){ - /* draw the selection bar with a transparent selection color */ - gl::color(mSelection.getColor().r, mSelection.getColor().g, mSelection.getColor().b, 0.5f); + for (size_t i = 0; i < getSize(); i++){ + /* when in selection use selection color */ + + if (i == mSelection.getStart()){ + /* draw the selection bar with a transparent selection color */ + gl::color(mSelection.getColor().r, mSelection.getColor().g, mSelection.getColor().b, 0.5f); mChunks[i].drawBar( di, mChunkBatch ); - /* set the color to the selection */ - gl::color(mSelection.getColor().r, mSelection.getColor().g, mSelection.getColor().b, selectionAlpha); - } + /* set the color to the selection */ + gl::color(mSelection.getColor().r, mSelection.getColor().g, mSelection.getColor().b, selectionAlpha); + } // check if one of the cursors is positioned in this chunk - if (std::find(mCursorsPos.begin(), mCursorsPos.end(),i) != mCursorsPos.end() ){ - gl::color(CURSOR_CLR); - mChunks[i].draw( di, mChunkBatch ); - gl::color(mSelection.getColor().r, mSelection.getColor().g, mSelection.getColor().b, selectionAlpha); - } - else{ - /* just draw with current color */ - mChunks[i].draw( di, mChunkBatch ); - } - - /* exit selection: go back to wave color */ - if (i == mSelection.getEnd()){ - /* draw the selection bar with a transparent selection color */ - gl::color(mSelection.getColor().r, mSelection.getColor().g, mSelection.getColor().b, 0.5f); + if (std::find(mCursorsPos.begin(), mCursorsPos.end(),i) != mCursorsPos.end() ){ + gl::color(CURSOR_CLR); + mChunks[i].draw( di, mChunkBatch ); + gl::color(mSelection.getColor().r, mSelection.getColor().g, mSelection.getColor().b, selectionAlpha); + } + else{ + /* just draw with current color */ + mChunks[i].draw( di, mChunkBatch ); + } + + /* exit selection: go back to wave color */ + if (i == mSelection.getEnd()){ + /* draw the selection bar with a transparent selection color */ + gl::color(mSelection.getColor().r, mSelection.getColor().g, mSelection.getColor().b, 0.5f); mChunks[i].drawBar( di, mChunkBatch ); - /* set the colo to the wave */ - gl::color(this->mColor); - } - } - gl::disableAlphaBlending(); - } - + /* set the colo to the wave */ + gl::color(this->mColor); + } + } + gl::disableAlphaBlending(); + } + - gl::popModelView(); + gl::popModelView(); } @@ -180,16 +203,16 @@ void Wave::Selection::setStart(size_t start) { - /* deselect the previous */ + /* deselect the previous */ mWave->mChunks[mSelectionStart].setAsSelectionStart( false ); - /* select the next */ + /* select the next */ mWave->mChunks[start].setAsSelectionStart( true ); - - mNull = false; + + mNull = false; size_t size = getSize(); - mSelectionStart = start; + mSelectionStart = start; mSelectionEnd = start + size - 1; if ( mSelectionEnd > mWave->getSize() - 1 ) mSelectionEnd = mWave->getSize() - 1; @@ -210,14 +233,14 @@ size = mWave->mNumChunks - mSelectionStart - 1; } - /* deselect the previous */ + /* deselect the previous */ mWave->mChunks[mSelectionEnd].setAsSelectionEnd( false ); mSelectionEnd = mSelectionStart + size; - /* select the next */ + /* select the next */ mWave->mChunks[mSelectionEnd].setAsSelectionEnd( true ); - mNull = false; + mNull = false; }
--- a/CollidoscopeTeensy/CollidoscopeTeensy_new.ino Wed Jul 13 12:31:37 2016 +0200 +++ b/CollidoscopeTeensy/CollidoscopeTeensy_new.ino Wed Jul 13 16:06:46 2016 +0200 @@ -1,12 +1,26 @@ /****************************************************************************** - - * Ben Bengler - * mail@benbengler.com - * 02.05.2016 + * Copyright (C) 2015 Ben Bengler (mail@benbengler.com) + * Copyright (C) 2016 Queen Mary University of London + * Authors: Ben Bengler, Fiore Martin * - * Collidoscope + * This file is part of Collidoscope. + * + * Collidoscope 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 <http://www.gnu.org/licenses/>. * + **************************************************************************** + * * Teensy 2 ++ pinout: https://www.pjrc.com/teensy/card4b.pdf * * ANALOG INPUTS: @@ -30,7 +44,7 @@ * DIGITAL OUTPUTS: * Record Button 1 Led -> D4 (4) * Record Button 2 Led -> D5 (5) - + * ******************************************************************************/
--- a/CollidoscopeTeensy/CollidoscopeTeensy_original.ino Wed Jul 13 12:31:37 2016 +0200 +++ b/CollidoscopeTeensy/CollidoscopeTeensy_original.ino Wed Jul 13 16:06:46 2016 +0200 @@ -1,25 +1,38 @@ - /****************************************************************************** - - * Ben Bengler - * mail@benbengler.com - * 02.05.2016 + * Copyright (C) 2015 Ben Bengler (mail@benbengler.com) + * Copyright (C) 2016 Queen Mary University of London + * Authors: Ben Bengler, Fiore Martin * - * Collidoscope + * This file is part of Collidoscope. + * + * Collidoscope 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 <http://www.gnu.org/licenses/>. * + **************************************************************************** + * * Teensy 2 ++ pinout: https://www.pjrc.com/teensy/card4b.pdf * * ANALOG INPUTS: * Wavejet -> F0 (38) [Horizontal rail 1] * Wavejet -> F1 (39) [Horizontal rail 2] - * Filter 1 -> F2 (40) [Vertical rail 1] - * Filter 2 -> F4 (42) [Vertical rail 2] + * Filter 1 -> F2 (40) [Fader with moon/sun 1] + * Filter 2 -> F4 (42) [Fader with moon/sun 2] + * Duration 1-> F3 (41) [Fader with grains 1] + * Duration 2-> F5 (43) [Fader with grains 2] * * DIGITAL INPUTS [INTERRUPTS]: * Sel. length 1 -> INT0/INT1 (0, 1) [Encoder 1] - * Sel. length 2 -> INT2/INT3 (2, 3) [Encoder 2] - * Duration 1 -> INT4/INT5 (36, 37)[Encoder 3] - * Duration 2 -> INT6/INT7 (18, 19)[Encoder 4] + * Sel. length 2 -> INT2/INT3 (2, 3) [Encoder 2] * * DIGITAL INPUTS: * Play1 toggle -> B0 (20) @@ -30,7 +43,7 @@ * DIGITAL OUTPUTS: * Record Button 1 Led -> D4 (4) * Record Button 2 Led -> D5 (5) - + * ******************************************************************************/ @@ -47,14 +60,12 @@ const int cc_filter = 7; // MIDI cc controlling LP filter const int cc_play = 4; // MIDI cc controlling PLAY const int cc_record = 5; // MIDI cc controlling RECORD -//const int cc_reset = 100; // MIDI cc controlling instrument RESET + /////////////////////////////////////////////////// //Default Values: const int Enc_def = 64; //default selection length int MIDI_led_state = LOW; -//boolean reset1 = true; -//boolean reset2 = true; /////////////////////////////////////////////////// // Interface Inputs @@ -166,28 +177,24 @@ //Loop/Keymode Switch Instrument 1 if (button1.risingEdge()) { - //Serial.println("Loop mode"); usbMIDI.sendControlChange(cc_play, 1, midi_chan_inst1); } if (button1.fallingEdge()) { - //Serial.println("Keyboardmode mode"); usbMIDI.sendControlChange(cc_play, 0, midi_chan_inst1); } //Record Instrument 1 if (button2.fallingEdge()) { - //Serial.println("RECORD! Instrument 1"); usbMIDI.sendControlChange(cc_record, 1, midi_chan_inst1); } //send MIDI Wavejet 1 [Position Instrument 1] - + //Serial.print("W1>"); Serial.println(Jet1_new); if (Jet1_new > Jet1_old+jitter_thresh || Jet1_new < Jet1_old-jitter_thresh) { - - int16_t midiVal = constrain( map(Jet1_new, 24, 926, 0, 149), 0, 149 ); - // int16_t midiVal = constrain( map( Jet1_new, 23, 928, 0, 149 ), 0, 149 ); old collidoscope + //int16_t midiVal = constrain( map(Jet1_new, 24, 926, 0, 149), 0, 149 ); + int16_t midiVal = constrain( map(Jet1_new, 18, 800, 0, 149), 0, 149 ); if( midiVal != Jet1_old_MIDI ){ Jet1_old_MIDI = midiVal; usbMIDI.sendPitchBend( midiVal, midi_chan_inst1 ); @@ -199,8 +206,7 @@ //send MIDI Filter 1 [Filter Instrument 1] - - if ( filter1_new != filter1_old ) { // maybe adding jitter threshold needed, see Jet1_new + if ( filter1_new != filter1_old ) { int16_t midiVal = constrain( map(filter1_new, 0, 1024, 0, 127), 0, 127 ); if( midiVal != filter1_old_MIDI){ @@ -213,7 +219,7 @@ digitalWrite(Pin_MIDIled, HIGH); } - if ( dur1_new != dur1_old ) { // maybe adding jitter threshold needed, see Jet1_new + if ( dur1_new != dur1_old ) { int16_t midiVal = constrain( map(dur1_new, 0, 1024, 0, 127), 0, 127 ); if( midiVal != dur1_old_MIDI){ @@ -242,26 +248,23 @@ //Loop/Keymode Switch Instrument 2 if (button3.risingEdge()) { - //Serial.println("Loop mode"); usbMIDI.sendControlChange(cc_play, 1, midi_chan_inst2); } if (button3.fallingEdge()) { - //Serial.println("Keyboardmode mode"); usbMIDI.sendControlChange(cc_play, 0, midi_chan_inst2); } //Record Instrument 2 if (button4.fallingEdge()) { - //Serial.println("RECORD! Instrument 2"); usbMIDI.sendControlChange(cc_record, 1, midi_chan_inst2); } //send MIDI Wavejet 2 [Position Instrument 2] - + // Serial.print("W2>"); Serial.println(Jet2_new); if (Jet2_new > Jet2_old+jitter_thresh || Jet2_new < Jet2_old-jitter_thresh) { - //Serial.println("RECORD! Instrument 2"); - int16_t midiVal = constrain( map( Jet2_new, 925, 18, 149, 0 ), 0, 149 ); + //int16_t midiVal = constrain( map( Jet2_new, 925, 18, 149, 0 ), 0, 149 ); + int16_t midiVal = constrain( map( Jet2_new, 15, 780, 0, 149 ), 0, 149 ); if( midiVal != Jet2_old_MIDI ){ Jet2_old_MIDI = midiVal; usbMIDI.sendPitchBend( midiVal, midi_chan_inst2 ); @@ -271,8 +274,7 @@ digitalWrite(Pin_MIDIled, HIGH); } - //Serial.println(filter2_new); - if ( filter2_new != filter2_old ) { // maybe adding jitter threshold needed, see Jet1_new + if ( filter2_new != filter2_old ) { int16_t midiVal = constrain( map(filter2_new, 0, 1024, 0, 127), 0, 127 ); if( midiVal != filter2_old_MIDI){ //Serial.println( midiVal ); @@ -284,7 +286,7 @@ digitalWrite(Pin_MIDIled, HIGH); } - if ( dur2_new != dur2_old ) { // maybe adding jitter threshold needed, see Jet1_new + if ( dur2_new != dur2_old ) { int16_t midiVal = constrain( map(dur2_new, 0, 1024, 0, 127), 0, 127 ); if( midiVal != dur2_old_MIDI){ //Serial.println( midiVal ); @@ -300,8 +302,6 @@ //send MIDI Encoder 2 [Selection length Instrument 2] if (Enc2_new != Enc2_old) { Enc2_old = Enc2_new; - //Serial.println("Encoder 2: "); - //Serial.println(Enc2_new); usbMIDI.sendControlChange(cc_length, Enc2_new, midi_chan_inst2); digitalWrite(Pin_MIDIled, HIGH); }
--- a/JackDevice/ContextJack.cpp Wed Jul 13 12:31:37 2016 +0200 +++ b/JackDevice/ContextJack.cpp Wed Jul 13 16:06:46 2016 +0200 @@ -1,26 +1,49 @@ /* - Copyright (c) 2015, The Cinder Project - This code is intended to be used with the Cinder C++ library, http://libcinder.org + Copyright (C) 2016 Queen Mary University of London + Author: Fiore Martin - Redistribution and use in source and binary forms, with or without modification, are permitted provided that - the following conditions are met: + This file is part of Collidoscope. + + Collidoscope 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 <http://www.gnu.org/licenses/>. + + This file incorporates work covered by the following copyright and permission notice: + + Copyright (c) 2014, The Cinder Project + + This code is intended to be used with the Cinder C++ library, http://libcinder.org + + Redistribution and use in source and binary forms, with or without modification, are permitted provided that + the following conditions are met: * Redistributions of source code must retain the above copyright notice, this list of conditions and - the following disclaimer. + the following disclaimer. * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and - the following disclaimer in the documentation and/or other materials provided with the distribution. + the following disclaimer in the documentation and/or other materials provided with the distribution. - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED - WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A - PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR - ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED - TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED + WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR + ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED + TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + */ + #include "cinder/audio/linux/ContextJack.h" #include "cinder/audio/Exception.h" @@ -60,50 +83,50 @@ int OutputDeviceNodeJack::jackCallback(jack_nframes_t nframes, void* userData) { // retrieve user data - RenderData *renderData = static_cast<RenderData *>( userData ); + RenderData *renderData = static_cast<RenderData *>( userData ); - OutputDeviceNodeJack *outputDeviceNode = static_cast<OutputDeviceNodeJack *>( renderData->outputNode ); + OutputDeviceNodeJack *outputDeviceNode = static_cast<OutputDeviceNodeJack *>( renderData->outputNode ); - auto ctx = renderData->outputNode->getContext(); - if( ! ctx ) { + auto ctx = renderData->outputNode->getContext(); + if( ! ctx ) { // this is from some cinder library code but it should not happen in Collidoscope as the context is set for( size_t chan = 0; chan < 2; chan++) - zeroJackPort( outputDeviceNode->mOutputPorts[chan], nframes ); + zeroJackPort( outputDeviceNode->mOutputPorts[chan], nframes ); - return 0; - } + return 0; + } - std::lock_guard<std::mutex> lock( ctx->getMutex() ); + std::lock_guard<std::mutex> lock( ctx->getMutex() ); - // verify associated context still exists, which may not be true if we blocked in ~Context() and were then deallocated. - ctx = renderData->outputNode->getContext(); - if( ! ctx ) { + // verify associated context still exists, which may not be true if we blocked in ~Context() and were then deallocated. + ctx = renderData->outputNode->getContext(); + if( ! ctx ) { for( size_t chan = 0; chan < 2; chan++) - zeroJackPort( outputDeviceNode->mOutputPorts[chan], nframes ); + zeroJackPort( outputDeviceNode->mOutputPorts[chan], nframes ); - return 0; - } + return 0; + } - Buffer *internalBuffer = outputDeviceNode->getInternalBuffer(); - internalBuffer->zero(); + Buffer *internalBuffer = outputDeviceNode->getInternalBuffer(); + internalBuffer->zero(); - ctx->preProcess(); + ctx->preProcess(); // process the whole audio graph using by recursively pulling the input all the way to the top of the graph - outputDeviceNode->pullInputs( internalBuffer ); + outputDeviceNode->pullInputs( internalBuffer ); - // if clip detection is enabled and buffer clipped, silence it - //if( outputDeviceNode->checkNotClipping() ){ + // if clip detection is enabled and buffer clipped, silence it + //if( outputDeviceNode->checkNotClipping() ){ //for( size_t chan = 0; chan < 2; chan++) - // zeroJackPort( outputDeviceNode->mOutputPorts[chan], nframes ); - //} + // zeroJackPort( outputDeviceNode->mOutputPorts[chan], nframes ); + //} //else { for( size_t chan = 0; chan < 2; chan++) copyToJackPort( outputDeviceNode->mOutputPorts[chan], internalBuffer->getChannel( chan ), nframes ); //} - ctx->postProcess(); + ctx->postProcess(); return 0; } @@ -181,38 +204,38 @@ // connect input ports to physical device (microphones) const char **mikePorts = jack_get_ports (mClient, NULL, NULL, - JackPortIsPhysical|JackPortIsOutput); + JackPortIsPhysical|JackPortIsOutput); - if (mikePorts == NULL) { + if (mikePorts == NULL) { throw cinder::audio::AudioContextExc("no physical input ports available"); - } + } - if (jack_connect (mClient, mikePorts[0], jack_port_name (mInputDeviceNode->mInputPorts[0]))) { + if (jack_connect (mClient, mikePorts[0], jack_port_name (mInputDeviceNode->mInputPorts[0]))) { throw cinder::audio::AudioContextExc("cannot connect input port 0"); - } + } - if (jack_connect (mClient, mikePorts[1], jack_port_name( mInputDeviceNode->mInputPorts[1]) )) { + if (jack_connect (mClient, mikePorts[1], jack_port_name( mInputDeviceNode->mInputPorts[1]) )) { throw cinder::audio::AudioContextExc("cannot connect input port 1"); - } + } // connect output ports to physical device (audio out ) const char **speakerPorts = jack_get_ports (mClient, NULL, NULL, - JackPortIsPhysical|JackPortIsInput); + JackPortIsPhysical|JackPortIsInput); - if (speakerPorts == NULL) { + if (speakerPorts == NULL) { throw cinder::audio::AudioContextExc("no physical output ports available"); - } + } - if (jack_connect (mClient, jack_port_name (mOutputPorts[0]), speakerPorts[0])) { + if (jack_connect (mClient, jack_port_name (mOutputPorts[0]), speakerPorts[0])) { throw cinder::audio::AudioContextExc("cannot connect output port 0"); - } + } - if (jack_connect (mClient, jack_port_name (mOutputPorts[1]), speakerPorts[1])) { + if (jack_connect (mClient, jack_port_name (mOutputPorts[1]), speakerPorts[1])) { throw cinder::audio::AudioContextExc("cannot connect output port 1"); - } + } - jack_free( mikePorts ); - jack_free( speakerPorts ); + jack_free( mikePorts ); + jack_free( speakerPorts ); } @@ -266,9 +289,9 @@ //-------------------------------------------ContextJack----------------------------------------------------------- -OutputDeviceNodeRef ContextJack::createOutputDeviceNode( const DeviceRef &device, const Node::Format &format ) +OutputDeviceNodeRef ContextJack::createOutputDeviceNode( const DeviceRef &device, const Node::Format &format ) { - + if( mOutputDeviceNode == nullptr ) { auto thisRef = std::static_pointer_cast<ContextJack>( shared_from_this() ); @@ -283,7 +306,7 @@ } } - return mOutputDeviceNode; + return mOutputDeviceNode; } InputDeviceNodeRef ContextJack::createInputDeviceNode( const DeviceRef &device, const Node::Format &format ) @@ -302,7 +325,7 @@ } } - return mInputDeviceNode; + return mInputDeviceNode; }
--- a/JackDevice/ContextJack.h Wed Jul 13 12:31:37 2016 +0200 +++ b/JackDevice/ContextJack.h Wed Jul 13 16:06:46 2016 +0200 @@ -1,24 +1,46 @@ /* - Copyright (c) 2015, The Cinder Project - This code is intended to be used with the Cinder C++ library, http://libcinder.org + Copyright (C) 2016 Queen Mary University of London + Author: Fiore Martin - Redistribution and use in source and binary forms, with or without modification, are permitted provided that - the following conditions are met: + This file is part of Collidoscope. + + Collidoscope 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 <http://www.gnu.org/licenses/>. + + This file incorporates work covered by the following copyright and permission notice: + + Copyright (c) 2014, The Cinder Project + + This code is intended to be used with the Cinder C++ library, http://libcinder.org + + Redistribution and use in source and binary forms, with or without modification, are permitted provided that + the following conditions are met: * Redistributions of source code must retain the above copyright notice, this list of conditions and - the following disclaimer. + the following disclaimer. * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and - the following disclaimer in the documentation and/or other materials provided with the distribution. + the following disclaimer in the documentation and/or other materials provided with the distribution. - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED - WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A - PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR - ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED - TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED + WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR + ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED + TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + */ #pragma once @@ -36,7 +58,7 @@ */ class OutputDeviceNodeJack : public OutputDeviceNode { public: - OutputDeviceNodeJack( const DeviceRef &device, const Format &format, const std::shared_ptr<ContextJack> &context ); + OutputDeviceNodeJack( const DeviceRef &device, const Format &format, const std::shared_ptr<ContextJack> &context ); /** Gives this output node a reference to the JackInputNode. * In initialize() the reference is used to give the input node access to jack input ports @@ -44,18 +66,18 @@ void setInput(InputDeviceNodeRef inputDeviceNode); protected: - void initialize() override; - void uninitialize() override; - void enableProcessing() override; - void disableProcessing() override; - bool supportsProcessInPlace() const override { return false; } + void initialize() override; + void uninitialize() override; + void enableProcessing() override; + void disableProcessing() override; + bool supportsProcessInPlace() const override { return false; } private: // this is called by jack in the audio thread at every tick of the sound card static int jackCallback(jack_nframes_t nframes, void* userData); - void renderToBufferFromInputs(); + void renderToBufferFromInputs(); /** * RenderData is passed as user_data to jack when the jack process callback is installed @@ -70,7 +92,7 @@ std::weak_ptr<ContextJack> mCinderContext; - jack_client_t *mClient; + jack_client_t *mClient; std::array< jack_port_t*, 2 > mOutputPorts; @@ -84,14 +106,14 @@ friend OutputDeviceNodeJack; public: - InputDeviceNodeJack( const DeviceRef &device, const Format &format, const std::shared_ptr<ContextJack> &context ); + InputDeviceNodeJack( const DeviceRef &device, const Format &format, const std::shared_ptr<ContextJack> &context ); protected: - void initialize() override; - void uninitialize() override; - void enableProcessing() override; - void disableProcessing() override; - void process( Buffer *buffer ) override; + void initialize() override; + void uninitialize() override; + void enableProcessing() override; + void disableProcessing() override; + void process( Buffer *buffer ) override; private: std::array< jack_port_t*, 2 > mInputPorts; @@ -99,19 +121,19 @@ class ContextJack : public Context { public: - ContextJack() {} - virtual ~ContextJack() {} + ContextJack() {} + virtual ~ContextJack() {} - OutputDeviceNodeRef createOutputDeviceNode( const DeviceRef &device, const Node::Format &format = Node::Format() ) override; - InputDeviceNodeRef createInputDeviceNode( const DeviceRef &device, const Node::Format &format = Node::Format() ) override; + OutputDeviceNodeRef createOutputDeviceNode( const DeviceRef &device, const Node::Format &format = Node::Format() ) override; + InputDeviceNodeRef createInputDeviceNode( const DeviceRef &device, const Node::Format &format = Node::Format() ) override; - OutputDeviceNodeRef mOutputDeviceNode; - InputDeviceNodeRef mInputDeviceNode; + OutputDeviceNodeRef mOutputDeviceNode; + InputDeviceNodeRef mInputDeviceNode; private: -}; +}; } } } // namespace cinder::audio::linux
--- a/JackDevice/DeviceManagerJack.cpp Wed Jul 13 12:31:37 2016 +0200 +++ b/JackDevice/DeviceManagerJack.cpp Wed Jul 13 16:06:46 2016 +0200 @@ -1,25 +1,46 @@ /* - Copyright (c) 2015, The Cinder Project - This code is intended to be used with the Cinder C++ library, http://libcinder.org + Copyright (C) 2016 Queen Mary University of London + Author: Fiore Martin - Redistribution and use in source and binary forms, with or without modification, are permitted provided that - the following conditions are met: + This file is part of Collidoscope. + + Collidoscope 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 <http://www.gnu.org/licenses/>. + + This file incorporates work covered by the following copyright and permission notice: + + Copyright (c) 2014, The Cinder Project + + This code is intended to be used with the Cinder C++ library, http://libcinder.org + + Redistribution and use in source and binary forms, with or without modification, are permitted provided that + the following conditions are met: * Redistributions of source code must retain the above copyright notice, this list of conditions and - the following disclaimer. * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and - the following disclaimer in the documentation and/or other materials provided with the distribution. + the following disclaimer in the documentation and/or other materials provided with the distribution. - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED - WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A - PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR - ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED - TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED + WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR + ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED + TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + */ #include "cinder/audio/linux/DeviceManagerJack.h" @@ -39,7 +60,7 @@ jack_status_t status; // open a jack client, get info and close - jack_client_t *client = jack_client_open ("device info", JackNullOption, &status, NULL); + jack_client_t *client = jack_client_open ("device info", JackNullOption, &status, NULL); if( client == NULL){ std::string msg = "jack_client_open() failed. "; @@ -57,7 +78,7 @@ DeviceManagerJack::~DeviceManagerJack() { - + } const std::vector<DeviceRef>& DeviceManagerJack::getDevices()
--- a/JackDevice/DeviceManagerJack.h Wed Jul 13 12:31:37 2016 +0200 +++ b/JackDevice/DeviceManagerJack.h Wed Jul 13 16:06:46 2016 +0200 @@ -1,24 +1,46 @@ /* - Copyright (c) 2015, The Cinder Project - This code is intended to be used with the Cinder C++ library, http://libcinder.org + Copyright (C) 2016 Queen Mary University of London + Author: Fiore Martin - Redistribution and use in source and binary forms, with or without modification, are permitted provided that - the following conditions are met: + This file is part of Collidoscope. + + Collidoscope 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 <http://www.gnu.org/licenses/>. + + This file incorporates work covered by the following copyright and permission notice: + + Copyright (c) 2014, The Cinder Project + + This code is intended to be used with the Cinder C++ library, http://libcinder.org + + Redistribution and use in source and binary forms, with or without modification, are permitted provided that + the following conditions are met: * Redistributions of source code must retain the above copyright notice, this list of conditions and - the following disclaimer. + the following disclaimer. * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and - the following disclaimer in the documentation and/or other materials provided with the distribution. + the following disclaimer in the documentation and/or other materials provided with the distribution. - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED - WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A - PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR - ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED - TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED + WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR + ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED + TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + */ #pragma once @@ -36,32 +58,32 @@ class DeviceManagerJack : public DeviceManager { public: - DeviceManagerJack(); - virtual ~DeviceManagerJack(); + DeviceManagerJack(); + virtual ~DeviceManagerJack(); - const std::vector<DeviceRef>& getDevices() override; - DeviceRef getDefaultOutput() override; - DeviceRef getDefaultInput() override; + const std::vector<DeviceRef>& getDevices() override; + DeviceRef getDefaultOutput() override; + DeviceRef getDefaultInput() override; - std::string getName( const DeviceRef &device ) override; - size_t getNumInputChannels( const DeviceRef &device ) override; - size_t getNumOutputChannels( const DeviceRef &device ) override; - size_t getSampleRate( const DeviceRef &device ) override; - size_t getFramesPerBlock( const DeviceRef &device ) override; + std::string getName( const DeviceRef &device ) override; + size_t getNumInputChannels( const DeviceRef &device ) override; + size_t getNumOutputChannels( const DeviceRef &device ) override; + size_t getSampleRate( const DeviceRef &device ) override; + size_t getFramesPerBlock( const DeviceRef &device ) override; - void setSampleRate( const DeviceRef &device, size_t sampleRate ) override; - void setFramesPerBlock( const DeviceRef &device, size_t framesPerBlock ) override; + void setSampleRate( const DeviceRef &device, size_t sampleRate ) override; + void setFramesPerBlock( const DeviceRef &device, size_t framesPerBlock ) override; - //! Returns the hardware's actual frames per block, which might not be a power of two. - size_t getFramesPerBlockHardware( const DeviceRef &device ); + //! Returns the hardware's actual frames per block, which might not be a power of two. + size_t getFramesPerBlockHardware( const DeviceRef &device ); private: - std::vector<DeviceRef> mDevices; - DeviceRef mDefaultOutDevice; - DeviceRef mDefaultInDevice; + std::vector<DeviceRef> mDevices; + DeviceRef mDefaultOutDevice; + DeviceRef mDefaultInDevice; size_t mSampleRate; size_t mBufferSize; -}; +}; -} } } // namespace cinder::audio::linux +} } } // namespace cinder::audio::linux
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/license.txt Wed Jul 13 16:06:46 2016 +0200 @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + 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 <http://www.gnu.org/licenses/>. + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + <program> Copyright (C) <year> <name of author> + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +<http://www.gnu.org/licenses/>. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +<http://www.gnu.org/philosophy/why-not-lgpl.html>. \ No newline at end of file