Index: camsource.conf.example
===================================================================
RCS file: /cvsroot/camsource/camsource/camsource.conf.example,v
retrieving revision 1.17
diff -u -r1.17 camsource.conf.example
--- camsource.conf.example	16 Sep 2002 11:46:07 -0000	1.17
+++ camsource.conf.example	17 Sep 2002 09:07:54 -0000
@@ -15,11 +15,16 @@
 			to max size as reported by the driver, fps
 			defaults to unchanged. You can put 0 for the fps
 			and width/height options to use the default values.
+			"Channel" is the input channel to use. If the
+			option is not present (or -1 is given), no
+			input channel will be selected (i.e. the default
+			will be left).
 		-->
 		<path>/dev/video0</path>
 		<width>640</width>
 		<height>480</height>
 		<fps>15</fps>
+		<channel>0</channel>
 	</camdev>
 	
 	<!--
Index: src/camdev.c
===================================================================
RCS file: /cvsroot/camsource/camsource/src/camdev.c,v
retrieving revision 1.5
diff -u -r1.5 camdev.c
--- src/camdev.c	15 Sep 2002 20:59:58 -0000	1.5
+++ src/camdev.c	17 Sep 2002 09:07:54 -0000
@@ -21,9 +21,12 @@
 	struct video_window vidwin;
 	char *path;
 	unsigned int x, y, fps;
+	int channel;
+	struct video_channel vidchan;
 	
 	path = "/dev/video0";
 	x = y = fps = 0;
+	channel = -1;
 	
 	if (node)
 	{
@@ -37,6 +40,8 @@
 				y = xml_atoi(node, 0);
 			else if (xml_isnode(node, "fps"))
 				fps = xml_atoi(node, 0);
+			else if (xml_isnode(node, "channel"))
+				channel = xml_atoi(node, -1);
 		}
 	}
 	
@@ -57,6 +62,15 @@
 	{
 		printf("Video device doesn't support grabbing to memory\n");
 		return -1;
+	}
+	
+	if (channel >= 0)
+	{
+		memset(&vidchan, 0, sizeof(vidchan));
+		vidchan.channel = channel;
+		ret = ioctl(newcamdev.fd, VIDIOCSCHAN, &vidchan);
+		if (ret)
+			printf("ioctl \"set input channel\" failed, continuing anyway: %s\n", strerror(errno));
 	}
 	
 	memset(&vidwin, 0, sizeof(vidwin));