* Fixed a total breakage of decoder plugins introduced by fast_memcpy.

[vlc] / plugins / gtk / intf_gtk.c

diff --git a/plugins/gtk/intf_gtk.c b/plugins/gtk/intf_gtk.c
index 0d7bc2010204bfa6dbec95e1e80390dbdae5483a..670777c0e217686ccae134c7fbe6bccf79db45c5 100644 (file)
--- a/plugins/gtk/intf_gtk.c
+++ b/plugins/gtk/intf_gtk.c
@@ -1,8 +1,8 @@
 /*****************************************************************************
  * intf_gtk.c: Gtk+ interface
  *****************************************************************************
- * Copyright (C) 1999, 2000 VideoLAN
- * $Id: intf_gtk.c,v 1.26 2001/10/04 00:50:24 sam Exp $
+ * Copyright (C) 1999-2001 VideoLAN
+ * $Id: intf_gtk.c,v 1.29 2001/12/07 18:33:07 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Stéphane Borel <stef@via.ecp.fr>
@@ -37,8 +37,8 @@
 
 #include <gtk/gtk.h>
 
-#include "config.h"
 #include "common.h"
+#include "intf_msg.h"
 #include "threads.h"
 #include "mtime.h"
 #include "tests.h"
@@ -47,7 +47,6 @@
 #include "input_ext-intf.h"
 
 #include "interface.h"
-#include "intf_msg.h"
 #include "intf_playlist.h"
 
 #include "video.h"
@@ -60,8 +59,6 @@
 #include "gtk_display.h"
 #include "intf_gtk.h"
 
-#include "main.h"
-
 #include "modules.h"
 #include "modules_export.h"
 
@@ -146,6 +143,7 @@ static int intf_Open( intf_thread_t *p_intf )
     }
 
     /* Initialize Gtk+ thread */
+    p_intf->p_sys->b_playing = 1;
     p_intf->p_sys->b_popup_changed = 0;
     p_intf->p_sys->b_window_changed = 0;
     p_intf->p_sys->b_playlist_changed = 0;
@@ -325,6 +323,7 @@ static gint GtkManage( gpointer p_data )
         {
             GtkModeManage( p_intf );
             GtkSetupMenus( p_intf );
+            p_intf->p_sys->b_playing = 1;
         }
 
         /* Manage the slider */
@@ -371,9 +370,10 @@ static gint GtkManage( gpointer p_data )
         vlc_mutex_unlock( &p_intf->p_input->stream.stream_lock );
 
     }
-    else if( !p_intf->b_die )
+    else if( p_intf->p_sys->b_playing && !p_intf->b_die )
     {
         GtkModeManage( p_intf );
+        p_intf->p_sys->b_playing = 0;
     }
 
     /* Manage core vlc functions through the callback */