Qt4 - Start mode configuration simplification.

[vlc] / modules / gui / qt4 / qt4.hpp

diff --git a/modules/gui/qt4/qt4.hpp b/modules/gui/qt4/qt4.hpp
index 12f1e2c2777e177358c31eececd4571d6015d74e..d0c4283f552f4d2abb0ca980c454d1b567189ce1 100644 (file)
--- a/modules/gui/qt4/qt4.hpp
+++ b/modules/gui/qt4/qt4.hpp
@@ -5,6 +5,7 @@
  * $Id$
  *
  * Authors: Clément Stenac <zorglub@videolan.org>
+ *          Jean-Baptiste Kempf <jb@videolan.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
@@ -24,12 +25,26 @@
 #ifndef _QVLC_H_
 #define _QVLC_H_
 
+#ifdef HAVE_CONFIG_H 
+# include "config.h" 
+#endif
+
 #include <vlc/vlc.h>
 #include <vlc_interface.h>
 #include <vlc_playlist.h>
 
 #include <QEvent>
 
+#define HAS_QT43 ( QT_VERSION >= 0x040300 )
+
+/* Add define for duration, VLC_META_ENGINE doesn't include it */
+#define VLC_META_ENGINE_DURATION   0x00000002
+#define VLC_META_DURATION          N_( "Duration" )
+
+#define QT_NORMAL_MODE 0
+#define QT_ALWAYS_VIDEO_MODE 1
+#define QT_MINIMAL_MODE 2
+
 class QApplication;
 class QMenu;
 class MainInterface;
@@ -44,8 +59,8 @@ struct intf_sys_t
     msg_subscription_t *p_sub; ///< Subscription to the message bank
 
     VideoWidget *p_video;
-    int i_saved_height, i_saved_width;
 
+    const char *psz_filepath;
     QMenu * p_popup_menu;
 };
 
@@ -58,8 +73,8 @@ struct intf_sys_t
 
 #define qfu( i ) QString::fromUtf8( i )
 #define qtr( i ) QString::fromUtf8( _(i) )
-#define qtu( i ) i.toUtf8().data()
-#define qta( i ) i.toAscii().data()
+#define qtu( i ) (i).toUtf8().data()
+#define qta( i ) (i).toAscii().data()
 
 #define CONNECT( a, b, c, d ) connect( a, SIGNAL( b ), c, SLOT(d) )
 #define BUTTONACT( b, a ) connect( b, SIGNAL( clicked() ), this, SLOT(a) )
@@ -81,9 +96,14 @@ struct intf_sys_t
     BUTTON_SET_IMG( button, text, image, tooltip );                \
     BUTTONACT( button, thisslot );
 
+#define VISIBLE(i) (i && i->isVisible())
+
+#define TOGGLEV( x ) { if( x->isVisible() ) x->hide();          \
+            else  x->show(); }
+
 static int DialogEvent_Type = QEvent::User + 1;
-static int PLUndockEvent_Type = QEvent::User + 2;
-static int PLDockEvent_Type = QEvent::User + 3;
+//static int PLUndockEvent_Type = QEvent::User + 2;
+//static int PLDockEvent_Type = QEvent::User + 3;
 static int SetVideoOnTopEvent_Type = QEvent::User + 4;
 
 class DialogEvent : public QEvent
@@ -102,15 +122,4 @@ public:
     intf_dialog_args_t *p_arg;
 };
 
-/* Ugly to put it here, but don't want more files ... */
-#include <QFrame>
-class BasePlaylistWidget : public QFrame
-{
-public:
-    BasePlaylistWidget( intf_thread_t *_p_i ) : p_intf( _p_i)  {};
-    virtual ~BasePlaylistWidget() {};
-protected:
-    intf_thread_t *p_intf;
-};
-
 #endif