* be a bit more verbose when creating the disk-image

[vlc] / mozilla / vlcplugin.cpp

diff --git a/mozilla/vlcplugin.cpp b/mozilla/vlcplugin.cpp
index 64bab097bb58383f29c5ac1e1a1133c8b519f513..5310ef2ffb3cb70286527d96121276add8144f13 100644 (file)
--- a/mozilla/vlcplugin.cpp
+++ b/mozilla/vlcplugin.cpp
@@ -1,8 +1,8 @@
 /*****************************************************************************
- * vlcplugin.cpp: a VideoLAN Client plugin for Mozilla
+ * vlcplugin.cpp: a VLC plugin for Mozilla
  *****************************************************************************
- * Copyright (C) 2002 VideoLAN
- * $Id: vlcplugin.cpp,v 1.2 2002/09/30 11:05:41 sam Exp $
+ * Copyright (C) 2002-2005 the VideoLAN team
+ * $Id$
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -18,16 +18,29 @@
  *
  * 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., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#include "config.h"
+
 #include <vlc/vlc.h>
 
+#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 "vlcpeer.h"
 #include "vlcplugin.h"
 
@@ -36,7 +49,7 @@
  *****************************************************************************/
 VlcPlugin::VlcPlugin( NPP instance )
 {
-    p_instance = instance; 
+    p_instance = instance;
     p_peer = NULL;
 }
 
@@ -71,11 +84,11 @@ VlcIntf* VlcPlugin::GetPeer()
     if( !p_peer )
     {
         p_peer = new VlcPeer( this );
-        if( p_peer == NULL ) 
+        if( p_peer == NULL )
         {
             return NULL;
         }
-        
+
         NS_ADDREF( p_peer );
     }
 
@@ -113,6 +126,6 @@ void VlcPlugin::SetFileName(const char * filename)
     fclose (fh);
     fprintf(stderr, "File loaded\n");
 #endif
-    return; 
+    return;
 }