Configure option --enable-qte works now (default is disabled).

Porting video out plugin/builtin for Qt Embedded to CVS is not complete. (Please do not use it.)

configure.in

@@ -1381,29 +1381,30 @@ from http://www.libsdl.org/, or configure with --disable-sdl. Have a nice day.
 fi
 
 dnl
-dnl  QT Embedded module
+dnl  Qt Embedded module
 dnl  (disabled by default)
 dnl
 AC_ARG_ENABLE(qte,
   [  --enable-qte            QT Embedded support (default disabled)])
-if test "x${enable_qte}" = "xyes"
+if test "x${enable_qte}" != "xno"
 then
   AC_ARG_WITH(qte,
   [    --with-qte=PATH    Qt Embedded headers and libraries])
   if test "x${with_qte}" = "x"
   then
     test_LDFLAGS="-L${QTDIR}/lib"
-    test_CFLAGS="-I$(QTDIR)/include/qte"
+    test_CFLAGS="-I$(QTDIR)/include"
+    PLUGINS="${PLUGINS} video_output/qte/qte"
   else
     test_LDFLAGS="-L${with_qte}/lib"
-    test_CFLAGS="-I${with_qte}/include/qte"
+    test_CFLAGS="-I${with_qte}/include"
+    BUILTINS="${BUILTINS} video_output/qte/qte"
   fi
 
-  CPPFLAGS="${save_CPPFLAGS} -I${qte_includes}"
-  AC_CHECK_HEADERS(qte/qte.h, [
-    PLUGINS="${PLUGINS} video_output/qte/qte"
-    qte_CFLAGS ="${qte_CFLAGS} ${test_CFLAGS} -DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti"
-    qte_LDFLAGS ="${qte_LDFLAGS} ${test_LDFLAGS} -lqpe -lqte"
+  CPPFLAGS="${save_CPPFLAGS} ${test_CFLAGS}"
+  AC_CHECK_HEADERS(qt.h, [
+    qte_CFLAGS="${qte_CFLAGS} ${test_CFLAGS} -DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti"
+    qte_LDFLAGS="${qte_LDFLAGS} ${test_LDFLAGS} -lqpe -lqte"
   ])
   CPPFLAGS="${save_CPPFLAGS}"
 fi
@@ -1781,10 +1782,10 @@ AC_ARG_ENABLE(opie,
      if test "x${with_qte}" = "x"
      then
        test_LDFLAGS="-L$(QTDIR)/lib"
-       test_CFLAGS="-I${QTDIR}/include/qte"
+       test_CFLAGS="-I${QTDIR}/include"
      else
        test_LDFLAGS="-L${with_qte}/lib"
-       test_CFLAGS="-I${with_qte}/include/qte"
+       test_CFLAGS="-I${with_qte}/include"
      fi
 
      PLUGINS="${PLUGINS} gui/opie/opie"

modules/LIST

 List of vlc plugins
-$Id: LIST,v 1.1 2002/08/06 20:04:26 massiot Exp $
+$Id: LIST,v 1.2 2002/09/15 20:54:12 jpsaman Exp $
 
  * a52_system: input module for A52 decapsulation.
 
@@ -127,6 +127,8 @@ $Id: LIST,v 1.1 2002/08/06 20:04:26 massiot Exp $
 
  * qt: interface module using the Qt widget set.
 
+ * qte: video output module for Qt Embedded.
+
  * rc: interface module using stdio.
 
  * sdl: audio output and video output module using the SDL library.

modules/video_output/qte/qte.h

@@ -2,7 +2,7 @@
  * qte.h : QT Embedded plugin for vlc
  *****************************************************************************
  * Copyright (C) 1998-2002 VideoLAN
- * $Id: qte.h,v 1.1 2002/09/04 21:13:33 jpsaman Exp $
+ * $Id: qte.h,v 1.2 2002/09/15 20:54:12 jpsaman Exp $
  *
  * Authors: Gerald Hansink <gerald.hansink@ordain.nl>
  *          Jean-Paul Saman <jpsaman@wxs.nl>
@@ -33,7 +33,7 @@
  * This structure is part of the video output thread descriptor.
  * It describes the specific properties of an video output plugin
  *****************************************************************************/
-typedef struct vout_sys_s
+struct vout_sys_t
 {
     /* Internal settings and properties */
     int                 i_width;
@@ -44,16 +44,16 @@ typedef struct vout_sys_s
 
     QApplication*       pcQApplication;
     QWidget*            pcVoutWidget;
-} vout_sys_t;
+};
 
 
 /*****************************************************************************
  * picture_sys_t: direct buffer method descriptor
  *****************************************************************************/
-typedef struct picture_sys_s
+struct picture_sys_t
 {
     QImage*             pQImage;
-} picture_sys_t;
+};
 
 
 /*****************************************************************************