[xine-cvs] CVS: gnome-xine/src settings.c,1.8,1.9

[Guenter B. <gu...@us...>]

Update of /cvsroot/xine/gnome-xine/src
In directory sc8-pr-cvs1:/tmp/cvs-serv9745/src

Modified Files:
	settings.c 
Log Message:
add amp slider to settings window

Index: settings.c
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/settings.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- settings.c	1 Mar 2003 23:37:56 -0000	1.8
+++ settings.c	8 Mar 2003 20:26:52 -0000	1.9
@@ -66,6 +66,13 @@
   gtk_xine_set_param (GTK_XINE(gtx), XINE_PARAM_AUDIO_COMPR_LEVEL, value);
 }
 
+static void amp_cb (GtkWidget* widget, gpointer data) {
+
+  int value = (gint) GTK_ADJUSTMENT (data)->value;
+
+  gtk_xine_set_param (GTK_XINE(gtx), XINE_PARAM_AUDIO_AMP_LEVEL, value);
+}
+
 static void avsync_cb (GtkWidget* widget, gpointer data) {
   int value = (gint) GTK_ADJUSTMENT (data)->value;
 
@@ -145,11 +152,27 @@
   gtk_table_attach (GTK_TABLE(table), scale, 1, 2, 1, 2,
 		    GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
 
+  /* amplifier */
+
+  label = gtk_label_new ("Amplifier");
+  gtk_table_attach (GTK_TABLE(table), label, 0, 1, 2, 3,
+		    GTK_FILL, GTK_FILL, 0, 0);
+
+  adj = gtk_adjustment_new (gtk_xine_get_param (GTK_XINE(gtx), XINE_PARAM_AUDIO_AMP_LEVEL),
+			    0.0, 200.0, 1.0, 10.0, 1.0);
+  scale = gtk_hscale_new (GTK_ADJUSTMENT(adj));
+
+  gtk_signal_connect( GTK_OBJECT (adj), "value-changed",
+		      GTK_SIGNAL_FUNC (amp_cb), adj );
+
+  gtk_table_attach (GTK_TABLE(table), scale, 1, 2, 2, 3,
+		    GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
+
 
   /* a/v sync */
 
   label = gtk_label_new ("A/V Sync");
-  gtk_table_attach (GTK_TABLE(table), label, 0, 1, 2, 3,
+  gtk_table_attach (GTK_TABLE(table), label, 0, 1, 3, 4,
 		    GTK_FILL, GTK_FILL, 0, 0);
 
   adj = gtk_adjustment_new (0.0, -180000.0, 180000.0, 1000.0, 10000.0, 1.0);
@@ -157,13 +180,13 @@
   gtk_signal_connect( GTK_OBJECT (adj), "value-changed",
 		      GTK_SIGNAL_FUNC (avsync_cb), adj );
 
-  gtk_table_attach (GTK_TABLE(table), scale, 1, 2, 2, 3,
+  gtk_table_attach (GTK_TABLE(table), scale, 1, 2, 3, 4,
 		    GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
 
   /* saturation */
 
   label = gtk_label_new ("Saturation");
-  gtk_table_attach (GTK_TABLE(table), label, 0, 1, 3, 4,
+  gtk_table_attach (GTK_TABLE(table), label, 0, 1, 4, 5,
 		    GTK_FILL, GTK_FILL, 0, 0);
 
   adj = gtk_adjustment_new (gtk_xine_get_param (GTK_XINE(gtx), XINE_PARAM_VO_SATURATION),
@@ -172,14 +195,14 @@
   gtk_signal_connect( GTK_OBJECT (adj), "value-changed",
 		      GTK_SIGNAL_FUNC (sat_cb), adj );
 
-  gtk_table_attach (GTK_TABLE(table), scale, 1, 2, 3, 4,
+  gtk_table_attach (GTK_TABLE(table), scale, 1, 2, 4, 5,
 		    GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
 
 
   /* contrast */
 
   label = gtk_label_new ("Contrast");
-  gtk_table_attach (GTK_TABLE(table), label, 0, 1, 4, 5,
+  gtk_table_attach (GTK_TABLE(table), label, 0, 1, 5, 6,
 		    GTK_FILL, GTK_FILL, 0, 0);
 
   adj = gtk_adjustment_new (gtk_xine_get_param (GTK_XINE(gtx), XINE_PARAM_VO_CONTRAST),
@@ -188,14 +211,14 @@
   gtk_signal_connect( GTK_OBJECT (adj), "value-changed",
 		      GTK_SIGNAL_FUNC (contr_cb), adj );
 
-  gtk_table_attach (GTK_TABLE(table), scale, 1, 2, 4, 5,
+  gtk_table_attach (GTK_TABLE(table), scale, 1, 2, 5, 6,
 		    GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
 
 
   /* brightness */
 
   label = gtk_label_new ("Brightness");
-  gtk_table_attach (GTK_TABLE(table), label, 0, 1, 5, 6,
+  gtk_table_attach (GTK_TABLE(table), label, 0, 1, 6, 7,
 		    GTK_FILL, GTK_FILL, 0, 0);
 
   adj = gtk_adjustment_new (gtk_xine_get_param (GTK_XINE(gtx), XINE_PARAM_VO_BRIGHTNESS),
@@ -204,7 +227,7 @@
   gtk_signal_connect( GTK_OBJECT (adj), "value-changed",
 		      GTK_SIGNAL_FUNC (bright_cb), adj );
 
-  gtk_table_attach (GTK_TABLE(table), scale, 1, 2, 5, 6,
+  gtk_table_attach (GTK_TABLE(table), scale, 1, 2, 6, 7,
 		    GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);