[Rhythmbox-devel] use less RAM (xine backend)



Heya,

Patch attached, uses the new "null-video" feature from xine-lib CVS.
Uses about 800kB less of RAM. Still nice.

Please apply

---
Bastien Nocera <hadess@hadess.net> 
She was as easy as the Daily Star crossword. 
Index: configure.ac
===================================================================
RCS file: /cvs/gnome/rhythmbox/configure.ac,v
retrieving revision 1.59
diff -u -r1.59 configure.ac
--- configure.ac	18 Nov 2003 00:56:37 -0000	1.59
+++ configure.ac	28 Nov 2003 14:56:21 -0000
@@ -90,6 +90,20 @@
 		],(AC_DEFINE(HAVE_XINE_CLOSE,1,[Define if you have the audio device close feature in xine-lib])))
 	CFLAGS="$SAVE_CFLAGS"
 	LIBS="$SAVE_LIBS"
+
+	dnl Remove when xine-lib is newer than rc2
+	SAVE_CFLAGS="$CFLAGS"
+	CFLAGS="$RHYTHMBOX_CFLAGS"
+	SAVE_LIBS="$LIBS"
+	LIBS="$RHYTHMBOX_LIBS"
+	AC_TRY_COMPILE([
+		#include <xine.h>
+		],[
+		int arg = 0;
+		xine_osd_show_unscaled (NULL, 0);
+		],(AC_DEFINE(HAVE_NULL_VIDEO,1,[Define if you have the NULL video feature in xine-lib])))
+	CFLAGS="$SAVE_CFLAGS"
+	LIBS="$SAVE_LIBS"
 else
 	dnl Now we're ready to ask for gstreamer libs and cflags
 	dnl And we can also ask for the right version of gstreamer
Index: monkey-media/monkey-media-player-xine.c
===================================================================
RCS file: /cvs/gnome/rhythmbox/monkey-media/monkey-media-player-xine.c,v
retrieving revision 1.11
diff -u -r1.11 monkey-media-player-xine.c
--- monkey-media/monkey-media-player-xine.c	15 Nov 2003 05:49:54 -0000	1.11
+++ monkey-media/monkey-media-player-xine.c	28 Nov 2003 14:56:21 -0000
@@ -335,6 +335,7 @@
 			     _("Failed to set up an audio driver; check your installation"));
 	}
 
+#ifndef HAVE_NULL_VIDEO
 	mp->priv->video_driver = xine_open_video_driver (mp->priv->xine, "none",
 							 XINE_VISUAL_TYPE_NONE, NULL);
 
@@ -351,6 +352,9 @@
 	}
 	entry.num_value = 5;
 	xine_config_update_entry (mp->priv->xine, &entry);
+#else
+	mp->priv->video_driver = NULL;
+#endif
 
 	mp->priv->stream = xine_stream_new (mp->priv->xine,
 				            mp->priv->audio_driver,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]