sinek/src tune.c,1.13,1.14

Update of /cvsroot/sinek/sinek/src
In directory sc8-pr-cvs1:/tmp/cvs-serv24748

Modified Files:
	tune.c 
Log Message:
gtkxine changes


Index: tune.c
===================================================================
RCS file: /cvsroot/sinek/sinek/src/tune.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- tune.c	4 Jan 2003 09:24:11 -0000	1.13
+++ tune.c	19 Jan 2003 05:30:39 -0000	1.14
@@ -9,18 +9,26 @@
 */
 
 #include "common.h"
+#include "gtkxine.h"
 
 static GtkWidget *tune_win = NULL;
 static GtkObject *hue_adj, *sat_adj, *bri_adj, *con_adj;
 static int hue, sat, bri, con;
 
-static GtkObject *create_prop(GtkWidget *box, char *name, int cap, int prop);
+static GtkObject *create_prop(GtkWidget *box, char *name, int prop);
 static void cb_cancel(GtkWidget *w, gpointer data);
 static void cb_hue(GtkAdjustment *adj);
 static void cb_sat(GtkAdjustment *adj);
 static void cb_bri(GtkAdjustment *adj);
 static void cb_con(GtkAdjustment *adj);
 
+enum
+{
+	PROP_HUE,
+	PROP_SAT,
+	PROP_BRI,
+	PROP_CON,
+};
 
 void tune_show(void)
 {
@@ -46,13 +54,13 @@
 	gtk_container_add(GTK_CONTAINER(b), hb);
 	gtk_container_set_border_width(GTK_CONTAINER(hb), 5);
 
-	hue_adj = create_prop(hb, _("Hue"), XINE_PARAM_VO_HUE, XINE_PARAM_VO_HUE);
+	hue_adj = create_prop(hb, _("Hue"), PROP_HUE);
 	g_signal_connect(hue_adj, "value_changed", G_CALLBACK(cb_hue), NULL);
-	sat_adj = create_prop(hb, _("Saturation"), XINE_PARAM_VO_SATURATION, XINE_PARAM_VO_SATURATION);
+	sat_adj = create_prop(hb, _("Saturation"), PROP_SAT);
 	g_signal_connect(sat_adj, "value_changed", G_CALLBACK(cb_sat), NULL);
-	bri_adj = create_prop(hb, _("Brightness"), XINE_PARAM_VO_BRIGHTNESS, XINE_PARAM_VO_BRIGHTNESS);
+	bri_adj = create_prop(hb, _("Brightness"), PROP_BRI);
 	g_signal_connect(bri_adj, "value_changed", G_CALLBACK(cb_bri), NULL);
-	con_adj = create_prop(hb, _("Contrast"), XINE_PARAM_VO_CONTRAST, XINE_PARAM_VO_CONTRAST);
+	con_adj = create_prop(hb, _("Contrast"), PROP_CON);
 	g_signal_connect(con_adj, "value_changed", G_CALLBACK(cb_con), NULL);
 
 	hb2 = gtk_hbutton_box_new();
@@ -86,17 +94,30 @@
 }
 
 
-static GtkObject *create_prop(GtkWidget *box, char *name, int cap, int prop)
+static GtkObject *create_prop(GtkWidget *box, char *name, int prop)
 {
 	GtkWidget *vb, *scale, *lab;
 	GtkObject *adj;
-	int cur /*, min, max */;
+	int cur; /* , min, max; */ /* XINE1.0's api is lacking some stuff 0.9 had.. */
 
 	vb = gtk_vbox_new(FALSE, 0);
 	gtk_widget_show(vb);
 	gtk_box_pack_start(GTK_BOX(box), vb, TRUE, TRUE, 0);
 
-	cur = xine_get_param(sinek.stream, prop);
+	switch (prop) {
+		case PROP_HUE:
+			cur = gtk_xine_get_video_hue(GTK_XINE(sinek.xine));
+			break;
+		case PROP_SAT:
+			cur = gtk_xine_get_video_saturation(GTK_XINE(sinek.xine));
+			break;
+		case PROP_BRI:
+			cur = gtk_xine_get_video_brightness(GTK_XINE(sinek.xine));
+			break;
+		case PROP_CON:
+			cur = gtk_xine_get_video_contrast(GTK_XINE(sinek.xine));
+			break;
+	}
 	//media->vd->get_property_min_max(media->vd, prop, &min, &max);
 	adj = gtk_adjustment_new(cur, 0, 100, 1, 0, 0);
 
@@ -120,25 +141,25 @@
 	{
 		GTK_ADJUSTMENT(hue_adj)->value = hue;
 		gtk_adjustment_value_changed(GTK_ADJUSTMENT(hue_adj));
-		xine_set_param(sinek.stream, XINE_PARAM_VO_HUE, hue);
+		gtk_xine_set_video_hue(GTK_XINE(sinek.xine), hue);
 	}
 	if(GTK_ADJUSTMENT(sat_adj)->value != sat)
 	{
 		GTK_ADJUSTMENT(sat_adj)->value = sat;
 		gtk_adjustment_value_changed(GTK_ADJUSTMENT(sat_adj));
-		xine_set_param(sinek.stream, XINE_PARAM_VO_SATURATION, sat);
+		gtk_xine_set_video_saturation(GTK_XINE(sinek.xine), sat);
 	}
 	if(GTK_ADJUSTMENT(bri_adj)->value != bri)
 	{
 		GTK_ADJUSTMENT(bri_adj)->value = bri;
 		gtk_adjustment_value_changed(GTK_ADJUSTMENT(bri_adj));
-		xine_set_param(sinek.stream, XINE_PARAM_VO_BRIGHTNESS, bri);
+		gtk_xine_set_video_brightness(GTK_XINE(sinek.xine), bri);
 	}
 	if(GTK_ADJUSTMENT(con_adj)->value != con)
 	{
 		GTK_ADJUSTMENT(con_adj)->value = con;
 		gtk_adjustment_value_changed(GTK_ADJUSTMENT(con_adj));
-		xine_set_param(sinek.stream, XINE_PARAM_VO_CONTRAST, con);
+		gtk_xine_set_video_contrast(GTK_XINE(sinek.xine), con);
 	}
 
 	gtk_widget_hide(tune_win);
@@ -147,23 +168,23 @@
 
 static void cb_hue(GtkAdjustment *adj)
 {
-	xine_set_param(sinek.stream, XINE_PARAM_VO_HUE, adj->value);
+	gtk_xine_set_video_hue(GTK_XINE(sinek.xine), adj->value);
 }
 
 
 static void cb_sat(GtkAdjustment *adj)
 {
-	xine_set_param(sinek.stream, XINE_PARAM_VO_SATURATION, adj->value);
+	gtk_xine_set_video_saturation(GTK_XINE(sinek.xine), adj->value);
 }
 
 
 static void cb_bri(GtkAdjustment *adj)
 {
-	xine_set_param(sinek.stream, XINE_PARAM_VO_BRIGHTNESS, adj->value);
+	gtk_xine_set_video_brightness(GTK_XINE(sinek.xine), adj->value);
 }
 
 
 static void cb_con(GtkAdjustment *adj)
 {
-	xine_set_param(sinek.stream, XINE_PARAM_VO_CONTRAST, adj->value);
+	gtk_xine_set_video_contrast(GTK_XINE(sinek.xine), adj->value);
 }




-------------------------------------------------------
This SF.NET email is sponsored by: Thawte.com - A 128-bit supercerts will
allow you to extend the highest allowed 128 bit encryption to all your 
clients even if they use browsers that are limited to 40 bit encryption. 
Get a guide here:http://ads.sourceforge.net/cgi-bin/redirect.pl?thaw0030en