* The pure Gnome part of the Gnome interface has been rewritten from
   scratch, and the .glade file included as well. You can edit it by
   installing glade-gnome and doing `glade plugins/gnome/intf_gnome.glade',
   or directly by hand if you grok XML.
 * Files can now be loaded into vlc using the `Open' buttons. But for the
   moment you still have to launch vlc with at least one file, because it
   quits when the end of the playlist is reached.
 * Idle screen was disabled because it eats a lot of CPU and is mostly
   useless for the moment. And it gets activated when pause lasts for too
   long.

AUTHORS

 
   Rgis Duchesne <regis@via.ecp.fr>
-  Michel Lespinasse <walken@wrs.com>
+  Michel Lespinasse <walken@zoy.org>
 
   Olivier Pomel <pomel@via.ecp.fr>
 
@@ -12,7 +12,7 @@
 
   Jean-Marc Dressler <polux@via.ecp.fr>
   Gal Hendryckx <jimmy@via.ecp.fr>
-  Samuel Hocevar <sam@via.ecp.fr>
+  Samuel Hocevar <sam@zoy.org
   Brieuc Jeunhomme <bbp@via.ecp.fr>
   Michel Kaempf <maxx@via.ecp.fr>
 

plugins/gnome/.cvsignore

+*.bak

plugins/gnome/gnome_interface.h

@@ -3,6 +3,6 @@
  */
 
 GtkWidget* create_intf_window (void);
-GtkWidget* create_intf_about (void);
 GtkWidget* create_intf_popup (void);
-GtkWidget* create_intf_playlist (void);
+GtkWidget* create_intf_about (void);
+GtkWidget* create_intf_fileopen (void);

plugins/gnome/gnome_support.c

@@ -91,6 +91,9 @@ create_pixmap                          (GtkWidget       *widget,
   GdkBitmap *mask;
   gchar *pathname;
 
+  if (!filename || !filename[0])
+      return create_dummy_pixmap (widget, gnome_pixmap);
+
   pathname = gnome_pixmap_file (filename);
   if (!pathname)
     {

plugins/gnome/gnome_sys.h

@@ -2,7 +2,7 @@
  * gnome_sys.h: private Gnome interface description
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: gnome_sys.h,v 1.1 2001/02/11 01:15:10 sam Exp $
+ * $Id: gnome_sys.h,v 1.2 2001/02/12 00:20:37 sam Exp $
  *
  * Authors:
  *
@@ -48,6 +48,7 @@ typedef struct intf_sys_s
     GtkWidget *         p_popup;                               /* popup menu */
     GtkWidget *         p_playlist;                              /* playlist */
     GtkWidget *         p_about;                             /* about window */
+    GtkWidget *         p_fileopen;                      /* file open window */
 
     /* XXX: ugly kludge */
     void             ( *pf_gtk_callback ) ( void );

plugins/gnome/intf_gnome.c

@@ -2,7 +2,7 @@
  * intf_gnome.c: Gnome interface
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: intf_gnome.c,v 1.8 2001/02/11 01:15:10 sam Exp $
+ * $Id: intf_gnome.c,v 1.9 2001/02/12 00:20:37 sam Exp $
  *
  * Authors:
  *
@@ -180,6 +180,7 @@ static void intf_Run( intf_thread_t *p_intf )
     /* we don't create these ones yet because we perhaps won't need them */
     p_intf->p_sys->p_about = NULL;
     p_intf->p_sys->p_playlist = NULL;
+    p_intf->p_sys->p_fileopen = NULL;
 
     /* store p_sys to keep an eye on it */
     gtk_object_set_data( GTK_OBJECT(p_intf->p_sys->p_window),

plugins/sdl/vout_sdl.c

@@ -320,46 +320,61 @@ int vout_Manage( vout_thread_t *p_vout )
 
             /* FIXME : this is temporary */
             case SDLK_p:
-                if( p_input->stream.control.i_status == PLAYING_S )
+                if( p_input != NULL )
                 {
-                    input_Pause( p_input );
-                }
-                else
-                {
-                    input_Play( p_input );
+                    if( p_input->stream.control.i_status == PLAYING_S )
+                    {
+                        input_Pause( p_input );
+                    }
+                    else
+                    {
+                        input_Play( p_input );
+                    }
                 }
                 break;
 
             case SDLK_a:
-                i_rate = p_input->stream.control.i_rate/2;
-                if ( i_rate >= MINIMAL_RATE )
+                if( p_input != NULL )
                 {
-                    input_Forward( p_input, i_rate );
+                    i_rate = p_input->stream.control.i_rate/2;
+                    if ( i_rate >= MINIMAL_RATE )
+                    {
+                        input_Forward( p_input, i_rate );
+                    }
                 }
                 break;
 
             case SDLK_z:
-                i_rate = p_input->stream.control.i_rate*2;
-                if ( i_rate <= MAXIMAL_RATE )
+                if( p_input != NULL )
                 {
-                    /* Compensation of int truncature */
-                    if ( i_rate > 500 && i_rate < 1000 )
-                        i_rate = 1000;
-                    input_Forward( p_input, i_rate );
+                    i_rate = p_input->stream.control.i_rate*2;
+                    if ( i_rate <= MAXIMAL_RATE )
+                    {
+                        /* Compensation of int truncature */
+                        if ( i_rate > 500 && i_rate < 1000 )
+                            i_rate = 1000;
+                        input_Forward( p_input, i_rate );
+                    }
                 }
                 break;
 
             case SDLK_j:
-                /* Jump forwards */
-                input_Seek( p_input, p_input->stream.i_tell
-                             + p_input->stream.i_size / 20 );
-                                                           /* gabuzomeu */
+                if( p_input != NULL )
+                {
+                    /* Jump forwards */
+                    input_Seek( p_input, p_input->stream.i_tell
+                                 + p_input->stream.i_size / 20 );
+                                                               /* gabuzomeu */
+                }
                 break;
 
             case SDLK_b:
-                /* Jump backwards */
-                input_Seek( p_input, p_input->stream.i_tell
-                             - p_input->stream.i_size / 20 );
+                if( p_input != NULL )
+                {
+                    /* Jump backwards */
+                    input_Seek( p_input, p_input->stream.i_tell
+                                 - p_input->stream.i_size / 20 );
+                }
                 break;
 
             default:

src/interface/interface.c

@@ -100,11 +100,11 @@ intf_thread_t* intf_Create( void )
     p_intf->pf_manage     = intf_Manage;
 
     /* Initialize structure */
-    p_intf->b_die =     0;
+    p_intf->b_die         = 0;
 
-    p_intf->p_input =       NULL;
-    p_intf->p_keys =        NULL;
-    p_intf->b_menu =        0;
+    p_intf->p_input       = NULL;
+    p_intf->p_keys        = NULL;
+    p_intf->b_menu        = 0;
     p_intf->b_menu_change = 0;
 
     if( p_intf->pf_open( p_intf ) )

src/video_output/video_output.c

@@ -1833,12 +1833,14 @@ int RenderSplash( vout_thread_t *p_vout )
  *****************************************************************************/
 int RenderIdle( vout_thread_t *p_vout )
 {
+#if 0
     int         i_x = 0, i_y = 0;                           /* text position */
     int         i_width, i_height;                              /* text size */
-    mtime_t     current_date;                                /* current date */
     int         i_amount = 0;                             /*  amount to draw */
     char *psz_text =    "Waiting for stream";            /* text to display */
     char *psz_wtext =   "[................]";
+#endif
+    mtime_t     current_date;                                /* current date */
 
 
     memset( p_vout->p_buffer[ p_vout->i_buffer_index ].p_data,
@@ -1850,6 +1852,8 @@ int RenderIdle( vout_thread_t *p_vout )
 //            && (current_date - p_vout->last_idle_date) > VOUT_IDLE_DELAY 
     )
     {
+        /* FIXME: idle screen disabled */
+#if 0
         SetBufferPicture( p_vout, NULL );
         vout_TextSize( p_vout->p_large_font, WIDE_TEXT | OUTLINED_TEXT, psz_text,
                        &i_width, &i_height );
@@ -1873,6 +1877,7 @@ int RenderIdle( vout_thread_t *p_vout )
 
             SetBufferArea( p_vout, i_x, i_y, i_width, i_height * 2 );
         }
+#endif
         return( 1 );
     }
     return( 0 );