diff options
| author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-12-20 00:56:45 (GMT) |
|---|---|---|
| committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-12-20 00:56:45 (GMT) |
| commit | 0388c7ac478187ff8d264b6e0275a4c4a43796b9 (patch) | |
| tree | 7e62439ebf72b6369ee7b1daa370e6251c06b7e0 /apps/samples/vrml/ffmpeg-server.invoked.scxml | |
| parent | 22e22bfd0965e01fea041e053873d352387805f6 (diff) | |
| download | uscxml-0388c7ac478187ff8d264b6e0275a4c4a43796b9.zip uscxml-0388c7ac478187ff8d264b6e0275a4c4a43796b9.tar.gz uscxml-0388c7ac478187ff8d264b6e0275a4c4a43796b9.tar.bz2 | |
Performance and bugfix for WebSockets
Diffstat (limited to 'apps/samples/vrml/ffmpeg-server.invoked.scxml')
| -rw-r--r-- | apps/samples/vrml/ffmpeg-server.invoked.scxml | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/apps/samples/vrml/ffmpeg-server.invoked.scxml b/apps/samples/vrml/ffmpeg-server.invoked.scxml index bac0792..0c6449f 100644 --- a/apps/samples/vrml/ffmpeg-server.invoked.scxml +++ b/apps/samples/vrml/ffmpeg-server.invoked.scxml @@ -121,7 +121,7 @@ --> <script> //<![CDATA[ -// dump(_event); + dump(_event); var pathDelim = ':'; // we need to flatten directories - this will seperate them in filenames // store event @@ -158,9 +158,7 @@ } var keyFrame = job.keyFrames[kfIndex]; - keyFrame.modelFile = keyFrame.imageURL.substr(keyFrame.serverURL.length + 1); - keyFrame.file = keyFrame.modelFile.substr(0, keyFrame.modelFile.indexOf('.')); - keyFrame.ext = keyFrame.modelFile.substr(keyFrame.modelFile.indexOf('.') + 1); + keyFrame.file = keyFrame.imagePath.substr(1); keyFrame.modelFile = keyFrame.file + ".osgb"; keyFrame.modelFile = keyFrame.modelFile.replace(/\//g, pathDelim); @@ -236,6 +234,7 @@ _event.data.pathComponent.length == 3 && _event.data.pathComponent[1] === 'movie' && _event.data.pathComponent[2] === 'codecs'"> + <log expr="_invokers['ffmpeg']" /> <send target="#_parent" event="send.codecs"> <param name="context" expr="_event.origin" /> <param name="codecs" expr="_invokers['ffmpeg']" /> |