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

    * plugins/gtk/*: gtk and gnome interfaces now uses frequency and
                     symbol rates default values

diff --git a/plugins/gtk/fixfiles.sh b/plugins/gtk/fixfiles.sh
index 032ebe5bf25a6a0a8a9600f12a5e47ad08481dd5..496fc3c51b6df2e3e8e3949f8992c79e890ba89d 100755 (executable)
--- a/plugins/gtk/fixfiles.sh
+++ b/plugins/gtk/fixfiles.sh
@@ -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

diff --git a/plugins/gtk/gnome_interface.c b/plugins/gtk/gnome_interface.c
index 446a24e6e1a3cb4859fd14d4cf8a428f911bdbb7..f782680ce8bddb9645c2089bde20b6328a0dc332 100644 (file)
--- a/plugins/gtk/gnome_interface.c
+++ b/plugins/gtk/gnome_interface.c
@@ -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,

diff --git a/plugins/gtk/gtk_interface.c b/plugins/gtk/gtk_interface.c
index 181fe14df3a75eb5d04abdc269a2c07612912f82..3726a76a68cedc5985ac1b22bea136a51c1b1559 100644 (file)
--- a/plugins/gtk/gtk_interface.c
+++ b/plugins/gtk/gtk_interface.c
@@ -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,

diff --git a/plugins/gtk/gtk_support.c b/plugins/gtk/gtk_support.c
index 1b952190c969a768a48956875d3c670b31f21c66..987d9a93e5c1c6a9df9545b376cd02e11ba1bbe8 100644 (file)
--- a/plugins/gtk/gtk_support.c
+++ b/plugins/gtk/gtk_support.c
@@ -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)
 {

diff --git a/plugins/satellite/input_satellite.c b/plugins/satellite/input_satellite.c
index 333d618111ec5a91e48f5942a1aa0af6e5ed2a37..509fa93cfa19a93ecee08ae5196e31959513fb1a 100644 (file)
--- a/plugins/satellite/input_satellite.c
+++ b/plugins/satellite/input_satellite.c
@@ -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 );