diff options
| author | tim <tim@eclectronics.org> | 2018-04-16 21:28:57 +0100 |
|---|---|---|
| committer | tim <tim@eclectronics.org> | 2018-04-16 21:28:57 +0100 |
| commit | 6d864bba9d421fbdb988abb6b0fe9c5ca89416cc (patch) | |
| tree | 66f23c8902c724b4d10333072cd52921bf5fbdd0 | |
| parent | d085782d6192d9c8498e2c5489097fff4db6815b (diff) | |
| parent | 0fc7051c2b4a4d77377742f50185f9a71ef4637b (diff) | |
merge conflicts
| -rw-r--r-- | menuApp/src/dirscanner.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/menuApp/src/dirscanner.cpp b/menuApp/src/dirscanner.cpp index 5a8b91b..1a4c673 100644 --- a/menuApp/src/dirscanner.cpp +++ b/menuApp/src/dirscanner.cpp @@ -41,6 +41,7 @@ bool playItem::load(string _filename){ if (video.setup(videosettings)){ //video.setLoopState(OF_LOOP_NONE); + ofLogNotice() << "loaded clip: "<<filename; loaded=2; } |