diff --git a/bin/data/vela.xml b/bin/data/vela.xml index 5c7cda0..975aac7 100755 --- a/bin/data/vela.xml +++ b/bin/data/vela.xml @@ -54,7 +54,7 @@ 10000 - + cu.usbmodem1421 /dev/ttyUSB0 diff --git a/src/MovieOMXPlayer.cpp b/src/MovieOMXPlayer.cpp index 90e3b5b..2de3085 100644 --- a/src/MovieOMXPlayer.cpp +++ b/src/MovieOMXPlayer.cpp @@ -19,7 +19,7 @@ MovieOMXPlayer::MovieOMXPlayer(string _filename, bool loop) { ofxOMXPlayerSettings settings; settings.videoPath = filename; settings.useHDMIForAudio = true; //default true - settings.enableTexture = false; //default true + settings.enableTexture = true; //default true settings.enableLooping = loop; //default true settings.enableAudio = false; //default true, save resources by disabling @@ -29,19 +29,21 @@ MovieOMXPlayer::MovieOMXPlayer(string _filename, bool loop) { //-------------------------------------------------------------- void MovieOMXPlayer::draw(float x, float y, float width, float height) { -/* - if (alpha == ALPHA_MAX) + + ofPushStyle(); + + if (getAlpha() == ALPHA_MAX) ofDisableAlphaBlending(); else ofEnableAlphaBlending(); - //ofSetColor(ofColor::white); + ofSetColor(255,255,255,getAlpha()); - movie.setAlpha(alpha); movie.draw(x, y, width, height); ofDisableAlphaBlending(); -*/ + + ofPopStyle(); } #endif