Populate "Stream and Media Info"

[vlc] / mozilla / vlcpeer.cpp

diff --git a/mozilla/vlcpeer.cpp b/mozilla/vlcpeer.cpp
index cfdb24561eb2084b6c32b04926cebba82390cbfc..f7078f42d926f746db13c67ef94eda5c56313d70 100644 (file)
--- a/mozilla/vlcpeer.cpp
+++ b/mozilla/vlcpeer.cpp
@@ -2,7 +2,7 @@
  * vlcpeer.cpp: scriptable peer descriptor
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: vlcpeer.cpp,v 1.4 2003/07/07 12:04:50 sam Exp $
+ * $Id: vlcpeer.cpp,v 1.9 2003/10/23 17:04:39 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -24,12 +24,28 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#include "config.h"
+
 #include <vlc/vlc.h>
 
-#include "nsISupports.h"
-#include "nsMemory.h"
+#ifdef DEBUG
+/* We do not want to use nsDebug.h */
+#   undef DEBUG
+#endif
+
+#ifdef HAVE_MOZILLA_CONFIG_H
+#   include <mozilla-config.h>
+#endif
+#include <nsISupports.h>
+#include <nsMemory.h>
+#include <npapi.h>
+
+#if !defined(XP_MACOSX) && !defined(XP_UNIX) && !defined(XP_WIN)
+#define XP_UNIX 1
+#elif defined(XP_MACOSX)
+#undef XP_UNIX
+#endif
 
-#include "npapi.h"
 #include "vlcpeer.h"
 #include "vlcplugin.h"
 
@@ -71,7 +87,7 @@ NS_IMETHODIMP VlcPeer::Play()
     {
         if( !p_plugin->b_stream && p_plugin->psz_target )
         {
-            VLC_AddTarget( p_plugin->i_vlc, p_plugin->psz_target,
+            VLC_AddTarget( p_plugin->i_vlc, p_plugin->psz_target, 0, 0,
                            PLAYLIST_APPEND | PLAYLIST_GO, PLAYLIST_END );
             p_plugin->b_stream = 1;
         }
@@ -104,7 +120,10 @@ NS_IMETHODIMP VlcPeer::Fullscreen()
 {
     if( p_plugin )
     {
+#ifdef XP_MACOSX
+#else
         VLC_FullScreen( p_plugin->i_vlc );
+#endif
     }
     return NS_OK;
 }