misc/objects.c: Don't rely on vlc_object_destroy() to destroy objects, but expects...

[vlc] / modules / video_output / glide.c

diff --git a/modules/video_output/glide.c b/modules/video_output/glide.c
index b1e7d0adb3ef4bc616b02c8d7766d7090e6cd670..0c2b9eb1cb8c5b17c90aa1a8565c1b16d6ee5426 100644 (file)
--- a/modules/video_output/glide.c
+++ b/modules/video_output/glide.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * glide.c : 3dfx Glide plugin for vlc
  *****************************************************************************
- * Copyright (C) 2000, 2001 VideoLAN (Centrale Réseaux) and its contributors
+ * Copyright (C) 2000, 2001 the VideoLAN team
  * $Id$
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
@@ -18,19 +18,21 @@
  *
  * 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 <errno.h>                                                 /* ENOMEM */
-#include <stdlib.h>                                      /* malloc(), free() */
-#include <string.h>
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
 #include <vlc/vlc.h>
-#include <vlc/intf.h>
-#include <vlc/vout.h>
+#include <vlc_interface.h>
+#include <vlc_vout.h>
 
 #ifndef __linux__
 #   include <conio.h>                                         /* for glide ? */
@@ -207,7 +209,7 @@ static int Manage( vout_thread_t *p_vout )
         switch( (char)buf )
         {
         case 'q':
-            p_vout->p_vlc->b_die = 1;
+            vlc_object_kill( p_vout->p_libvlc );
             break;
 
         default: