summaryrefslogtreecommitdiff
path: root/gui/src/ofApp.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'gui/src/ofApp.cpp')
-rw-r--r--gui/src/ofApp.cpp41
1 files changed, 32 insertions, 9 deletions
diff --git a/gui/src/ofApp.cpp b/gui/src/ofApp.cpp
index a89a893..43f51f1 100644
--- a/gui/src/ofApp.cpp
+++ b/gui/src/ofApp.cpp
@@ -229,6 +229,29 @@ void ofApp::newMidiMessage(ofxMidiMessage& msg) {
}
+ //column 2 for more controls
+ offet=2;
+
+ if (msg.channel==1&&msg.control==1+offet){
+ //pot 1
+ for (int i=0;i<sets.size();i++){
+ //sets[i].zoomMultiplier=1.0f+(((float)msg.value-64)/64.0f); doesn't work
+ };
+
+ printf("Val %i, zoomMultiplier: %f \n",msg.value,sets[0].fitFactor);
+ }
+ if (msg.channel==1&&msg.control==65+offet){
+ //top button 1
+
+ }
+ if (msg.channel==1&&msg.control==73+offet){
+ //bottom button 1
+ }
+ if (msg.channel==1&&msg.control==81+offet){
+ //fader 1
+
+ }
+
}
//--------------------------------------------------------------
@@ -322,20 +345,20 @@ void ofApp::gotMessage(ofMessage msg){
//--------------------------------------------------------------
void ofApp::dragEvent(ofDragInfo dragInfo){
- std::string filenames;
+ //std::string filenames;
- for (auto f = dragInfo.files.begin(); f != dragInfo.files.end(); f++){
- if (f!=dragInfo.files.begin()){
- filenames=filenames+", ";
- }
- filenames=filenames+*f;
+ //for (auto f = dragInfo.files.begin(); f != dragInfo.files.end(); f++){
+ // if (f!=dragInfo.files.begin()){
+ // filenames=filenames+", ";
+ // }
+ // filenames=filenames+*f;
if (dragInfo.position.y<200){
- sets[0].add(*f); //,dragInfo.position);
+ sets[0].addfiles(dragInfo.files); //,dragInfo.position);
}
- else sets[1].add(*f); //,dragInfo.position);
+ else sets[1].addfiles(dragInfo.files); //,dragInfo.position);
- }
+ //}
}