Changeset 1916 for trunk/lang

Timestamp:

Oct 6, 2010, 6:58:50 AM (14 years ago)

Author:

dkearney

Message:

switching from RpMediaPlayer? to RpVideo? code for the video viewer widget. changed flowdial widget so the dial moved as needed for the video widget.

Location:

trunk/lang/tcl/src

Files:

• Makefile.in (modified) (1 diff)
• Rappture_Init.c (modified) (2 diffs)
• RpVideoTclInterface.cc (added)

trunk/lang/tcl/src/Makefile.in

@@ -71 +71 @@
 FFMPEG          = @HAVE_FFMPEG_LIBS@
 ifeq ($(FFMPEG),yes)
-    OBJS += RpMediaPlayerTclInterface.o
+    # OBJS += RpMediaPlayerTclInterface.o
+    OBJS += RpVideoTclInterface.o
     LIBS += -L../../../src/objects -lRpObjects
 endif

trunk/lang/tcl/src/Rappture_Init.c

@@ -38 +38 @@
 
 #ifdef BUILD_with_ffmpeg
-extern Tcl_AppInitProc RpMediaPlayer_Init;
+// extern Tcl_AppInitProc RpMediaPlayer_Init;
+extern Tcl_AppInitProc RpVideo_Init;
 #endif
 
@@ -71 +72 @@
     }
 #ifdef BUILD_with_ffmpeg
-    if (RpMediaPlayer_Init(interp) != TCL_OK) {
+//    if (RpMediaPlayer_Init(interp) != TCL_OK) {
+//        return TCL_ERROR;
+//    }
+    if (RpVideo_Init(interp) != TCL_OK) {
         return TCL_ERROR;
     }