Changeset 1897 for branches/blt4/lang/tcl/src/Rappture_Init.c

Timestamp:

Aug 31, 2010, 8:25:36 PM (14 years ago)

Author:

gah

Message:

re-merge with latest trunk changes

File:

• branches/blt4/lang/tcl/src/Rappture_Init.c (modified) (3 diffs)

branches/blt4/lang/tcl/src/Rappture_Init.c

@@ -15 +15 @@
 
 #include <tcl.h>
+#include "config.h"
 
 #ifdef BUILD_rappture
@@ -35 +36 @@
 extern Tcl_AppInitProc RpEncoding_Init;
 extern Tcl_AppInitProc RpUtils_Init;
+
+#ifdef BUILD_with_ffmpeg
+extern Tcl_AppInitProc RpMediaPlayer_Init;
+#endif
 
 #ifdef BUILD_Rappture
@@ -65 +70 @@
         return TCL_ERROR;
     }
+#ifdef BUILD_with_ffmpeg
+    if (RpMediaPlayer_Init(interp) != TCL_OK) {
+        return TCL_ERROR;
+    }
+#endif
     if (RpRlimit_Init(interp) != TCL_OK) {
         return TCL_ERROR;