Changeset 3559 for trunk/packages/vizservers/nanovis/Trace.cpp

Timestamp:

Mar 22, 2013, 7:45:30 PM (12 years ago)

Author:

gah

Message:

• Clean up unused variable warnings.
• Remove use of ffmpeg libraries from nanovis. This should make it easier to maintain (don't have to keep up with all the backward incompatible changes to the ffmpeg library).

File:

• trunk/packages/vizservers/nanovis/Trace.cpp (modified) (4 diffs)

trunk/packages/vizservers/nanovis/Trace.cpp

@@ -54 +54 @@
 PrintFBOStatus(GLenum status, const char *prefix) 
 {
+#ifdef WANT_TRACE
     const char *mesg;
+
     switch(status) {
     case GL_FRAMEBUFFER_COMPLETE_EXT:
@@ -78 +80 @@
     }
     TRACE("FB Status: %s: %s", prefix, mesg);
+#endif  /*WANT_TRACE*/
 }
 
@@ -83 +86 @@
 CheckGL(const char *prefix)
 {
-    const char *mesg;
     GLenum status = (GLenum)glGetError();
+    if (status == GL_NO_ERROR) {
+        return true;
+    }
+#ifdef WANT_TRACE
+    const char *mesg;                   
+
     switch(status) {
-    case GL_NO_ERROR:
-        return true;
     case GL_INVALID_ENUM:
         mesg = "GL_INVALID_ENUM";                       break;
@@ -107 +113 @@
     } 
     TRACE("GL Status: %s: %s", prefix, mesg);
+#endif
     return false;
 }