Changeset 3608 for trunk/packages/vizservers

Timestamp:

Apr 2, 2013 1:54:43 PM (11 years ago)

Author:

ldelgass

Message:

Fix for flow video capture

Location:

trunk/packages/vizservers/nanovis

Files:

• Command.cpp (modified) (1 diff)
• FlowCmd.cpp (modified) (4 diffs)

trunk/packages/vizservers/nanovis/Command.cpp

@@ -1333 +1333 @@
         queueResponse(info, cmdLength, Response::VOLATILE);
 #else
-        ssize_t nWritten  = SocketWrite(info, (size_t)cmdLength);
-        if (nWritten != (ssize_t)cmdLength) {
+        if (SocketWrite(info, (size_t)cmdLength) != (ssize_t)cmdLength) {
             ERROR("Short write");
-             return TCL_ERROR;
+            return TCL_ERROR;
         }
 #endif

trunk/packages/vizservers/nanovis/FlowCmd.cpp

@@ -1070 +1070 @@
 };
 
-static int
-MakeImageFiles(Tcl_Interp *interp, char *tmpFileName, 
-               FlowVideoSwitches *switchesPtr, bool *cancelPtr)
+static bool
+MakeImageFiles(char *tmpFileName,
+               int width, int height, int numFrames,
+               bool *cancelPtr)
 {
     struct pollfd pollResults;
@@ -1084 +1085 @@
     oldHeight = NanoVis::winHeight;
 
-    if ((switchesPtr->width != oldWidth) || 
-        (switchesPtr->height != oldHeight)) {
+    if (width != oldWidth ||
+        height != oldHeight) {
         // Resize to the requested size.
-        NanoVis::resizeOffscreenBuffer(switchesPtr->width, switchesPtr->height);
+        NanoVis::resizeOffscreenBuffer(width, height);
     }
     NanoVis::resetFlows();
     *cancelPtr = false;
-    int result = TCL_OK;
+    bool result = true;
     size_t length = strlen(tmpFileName);
-    for (int i = 1; i <= switchesPtr->numFrames; i++) {
+    for (int i = 1; i <= numFrames; i++) {
         if (((i & 0xF) == 0) && (poll(&pollResults, 1, timeout) > 0)) {
             /* If there's another command on stdin, that means the client is
@@ -1116 +1117 @@
         sprintf(tmpFileName + length, "/image%d.ppm", i);
         result = nv::writePPMFile(tmpFileName, NanoVis::screenBuffer,
-                                  switchesPtr->width, switchesPtr->height);
-        if (result != TCL_OK) {
+                                  width, height);
+        if (!result) {
             break;
         }
     }
-    if ((switchesPtr->width != oldWidth) || 
-        (switchesPtr->height != oldHeight)) {
+    if (width != oldWidth || 
+        height != oldHeight) {
         NanoVis::resizeOffscreenBuffer(oldWidth, oldHeight);
     }
@@ -1241 +1242 @@
     size_t length = strlen(tmpFileName);
     bool canceled = false;
-    result = MakeImageFiles(interp, tmpFileName, &switches, &canceled);
+    if (MakeImageFiles(tmpFileName,
+                       switches.width, switches.height, switches.numFrames,
+                       &canceled)) {
+        result = TCL_OK;
+    } else {
+        result = TCL_ERROR;
+    }
     if ((result == TCL_OK) && (!canceled)) {
         result = MakeMovie(interp, tmpFileName, token, &switches);