Merge branch '0.9.0'

timscaffidi · Nov 10, 2015 · ea03401 · ea03401
2 parents ff0f51d + 9b9c95b
commit ea03401
Show file tree

Hide file tree

Showing 7 changed files with 153 additions and 205 deletions.
diff --git a/ofxVideoRecorderExample/Makefile b/ofxVideoRecorderExample/Makefile
diff --git a/ofxVideoRecorderExample/config.make b/ofxVideoRecorderExample/config.make
diff --git a/ofxVideoRecorderExample/src/main.cpp b/ofxVideoRecorderExample/src/main.cpp
@@ -1,12 +1,10 @@
 #include "ofMain.h"
 #include "ofApp.h"
-#include "ofAppGlutWindow.h"
 
 //========================================================================
 int main( ){
 
-    ofAppGlutWindow window;
-	ofSetupOpenGL(&window, 1024,768, OF_WINDOW);			// <-------- setup the GL context
+	ofSetupOpenGL(1024,768, OF_WINDOW);			// <-------- setup the GL context
 
 	// this kicks off the running of my app
 	// can be OF_WINDOW or OF_FULLSCREEN

diff --git a/ofxVideoRecorderExample/src/ofApp.cpp b/ofxVideoRecorderExample/src/ofApp.cpp
@@ -20,6 +20,8 @@ void ofApp::setup(){
     vidRecorder.setVideoBitrate("800k");
     vidRecorder.setAudioCodec("mp3");
     vidRecorder.setAudioBitrate("192k");
+
+    ofAddListener(vidRecorder.outputFileCompleteEvent, this, &ofApp::recordingComplete);
 
 //    soundStream.listDevices();
 //    soundStream.setDeviceID(11);
@@ -30,15 +32,17 @@ void ofApp::setup(){
     ofEnableAlphaBlending();
 }
 
-void ofApp::exit() {
+//--------------------------------------------------------------
+void ofApp::exit(){
+    ofRemoveListener(vidRecorder.outputFileCompleteEvent, this, &ofApp::recordingComplete);
     vidRecorder.close();
 }
 
 //--------------------------------------------------------------
 void ofApp::update(){
     vidGrabber.update();
     if(vidGrabber.isFrameNew() && bRecording){
-        bool success = vidRecorder.addFrame(vidGrabber.getPixelsRef());
+        bool success = vidRecorder.addFrame(vidGrabber.getPixels());
         if (!success) {
             ofLogWarning("This frame was not added!");
         }
@@ -67,21 +71,27 @@ void ofApp::draw(){
     << (bRecording?"close current video file: c":"") << endl;
 
     ofSetColor(0,0,0,100);
-    ofRect(0, 0, 260, 75);
+    ofDrawRectangle(0, 0, 260, 75);
     ofSetColor(255, 255, 255);
     ofDrawBitmapString(ss.str(),15,15);
 
     if(bRecording){
     ofSetColor(255, 0, 0);
-    ofCircle(ofGetWidth() - 20, 20, 5);
+    ofDrawCircle(ofGetWidth() - 20, 20, 5);
     }
 }
 
+//--------------------------------------------------------------
 void ofApp::audioIn(float *input, int bufferSize, int nChannels){
     if(bRecording)
         vidRecorder.addAudioSamples(input, bufferSize, nChannels);
 }
 
+//--------------------------------------------------------------
+void ofApp::recordingComplete(ofxVideoRecorderOutputFileCompleteEventArgs& args){
+    cout << "The recoded video file is now complete." << endl;
+}
+
 //--------------------------------------------------------------
 void ofApp::keyPressed(int key){
 }

diff --git a/ofxVideoRecorderExample/src/ofApp.h b/ofxVideoRecorderExample/src/ofApp.h
@@ -31,6 +31,8 @@ class ofApp : public ofBaseApp{
     string fileName;
     string fileExt;
 
+    void recordingComplete(ofxVideoRecorderOutputFileCompleteEventArgs& args);
+
     ofFbo recordFbo;
     ofPixels recordPixels;
 };