Commit b5f16d75 authored by Johan Bilien's avatar Johan Bilien
Browse files

* plugins/satellite/input_satellite.c: cosmetic changes in error messages

    * plugins/gtk/*: gtk and gnome interfaces now uses frequency and
                     symbol rates default values
parent 966567ba
......@@ -15,6 +15,8 @@ do
EOF
tail +8 $file \
| sed 's#_("/dev/dvd")#config_GetPszVariable( "dvd" )#' \
| sed 's#11954#config_GetIntVariable( "frequency" )#' \
| sed 's#27500#config_GetIntVariable( "symbol-rate" )#' \
>> /tmp/$$.$file.bak
mv -f /tmp/$$.$file.bak $file
fi
......
......@@ -2696,7 +2696,7 @@ create_intf_sat (void)
(GtkAttachOptions) (0), 0, 0);
gtk_misc_set_alignment (GTK_MISC (label30), 0, 0.5);
sat_freq_adj = gtk_adjustment_new (11954, 10000, 12999, 1, 10, 10);
sat_freq_adj = gtk_adjustment_new (config_GetIntVariable( "frequency" ), 10000, 12999, 1, 10, 10);
sat_freq = gtk_spin_button_new (GTK_ADJUSTMENT (sat_freq_adj), 1, 0);
gtk_widget_ref (sat_freq);
gtk_object_set_data_full (GTK_OBJECT (intf_sat), "sat_freq", sat_freq,
......@@ -2747,7 +2747,7 @@ create_intf_sat (void)
(GtkAttachOptions) (0), 0, 0);
gtk_misc_set_alignment (GTK_MISC (label33), 0, 0.5);
sat_srate_adj = gtk_adjustment_new (27500, 1000, 30000, 1, 10, 10);
sat_srate_adj = gtk_adjustment_new (config_GetIntVariable( "symbol-rate" ), 1000, 30000, 1, 10, 10);
sat_srate = gtk_spin_button_new (GTK_ADJUSTMENT (sat_srate_adj), 1, 0);
gtk_widget_ref (sat_srate);
gtk_object_set_data_full (GTK_OBJECT (intf_sat), "sat_srate", sat_srate,
......
......@@ -2470,7 +2470,7 @@ create_intf_sat (void)
gtk_table_set_row_spacings (GTK_TABLE (table3), 5);
gtk_table_set_col_spacings (GTK_TABLE (table3), 5);
sat_freq_adj = gtk_adjustment_new (11954, 10000, 12999, 1, 10, 10);
sat_freq_adj = gtk_adjustment_new (config_GetIntVariable( "frequency" ), 10000, 12999, 1, 10, 10);
sat_freq = gtk_spin_button_new (GTK_ADJUSTMENT (sat_freq_adj), 1, 0);
gtk_widget_ref (sat_freq);
gtk_object_set_data_full (GTK_OBJECT (intf_sat), "sat_freq", sat_freq,
......@@ -2480,7 +2480,7 @@ create_intf_sat (void)
(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
sat_srate_adj = gtk_adjustment_new (27500, 1000, 30000, 1, 10, 10);
sat_srate_adj = gtk_adjustment_new (config_GetIntVariable( "symbol-rate" ), 1000, 30000, 1, 10, 10);
sat_srate = gtk_spin_button_new (GTK_ADJUSTMENT (sat_srate_adj), 1, 0);
gtk_widget_ref (sat_srate);
gtk_object_set_data_full (GTK_OBJECT (intf_sat), "sat_srate", sat_srate,
......
......@@ -139,7 +139,7 @@ create_pixmap (GtkWidget *widget,
}
/* This is an internally used function to check if a pixmap file exists. */
gchar*
static gchar*
check_file_exists (const gchar *directory,
const gchar *filename)
{
......
......@@ -259,29 +259,29 @@ static int SatelliteOpen( input_thread_t * p_input )
return -1;
break;
case -3:
intf_ErrMsg( "input: satellite: Frontend returned\
no event" );
intf_ErrMsg( "input: satellite: Frontend returned"\
"no event" );
close( p_satellite->i_handle );
free( p_satellite );
return -1;
break;
case -4:
intf_ErrMsg( "input: satellite: Frontend: time out\
when polling for event" );
intf_ErrMsg( "input: satellite: Frontend: time out"\
"when polling for event" );
close( p_satellite->i_handle );
free( p_satellite );
return -1;
break;
case -5:
intf_ErrMsg( "input: satellite: An error occured when polling\
Frontend device" );
intf_ErrMsg( "input: satellite: An error occured when polling"\
"Frontend device" );
close( p_satellite->i_handle );
free( p_satellite );
return -1;
break;
case -1:
intf_ErrMsg( "input: satellite: Frontend returned\
an failure event" );
intf_ErrMsg( "input: satellite: Frontend returned"\
"a failure event" );
close( p_satellite->i_handle );
free( p_satellite );
return -1;
......@@ -294,8 +294,8 @@ static int SatelliteOpen( input_thread_t * p_input )
if ( ioctl_SetDMXFilter( 0, &i_fd, 3 ) < 0 )
{
intf_ErrMsg( "input: satellite: An error occured when setting\
filter on PAT" );
intf_ErrMsg( "input: satellite: An error occured when setting"\
"filter on PAT" );
close( p_satellite->i_handle );
free( p_satellite );
return -1;
......@@ -303,8 +303,8 @@ static int SatelliteOpen( input_thread_t * p_input )
if( input_InitStream( p_input, sizeof( stream_ts_data_t ) ) == -1 )
{
intf_ErrMsg( "input: satellite: Not enough memory to allow stream\
structure" );
intf_ErrMsg( "input: satellite: Not enough memory to allow stream"\
"structure" );
close( p_satellite->i_handle );
free( p_satellite );
return( -1 );
......
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