fix previous commit

[vlc] / modules / video_output / qte / qte.h

diff --git a/modules/video_output/qte/qte.h b/modules/video_output/qte/qte.h
index 97667650a48f1ff2775639f2d9ff5901359ef956..d7be0e06917c962cbba854ad9ad6b37452d8f4cb 100644 (file)
--- a/modules/video_output/qte/qte.h
+++ b/modules/video_output/qte/qte.h
@@ -1,11 +1,11 @@
 /*****************************************************************************
  * 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 $
+ * Copyright (C) 1998-2002 the VideoLAN team
+ * $Id$
  *
- * Authors: Gerald Hansink <gerald.hansink@ordain.nl>
- *          Jean-Paul Saman <jpsaman@wxs.nl>
+ * Authors: Gerald Hansink <gerald.hansink@ordina.nl>
+ *          Jean-Paul Saman <jpsaman _at_ videolan _dot_ org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,13 +19,24 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
 
+/*****************************************************************************
+ * event_thread_t: QT Embedded event thread
+ *****************************************************************************/
+typedef struct event_thread_t
+{
+    VLC_COMMON_MEMBERS
+
+    vout_thread_t * p_vout;
+
+} event_thread_t;
+
 
 /*****************************************************************************
  * vout_sys_t: video output method descriptor
@@ -33,7 +44,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;
@@ -42,18 +53,24 @@ typedef struct vout_sys_s
     bool                bRunning;
     bool                bOwnsQApp;
 
-    QApplication*       pcQApplication;
-    QWidget*            pcVoutWidget;
-} vout_sys_t;
+#ifdef NEED_QTE_MAIN
+    module_t *          p_qte_main;
+#endif
+
+    QApplication*       p_QApplication;
+    QWidget*            p_VideoWidget;
+
+    event_thread_t *    p_event;
+};
 
 
 /*****************************************************************************
  * picture_sys_t: direct buffer method descriptor
  *****************************************************************************/
-typedef struct picture_sys_s
+struct picture_sys_t
 {
     QImage*             pQImage;
-} picture_sys_t;
+};
 
 
 /*****************************************************************************