#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>
#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;
{
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( p_intf )
#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 ); \
#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;
+#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
{