diff --git a/Builds/MacOSX/Plugins/KWIKFormat/KWIKFormat.xcodeproj/project.pbxproj b/Builds/MacOSX/Plugins/KWIKFormat/KWIKFormat.xcodeproj/project.pbxproj index 483460fac43447a68c689bf83f724957c315b50a..fef5a4d1ee188aaa473e82ea3ee3a0c8002662a4 100644 --- a/Builds/MacOSX/Plugins/KWIKFormat/KWIKFormat.xcodeproj/project.pbxproj +++ b/Builds/MacOSX/Plugins/KWIKFormat/KWIKFormat.xcodeproj/project.pbxproj @@ -207,6 +207,8 @@ INFOPLIST_FILE = KWIKFormat/Info.plist; OTHER_LDFLAGS = ( "$(inherited)", + "-lz", + /opt/local/lib/libsz.a, /opt/local/lib/libhdf5.a, /opt/local/lib/libhdf5_cpp.a, ); @@ -225,6 +227,8 @@ INFOPLIST_FILE = KWIKFormat/Info.plist; OTHER_LDFLAGS = ( "$(inherited)", + "-lz", + /opt/local/lib/libsz.a, /opt/local/lib/libhdf5.a, /opt/local/lib/libhdf5_cpp.a, ); diff --git a/Source/Plugins/ExampleProcessor/ExampleEditor.cpp b/Source/Plugins/ExampleProcessor/ExampleEditor.cpp index d6038061a9e065b3512f69c5660619090db4977f..2f9d152b0c3feea3d089b262e0be6238582a3b35 100644 --- a/Source/Plugins/ExampleProcessor/ExampleEditor.cpp +++ b/Source/Plugins/ExampleProcessor/ExampleEditor.cpp @@ -36,6 +36,10 @@ ExampleEditor::ExampleEditor(GenericProcessor* parentNode, bool useDefaultParame addAndMakeVisible(exampleButton); } +ExampleEditor::~ExampleEditor() +{ +} + /** The listener methods that reacts to the button click. The same method is called for all buttons on the editor, so the button variable, which cointains a pointer to the button that called the method diff --git a/Source/Plugins/ExampleProcessor/Makefile.example b/Source/Plugins/ExampleProcessor/Makefile.example index 3174430a0d5693c81798a934b2576c85d5c5f795..973d9274ec088e46ba03fcfc6a3d649ae3d2ca65 100644 --- a/Source/Plugins/ExampleProcessor/Makefile.example +++ b/Source/Plugins/ExampleProcessor/Makefile.example @@ -10,12 +10,6 @@ VPATH := $(SOURCE_DIRS) SRC := $(foreach sdir,$(SRC_DIR),$(wildcard $(sdir)/*.cpp)) OBJ := $(addprefix $(OBJDIR)/,$(notdir $(SRC:.cpp=.o))) -#Library paths for OSX, can be removed if no external libraries are needed -ifeq ($(OS),Darwin) -CXXFLAGS := $(CXXFLAGS) -I/opt/local/include -LDFLAGS := $(LDFLAGS) -L/opt/local/lib -endif - #Extra macros and libraries needed by the plugin #CXXFLAGS := $(CXXFLAGS) -D EXAMPLE_MACRO #LDFLAGS := $(LDFLAGS) -lExampleLib diff --git a/Source/Plugins/LfpDisplayNodeBeta/LfpDisplayCanvas.cpp b/Source/Plugins/LfpDisplayNodeBeta/LfpDisplayCanvas.cpp index f484e2c93c81a54c0aaab5b164201d6c5ab91a1c..6adfc092881fef3576b3e1d2937978da5a4861c3 100644 --- a/Source/Plugins/LfpDisplayNodeBeta/LfpDisplayCanvas.cpp +++ b/Source/Plugins/LfpDisplayNodeBeta/LfpDisplayCanvas.cpp @@ -2066,8 +2066,8 @@ void LfpChannelDisplay::pxPaint() int jfrom_wholechannel= (int) (getY()+center-channelHeight/2)+1 +0 ; int jto_wholechannel= (int) (getY()+center+channelHeight/2) -0; - int jfrom_wholechannel_almost= (int) (getY()+center-channelHeight/3)+1 +0 ; // a bit less tall, for saturation warnings - int jto_wholechannel_almost= (int) (getY()+center+channelHeight/3) -0; + //int jfrom_wholechannel_almost= (int) (getY()+center-channelHeight/3)+1 +0 ; // a bit less tall, for saturation warnings + //int jto_wholechannel_almost= (int) (getY()+center+channelHeight/3) -0; // max and min of channel, this is the range where actual data is drawn @@ -2256,7 +2256,7 @@ void LfpChannelDisplay::pxPaint() { hfrom = (cs_next); hto = (cs_this); } - float hrange=hto-hfrom; + //float hrange=hto-hfrom; float ha=1; for (int l=hfrom; l<hto; l++) { diff --git a/Source/Processors/Editors/ChannelSelector.cpp b/Source/Processors/Editors/ChannelSelector.cpp index 6d0f3fd78a4c281aaf8c50829350f6115767a23f..3f4c4bdbec890d84d6ab75101d73ded3c8ad7380 100755 --- a/Source/Processors/Editors/ChannelSelector.cpp +++ b/Source/Processors/Editors/ChannelSelector.cpp @@ -41,12 +41,12 @@ static const int DURATION_ANIMATION_COLLAPSE_MS = 200; ChannelSelector::ChannelSelector(bool createButtons, Font& titleFont_) : - eventsOnly(false), paramsToggled(true), paramsActive(true), - recActive(true), radioStatus(false), isNotSink(createButtons), - moveRight(false), moveLeft(false), offsetLR(0), offsetUD(0), desiredOffset(0), titleFont(titleFont_), acquisitionIsActive(false) + eventsOnly(false) + , parameterSlicerChannelSelector (Channels::PARAM_CHANNELS, "Parameter slicer channel selector component") , audioSlicerChannelSelector (Channels::AUDIO_CHANNELS, "Audio slicer channel selector component") , recordSlicerChannelSelector (Channels::RECORD_CHANNELS, "Record slicer channel selector component") - , parameterSlicerChannelSelector (Channels::PARAM_CHANNELS, "Parameter slicer channel selector component") + , paramsToggled(true), paramsActive(true), recActive(true), radioStatus(false), isNotSink(createButtons) + , moveRight(false), moveLeft(false), offsetLR(0), offsetUD(0), desiredOffset(0), titleFont(titleFont_), acquisitionIsActive(false) { // initialize buttons audioButton = new EditorButton("AUDIO", titleFont); diff --git a/Source/Utils/ListSliceParser.cpp b/Source/Utils/ListSliceParser.cpp index 022821979a89c5243ca90ae03bbd694cdcc3cb8e..45ecfe0cc776bd448e197c88081f77c70dfe9ac5 100644 --- a/Source/Utils/ListSliceParser.cpp +++ b/Source/Utils/ListSliceParser.cpp @@ -28,7 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. int ListSliceParser::convertStringToInteger (String s) { char ar[20]; - int i, j, k = 0; + int i, k = 0; for (i = 0; i < s.length(); i++) { if (s[i] >= 48 && s[i] <= 57)