--- a/simpletv.c	Sun Aug 21 12:35:01 2005 +0000
+++ b/simpletv.c	Sun Aug 21 12:35:31 2005 +0000
@@ -118,194 +118,194 @@
 
 void
 Close() {
-	close(tuner_fd);
-	close(bktr_fd);
+    close(tuner_fd);
+    close(bktr_fd);
 }
 
 void
 Open() {
-	struct meteor_geomet geo;
-	int		buffer_size, format, source, c;
-	char           *device_name;
+    struct meteor_geomet geo;
+    int		buffer_size, format, source, c;
+    char           *device_name;
 
-	format = PAL;		/* default value */
-	source = 1;		/* default value */
-	device_name = "/dev/bktr0";	/* default value */
+    format = PAL;		/* default value */
+    source = 1;		/* default value */
+    device_name = "/dev/bktr0";	/* default value */
 
-	/* Open the Meteor or Bt848/Bt878 grabber */
-	if ((bktr_fd = open(device_name, O_RDONLY)) < 0) {
-		printf("open failed: %d\n", errno);
-		exit(1);
-	}
-	if ((tuner_fd = open("/dev/tuner0", O_RDONLY)) < 0) {
-		printf("open failed: %d\n", errno);
-		exit(1);
-	}
-	/* set up the capture type and size */
-	geo.rows = height;
-	geo.columns = width;
-	geo.frames = 1;
+    /* Open the Meteor or Bt848/Bt878 grabber */
+    if ((bktr_fd = open(device_name, O_RDONLY)) < 0) {
+	printf("open failed: %d\n", errno);
+	exit(1);
+    }
+    if ((tuner_fd = open("/dev/tuner0", O_RDONLY)) < 0) {
+	printf("open failed: %d\n", errno);
+	exit(1);
+    }
+    /* set up the capture type and size */
+    geo.rows = height;
+    geo.columns = width;
+    geo.frames = 1;
 #ifdef USE_XVIMAGES
-	/* Should be YUV_12, but 422 actually gives a synced picture.  Though  */
-	geo.oformat = METEOR_GEO_YUV_422 | METEOR_GEO_YUV_12;
+    /* Should be YUV_12, but 422 actually gives a synced picture.  Though  */
+    geo.oformat = METEOR_GEO_YUV_422 | METEOR_GEO_YUV_12;
 	
 #else
-	geo.oformat = METEOR_GEO_RGB24;
+    geo.oformat = METEOR_GEO_RGB24;
 #endif
 
-	/* switch from interlaced capture to single field capture if */
-	/* the grab height is less than half the normal TV height */
-	/* this gives better quality captures when the object in the TV */
-	/* picture is moving */
-	if ((format == PAL) && (height <= (PAL_HEIGHT / 2)))
-		geo.oformat |= METEOR_GEO_ODD_ONLY;
-	if ((format == NTSC) && (height <= (NTSC_HEIGHT / 2)))
-		geo.oformat |= METEOR_GEO_ODD_ONLY;
+    /* switch from interlaced capture to single field capture if */
+    /* the grab height is less than half the normal TV height */
+    /* this gives better quality captures when the object in the TV */
+    /* picture is moving */
+    if ((format == PAL) && (height <= (PAL_HEIGHT / 2)))
+	geo.oformat |= METEOR_GEO_ODD_ONLY;
+    if ((format == NTSC) && (height <= (NTSC_HEIGHT / 2)))
+	geo.oformat |= METEOR_GEO_ODD_ONLY;
 
-	if (ioctl(bktr_fd, METEORSETGEO, &geo) < 0) {
-		printf("METEORSETGEO ioctl failed: %d\n", errno);
-		exit(1);
-	}
-	/* Select PAL or NTSC */
-	switch (format) {
-	case PAL:
-		c = METEOR_FMT_PAL;
-		break;
-	case NTSC:
-		c = METEOR_FMT_NTSC;
-		break;
-	default:
-		c = METEOR_FMT_NTSC;
-		break;
-	}
+    if (ioctl(bktr_fd, METEORSETGEO, &geo) < 0) {
+	printf("METEORSETGEO ioctl failed: %d\n", errno);
+	exit(1);
+    }
+    /* Select PAL or NTSC */
+    switch (format) {
+    case PAL:
+	c = METEOR_FMT_PAL;
+	break;
+    case NTSC:
+	c = METEOR_FMT_NTSC;
+	break;
+    default:
+	c = METEOR_FMT_NTSC;
+	break;
+    }
 
-	c = BT848_IFORM_F_PALBDGHI;
-	if (ioctl(bktr_fd, BT848SFMT, &c) < 0) {
-		DO_IOCTL_SERR("BT848SFMT", c);
-		return;
-	}
-	c = AUDIO_TUNER;
-	if (ioctl(tuner_fd, BT848_SAUDIO, &c) < 0) {
-		DO_IOCTL_SERR("BT848SFMT", c);
-		return;
-	}
-	c = CHNLSET_AUSTRALIA;
-	if (ioctl(tuner_fd, TVTUNER_SETTYPE, &c) < 0) {
-		DO_IOCTL_SERR("TVTUNER_SETTYPE", c);
-		return;
-	}
-	if (ioctl(tuner_fd, TVTUNER_SETCHNL, &channel) < 0) {
-		DO_IOCTL_SERR("TVTUNER_SETCHNL", channel);
-		return;
-	}
-	/* Select the Video Source */
-	/* Video In, Tuner, S-Video */
-	switch (source) {
-	case 0:
-		c = METEOR_INPUT_DEV0;
-		break;
-	case 1:
-		c = METEOR_INPUT_DEV1;
-		break;
-	case 2:
-		c = METEOR_INPUT_DEV2;
-		break;
-	case 3:
-		c = METEOR_INPUT_DEV3;
-		break;
-	default:
-		c = METEOR_INPUT_DEV0;
-		break;
-	}
+    c = BT848_IFORM_F_PALBDGHI;
+    if (ioctl(bktr_fd, BT848SFMT, &c) < 0) {
+	DO_IOCTL_SERR("BT848SFMT", c);
+	return;
+    }
+    c = AUDIO_TUNER;
+    if (ioctl(tuner_fd, BT848_SAUDIO, &c) < 0) {
+	DO_IOCTL_SERR("BT848SFMT", c);
+	return;
+    }
+    c = CHNLSET_AUSTRALIA;
+    if (ioctl(tuner_fd, TVTUNER_SETTYPE, &c) < 0) {
+	DO_IOCTL_SERR("TVTUNER_SETTYPE", c);
+	return;
+    }
+    if (ioctl(tuner_fd, TVTUNER_SETCHNL, &channel) < 0) {
+	DO_IOCTL_SERR("TVTUNER_SETCHNL", channel);
+	return;
+    }
+    /* Select the Video Source */
+    /* Video In, Tuner, S-Video */
+    switch (source) {
+    case 0:
+	c = METEOR_INPUT_DEV0;
+	break;
+    case 1:
+	c = METEOR_INPUT_DEV1;
+	break;
+    case 2:
+	c = METEOR_INPUT_DEV2;
+	break;
+    case 3:
+	c = METEOR_INPUT_DEV3;
+	break;
+    default:
+	c = METEOR_INPUT_DEV0;
+	break;
+    }
 
-	printf("Input - %x\n", c);
-	if (ioctl(bktr_fd, METEORSINPUT, &c) < 0) {
-		printf("ioctl failed: %d\n", errno);
-		exit(1);
-	}
-	/* Use mmap to Map the drivers grab buffer */
-	buffer_size = width * height * 4;	/* R,G,B,spare */
-	bktr_buffer = (unsigned char *)mmap((caddr_t) 0, buffer_size, PROT_READ,
-					    MAP_SHARED, bktr_fd, (off_t) 0);
+    printf("Input - %x\n", c);
+    if (ioctl(bktr_fd, METEORSINPUT, &c) < 0) {
+	printf("ioctl failed: %d\n", errno);
+	exit(1);
+    }
+    /* Use mmap to Map the drivers grab buffer */
+    buffer_size = width * height * 4;	/* R,G,B,spare */
+    bktr_buffer = (unsigned char *)mmap((caddr_t) 0, buffer_size, PROT_READ,
+					MAP_SHARED, bktr_fd, (off_t) 0);
 
-	if (bktr_buffer == (unsigned char *)MAP_FAILED)
-		exit(1);
+    if (bktr_buffer == (unsigned char *)MAP_FAILED)
+	exit(1);
 
 
-	/* We may need to wait for a short time to allow the grabber */
-	/* brightness to settle down */
-	sleep(GRABBER_SETTLE_TIME);
+    /* We may need to wait for a short time to allow the grabber */
+    /* brightness to settle down */
+    sleep(GRABBER_SETTLE_TIME);
 }
 
 /*--------------------------------------------------------------------------*/
 
 void
 Capture() {
-	int		c;
+    int		c;
 
-	/* Perform a single frame capture */
-	c = METEOR_CAP_SINGLE;
-	ioctl(bktr_fd, METEORCAPTUR, &c);
+    /* Perform a single frame capture */
+    c = METEOR_CAP_SINGLE;
+    ioctl(bktr_fd, METEORCAPTUR, &c);
 }
 
 /*--------------------------------------------------------------------------*/
 
 void
 SaveImage() {
-	unsigned char  *line_buffer;
-	int		o         , w, h;
-	unsigned char  *p;
-	unsigned char	header[30];
-	char           *filename = "t.ppm" /* argv[3] */ ;
+    unsigned char  *line_buffer;
+    int		o         , w, h;
+    unsigned char  *p;
+    unsigned char	header[30];
+    char           *filename = "t.ppm" /* argv[3] */ ;
 
-	/* Create the output file */
-	if ((o = open(filename, O_WRONLY | O_CREAT, 0644)) < 0) {
-		printf("ppm open failed: %d\n", errno);
-		exit(1);
-	}
-	/* make PPM header and save to file */
-	sprintf(header, "P6\n%d\n%d\n255\n", width, height);
-	write(o, header, strlen(header));
+    /* Create the output file */
+    if ((o = open(filename, O_WRONLY | O_CREAT, 0644)) < 0) {
+	printf("ppm open failed: %d\n", errno);
+	exit(1);
+    }
+    /* make PPM header and save to file */
+    sprintf(header, "P6\n%d\n%d\n255\n", width, height);
+    write(o, header, strlen(header));
 
-	/* save the RGB data to PPM file */
-	/* save this one line at a time */
-	line_buffer = (unsigned char *)malloc(width * 3 * sizeof(unsigned char));
-	p = bktr_buffer;
-	for (h = 0; h < height; h++) {
-		for (w = 0; w < width; w++) {
-			line_buffer[(w * 3) + 2] = *p++;	/* blue */
-			line_buffer[(w * 3) + 1] = *p++;	/* green */
-			line_buffer[(w * 3) + 0] = *p++;	/* red */
-			p++;	/* NULL byte */
-		}
-		write(o, line_buffer, width * 3);
+    /* save the RGB data to PPM file */
+    /* save this one line at a time */
+    line_buffer = (unsigned char *)malloc(width * 3 * sizeof(unsigned char));
+    p = bktr_buffer;
+    for (h = 0; h < height; h++) {
+	for (w = 0; w < width; w++) {
+	    line_buffer[(w * 3) + 2] = *p++;	/* blue */
+	    line_buffer[(w * 3) + 1] = *p++;	/* green */
+	    line_buffer[(w * 3) + 0] = *p++;	/* red */
+	    p++;	/* NULL byte */
 	}
-	close(o);
-	free(line_buffer);
+	write(o, line_buffer, width * 3);
+    }
+    close(o);
+    free(line_buffer);
 }
 
 void
 X_ShowCursor(void) {
-	XDefineCursor(disp, win, 0);
+    XDefineCursor(disp, win, 0);
 }
 
 void
 X_HideCursor(void) {
-	Cursor		no_ptr;
-	Pixmap		bm_no;
-	XColor		black  , dummy;
-	Colormap	colormap;
-	static unsigned char bm_no_data[] = {0, 0, 0, 0, 0, 0, 0, 0};
+    Cursor		no_ptr;
+    Pixmap		bm_no;
+    XColor		black  , dummy;
+    Colormap	colormap;
+    static unsigned char bm_no_data[] = {0, 0, 0, 0, 0, 0, 0, 0};
 
-	colormap = DefaultColormap(disp, DefaultScreen(disp));
-	XAllocNamedColor(disp, colormap, "black", &black, &dummy);
-	bm_no = XCreateBitmapFromData(disp, win, bm_no_data, 8, 8);
-	no_ptr = XCreatePixmapCursor(disp, bm_no, bm_no, &black, &black, 0, 0);
+    colormap = DefaultColormap(disp, DefaultScreen(disp));
+    XAllocNamedColor(disp, colormap, "black", &black, &dummy);
+    bm_no = XCreateBitmapFromData(disp, win, bm_no_data, 8, 8);
+    no_ptr = XCreatePixmapCursor(disp, bm_no, bm_no, &black, &black, 0, 0);
 
-	XDefineCursor(disp, win, no_ptr);
-	XFreeCursor(disp, no_ptr);
-	if (bm_no != None)
-		XFreePixmap(disp, bm_no);
+    XDefineCursor(disp, win, no_ptr);
+    XFreeCursor(disp, no_ptr);
+    if (bm_no != None)
+	XFreePixmap(disp, bm_no);
 
 }
 
@@ -321,159 +321,159 @@
 #define _NET_WM_STATE_TOGGLE        2	/* toggle property  */
 void
 vo_x11_ewmh_fullscreen(int action) {
-	XEvent		xev;
+    XEvent		xev;
 
-	assert(action == _NET_WM_STATE_REMOVE ||
-	       action == _NET_WM_STATE_ADD || action == _NET_WM_STATE_TOGGLE);
+    assert(action == _NET_WM_STATE_REMOVE ||
+	   action == _NET_WM_STATE_ADD || action == _NET_WM_STATE_TOGGLE);
 
 
-	/* init X event structure for _NET_WM_FULLSCREEN client msg */
-	xev.xclient.type = ClientMessage;
-	xev.xclient.serial = 0;
-	xev.xclient.send_event = True;
-	xev.xclient.message_type = XInternAtom(disp, "_NET_WM_STATE", False);
-	xev.xclient.window = win;
-	xev.xclient.format = 32;
-	xev.xclient.data.l[0] = action;
-	xev.xclient.data.l[1] = XInternAtom(disp, "_NET_WM_STATE_FULLSCREEN", False);
-	xev.xclient.data.l[2] = 0;
-	xev.xclient.data.l[3] = 0;
-	xev.xclient.data.l[4] = 0;
+    /* init X event structure for _NET_WM_FULLSCREEN client msg */
+    xev.xclient.type = ClientMessage;
+    xev.xclient.serial = 0;
+    xev.xclient.send_event = True;
+    xev.xclient.message_type = XInternAtom(disp, "_NET_WM_STATE", False);
+    xev.xclient.window = win;
+    xev.xclient.format = 32;
+    xev.xclient.data.l[0] = action;
+    xev.xclient.data.l[1] = XInternAtom(disp, "_NET_WM_STATE_FULLSCREEN", False);
+    xev.xclient.data.l[2] = 0;
+    xev.xclient.data.l[3] = 0;
+    xev.xclient.data.l[4] = 0;
 
-	/* finally send that damn thing */
-	if (!XSendEvent(disp, DefaultRootWindow(disp), False,
-			SubstructureRedirectMask | SubstructureNotifyMask,
-			&xev)) {
-		fprintf(stderr, "Failed to send fullscreen command\n");
-	}
+    /* finally send that damn thing */
+    if (!XSendEvent(disp, DefaultRootWindow(disp), False,
+		    SubstructureRedirectMask | SubstructureNotifyMask,
+		    &xev)) {
+	fprintf(stderr, "Failed to send fullscreen command\n");
+    }
 }
 
 
 void
 X_Setup(int w, int h) {
-	XGCValues	gcvals;
-	Window		root;
-	XVisualInfo	vinfo_pref;
-	int		num_vis;
-	XPixmapFormatValues *pf;
-	int		num_pf    , pfi, i, j;
-	XSizeHints	sz_hint;
+    XGCValues	gcvals;
+    Window		root;
+    XVisualInfo	vinfo_pref;
+    int		num_vis;
+    XPixmapFormatValues *pf;
+    int		num_pf    , pfi, i, j;
+    XSizeHints	sz_hint;
 	
-	disp = XOpenDisplay(NULL);
-	if (!disp) {
-		fprintf(stderr, "X-Error: unable to connect to display\n");
-		exit(1);
-	}
-	XSynchronize(disp, True);
+    disp = XOpenDisplay(NULL);
+    if (!disp) {
+	fprintf(stderr, "X-Error: unable to connect to display\n");
+	exit(1);
+    }
+    XSynchronize(disp, True);
 
-	scr = DefaultScreen(disp);
-	vis = DefaultVisual(disp, scr);
-	root = DefaultRootWindow(disp);
-	depth = DefaultDepth(disp, scr);
+    scr = DefaultScreen(disp);
+    vis = DefaultVisual(disp, scr);
+    root = DefaultRootWindow(disp);
+    depth = DefaultDepth(disp, scr);
 
-	vinfo_pref.screen = scr;
-	vinfo_pref.visualid = XVisualIDFromVisual(vis);
-	vi = XGetVisualInfo(disp, VisualScreenMask | VisualIDMask,
-			    &vinfo_pref, &num_vis);
-	assert(num_vis == 1);
+    vinfo_pref.screen = scr;
+    vinfo_pref.visualid = XVisualIDFromVisual(vis);
+    vi = XGetVisualInfo(disp, VisualScreenMask | VisualIDMask,
+			&vinfo_pref, &num_vis);
+    assert(num_vis == 1);
 
-	win = XCreateSimpleWindow(disp, root, 0, 0, w, h, 0, 0, 0);
-	gc = XCreateGC(disp, win, (unsigned long)0, &gcvals);
-	XSetForeground(disp, gc, 0);
-	XSetBackground(disp, gc, 1);
+    win = XCreateSimpleWindow(disp, root, 0, 0, w, h, 0, 0, 0);
+    gc = XCreateGC(disp, win, (unsigned long)0, &gcvals);
+    XSetForeground(disp, gc, 0);
+    XSetBackground(disp, gc, 1);
 
-	XMapWindow(disp, win);
-	cmap = DefaultColormap(disp, scr);
+    XMapWindow(disp, win);
+    cmap = DefaultColormap(disp, scr);
 
-	sz_hint.flags = PAspect;
-	sz_hint.min_aspect.x = width;
-	sz_hint.min_aspect.y = height;
-	sz_hint.max_aspect.x = width;
-	sz_hint.max_aspect.y = height;
+    sz_hint.flags = PAspect;
+    sz_hint.min_aspect.x = width;
+    sz_hint.min_aspect.y = height;
+    sz_hint.max_aspect.x = width;
+    sz_hint.max_aspect.y = height;
 
-	/* set min height/width to 4 to avoid off by one errors */
-	sz_hint.min_width = sz_hint.min_height = 4;
-	sz_hint.flags |= PMinSize;
-	XSetWMNormalHints(disp, win, &sz_hint);
+    /* set min height/width to 4 to avoid off by one errors */
+    sz_hint.min_width = sz_hint.min_height = 4;
+    sz_hint.flags |= PMinSize;
+    XSetWMNormalHints(disp, win, &sz_hint);
 
-	XSync(disp, False);
+    XSync(disp, False);
 
-	/* Setup with Xv extension  */
-	xv_adaptor = -1;
-	xv_format_id = -1;
-	XvQueryAdaptors(disp, root, &xv_num_adaptors, &xv_adaptors);
-	for (i = 0; i < xv_num_adaptors; i++) {
-		XvAdaptorInfo  *adaptor = &xv_adaptors[i];
-		int		takes_images;
+    /* Setup with Xv extension  */
+    xv_adaptor = -1;
+    xv_format_id = -1;
+    XvQueryAdaptors(disp, root, &xv_num_adaptors, &xv_adaptors);
+    for (i = 0; i < xv_num_adaptors; i++) {
+	XvAdaptorInfo  *adaptor = &xv_adaptors[i];
+	int		takes_images;
 
-		takes_images = adaptor->type & (XvInputMask | XvImageMask);
-		if (takes_images) {
-			XvImageFormatValues *formats;
-			int		num_formats;
+	takes_images = adaptor->type & (XvInputMask | XvImageMask);
+	if (takes_images) {
+	    XvImageFormatValues *formats;
+	    int		num_formats;
 
-			formats = XvListImageFormats(disp, adaptor->base_id, &num_formats);
-			for (j = 0; j < num_formats; j++)
-				if (formats[j].type == XvYUV && formats[j].format == XvPlanar &&
-				    strcmp(formats[j].guid, "YV12") == 0)
-					break;
-			if (j < num_formats) {
-				xv_adaptor = i;
-				xv_format_id = formats[j].id;
-				break;
-			}
-		}
+	    formats = XvListImageFormats(disp, adaptor->base_id, &num_formats);
+	    for (j = 0; j < num_formats; j++)
+		if (formats[j].type == XvYUV && formats[j].format == XvPlanar &&
+		    strcmp(formats[j].guid, "YV12") == 0)
+		    break;
+	    if (j < num_formats) {
+		xv_adaptor = i;
+		xv_format_id = formats[j].id;
+		break;
+	    }
 	}
-	assert(xv_adaptor >= 0);
+    }
+    assert(xv_adaptor >= 0);
 
-	/* Create an image to captured frames  */
+    /* Create an image to captured frames  */
 #ifdef USE_XVIMAGES
-	yuv_image = XvShmCreateImage(disp, xv_adaptors[xv_adaptor].base_id,
-				     xv_format_id, 0, w, h, &shminfo);
-	if (!yuv_image)
-		fprintf(stderr, "X-Error: unable to create XvShm XImage\n");
+    yuv_image = XvShmCreateImage(disp, xv_adaptors[xv_adaptor].base_id,
+				 xv_format_id, 0, w, h, &shminfo);
+    if (!yuv_image)
+	fprintf(stderr, "X-Error: unable to create XvShm XImage\n");
 
-	shminfo.shmid = shmget(IPC_PRIVATE, yuv_image->data_size, IPC_CREAT | 0777);
-	if (shminfo.shmid == -1)
-		fprintf(stderr, "SharedMemory Error: unable to get identifier\n");
+    shminfo.shmid = shmget(IPC_PRIVATE, yuv_image->data_size, IPC_CREAT | 0777);
+    if (shminfo.shmid == -1)
+	fprintf(stderr, "SharedMemory Error: unable to get identifier\n");
 
-	shminfo.shmaddr = yuv_image->data = shmat(shminfo.shmid, 0, 0);
-	yuv_image->data = shminfo.shmaddr;
+    shminfo.shmaddr = yuv_image->data = shmat(shminfo.shmid, 0, 0);
+    yuv_image->data = shminfo.shmaddr;
 #else
-	rgb_image = XShmCreateImage(disp, vis, depth, ZPixmap, NULL, &shminfo, w, h);
-	if (!rgb_image)
-		fprintf(stderr, "X-Error: unable to create XShm XImage\n");
+    rgb_image = XShmCreateImage(disp, vis, depth, ZPixmap, NULL, &shminfo, w, h);
+    if (!rgb_image)
+	fprintf(stderr, "X-Error: unable to create XShm XImage\n");
 
-	shminfo.shmid = shmget(IPC_PRIVATE,
-			       rgb_image->bytes_per_line * rgb_image->height,
-			       IPC_CREAT | 0777);
-	if (shminfo.shmid == -1)
-		fprintf(stderr, "SharedMemory Error: unable to get identifier\n");
+    shminfo.shmid = shmget(IPC_PRIVATE,
+			   rgb_image->bytes_per_line * rgb_image->height,
+			   IPC_CREAT | 0777);
+    if (shminfo.shmid == -1)
+	fprintf(stderr, "SharedMemory Error: unable to get identifier\n");
 
-	shminfo.shmaddr = rgb_image->data = shmat(shminfo.shmid, 0, 0);
+    shminfo.shmaddr = rgb_image->data = shmat(shminfo.shmid, 0, 0);
 #endif
 
-	if (!XShmAttach(disp, &shminfo))
-		fprintf(stderr, "X-Error: unable to attach XShm Shared Memory Segment\n");
+    if (!XShmAttach(disp, &shminfo))
+	fprintf(stderr, "X-Error: unable to attach XShm Shared Memory Segment\n");
 
-	/* Create a pixmap for the window background  */
+    /* Create a pixmap for the window background  */
 #ifdef OLD
-	pmap = XShmCreatePixmap(disp, win, shminfo.shmaddr, &shminfo, w, h, depth);
-	if (!pmap)
-		fprintf(stderr, "Unable to create pixmap\n");
+    pmap = XShmCreatePixmap(disp, win, shminfo.shmaddr, &shminfo, w, h, depth);
+    if (!pmap)
+	fprintf(stderr, "Unable to create pixmap\n");
 #endif
 
-	/* Determine bits-per-pixel for pixmaps  */
-	pf = XListPixmapFormats(disp, &num_pf);
-	assert(pf);
-	for (pfi = 0; pfi < num_pf; pfi++)
-		if (pf[pfi].depth == vi->depth)
-			break;
-	assert(pfi < num_pf);
-	bits_per_pixel = pf[pfi].bits_per_pixel;
-	XFree(pf);
+    /* Determine bits-per-pixel for pixmaps  */
+    pf = XListPixmapFormats(disp, &num_pf);
+    assert(pf);
+    for (pfi = 0; pfi < num_pf; pfi++)
+	if (pf[pfi].depth == vi->depth)
+	    break;
+    assert(pfi < num_pf);
+    bits_per_pixel = pf[pfi].bits_per_pixel;
+    XFree(pf);
 
 #ifdef OLD
-	XSetWindowBackgroundPixmap(disp, win, pmap);
+    XSetWindowBackgroundPixmap(disp, win, pmap);
 #endif
 }
 
@@ -481,16 +481,16 @@
 
 void
 X_Shutdown() {
-	XShmDetach(disp, &shminfo);
+    XShmDetach(disp, &shminfo);
 #ifdef USE_XVIMAGES
-	shmctl(shminfo.shmid, IPC_RMID, 0);
-	shmdt(shminfo.shmaddr);
-	XFree(yuv_image);
+    shmctl(shminfo.shmid, IPC_RMID, 0);
+    shmdt(shminfo.shmaddr);
+    XFree(yuv_image);
 #else
-	XDestroyImage(rgb_image);
+    XDestroyImage(rgb_image);
 #endif
-	shmdt(shminfo.shmaddr);
-	shmctl(shminfo.shmid, IPC_RMID, 0);
+    shmdt(shminfo.shmaddr);
+    shmctl(shminfo.shmid, IPC_RMID, 0);
 }
 
 
@@ -498,19 +498,19 @@
 
 void
 X_Display(void) {
-	int		_w        , _h, _d;
-	Window		_dw;
+    int		_w        , _h, _d;
+    Window		_dw;
 
 #ifdef USE_XVIMAGES
-	XGetGeometry(disp, win, &_dw, &_d, &_d, &_w, &_h, &_d, &_d);
-	XvShmPutImage(disp, xv_adaptors[xv_adaptor].base_id, win,
-		      gc, yuv_image, 0, 0, yuv_image->width, yuv_image->height,
-		      0, 0, _w, _h, True);
+    XGetGeometry(disp, win, &_dw, &_d, &_d, &_w, &_h, &_d, &_d);
+    XvShmPutImage(disp, xv_adaptors[xv_adaptor].base_id, win,
+		  gc, yuv_image, 0, 0, yuv_image->width, yuv_image->height,
+		  0, 0, _w, _h, True);
 #else
-	XShmPutImage(disp, win, gc, rgb_image, 0, 0, 0, 0,
-		     rgb_image->width, rgb_image->height, False);
+    XShmPutImage(disp, win, gc, rgb_image, 0, 0, 0, 0,
+		 rgb_image->width, rgb_image->height, False);
 #endif
-	XSync(disp, False);
+    XSync(disp, False);
 }
 
 #define CMD_NONE	0
@@ -529,359 +529,359 @@
 int
 main(int argc, char *argv[]) {
 #ifndef USE_XVIMAGES
-	HermesHandle	conv;
-	HermesFormat	fmt_source, fmt_dest;
+    HermesHandle	conv;
+    HermesFormat	fmt_source, fmt_dest;
 #endif
-	XEvent		e;
-	char           	*scratch_buf, *code, *c, *mixerdev;
-	int		frames, channelidx, oldchan, mute, cursor, fd, ret, cmd;
-	int		exitnow, mfd, uselirc, curvol;
-	struct timeval	then, now, diff, lastmove;
-	float		rate;
-	KeySym		key;
-	char		text      [255];
-	int		channellist[] = {2, 7, 9, 10, 28};
-	struct lirc_config *config;
-	struct pollfd	fds[1];
+    XEvent		e;
+    char           	*scratch_buf, *code, *c, *mixerdev;
+    int		frames, channelidx, oldchan, mute, cursor, fd, ret, cmd;
+    int		exitnow, mfd, uselirc, curvol;
+    struct timeval	then, now, diff, lastmove;
+    float		rate;
+    KeySym		key;
+    char		text      [255];
+    int		channellist[] = {2, 7, 9, 10, 28};
+    struct lirc_config *config;
+    struct pollfd	fds[1];
     
 #define NUMCHANS (sizeof(channellist) / sizeof(channellist[0]))
 
-	channelidx = mute = cursor = 0;
+    channelidx = mute = cursor = 0;
 
-	oldchan = channel = channellist[channelidx];
+    oldchan = channel = channellist[channelidx];
 
 #ifndef USE_XVIMAGES
-	if (!Hermes_Init()) {
-		printf("Couldn't initialise Hermes!\n");
-		exit(1);
-	}
-	conv = Hermes_ConverterInstance(HERMES_CONVERT_NORMAL);
-	if (!conv) {
-		printf("Could not obtain converter instance from Hermes!\n");
-		exit(1);
-	}
+    if (!Hermes_Init()) {
+	printf("Couldn't initialise Hermes!\n");
+	exit(1);
+    }
+    conv = Hermes_ConverterInstance(HERMES_CONVERT_NORMAL);
+    if (!conv) {
+	printf("Could not obtain converter instance from Hermes!\n");
+	exit(1);
+    }
 #endif
 
-	X_Setup(width, height);
-	XSelectInput(disp, win, KeyReleaseMask | PointerMotionMask | ButtonPressMask | ButtonReleaseMask);
+    X_Setup(width, height);
+    XSelectInput(disp, win, KeyReleaseMask | PointerMotionMask | ButtonPressMask | ButtonReleaseMask);
 
-	X_HideCursor();
+    X_HideCursor();
 
-	/* Open Capture device  */
-	Open();
+    /* Open Capture device  */
+    Open();
 
-	/* Open audio mixer */
-	mixerdev = "/dev/mixer";
-	if ((mfd = open(mixerdev, O_RDWR)) == -1)
-		fprintf(stderr, "Unable to open %s - %s\n", mixerdev, strerror(errno));
+    /* Open audio mixer */
+    mixerdev = "/dev/mixer";
+    if ((mfd = open(mixerdev, O_RDWR)) == -1)
+	fprintf(stderr, "Unable to open %s - %s\n", mixerdev, strerror(errno));
 
-	/* Talk to LIRC */
-	if ((fd = lirc_init(basename(argv[0]), 1)) == -1) {
-		fprintf(stderr, "Unable to init lirc client library\n");
-		uselirc = 0;
-	} else {
-		if (lirc_readconfig(NULL, &config, NULL) != 0) {
-			fprintf(stderr, "Unable to parse config file\n");
-			uselirc = 0;
-		} else
-			uselirc = 1;
-		fds[0].fd = fd;
-		fds[0].events = POLLRDNORM;
-	}
+    /* Talk to LIRC */
+    if ((fd = lirc_init(basename(argv[0]), 1)) == -1) {
+	fprintf(stderr, "Unable to init lirc client library\n");
+	uselirc = 0;
+    } else {
+	if (lirc_readconfig(NULL, &config, NULL) != 0) {
+	    fprintf(stderr, "Unable to parse config file\n");
+	    uselirc = 0;
+	} else
+	    uselirc = 1;
+	fds[0].fd = fd;
+	fds[0].events = POLLRDNORM;
+    }
 
 #ifndef USE_XVIMAGES
-	/* Conversion from and to formats  */
-	fmt_source.indexed = 0;
-	fmt_source.bits = 32;
-	fmt_source.r = 0xff0000;
-	fmt_source.g = 0x00ff00;
-	fmt_source.b = 0x0000ff;
-	fmt_source.a = 0;
+    /* Conversion from and to formats  */
+    fmt_source.indexed = 0;
+    fmt_source.bits = 32;
+    fmt_source.r = 0xff0000;
+    fmt_source.g = 0x00ff00;
+    fmt_source.b = 0x0000ff;
+    fmt_source.a = 0;
 
-	fmt_dest.indexed = 0;
-	fmt_dest.bits = bits_per_pixel;
-	fmt_dest.r = vi->red_mask;
-	fmt_dest.g = vi->green_mask;
-	fmt_dest.b = vi->blue_mask;
-	fmt_dest.a = 0;
+    fmt_dest.indexed = 0;
+    fmt_dest.bits = bits_per_pixel;
+    fmt_dest.r = vi->red_mask;
+    fmt_dest.g = vi->green_mask;
+    fmt_dest.b = vi->blue_mask;
+    fmt_dest.a = 0;
 #else
-	scratch_buf = malloc(width * height);
+    scratch_buf = malloc(width * height);
 #endif
 
-	frames = 0;
-	gettimeofday(&then, NULL);
-	gettimeofday(&lastmove, NULL);
+    frames = 0;
+    gettimeofday(&then, NULL);
+    gettimeofday(&lastmove, NULL);
 
-	exitnow = 0;
+    exitnow = 0;
 
-	/* Capture loop  */
-	while (1) {
-		if (frames == 50) {
-			gettimeofday(&now, NULL);
-			timersub(&now, &then, &diff);
+    /* Capture loop  */
+    while (1) {
+	if (frames == 50) {
+	    gettimeofday(&now, NULL);
+	    timersub(&now, &then, &diff);
 
-			rate = (float)frames / (float)(diff.tv_usec / 1000000.0 + diff.tv_sec);
+	    rate = (float)frames / (float)(diff.tv_usec / 1000000.0 + diff.tv_sec);
 
-			printf("%d frames in %.2f seconds, rate %.2f\n", frames, (float)(diff.tv_usec / 1000000.0) + diff.tv_sec, rate);
-			gettimeofday(&then, NULL);
-			frames = 0;
-			XResetScreenSaver(disp);
-		}
-		frames++;
+	    printf("%d frames in %.2f seconds, rate %.2f\n", frames, (float)(diff.tv_usec / 1000000.0) + diff.tv_sec, rate);
+	    gettimeofday(&then, NULL);
+	    frames = 0;
+	    XResetScreenSaver(disp);
+	}
+	frames++;
 
-		timersub(&now, &lastmove, &diff);
-		if (((float)diff.tv_usec / 1000000.0 + (float)diff.tv_sec) > 2.0) {
-			if (cursor) {
-				X_HideCursor();
-				cursor = 0;
-			}
-		} else {
-			if (!cursor) {
-				X_ShowCursor();
-				cursor = 1;
-			}
-		}
+	timersub(&now, &lastmove, &diff);
+	if (((float)diff.tv_usec / 1000000.0 + (float)diff.tv_sec) > 2.0) {
+	    if (cursor) {
+		X_HideCursor();
+		cursor = 0;
+	    }
+	} else {
+	    if (!cursor) {
+		X_ShowCursor();
+		cursor = 1;
+	    }
+	}
 
-		if (XCheckMaskEvent(disp, PointerMotionMask, &e) && e.type == MotionNotify) {
-			gettimeofday(&lastmove, NULL);
-		}
-		cmd = CMD_NONE;
+	if (XCheckMaskEvent(disp, PointerMotionMask, &e) && e.type == MotionNotify) {
+	    gettimeofday(&lastmove, NULL);
+	}
+	cmd = CMD_NONE;
 
-		if (XCheckMaskEvent(disp, ButtonReleaseMask, &e)) {
-			printf("e.type = %d\n", e.type);
-			cmd = CMD_MUTE;
-		}
-		if (XCheckMaskEvent(disp, KeyReleaseMask, &e) && e.type == KeyRelease) {
-			gettimeofday(&lastmove, NULL);
+	if (XCheckMaskEvent(disp, ButtonReleaseMask, &e)) {
+	    printf("e.type = %d\n", e.type);
+	    cmd = CMD_MUTE;
+	}
+	if (XCheckMaskEvent(disp, KeyReleaseMask, &e) && e.type == KeyRelease) {
+	    gettimeofday(&lastmove, NULL);
 
-			XLookupString(&e.xkey, text, 255, &key, 0);
-			printf("Press - %c\n", text[0]);
+	    XLookupString(&e.xkey, text, 255, &key, 0);
+	    printf("Press - %c\n", text[0]);
 
-			switch (text[0]) {
-			case 'q':
-				cmd = CMD_QUIT;
-				break;
+	    switch (text[0]) {
+	    case 'q':
+		cmd = CMD_QUIT;
+		break;
 
-			case '=':
-			case '+':
-				cmd = CMD_CHNUP;
-				break;
+	    case '=':
+	    case '+':
+		cmd = CMD_CHNUP;
+		break;
 
-			case '-':
-				cmd = CMD_CHNDN;
-				break;
+	    case '-':
+		cmd = CMD_CHNDN;
+		break;
 
-			case 'h':
-				cmd = CMD_CURSOR;
-				break;
+	    case 'h':
+		cmd = CMD_CURSOR;
+		break;
 
-			case 'm':
-				cmd = CMD_MUTE;
-				break;
+	    case 'm':
+		cmd = CMD_MUTE;
+		break;
 
-			case 'r':
-				cmd = CMD_RELOAD;
-				break;
+	    case 'r':
+		cmd = CMD_RELOAD;
+		break;
 
-			case ',':
-				cmd = CMD_VOLDN;
-				break;
+	    case ',':
+		cmd = CMD_VOLDN;
+		break;
 
-			case '.':
-				cmd = CMD_VOLUP;
-				break;
+	    case '.':
+		cmd = CMD_VOLUP;
+		break;
 
-			case 'f':
-				cmd = CMD_FSTOGGLE;
-				break;
-			}
-		}
+	    case 'f':
+		cmd = CMD_FSTOGGLE;
+		break;
+	    }
+	}
 
-		/* Poll for IR events */
-		if (uselirc) {
-			fds[0].revents = 0;
+	/* Poll for IR events */
+	if (uselirc) {
+	    fds[0].revents = 0;
 
-			while (1) {
+	    while (1) {
 		
-				if (poll(fds, 1, 0) == -1) {
-					fprintf(stderr, "Poll failed - %s\n", strerror(errno));
-					exit(EXIT_FAILURE);
-				}
-				if ((fds[0].revents & POLLRDNORM) != 0) {
-					fprintf(stderr, "Processing IR.. \n", lircfails);
+		if (poll(fds, 1, 0) == -1) {
+		    fprintf(stderr, "Poll failed - %s\n", strerror(errno));
+		    exit(EXIT_FAILURE);
+		}
+		if ((fds[0].revents & POLLRDNORM) != 0) {
+		    fprintf(stderr, "Processing IR.. \n", lircfails);
 
-					/* Try and get an event */
-					if (lirc_nextcode(&code) == 0) {
-						if (code == NULL) {
-							continue;
-						}
+		    /* Try and get an event */
+		    if (lirc_nextcode(&code) == 0) {
+			if (code == NULL) {
+			    continue;
+			}
 			
-						/* Translate it (via the config file) */
-						while ((ret = lirc_code2char(config, code, &c)) == 0 &&
-						       c != NULL) {
-							fprintf(stderr, "Got command \"%s\"\n", c);
+			/* Translate it (via the config file) */
+			while ((ret = lirc_code2char(config, code, &c)) == 0 &&
+			       c != NULL) {
+			    fprintf(stderr, "Got command \"%s\"\n", c);
 
-							if (!strcmp(c, "Mute"))
-								cmd = CMD_MUTE;
-							else if (!strcmp(c, "CH_UP"))
-								cmd = CMD_CHNUP;
-							else if (!strcmp(c, "CH_DOWN"))
-								cmd = CMD_CHNDN;
-							else if (!strcmp(c, "Power"))
-								cmd = CMD_QUIT;
-							else if (!strcmp(c, "VOL_UP"))
-								cmd = CMD_VOLUP;
-							else if (!strcmp(c, "VOL_DOWN"))
-								cmd = CMD_VOLDN;
-							else if (!strcmp(c, "AV/TV"))
-								cmd = CMD_FSTOGGLE;
+			    if (!strcmp(c, "Mute"))
+				cmd = CMD_MUTE;
+			    else if (!strcmp(c, "CH_UP"))
+				cmd = CMD_CHNUP;
+			    else if (!strcmp(c, "CH_DOWN"))
+				cmd = CMD_CHNDN;
+			    else if (!strcmp(c, "Power"))
+				cmd = CMD_QUIT;
+			    else if (!strcmp(c, "VOL_UP"))
+				cmd = CMD_VOLUP;
+			    else if (!strcmp(c, "VOL_DOWN"))
+				cmd = CMD_VOLDN;
+			    else if (!strcmp(c, "AV/TV"))
+				cmd = CMD_FSTOGGLE;
 			    
-							free(code);
-						}
-					} else {
-						/* lircd probably died */
-						uselirc = 0;
-						fprintf(stderr, "Failed to communicate with LIRC - daemon exited?");
-					}
-				} else
-					break;
+			    free(code);
 			}
+		    } else {
+			/* lircd probably died */
+			uselirc = 0;
+			fprintf(stderr, "Failed to communicate with LIRC - daemon exited?");
+		    }
+		} else
+		    break;
+	    }
+	}
+	switch (cmd) {
+	case CMD_QUIT:
+	    exitnow = 1;
+	    break;
+
+	case CMD_CHNUP:
+	case CMD_CHNDN:
+	    if (cmd == CMD_CHNUP)
+		channelidx++;
+	    else
+		channelidx--;
+
+	    if (channelidx < 0)
+		channelidx = NUMCHANS - 1;
+	    if (channelidx > NUMCHANS - 1)
+		channelidx = 0;
+
+	    channel = channellist[channelidx];
+
+	    printf("Channel - %d\n", channel);
+	    if (oldchan != channel) {
+		oldchan = channel;
+
+		if (ioctl(tuner_fd, TVTUNER_SETCHNL, &channel) < 0) {
+		    DO_IOCTL_SERR("TVTUNER_SETCHNL", channel);
+		    exit(1);
 		}
-		switch (cmd) {
-		case CMD_QUIT:
-			exitnow = 1;
-			break;
-
-		case CMD_CHNUP:
-		case CMD_CHNDN:
-			if (cmd == CMD_CHNUP)
-				channelidx++;
-			else
-				channelidx--;
-
-			if (channelidx < 0)
-				channelidx = NUMCHANS - 1;
-			if (channelidx > NUMCHANS - 1)
-				channelidx = 0;
-
-			channel = channellist[channelidx];
-
-			printf("Channel - %d\n", channel);
-			if (oldchan != channel) {
-				oldchan = channel;
-
-				if (ioctl(tuner_fd, TVTUNER_SETCHNL, &channel) < 0) {
-					DO_IOCTL_SERR("TVTUNER_SETCHNL", channel);
-					exit(1);
-				}
-			}
-			break;
+	    }
+	    break;
 
-		case CMD_MUTE:
-			if (mute)
-				mute = 0;
-			else
-				mute = 1;
+	case CMD_MUTE:
+	    if (mute)
+		mute = 0;
+	    else
+		mute = 1;
 
-			printf("Mute - %d\n", mute);
-			if (ioctl(tuner_fd, BT848_SAUDIO, &mute) < 0) {
-				DO_IOCTL_SERR("BT848_SAUDIO", mute);
-				exit(1);
-			}
-			break;
+	    printf("Mute - %d\n", mute);
+	    if (ioctl(tuner_fd, BT848_SAUDIO, &mute) < 0) {
+		DO_IOCTL_SERR("BT848_SAUDIO", mute);
+		exit(1);
+	    }
+	    break;
 
-		case CMD_CURSOR:
-			if (cursor) {
-				printf("Cursor hidden\n");
-				X_HideCursor();
-				cursor = 0;
-			} else {
-				printf("Cursor revealed\n");
-				X_ShowCursor();
-				cursor = 1;
-			}
-			break;
+	case CMD_CURSOR:
+	    if (cursor) {
+		printf("Cursor hidden\n");
+		X_HideCursor();
+		cursor = 0;
+	    } else {
+		printf("Cursor revealed\n");
+		X_ShowCursor();
+		cursor = 1;
+	    }
+	    break;
 
-		case CMD_RELOAD:
-			printf("Reloading\n");
-			Close();
-			Open();
-			break;
+	case CMD_RELOAD:
+	    printf("Reloading\n");
+	    Close();
+	    Open();
+	    break;
 
-		case CMD_VOLUP:
-		case CMD_VOLDN:
-			if (ioctl(mfd, MIXER_READ(SOUND_MIXER_VOLUME), &curvol) == -1) {
-				fprintf(stderr, "Unable to read current volume - %s\n", strerror(errno));
-				break;
-			}
-			curvol = curvol & 0x7f;
+	case CMD_VOLUP:
+	case CMD_VOLDN:
+	    if (ioctl(mfd, MIXER_READ(SOUND_MIXER_VOLUME), &curvol) == -1) {
+		fprintf(stderr, "Unable to read current volume - %s\n", strerror(errno));
+		break;
+	    }
+	    curvol = curvol & 0x7f;
 
-			if (cmd == CMD_VOLUP)
-				curvol += 5;
-			else
-				curvol -= 5;
+	    if (cmd == CMD_VOLUP)
+		curvol += 5;
+	    else
+		curvol -= 5;
 
-			if (curvol < 0)
-				curvol = 0;
-			if (curvol > 100)
-				curvol = 100;
+	    if (curvol < 0)
+		curvol = 0;
+	    if (curvol > 100)
+		curvol = 100;
 
-			printf("Setting volume to %d\n", curvol);
-			curvol |= curvol << 8;
+	    printf("Setting volume to %d\n", curvol);
+	    curvol |= curvol << 8;
 
-			if (ioctl(mfd, MIXER_WRITE(SOUND_MIXER_VOLUME), &curvol) == -1) {
-				fprintf(stderr, "Unable to write volume - %s\n", strerror(errno));
-				break;
-			}
-			break;
+	    if (ioctl(mfd, MIXER_WRITE(SOUND_MIXER_VOLUME), &curvol) == -1) {
+		fprintf(stderr, "Unable to write volume - %s\n", strerror(errno));
+		break;
+	    }
+	    break;
 
-		case CMD_FSTOGGLE:
-			vo_x11_ewmh_fullscreen(_NET_WM_STATE_TOGGLE);
-			break;
+	case CMD_FSTOGGLE:
+	    vo_x11_ewmh_fullscreen(_NET_WM_STATE_TOGGLE);
+	    break;
 
-		}
+	}
 
-		Capture();
+	Capture();
 
 #ifdef USE_XVIMAGES
-		/* bktr's YUV_12 is planar W*H bytes Y, W/2*H/2 bytes U,  */
-		/* W/2*H/2 bytes V.  Xv's YV12 is the same with U and V  */
-		/* planes reversed.                                      */
-		{
-			int		y_off     , u_off, v_off;
-			y_off = 0;
-			u_off = width * height;
-			v_off = u_off + width * height / 4;
+	/* bktr's YUV_12 is planar W*H bytes Y, W/2*H/2 bytes U,  */
+	/* W/2*H/2 bytes V.  Xv's YV12 is the same with U and V  */
+	/* planes reversed.                                      */
+	{
+	    int		y_off     , u_off, v_off;
+	    y_off = 0;
+	    u_off = width * height;
+	    v_off = u_off + width * height / 4;
 
-			assert(yuv_image->data_size == width * height * 3 / 2);
-			memcpy(yuv_image->data, bktr_buffer, u_off - y_off);
-			memcpy(yuv_image->data + u_off, bktr_buffer + v_off, v_off - u_off);
-			memcpy(yuv_image->data + v_off, bktr_buffer + u_off, v_off - u_off);
-		}
+	    assert(yuv_image->data_size == width * height * 3 / 2);
+	    memcpy(yuv_image->data, bktr_buffer, u_off - y_off);
+	    memcpy(yuv_image->data + u_off, bktr_buffer + v_off, v_off - u_off);
+	    memcpy(yuv_image->data + v_off, bktr_buffer + u_off, v_off - u_off);
+	}
 #else
-		/* SaveImage(); */
+	/* SaveImage(); */
 
-		Hermes_ConverterRequest(conv, &fmt_source, &fmt_dest);
-		Hermes_ConverterCopy(conv, bktr_buffer, 0, 0, width, height, width * 4,
-				     rgb_image->data, 0, 0, width, height,
-				     rgb_image->bytes_per_line);
+	Hermes_ConverterRequest(conv, &fmt_source, &fmt_dest);
+	Hermes_ConverterCopy(conv, bktr_buffer, 0, 0, width, height, width * 4,
+			     rgb_image->data, 0, 0, width, height,
+			     rgb_image->bytes_per_line);
 #endif
 
-		X_Display();
-		if (exitnow) {
-			printf("quitting\n");
-			break;
-		}
+	X_Display();
+	if (exitnow) {
+	    printf("quitting\n");
+	    break;
 	}
+    }
 
 #ifndef USE_XVIMAGES
-	Hermes_ConverterReturn(conv);
-	Hermes_Done();
+    Hermes_ConverterReturn(conv);
+    Hermes_Done();
 #endif
 
-	X_Shutdown();
-	lirc_freeconfig(config);
-	lirc_deinit();
+    X_Shutdown();
+    lirc_freeconfig(config);
+    lirc_deinit();
 
-	return 0;
+    return 0;
 }