* $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
#ifndef _QVLC_H_
#define _QVLC_H_
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
#include <vlc_interface.h>
#include <vlc_playlist.h>
#include <QEvent>
+#define HAS_QT43 ( QT_VERSION >= 0x040300 )
+
+#define QT_NORMAL_MODE 0
+#define QT_ALWAYS_VIDEO_MODE 1
+#define QT_MINIMAL_MODE 2
+
class QApplication;
class QMenu;
class MainInterface;
{
QApplication *p_app;
MainInterface *p_mi;
+
+ bool b_isDialogProvider;
+
playlist_t *p_playlist;
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;
};
#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 QPL_LOCK vlc_object_lock( THEPL );
+#define QPL_UNLOCK vlc_object_unlock( THEPL );
#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) )
-#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) )
#define BUTTON_SET_IMG( button, text, image, tooltip ) \
BUTTON_SET( button, text, tooltip ); \
- button->setIcon( QIcon( ":/pixmaps/"#image ) );
+ button->setIcon( QIcon( ":/"#image ) );
#define BUTTON_SET_ACT_I( button, text, image, tooltip, thisslot ) \
BUTTON_SET_IMG( button, text, image, tooltip ); \
BUTTONACT( button, thisslot );
-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;
+#define VISIBLE(i) (i && i->isVisible())
+
+#define TOGGLEV( x ) { if( x->isVisible() ) x->hide(); \
+ else x->show(); }
+
+#if QT43
+ #define setLayoutMargins( a, b, c, d, e) setContentsMargins( a, b, c, d )
+#else
+ #define setLayoutMargins( a, b, c, d, e) setMargin( e )
+#endif
+
+enum {
+ DialogEventType = 0,
+ IMEventType = 100,
+ PLEventType = 200
+};
+
+static int DialogEvent_Type = QEvent::User + DialogEventType + 1;
+//static int PLUndockEvent_Type = QEvent::User + DialogEventType + 2;
+//static int PLDockEvent_Type = QEvent::User + DialogEventType + 3;
+static int SetVideoOnTopEvent_Type = QEvent::User + DialogEventType + 4;
class DialogEvent : public QEvent
{
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