* Mandatory step for video output IV and the audio output quality

[vlc] / plugins / gnome / gnome_callbacks.c

diff --git a/plugins/gnome/gnome_callbacks.c b/plugins/gnome/gnome_callbacks.c
index f615d2f7f6cb0d62c6fc69e5df3d9ef64b708846..e3f6a635bb0e6c485262136cf38ff75ef67e551a 100644 (file)
--- a/plugins/gnome/gnome_callbacks.c
+++ b/plugins/gnome/gnome_callbacks.c
@@ -2,7 +2,7 @@
  * gnome_callbacks.c : Callbacks for the Gnome plugin.
  *****************************************************************************
  * Copyright (C) 2000, 2001 VideoLAN
- * $Id: gnome_callbacks.c,v 1.22 2001/04/08 07:45:03 stef Exp $
+ * $Id: gnome_callbacks.c,v 1.25 2001/05/01 04:18:18 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Stéphane Borel <stef@via.ecp.fr>
@@ -175,11 +175,10 @@ on_button_title_prev_clicked           (GtkButton       *button,
     {
         p_area = p_intf->p_input->stream.pp_areas[i_id];
         p_intf->p_input->pf_set_area( p_intf->p_input, (input_area_t*)p_area );
-        p_intf->p_sys->b_menus_update = 1;
 
         input_SetStatus( p_intf->p_input, INPUT_STATUS_PLAY );
 
-        p_intf->p_sys->b_menus_update = 1;
+        p_intf->p_sys->b_title_update = 1;
     }
 }
 
@@ -199,11 +198,10 @@ on_button_title_next_clicked           (GtkButton       *button,
     {
         p_area = p_intf->p_input->stream.pp_areas[i_id];   
         p_intf->p_input->pf_set_area( p_intf->p_input, (input_area_t*)p_area );
-        p_intf->p_sys->b_menus_update = 1;
 
         input_SetStatus( p_intf->p_input, INPUT_STATUS_PLAY );
 
-        p_intf->p_sys->b_menus_update = 1;
+        p_intf->p_sys->b_title_update = 1;
     }
 }
 
@@ -225,7 +223,7 @@ on_button_chapter_prev_clicked         (GtkButton       *button,
 
         input_SetStatus( p_intf->p_input, INPUT_STATUS_PLAY );
 
-        p_intf->p_sys->b_menus_update = 1;
+        p_intf->p_sys->b_chapter_update = 1;
     }
 }
 
@@ -247,7 +245,7 @@ on_button_chapter_next_clicked         (GtkButton       *button,
 
         input_SetStatus( p_intf->p_input, INPUT_STATUS_PLAY );
 
-        p_intf->p_sys->b_menus_update = 1;
+        p_intf->p_sys->b_chapter_update = 1;
     }
 }
 
@@ -337,11 +335,13 @@ on_menubar_audio_toggle                (GtkCheckMenuItem     *menuitem,
 
     p_intf = GetIntf( GTK_WIDGET(menuitem), "intf_window" );
 
-    if( !p_intf->p_sys->b_menus_update )
+    if( !p_intf->p_sys->b_audio_update )
     {
         p_es = (es_descriptor_t*)user_data;
 
         input_ToggleES( p_intf->p_input, p_es, menuitem->active );
+
+        p_intf->p_sys->b_audio_update = menuitem->active;
     }
 }
 
@@ -355,11 +355,13 @@ on_menubar_subtitle_toggle             (GtkCheckMenuItem     *menuitem,
 
     p_intf = GetIntf( GTK_WIDGET(menuitem), "intf_window" );
 
-    if( !p_intf->p_sys->b_menus_update )
+    if( !p_intf->p_sys->b_spu_update )
     {
         p_es = (es_descriptor_t*)user_data;
 
         input_ToggleES( p_intf->p_input, p_es, menuitem->active );
+
+        p_intf->p_sys->b_spu_update = menuitem->active;
     }
 }
 
@@ -370,14 +372,14 @@ on_menubar_title_toggle                (GtkCheckMenuItem     *menuitem,
 {
     intf_thread_t * p_intf = GetIntf( GTK_WIDGET(menuitem), "intf_window" );
 
-    if( menuitem->active && !p_intf->p_sys->b_menus_update )
+    if( menuitem->active && !p_intf->p_sys->b_title_update )
     {
         p_intf->p_input->pf_set_area( p_intf->p_input,
                                      (input_area_t*)user_data );
 
         input_SetStatus( p_intf->p_input, INPUT_STATUS_PLAY );
 
-        p_intf->p_sys->b_menus_update = 1;
+        p_intf->p_sys->b_title_update = 1;
     }
 }
 
@@ -391,7 +393,7 @@ on_menubar_chapter_toggle              (GtkCheckMenuItem     *menuitem,
     gint            i_chapter = (gint)user_data;
     char            psz_chapter[3];
 
-    if( menuitem->active && !p_intf->p_sys->b_menus_update )
+    if( menuitem->active && !p_intf->p_sys->b_chapter_update )
     {
         p_area->i_part = i_chapter;
         p_intf->p_input->pf_set_area( p_intf->p_input, (input_area_t*)p_area );
@@ -401,11 +403,30 @@ on_menubar_chapter_toggle              (GtkCheckMenuItem     *menuitem,
 
         input_SetStatus( p_intf->p_input, INPUT_STATUS_PLAY );
 
-        p_intf->p_sys->b_menus_update = 1;
+        p_intf->p_sys->b_chapter_update = 1;
     }
 
 }
 
+
+void
+on_menubar_angle_toggle                (GtkCheckMenuItem     *menuitem,
+                                        gpointer             user_data)
+{
+    intf_thread_t * p_intf    = GetIntf( GTK_WIDGET(menuitem), "intf_window" );
+    input_area_t *  p_area    = p_intf->p_input->stream.p_selected_area;
+    gint            i_angle   = (gint)user_data;
+
+    if( menuitem->active && !p_intf->p_sys->b_angle_update )
+    {
+        p_area->i_angle = i_angle;
+        p_intf->p_input->pf_set_area( p_intf->p_input, (input_area_t*)p_area );
+
+        p_intf->p_sys->b_angle_update = 1;
+    }
+}
+
+
 void
 on_menubar_modules_activate            (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
@@ -681,9 +702,11 @@ on_popup_audio_toggle                  (GtkCheckMenuItem     *menuitem,
 
     p_es = (es_descriptor_t*)user_data;
 
-    if( !p_intf->p_sys->b_menus_update )
+    if( !p_intf->p_sys->b_audio_update )
     {
         input_ToggleES( p_intf->p_input, p_es, menuitem->active );
+
+        p_intf->p_sys->b_audio_update = menuitem->active;
     }
 }
 
@@ -697,9 +720,11 @@ on_popup_subtitle_toggle            (GtkCheckMenuItem     *menuitem,
 
     p_es = (es_descriptor_t*)user_data;
 
-    if( !p_intf->p_sys->b_menus_update )
+    if( !p_intf->p_sys->b_spu_update )
     {
         input_ToggleES( p_intf->p_input, p_es, menuitem->active );
+
+        p_intf->p_sys->b_spu_update = menuitem->active;
     }
 }
 
@@ -710,7 +735,9 @@ on_popup_navigation_toggle             (GtkCheckMenuItem     *menuitem,
 {
     intf_thread_t * p_intf = GetIntf( GTK_WIDGET(menuitem), "intf_popup" );
 
-    if( menuitem->active && !p_intf->p_sys->b_menus_update )
+    if( menuitem->active &&
+        !p_intf->p_sys->b_title_update &&
+        !p_intf->p_sys->b_chapter_update )
     {
         input_area_t *  p_area;
         gint            i_title;
@@ -718,15 +745,39 @@ on_popup_navigation_toggle             (GtkCheckMenuItem     *menuitem,
 
         i_title   = (gint)(user_data) / 100;
         i_chapter = (gint)(user_data) - ( 100 * i_title );
+        p_area = p_intf->p_input->stream.p_selected_area;
+
+
+        if( p_area != p_intf->p_input->stream.pp_areas[i_title] )
+        {
+            p_area = p_intf->p_input->stream.pp_areas[i_title];
+            p_intf->p_sys->b_title_update = 1;
+        }
 
-        p_area = p_intf->p_input->stream.pp_areas[i_title];
         p_area->i_part = i_chapter;
+        p_intf->p_sys->b_chapter_update = 1;
 
         p_intf->p_input->pf_set_area( p_intf->p_input, (input_area_t*)p_area );
 
         input_SetStatus( p_intf->p_input, INPUT_STATUS_PLAY );
+    }
+}
 
-        p_intf->p_sys->b_menus_update = 1;
+
+void
+on_popup_angle_toggle                  (GtkCheckMenuItem     *menuitem,
+                                        gpointer             user_data)
+{
+    intf_thread_t * p_intf    = GetIntf( GTK_WIDGET(menuitem), "intf_popup" );
+    input_area_t *  p_area    = p_intf->p_input->stream.p_selected_area;
+    gint            i_angle   = (gint)user_data;
+
+    if( menuitem->active && !p_intf->p_sys->b_angle_update )
+    {
+        p_area->i_angle = i_angle;
+        p_intf->p_input->pf_set_area( p_intf->p_input, (input_area_t*)p_area );
+
+        p_intf->p_sys->b_angle_update = 1;
     }
 }
 
@@ -832,11 +883,10 @@ on_fileopen_ok_clicked                 (GtkButton       *button,
     intf_PlaylistAdd( p_main->p_playlist, PLAYLIST_END, (char*)filename );
 
     /* Select added item and switch to file interface */
-    intf_PlaylistJumpto( p_main->p_playlist, p_main->p_playlist->i_size-2 );
     if( p_intf->p_input != NULL )
         p_intf->p_input->b_eof = 1;
-    p_intf->p_sys->i_intf_mode = FILE_MODE;
-    p_intf->p_sys->b_mode_changed = 1;
+
+//    p_intf->p_sys->b_mode_changed = 1;
 }
 
 
@@ -961,7 +1011,8 @@ on_disc_ok_clicked                     (GtkButton       *button,
                                          GTK_WIDGET(button), "disc_name" ) ) );
 
     /* "dvd:foo" has size 5 + strlen(foo) */
-    psz_source = malloc( 5 + strlen( psz_device ) );
+    psz_source = malloc( 3 /* "dvd" */ + 1 /* ":" */
+                           + strlen( psz_device ) + 1 /* "\0" */ );
     if( psz_source == NULL )
     {
         return;
@@ -1004,7 +1055,7 @@ on_disc_ok_clicked                     (GtkButton       *button,
     intf_PlaylistJumpto( p_main->p_playlist, p_main->p_playlist->i_size-2 );
     if( p_intf->p_input != NULL )
         p_intf->p_input->b_eof = 1;
-    p_intf->p_sys->b_mode_changed = 1;
+//    p_intf->p_sys->b_mode_changed = 1;
 
     gtk_widget_hide( p_intf->p_sys->p_disc );
 }
@@ -1060,7 +1111,9 @@ on_network_ok_clicked                  (GtkButton       *button,
     }
 
     /* Allocate room for "protocol://server:port" */
-    psz_source = malloc( strlen( psz_protocol ) + strlen( psz_server ) + 10 );
+    psz_source = malloc( strlen( psz_protocol ) + 3 /* "://" */
+                           + strlen( psz_server ) + 1 /* ":" */
+                           + 5 /* 0-65535 */ + 1 /* "\0" */ );
     if( psz_source == NULL )
     {
         return;
@@ -1075,8 +1128,7 @@ on_network_ok_clicked                  (GtkButton       *button,
     intf_PlaylistJumpto( p_main->p_playlist, p_main->p_playlist->i_size-2 );
     if( p_intf->p_input != NULL )
         p_intf->p_input->b_eof = 1;
-    p_intf->p_sys->b_mode_changed = 1;
-    p_intf->p_sys->i_intf_mode = NET_MODE;
+//    p_intf->p_sys->b_mode_changed = 1;
 
     gtk_widget_hide( p_intf->p_sys->p_network );
 }