X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fqt4.hpp;h=3c2de020e581f6bbacd17fa3f6fc959a7635e3ff;hb=72c15d7a0fa25233af63d460968e67e5172e7bd9;hp=aa8047068206382f2e2fc31369a1363ee57728c3;hpb=6523dc216580a0886adcd5f95e596a41a9d87107;p=vlc

diff --git a/modules/gui/qt4/qt4.hpp b/modules/gui/qt4/qt4.hpp
index aa80470682..3c2de020e5 100644
--- a/modules/gui/qt4/qt4.hpp
+++ b/modules/gui/qt4/qt4.hpp
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * qt4.hpp : QT4 interface
  ****************************************************************************
- * Copyright (C) 2006 the VideoLAN team
+ * Copyright (C) 2006-2007 the VideoLAN team
  * $Id$
  *
  * Authors: Clément Stenac <zorglub@videolan.org>
@@ -18,15 +18,25 @@
  *
  * 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
 
 #ifndef _QVLC_H_
 #define _QVLC_H_
 
 #include <vlc/vlc.h>
-#include <vlc/intf.h>
+#include <vlc_interface.h>
+#include <vlc_playlist.h>
+
 #include <QEvent>
 
+#define 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")
+
+
 class QApplication;
 class QMenu;
 class MainInterface;
@@ -47,8 +57,11 @@ struct intf_sys_t
 };
 
 #define THEPL p_intf->p_sys->p_playlist
+#define QPL_LOCK vlc_mutex_lock( &THEPL->object_lock );
+#define QPL_UNLOCK vlc_mutex_unlock( &THEPL->object_lock );
+
 #define THEDP DialogsProvider::getInstance()
-#define THEMIM MainInputManager::getInstance( NULL )
+#define THEMIM MainInputManager::getInstance( p_intf )
 
 #define qfu( i ) QString::fromUtf8( i )
 #define qtr( i ) QString::fromUtf8( _(i) )
@@ -57,9 +70,33 @@ struct intf_sys_t
 
 #define CONNECT( a, b, c, d ) connect( a, SIGNAL( b ), c, SLOT(d) )
 #define BUTTONACT( b, a ) connect( b, SIGNAL( clicked() ), this, SLOT(a) )
-#define ON_TIMEOUT( act ) CONNECT( THEDP->fixed_timer, timeout, this, act )
+#define ON_TIMEOUT( act ) CONNECT( THEDP->fixed_timer, timeout(), this, act )
+
+#define BUTTON_SET( button, text, tooltip )  \
+    button->setText( text );                 \
+    button->setToolTip( tooltip );
+
+#define BUTTON_SET_ACT( button, text, tooltip, thisslot ) \
+    BUTTON_SET( button, text, tooltip );                  \
+    BUTTONACT( button, thisslot );
+
+#define BUTTON_SET_IMG( button, text, image, tooltip )    \
+    BUTTON_SET( button, text, tooltip );                  \
+    button->setIcon( QIcon( ":/pixmaps/"#image ) );
+
+#define BUTTON_SET_ACT_I( button, text, image, tooltip, thisslot ) \
+    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 SetVideoOnTopEvent_Type = QEvent::User + 4;
 
 class DialogEvent : public QEvent
 {
@@ -77,4 +114,16 @@ public:
     intf_dialog_args_t *p_arg;
 };
 
+/* Ugly to put it here, but don't want more files ... */
+#if 0
+#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
 #endif