Commit d2f76771 authored by Sam Hocevar's avatar Sam Hocevar

* ./modules/gui/gtk/open.c: the Gtk and GNOME interfaces no longer ignore

    the "dvd", "frequency" and "symbol-rate" variables.
parent c21f684a
#! /bin/sh
## bootstrap.sh file for vlc, the VideoLAN Client
## $Id: bootstrap.sh,v 1.10 2002/08/07 21:36:55 massiot Exp $
## $Id: bootstrap.sh,v 1.11 2002/08/24 11:57:07 sam Exp $
##
## Authors: Samuel Hocevar <sam@zoy.org>
......@@ -82,9 +82,6 @@ then
#include <vlc/vlc.h>
EOF
tail +8 modules/gui/gtk/$file \
| sed 's#DISABLED!!!_("/dev/dvd")#config_GetPsz( "dvd" )#' \
| sed 's#DISABLED!!!11954#config_GetInt( "frequency" )#' \
| sed 's#DISABLED!!!27500#config_GetInt( "symbol-rate" )#' \
| sed 's#_("-:--:--")#"-:--:--"#' \
| sed 's#_("---")#"---"#' \
| sed 's#_("--")#"--"#' \
......
......@@ -2,7 +2,7 @@
* gtk_open.c : functions to handle file/disc/network open widgets.
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
* $Id: open.c,v 1.1 2002/08/04 17:23:43 sam Exp $
* $Id: open.c,v 1.2 2002/08/24 11:57:07 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Stphane Borel <stef@via.ecp.fr>
......@@ -437,6 +437,16 @@ static void GtkOpenShow( intf_thread_t *p_intf, int i_page )
free( psz_var );
}
/* Disc stuff */
psz_var = config_GetPsz( p_intf, "dvd" );
if( psz_var )
{
gtk_entry_set_text( GTK_ENTRY( gtk_object_get_data(
GTK_OBJECT( p_intf->p_sys->p_open ), "disc_name" ) ),
psz_var );
free( psz_var );
}
/* Network stuff */
gtk_spin_button_set_value( GTK_SPIN_BUTTON( gtk_object_get_data(
GTK_OBJECT( p_intf->p_sys->p_open ), "network_udp_port" ) ),
......@@ -459,6 +469,25 @@ static void GtkOpenShow( intf_thread_t *p_intf, int i_page )
GTK_OBJECT( p_intf->p_sys->p_open ), "network_channel" ),
config_GetInt( p_intf, "network-channel" ) );
/* Satellite stuff */
psz_var = config_GetPsz( p_intf, "frequency" );
if( psz_var )
{
gtk_entry_set_text( GTK_ENTRY( gtk_object_get_data(
GTK_OBJECT( p_intf->p_sys->p_open ), "sat_freq" ) ),
psz_var );
free( psz_var );
}
psz_var = config_GetPsz( p_intf, "symbol-rate" );
if( psz_var )
{
gtk_entry_set_text( GTK_ENTRY( gtk_object_get_data(
GTK_OBJECT( p_intf->p_sys->p_open ), "sat_srate" ) ),
psz_var );
free( psz_var );
}
/* Set the right page */
setpage:
p_notebook = lookup_widget( GTK_WIDGET( p_intf->p_sys->p_open ),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment