From 49327f43ca2196122a60314e67eeee929efea873 Mon Sep 17 00:00:00 2001 From: Stephen Torri Date: Fri, 28 Feb 2003 02:51:47 +0000 Subject: Xine assert() replacement: All assert() function calls, with exceptions of libdvdread and libdvdnav, have been replaced with XINE_ASSERT. Functionally XINE_ASSERT behaves just likes its predecesor but its adding the ability to print out a stack trace at the point where the assertion fails. So here are a few examples. assert (0); This use of assert was found in a couple locations most favorably being the default case of a switch statement. This was the only thing there. So if the switch statement was unable to find a match it would have defaulted to this and the user and the developers would be stuck wonder who died and where. So it has been replaced with XINE_ASSERT(0, "We have reach this point and don't have a default case"); It may seem a bit none descriptive but there is more going on behind the scene. In addition to checking a condition is true/false, in this case '0', the XINE_ASSERT prints out: :: - assertion '' failed. An example of this might be: input_dvd.c:open_plugin:1178 - assertion '0' failed. xine_malloc failed!!! You have run out of memory XINE_ASSERT and its helper function, print_trace, are found in src/xine-utils/xineutils.h CVS patchset: 4301 CVS date: 2003/02/28 02:51:47 --- src/video_out/video_out_directfb.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/video_out/video_out_directfb.c') diff --git a/src/video_out/video_out_directfb.c b/src/video_out/video_out_directfb.c index 9c01d12fe..4ddda3eb0 100644 --- a/src/video_out/video_out_directfb.c +++ b/src/video_out/video_out_directfb.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: video_out_directfb.c,v 1.14 2002/09/05 20:44:42 mroi Exp $ + * $Id: video_out_directfb.c,v 1.15 2003/02/28 02:51:51 storri Exp $ * * DirectFB based output plugin. * Rich Wareham @@ -44,7 +44,6 @@ #include #include #include -#include #include "video_out.h" @@ -344,8 +343,8 @@ static void directfb_overlay_blend (vo_driver_t *this_gen, vo_frame_t *frame_gen if( !overlay->rgb_clut || !overlay->clip_rgb_clut) directfb_overlay_clut_yuv2rgb(this,overlay); - assert (this->delivered_width == frame->width); - assert (this->delivered_height == frame->height); + XINE_ASSERT (this->delivered_width == frame->width, "Delivered frame width does not match desired width"); + XINE_ASSERT (this->delivered_height == frame->height, "Delivered frame height does not match desire height"); # if BYTES_PER_PIXEL == 3 blend_rgb24 ((uint8_t *)frame->texture, overlay, frame->width, frame->height, -- cgit v1.2.3