threads: Make sure we don't re-create a thread if the object has already one.

[vlc] / projects / mozilla / vlcplugin.h

diff --git a/projects/mozilla/vlcplugin.h b/projects/mozilla/vlcplugin.h
index d3c9af356bc4b44a6aae090882982cf2c8b1fbf6..cb6132a6558672fcd6e21ee3f3a1542284734d42 100644 (file)
--- a/projects/mozilla/vlcplugin.h
+++ b/projects/mozilla/vlcplugin.h
@@ -1,11 +1,12 @@
 /*****************************************************************************
  * vlcplugin.h: a VLC plugin for Mozilla
  *****************************************************************************
- * Copyright (C) 2002-2006 the VideoLAN team
+ * Copyright (C) 2002-2008 the VideoLAN team
  * $Id$
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
-            Damien Fouilleul <damienf@videolan.org>
+ *          Damien Fouilleul <damienf@videolan.org>
+ *         Jean-Paul Saman <jpsaman@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
@@ -28,7 +29,7 @@
 #ifndef __VLCPLUGIN_H__
 #define __VLCPLUGIN_H__
 
-#include <vlc/libvlc.h>
+#include <vlc/vlc.h>
 #include <npapi.h>
 #include "control/nporuntime.h"
 
@@ -66,6 +67,18 @@
 #   define __MIN(a, b)   ( ((a) < (b)) ? (a) : (b) )
 #endif
 
+typedef enum vlc_toolbar_clicked_e {
+    clicked_Unknown = 0,
+    clicked_Play,
+    clicked_Pause,
+    clicked_Stop,
+    clicked_timeline,
+    clicked_Time,
+    clicked_Fullscreen,
+    clicked_Mute,
+    clicked_Unmute
+} vlc_toolbar_clicked_t;
+
 class VlcPlugin
 {
 public:
@@ -111,6 +124,11 @@ public:
     void                showToolbar();
     void                hideToolbar();
     void                redrawToolbar();
+    void                getToolbarSize(unsigned int *width, unsigned int *height)
+                            { *width = i_tb_width; *height = i_tb_height; };
+    int                 setToolbarSize(unsigned int width, unsigned int height)
+                            { i_tb_width = width; i_tb_height = height; return 1; };
+    vlc_toolbar_clicked_t getToolbarButtonClicked( int i_xpos, int i_ypos );
 #endif
 
     uint16    i_npmode; /* either NP_EMBED or NP_FULL */
@@ -118,12 +136,9 @@ public:
     /* plugin properties */
     int      b_stream;
     int      b_autoplay;
+    int      b_toolbar;
     char *   psz_target;
 
-#if XP_UNIX
-    /* toolbar */
-    int     i_control_height;
-#endif
 private:
     /* VLC reference */
     libvlc_instance_t   *libvlc_instance;
@@ -141,6 +156,7 @@ private:
 #endif
 #if XP_UNIX
     unsigned int     i_width, i_height;
+    unsigned int     i_tb_width, i_tb_height;
     Window           npvideo, npcontrol;
 
     XImage *p_btnPlay;
@@ -207,7 +223,10 @@ private:
     "video/divx:divx:DivX video;" \
     /* FLV */ \
     "video/flv:flv:FLV video;" \
-    "video/x-flv:flv:FLV video;"
+    "video/x-flv:flv:FLV video;" \
+    /* Matroska */ \
+    "video/x-matroska:mkv:Matroska video;" \
+    "audio/x-matroska:mka:Matroska audio;"