[vlc-devel] commit: Remove dead code from mozilla plugin. (Jean-Paul Saman )

[git version control]

vlc | branch: 0.8.6-bugfix | Jean-Paul Saman <jpsaman at videolan.org> | Mon Nov  3 22:56:23 2008 +0100| [f539da81ecc75f087b5ba69659c4412a239329a6] | committer: Jean-Paul Saman 

Remove dead code from mozilla plugin.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f539da81ecc75f087b5ba69659c4412a239329a6
---

 mozilla/vlcplugin.cpp |   38 --------------------------------------
 mozilla/vlcshell.cpp  |    7 +------
 2 files changed, 1 insertions(+), 44 deletions(-)

diff --git a/mozilla/vlcplugin.cpp b/mozilla/vlcplugin.cpp
index f214255..e67c268 100644
--- a/mozilla/vlcplugin.cpp
+++ b/mozilla/vlcplugin.cpp
@@ -112,11 +112,6 @@ NPError VlcPlugin::init(int argc, char* const argn[], char* const argv[])
         ppsz_argv[ppsz_argc++] = "--win9x-cv-method=1";
     }
 
-
-#if 0
-    ppsz_argv[0] = "C:\\Cygwin\\home\\damienf\\vlc-trunk\\vlc";
-#endif
-
 #endif /* XP_MACOSX */
 
     /* common settings */
@@ -246,39 +241,6 @@ NPError VlcPlugin::init(int argc, char* const argn[], char* const argv[])
     return NPERR_NO_ERROR;
 }
 
-#if 0
-#ifdef XP_WIN
-/* This is really ugly but there is a deadlock when stopping a stream
- * (in VLC_CleanUp()) because the video output is a child of the drawable but
- * is in a different thread. */
-static void HackStopVout( VlcPlugin* p_plugin )
-{
-    MSG msg;
-    HWND hwnd;
-    vlc_value_t value;
-
-    int i_vlc = libvlc_get_vlc_id(p_plugin->libvlc_instance);
-    VLC_VariableGet( i_vlc, "drawable", &value );
-
-    hwnd = FindWindowEx( (HWND)value.i_int, 0, 0, 0 );
-    if( !hwnd ) return;
-
-    PostMessage( hwnd, WM_CLOSE, 0, 0 );
-
-    do
-    {
-        while( PeekMessage( &msg, (HWND)value.i_int, 0, 0, PM_REMOVE ) )
-        {
-            TranslateMessage(&msg);
-            DispatchMessage(&msg);
-        }
-        if( FindWindowEx( (HWND)value.i_int, 0, 0, 0 ) ) Sleep( 10 );
-    }
-    while( (hwnd = FindWindowEx( (HWND)value.i_int, 0, 0, 0 )) );
-}
-#endif /* XP_WIN */
-#endif
-
 VlcPlugin::~VlcPlugin()
 {
     delete psz_baseURL;
diff --git a/mozilla/vlcshell.cpp b/mozilla/vlcshell.cpp
index 2ebe857..e77f23c 100644
--- a/mozilla/vlcshell.cpp
+++ b/mozilla/vlcshell.cpp
@@ -2,7 +2,7 @@
  * vlcshell.cpp: a VLC plugin for Mozilla
  *****************************************************************************
  * Copyright (C) 2002-2005 the VideoLAN team
- * $Id$
+ * $Id: 2ebe857dfacd998db2a4d202c66e4a406e1442ce $
  *
  * Authors: Samuel Hocevar <sam at zoy.org>
  *
@@ -35,11 +35,6 @@
 #   include <mozilla-config.h>
 #endif
 
-/* This is from mozilla java, do we really need it? */
-#if 0
-#include <jri.h>
-#endif
-
 #include "vlcplugin.h"
 
 /* Enable/disable debugging printf's for X11 resizing */