fix conflict

1 files changed, 11 insertions, 0 deletions

diff --git a/audioin/src/ofApp.h b/audioin/src/ofApp.h
index c0bba64..5f5e78c 100644
--- a/audioin/src/ofApp.h
+++ b/audioin/src/ofApp.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "ofMain.h"
+#include "ofxGui.h"
 #include "ofxHelios.h"
 
 //#include <baudvine/ringbuf.h>
@@ -100,4 +101,14 @@ class ofApp : public ofBaseApp{
         float lineWidth;
 
         ofxHelios laser;
+
+        //======= laser gui
+
+        ofxPanel lasergui;
+        ofParameter<bool> laser_power;
+        ofParameter<int> laser_intensity;
+        ofParameter<int> laser_points;
+        ofParameter<int> laser_subdivide;
+        ofParameter<int> laser_blank_num;
+        ofParameter<float> laser_max_angle;
 };