* modules/**/.cvsignore: added Makefile{,.in.am} to the ignore list, as

[vlc] / modules / gui / gtk / display.c

diff --git a/modules/gui/gtk/display.c b/modules/gui/gtk/display.c
index 0a56dcb99f5cc950f4a50620da6a4e71a5bc434a..781747088115b4da3676bfbf18332d37399a5fb7 100644 (file)
--- a/modules/gui/gtk/display.c
+++ b/modules/gui/gtk/display.c
@@ -2,7 +2,7 @@
  * display.c: Gtk+ tools for main interface
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: display.c,v 1.4 2002/09/30 11:05:38 sam Exp $
+ * $Id: display.c,v 1.10 2003/05/05 16:09:39 gbazin Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Stéphane Borel <stef@via.ecp.fr>
@@ -86,7 +86,6 @@ gint E_(GtkModeManage)( intf_thread_t * p_intf )
     GtkWidget *     p_network_box;
     GtkWidget *     p_slider;
     GtkWidget *     p_label;
-    GtkWidget *     p_channel;
     vlc_bool_t      b_control;
 
 #define GETWIDGET( ptr, name ) GTK_WIDGET( gtk_object_get_data( GTK_OBJECT( \
@@ -135,17 +134,6 @@ gint E_(GtkModeManage)( intf_thread_t * p_intf )
                             "network_address_label" );
                 gtk_label_set_text( GTK_LABEL( p_label ),
                                     p_intf->p_sys->p_input->psz_source );
-                p_channel = GTK_WIDGET( gtk_object_get_data( GTK_OBJECT(
-                           p_intf->p_sys->p_window ), "network_channel_box" ) );
-                if( config_GetInt( p_intf, "network-channel" ) )
-                {
-                    gtk_widget_show( GTK_WIDGET( p_channel ) );
-                }
-                else
-                {
-                    gtk_widget_hide( GTK_WIDGET( p_channel ) );
-                }
-
                 break;
             default:
                 msg_Warn( p_intf, "cannot determine input method" );
@@ -177,28 +165,20 @@ gint E_(GtkModeManage)( intf_thread_t * p_intf )
         p_intf->p_sys->b_audio_update = 1;
         p_intf->p_sys->b_spu_update = 1;
         p_intf->p_sys->i_part = 0;
-    
+#if 0
+        p_intf->p_sys->b_aout_update = 1;
+        p_intf->p_sys->b_vout_update = 1;
+#endif
         p_intf->p_sys->p_input->stream.b_changed = 0;
         msg_Dbg( p_intf, "stream has changed, refreshing interface" );
     }
     else
     {
-        if( config_GetInt( p_intf, "network-channel" ) )
-        {
-            gtk_widget_show( GTK_WIDGET( p_network_box ) );
-
-            p_channel = GTK_WIDGET( gtk_object_get_data( GTK_OBJECT(
-                       p_intf->p_sys->p_window ), "network_channel_box" ) );
-            gtk_widget_show( GTK_WIDGET( p_channel ) );
-        }
-        else
-        {
-            /* default mode */
-            p_label = gtk_object_get_data(
-                    GTK_OBJECT( p_intf->p_sys->p_window ), "label_status" );
-            gtk_label_set_text( GTK_LABEL( p_label ), "" );
-            gtk_widget_show( GTK_WIDGET( p_file_box ) );
-        }
+        /* default mode */
+        p_label = gtk_object_get_data(
+                  GTK_OBJECT( p_intf->p_sys->p_window ), "label_status" );
+        gtk_label_set_text( GTK_LABEL( p_label ), "" );
+        gtk_widget_show( GTK_WIDGET( p_file_box ) );
 
         /* unsensitize menus */
         gtk_widget_set_sensitive( GETWIDGET(p_window,"menubar_program"),
@@ -211,7 +191,7 @@ gint E_(GtkModeManage)( intf_thread_t * p_intf )
                                   FALSE );
         gtk_widget_set_sensitive( GETWIDGET(p_popup,"popup_navigation"),
                                   FALSE );
-        gtk_widget_set_sensitive( GETWIDGET(p_popup,"popup_audio"), FALSE );
+        gtk_widget_set_sensitive( GETWIDGET(p_popup,"popup_language"), FALSE );
         gtk_widget_set_sensitive( GETWIDGET(p_popup,"popup_subpictures"),
                                   FALSE );
     }
@@ -237,28 +217,29 @@ gint E_(GtkModeManage)( intf_thread_t * p_intf )
  *****************************************************************************/
 void E_(GtkHideTooltips)( vlc_object_t *p_this )
 {
-    intf_thread_t **pp_intf;
+    intf_thread_t *p_intf;
+    int i_index;
     vlc_list_t *p_list = vlc_list_find( p_this, VLC_OBJECT_INTF,
-                                                FIND_ANYWHERE );
+                                        FIND_ANYWHERE );
 
     vlc_bool_t b_enable = config_GetInt( p_this, "gnome-tooltips" );
 
-    for( pp_intf = (intf_thread_t **)p_list->pp_objects ;
-         *pp_intf ;
-         pp_intf++ )
+    for( i_index = 0; i_index < p_list->i_count; i_index++ )
     {
-        if( strcmp( MODULE_STRING, (*pp_intf)->p_module->psz_object_name ) )
+        p_intf = (intf_thread_t *)p_list->p_values[i_index].p_object ;
+
+        if( strcmp( MODULE_STRING, p_intf->p_module->psz_object_name ) )
         {
             continue;
         }
 
         if( b_enable )
         {
-            gtk_tooltips_enable( (*pp_intf)->p_sys->p_tooltips );
+            gtk_tooltips_enable( p_intf->p_sys->p_tooltips );
         }
         else
         {
-            gtk_tooltips_disable( (*pp_intf)->p_sys->p_tooltips );
+            gtk_tooltips_disable( p_intf->p_sys->p_tooltips );
         }
     }
 
@@ -276,24 +257,25 @@ void GtkHideToolbarText( vlc_object_t *p_this )
 {
     GtkToolbarStyle style;
     GtkToolbar * p_toolbar;
-    intf_thread_t **pp_intf;
+    intf_thread_t *p_intf;
+    int i_index;
     vlc_list_t *p_list = vlc_list_find( p_this, VLC_OBJECT_INTF,
-                                                FIND_ANYWHERE );
+                                        FIND_ANYWHERE );
 
     style = config_GetInt( p_this, "gnome-toolbartext" )
             ? GTK_TOOLBAR_BOTH
             : GTK_TOOLBAR_ICONS;
 
-    for( pp_intf = (intf_thread_t **)p_list->pp_objects ;
-         *pp_intf ;
-         pp_intf++ )
+    for( i_index = 0; i_index < p_list->i_count; i_index++ )
     {
-        if( strcmp( MODULE_STRING, (*pp_intf)->p_module->psz_object_name ) )
+        p_intf = (intf_thread_t *)p_list->p_values[i_index].p_object ;
+
+        if( strcmp( MODULE_STRING, p_intf->p_module->psz_object_name ) )
         {
             continue;
         }
 
-        p_toolbar = GTK_TOOLBAR(lookup_widget( (*pp_intf)->p_sys->p_window,
+        p_toolbar = GTK_TOOLBAR(lookup_widget( p_intf->p_sys->p_window,
                                                "toolbar" ));
         gtk_toolbar_set_style( p_toolbar, style );
     }