sinek/src about.c,1.14,1.15 osd.c,1.17,1.18 tune.c,1.12,1.13 utility.c,1.36,1.37

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

Modified Files:
	about.c osd.c tune.c utility.c 
Log Message:
finish xine1.0 api port.  well, it compiles anyways.  testing begins now.


Index: about.c
===================================================================
RCS file: /cvsroot/sinek/sinek/src/about.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- about.c	10 Jul 2002 21:10:42 -0000	1.14
+++ about.c	4 Jan 2003 09:24:11 -0000	1.15
@@ -18,6 +18,9 @@
 	GtkWidget *w, *vb, *vb2, *vb3, *lab, *hb, *b, *logo;
 	GdkPixbuf *pb;
 	char *tmp;
+	int major, minor, sub;
+
+	xine_get_version(&major, &minor, &sub);
 
 	w = gtk_dialog_new();
 	gtk_dialog_set_has_separator(GTK_DIALOG(w), FALSE);
@@ -69,7 +72,7 @@
 	gtk_widget_show(lab);
 	gtk_box_pack_start(GTK_BOX(vb2), lab, FALSE, FALSE, 0);
 
-	tmp = g_strdup_printf(_("Powered by libxine v%d.%d.%d"), xine_get_major_version(), xine_get_minor_version(), xine_get_sub_version());
+	tmp = g_strdup_printf(_("Powered by libxine v%d.%d.%d"), major, minor, sub);
 	lab = gtk_label_new(tmp);
 	gtk_widget_show(lab);
 	gtk_box_pack_start(GTK_BOX(vb2), lab, FALSE, FALSE, 0);

Index: osd.c
===================================================================
RCS file: /cvsroot/sinek/sinek/src/osd.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- osd.c	29 Jun 2002 20:29:05 -0000	1.17
+++ osd.c	4 Jan 2003 09:24:11 -0000	1.18
@@ -12,8 +12,7 @@
 
 #include <gdk/gdkx.h>
 
-static osd_renderer_t *osd_renderer;
-static osd_object_t *osd;
+static xine_osd_t *osd;
 static GC gc;
 static Pixmap px;
 static XImage *ximg;
@@ -38,10 +37,8 @@
 
 	wm_build(fontsel_build);
 
-	osd_pos = media->conf->register_range(media->conf, "sinek.subtitle_pos", 85, 0, 99, NULL, NULL, NULL, NULL);
-
-	osd_renderer = xine_get_osd_renderer(sinek.xine);
-	osd = osd_renderer->new_object(osd_renderer, 400, 100);
+	osd_pos = xine_config_register_range(sinek.xine, "sinek.subtitle_pos", 85, 0, 99, NULL, NULL, 0, NULL, NULL);
+	osd = xine_osd_new(sinek.stream, 0, 0, 400, 100);
 
 	gc = XCreateGC(sinek.display, sinek.video_win, 0, NULL);
 	px = XCreatePixmap(sinek.display, sinek.video_win, 400, 100, sinek.depth);
@@ -91,23 +88,23 @@
 	osd_w = tw;
 	osd_h = th;
 	ximg = XGetImage(sinek.display, px, 0, 0, 400, 100, sinek.depth, 1);
-	osd_renderer->clear(osd);
-	osd_renderer->filled_rect(osd, 10, 2, tw, th, 3);
+	xine_osd_clear(osd);
+	xine_osd_draw_rect(osd, 10, 2, tw, th, 3, 1);
 	for(i = 0; i < th; i++)
 	{
 		for(j = 0; j < tw; j++)
 		{
 			if(XGetPixel(ximg, j, i))
 			{
-				osd_renderer->line(osd, j, i, j+1, i+1, 10);
+				xine_osd_draw_line(osd, j, i, j+1, i+1, 10);
 			}
 		}
 	}
-	osd_renderer->line(osd, 0, 0, 1, 1, 0);
+	xine_osd_draw_line(osd, 0, 0, 1, 1, 0);
 	osd_x = (sinek.vid_w - osd_w) / 2;
 	osd_y = sinek.vid_h * osd_pos / 100;
 	if(osd_y + osd_h > sinek.vid_h) osd_y = sinek.vid_h - osd_y;
-	osd_renderer->set_position(osd, osd_x, osd_y);
+	xine_osd_set_position(osd, osd_x, osd_y);
 	XDestroyImage(ximg);
 }
 
@@ -118,16 +115,16 @@
 
 	if(title)
 	{
-		if(show) osd_renderer->hide(osd, 0);
+		if(show) xine_osd_hide(osd, 0);
 		osd_display(title);
-		osd_renderer->show(osd, 0);
+		xine_osd_show(osd, 0);
 		show = 1;
 	}
 	else
 	{
 		if(show)
 		{
-			osd_renderer->hide(osd, 0);
+			xine_osd_hide(osd, 0);
 			show = 0;
 		}
 	}
@@ -139,7 +136,7 @@
 	static char **old = NULL;
 	subtitle_t *sub;
 	char **cur;
-	unsigned long pos;
+	int x, y, pos;
 
 	if(sinek.osd_place)
 	{
@@ -150,18 +147,16 @@
 		}
 		return;
 	}
-	if(sinek.osd_subtitles)
+	if (sinek.osd_subtitles && xine_get_pos_length(sinek.stream, &x, &pos, &y))
 	{
-		pos = xine_get_current_time(sinek.xine) * 100;
-		sub = subtitle_find(pos);
-		if(sub)
-		{
+		sub = subtitle_find(pos * 100);
+		if (sub) {
 			cur = sub->text;
-			if(cur != old) show_subtitle(cur);
+			if (cur != old)
+				show_subtitle(cur);
 			old = cur;
 		}
-		else
-		{
+		else {
 			show_subtitle(NULL);
 			old = NULL;
 		}
@@ -179,13 +174,22 @@
 
 void osd_position(int x, int y)
 {
-	osd_renderer->hide(osd, 0);
-	if(sinek.vid_h) osd_pos = y * 100 / sinek.vid_h; else osd_pos = 0;
+	xine_cfg_entry_t entry;
+
+	xine_osd_hide(osd, 0);
+	if (sinek.vid_h)
+		osd_pos = y * 100 / sinek.vid_h;
+	else
+		osd_pos = 0;
 	osd_y = sinek.vid_h * osd_pos / 100;
-	if(osd_y + osd_h > sinek.vid_h) osd_y = sinek.vid_h - osd_y;
-	osd_renderer->set_position(osd, osd_x, osd_y);
-	osd_renderer->show(osd, 0);
-	media->conf->update_num(media->conf, "sinek.subtitle_pos", osd_pos);
+	if (osd_y + osd_h > sinek.vid_h)
+		osd_y = sinek.vid_h - osd_y;
+	xine_osd_set_position(osd, osd_x, osd_y);
+	xine_osd_show(osd, 0);
+
+	xine_config_lookup_entry(sinek.xine, "sinek.subtitle_pos", &entry);
+	entry.num_value = osd_pos;
+	xine_config_update_entry(sinek.xine, &entry);
 }
 
 
@@ -200,12 +204,15 @@
 static void cb_font(GtkWidget *w, GtkFontSelectionDialog *fsd)
 {
 	GdkFont *font;
+	xine_cfg_entry_t entry;
 
 	font = gtk_font_selection_dialog_get_font(fsd);
 	if(font && gdk_font_id(font))
 	{
 		gdkfont = font;
-		media->conf->update_string(media->conf, "sinek.subtitle_font_name", gtk_font_selection_dialog_get_font_name(fsd));
+		xine_config_lookup_entry(sinek.xine, "sinek.subtitle_font_name", &entry);
+		entry.str_value = gtk_font_selection_dialog_get_font_name(fsd);
+		xine_config_update_entry(sinek.xine, &entry);
 	}
 	gtk_widget_hide(GTK_WIDGET(fsd));
 }
@@ -219,7 +226,7 @@
 
 static int fontsel_build(GtkWidget **win)
 {
-	char *font;
+	const char *font;
 	GtkWidget *fontreq, *but;
 
 	fontreq = gtk_font_selection_dialog_new(_("Select Subtitle Font"));
@@ -236,7 +243,7 @@
 	GTK_WIDGET_SET_FLAGS(but, GTK_CAN_DEFAULT);
 	g_signal_connect_swapped(G_OBJECT(but), "clicked", G_CALLBACK(gtk_widget_hide), GTK_OBJECT(fontreq));
 
-	font = media->conf->register_string(media->conf, "sinek.subtitle_font_name", "Sans 12", NULL, NULL, NULL, NULL);
+	font = xine_config_register_string(sinek.xine, "sinek.subtitle_font_name", "Sans 12", NULL, NULL, 0, NULL, NULL);
 	gtk_font_selection_dialog_set_font_name(GTK_FONT_SELECTION_DIALOG(fontreq), font);
 	gdkfont = gtk_font_selection_dialog_get_font(GTK_FONT_SELECTION_DIALOG(fontreq));
 

Index: tune.c
===================================================================
RCS file: /cvsroot/sinek/sinek/src/tune.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- tune.c	3 Jan 2003 09:42:20 -0000	1.12
+++ tune.c	4 Jan 2003 09:24:11 -0000	1.13
@@ -90,7 +90,7 @@
 {
 	GtkWidget *vb, *scale, *lab;
 	GtkObject *adj;
-	int cur, min, max;
+	int cur /*, min, max */;
 
 	vb = gtk_vbox_new(FALSE, 0);
 	gtk_widget_show(vb);

Index: utility.c
===================================================================
RCS file: /cvsroot/sinek/sinek/src/utility.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- utility.c	3 Jan 2003 09:42:20 -0000	1.36
+++ utility.c	4 Jan 2003 09:24:11 -0000	1.37
@@ -557,7 +557,7 @@
 {
 	static GtkWidget *browse_win = NULL;
 	GtkWidget *freq, *box, *b;
-	char *path;
+	const char *path;
 
 	if(browse_win) goto out;
 




-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf