Merge branch 'master' of steffen.gulpe.de:steffen/SimpleSkyCam

posctl.cc

@@ -906,7 +906,7 @@ int PosCtl::OutputOpen() {
 };
 
 int PosCtl::WriteTTY (char * outbuf) {
-	printf ("%s:%d %s send: '%s'\n", __FILE__, __LINE__, __FUNCTION__, outbuf);
+        //printf ("%s:%d %s send: '%s'\n", __FILE__, __LINE__, __FUNCTION__, outbuf);
 
 #ifdef BUILD_WINDOWS
 	DWORD len;
@@ -949,7 +949,7 @@ int PosCtl::ReadTTY (char * inbuf, int length) {
 	}
 	else {
 	  inbuf[len] = 0;
-	  printf ("%s:%d %s receive: '%s'\n", __FILE__, __LINE__, __FUNCTION__, inbuf);
+	  //printf ("%s:%d %s receive: '%s'\n", __FILE__, __LINE__, __FUNCTION__, inbuf);
 	}
 #else
 	ssize_t len;

videodev-svbcam.cc

@@ -178,10 +178,12 @@ int VideoDev_SVBCam::Open() {
 			print_error(err);
 			return VDEV_STATUS_ERROR;
 		}
-		printf ("%s:%d %s Got Control idx:%d  name:%s desc:%s    [%ld - %ld]\n", __FILE__, __LINE__, __FUNCTION__,
-					i, camcontrols[i].Name, camcontrols[i].Description, (long)camcontrols[i].MinValue, (long)camcontrols[i].MaxValue);
+		printf ("%s:%d %s Control-%02d name:%s desc:%s [%ld:%ld-%ld] auto:%ld write:%ld type:%d\n", __FILE__, __LINE__, __FUNCTION__,
+			i, camcontrols[i].Name, camcontrols[i].Description,
+			(long)camcontrols[i].DefaultValue, (long)camcontrols[i].MinValue, (long)camcontrols[i].MaxValue,
+			(long)camcontrols[i].IsAutoSupported, (long)camcontrols[i].IsWritable, (unsigned int)camcontrols[i].ControlType);
 		vctl.name = (char*)camcontrols[i].Name;
-		vctl.id = i;
+		vctl.id = camcontrols[i].ControlType;
 		vctl.min = camcontrols[i].MinValue;
 		vctl.max = camcontrols[i].MaxValue;
 		GetDevCtrl(i, &vctl.value);