OS X changes

Builds/MacOSX/open-ephys.xcodeproj/project.pbxproj

@@ -985,7 +985,12 @@
 				GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
 				GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = (
+					/usr/local/include/freetype2,
+					/usr/local/include,
+				);
 				PRODUCT_NAME = "open-ephys";
+				SDKROOT = macosx;
 				WARNING_CFLAGS = "-Wreorder";
 				ZERO_LINK = NO;
 			};
@@ -1006,7 +1011,12 @@
 				GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
 				GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = (
+					/usr/local/include/freetype2,
+					/usr/local/include,
+				);
 				PRODUCT_NAME = "open-ephys";
+				SDKROOT = macosx;
 				WARNING_CFLAGS = "-Wreorder";
 				ZERO_LINK = NO;
 			};

Source/Processors/DataThreads/FileReaderThread.cpp

@@ -32,7 +32,7 @@ FileReaderThread::FileReaderThread(SourceNode* sn) : DataThread(sn)
     bufferSize = 1600;
 
 #if JUCE_MAC
-    input = fopen("/Users/Josh/Documents/Programming/open-ephys/GUI/Builds/Linux/build/data_stream_16ch_2", "r");
+    input = fopen("/Users/Josh/Programming/open-ephys/GUI/Builds/Linux/build/data_stream_16ch_2", "r");
 #else
     input = fopen("./data_stream_16ch_2","r");
 #endif

Source/Processors/Visualization/LfpDisplayCanvas.cpp

@@ -208,8 +208,10 @@ void LfpDisplayCanvas::canvasWasResized()
 
 void LfpDisplayCanvas::renderOpenGL()
 {
+    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT); // clear buffers to preset values
+
 	
-	glClear(GL_COLOR_BUFFER_BIT); // clear buffers to preset values
+	//glClear(GL_COLOR_BUFFER_BIT); // clear buffers to preset values
 
     if (animationIsActive)
         updateScreenBuffer();
@@ -235,6 +237,9 @@ void LfpDisplayCanvas::renderOpenGL()
 	drawProgressBar();
 
 	drawTimeline();
+    
+   // glFlush();
+    swapBuffers();
 	
 }
 

Source/UI/InfoLabel.cpp

@@ -82,10 +82,12 @@ void InfoLabel::newOpenGLContextCreated()
 void InfoLabel::renderOpenGL()
 {
 
-	glClear(GL_COLOR_BUFFER_BIT); // clear buffers to preset values
+	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT); // clear buffers to preset values
 	drawLabel();
 	drawScrollBars();
 
+   // glFlush();
+    swapBuffers();
 }
 
 

Source/UI/ProcessorList.cpp

@@ -116,10 +116,14 @@ void ProcessorList::newOpenGLContextCreated()
 void ProcessorList::renderOpenGL()
 {
 	
-	glClear(GL_COLOR_BUFFER_BIT); // clear buffers to preset values
+    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT); // clear buffers to preset values
+
+	//glClear(GL_COLOR_BUFFER_BIT); // clear buffers to preset values
 	drawItems();
 	drawScrollBars();
-	glFlush();
+	
+    //glFlush();
+    swapBuffers();
 }