From 3af2ca1a6432f54c5bec2b966e9499fdcd220514 Mon Sep 17 00:00:00 2001
From: jsiegle <jsiegle@mit.edu>
Date: Sat, 10 Mar 2012 13:55:39 -0500
Subject: [PATCH] Commit before branching
---
Source/AccessClass.cpp | 23 ++++++++++++++++++-----
Source/AccessClass.h | 32 +++++++++++++++++++++++++++-----
Source/Processors/AudioNode.cpp | 13 +++++++++++++
Source/Processors/EventNode.cpp | 5 -----
Source/UI/ControlPanel.h | 2 --
5 files changed, 58 insertions(+), 17 deletions(-)
diff --git a/Source/AccessClass.cpp b/Source/AccessClass.cpp
index 7816f8245..71dcade70 100644
--- a/Source/AccessClass.cpp
+++ b/Source/AccessClass.cpp
@@ -1,11 +1,24 @@
/*
- ==============================================================================
+ ------------------------------------------------------------------
- AccessClass.cpp
- Created: 1 Mar 2012 1:36:31pm
- Author: jsiegle
+ This file is part of the Open Ephys GUI
+ Copyright (C) 2012 Open Ephys
+
+ ------------------------------------------------------------------
+
+ 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/>.
- ==============================================================================
*/
#include "AccessClass.h"
diff --git a/Source/AccessClass.h b/Source/AccessClass.h
index 582112bdb..6f9b6b127 100644
--- a/Source/AccessClass.h
+++ b/Source/AccessClass.h
@@ -1,11 +1,24 @@
/*
- ==============================================================================
+ ------------------------------------------------------------------
- AccessClass.h
- Created: 1 Mar 2012 1:17:45pm
- Author: jsiegle
+ This file is part of the Open Ephys GUI
+ Copyright (C) 2012 Open Ephys
+
+ ------------------------------------------------------------------
+
+ 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/>.
- ==============================================================================
*/
#ifndef __ACCESSCLASS_H_CE1DC2DE__
@@ -23,6 +36,15 @@ class ControlPanel;
class Configuration;
class AudioComponent;
+
+/**
+
+ Allows subclasses to access important pointers within the application.
+
+ @see UIComponent
+
+*/
+
class AccessClass : public ActionBroadcaster
{
public:
diff --git a/Source/Processors/AudioNode.cpp b/Source/Processors/AudioNode.cpp
index 2fd02584c..5ba800e76 100644
--- a/Source/Processors/AudioNode.cpp
+++ b/Source/Processors/AudioNode.cpp
@@ -37,6 +37,8 @@ AudioNode::AudioNode()
leftChan.add(0);
rightChan.add(1);
+ currentChannel = 0;
+
}
@@ -70,6 +72,16 @@ void AudioNode::process(AudioSampleBuffer &buffer,
int& nSamples)
{
+ // if (currentChannel == 0)
+ // {
+ // buffer.clear(1,0,buffer.getNumSamples());
+ // buffer.copyFrom();
+ // } else if (currentChannel == 1)
+ // {
+ // buffer.clear(0,0,buffer.getNumSamples());
+ // buffer.copyFrom();
+ // } else {
+
buffer.clear(0,0,buffer.getNumSamples());
buffer.clear(1,0,buffer.getNumSamples());
@@ -94,4 +106,5 @@ void AudioNode::process(AudioSampleBuffer &buffer,
volume // gain to apply
);
}
+ //}
}
diff --git a/Source/Processors/EventNode.cpp b/Source/Processors/EventNode.cpp
index 67d365b47..e1bba9c70 100644
--- a/Source/Processors/EventNode.cpp
+++ b/Source/Processors/EventNode.cpp
@@ -29,7 +29,6 @@ EventNode::EventNode()
{
setNumOutputs(0);
setNumInputs(0);
-// setSampleRate(44100.0);
setPlayConfigDetails(getNumInputs(), getNumOutputs(), 44100.0, 128);
@@ -46,13 +45,9 @@ AudioProcessorEditor* EventNode::createEditor()
setEditor(editor);
std::cout << "Creating editor." << std::endl;
- //editor->setUIComponent(getUIComponent());
- //editor->setConfiguration(config);
- //filterEditor = new FilterEditor(this);
return editor;
- //return 0;
}
diff --git a/Source/UI/ControlPanel.h b/Source/UI/ControlPanel.h
index e532a258c..72988db99 100644
--- a/Source/UI/ControlPanel.h
+++ b/Source/UI/ControlPanel.h
@@ -33,8 +33,6 @@
#include "../OpenGL.h"
-//------------------------------------------------------------------------
-
/**
Displays information and provides buttons to control acquistion and recording.
--
GitLab