X-Git-Url: https://git.ao2.it/libam7xxx.git/blobdiff_plain/5003b770a9466d1adefa8bdf4d2cdec1fec333e3..d0baf1a9e4095176e46f6a8858de420669aea97a:/examples/picoproj.c

diff --git a/examples/picoproj.c b/examples/picoproj.c
index 54cbedf..b5ce593 100644
--- a/examples/picoproj.c
+++ b/examples/picoproj.c
@@ -35,6 +35,7 @@ static void usage(char *name)
 {
 	printf("usage: %s [OPTIONS]\n\n", name);
 	printf("OPTIONS:\n");
+	printf("\t-d <index>\t\tthe device index (default is 0)\n");
 	printf("\t-f <filename>\t\tthe image file to upload\n");
 	printf("\t-F <format>\t\tthe image format to use (default is JPEG)\n");
 	printf("\t\t\t\tSUPPORTED FORMATS:\n");
@@ -66,17 +67,25 @@ int main(int argc, char *argv[])
 	am7xxx_context *ctx;
 	am7xxx_device *dev;
 	int log_level = AM7XXX_LOG_INFO;
-	am7xxx_power_mode power_mode = AM7XXX_POWER_LOW;
-	am7xxx_zoom_mode zoom = AM7XXX_ZOOM_ORIGINAL;
+	int device_index = 0;
+	int power_mode = AM7XXX_POWER_LOW;
+	int zoom = AM7XXX_ZOOM_ORIGINAL;
 	int format = AM7XXX_IMAGE_FORMAT_JPEG;
 	int width = 800;
 	int height = 480;
 	unsigned char *image;
-	unsigned int size;
+	off_t size;
 	am7xxx_device_info device_info;
 
-	while ((opt = getopt(argc, argv, "f:F:l:p:z:W:H:h")) != -1) {
+	while ((opt = getopt(argc, argv, "d:f:F:l:p:z:W:H:h")) != -1) {
 		switch (opt) {
+		case 'd':
+			device_index = atoi(optarg);
+			if (device_index < 0) {
+				fprintf(stderr, "Unsupported device index\n");
+				exit(EXIT_FAILURE);
+			}
+			break;
 		case 'f':
 			if (filename[0] != '\0')
 				fprintf(stderr, "Warning: image file already specified\n");
@@ -151,7 +160,6 @@ int main(int argc, char *argv[])
 		case 'h':
 			usage(argv[0]);
 			exit(EXIT_SUCCESS);
-			break;
 		default: /* '?' */
 			usage(argv[0]);
 			exit(EXIT_FAILURE);
@@ -159,7 +167,8 @@ int main(int argc, char *argv[])
 	}
 
 	if (filename[0] == '\0') {
-		fprintf(stderr, "An image file MUST be specified.\n");
+		fprintf(stderr, "An image file MUST be specified with the -f option.\n\n");
+		usage(argv[0]);
 		exit_code = EXIT_FAILURE;
 		goto out;
 	}
@@ -212,7 +221,6 @@ int main(int argc, char *argv[])
 		goto cleanup;
 	}
 
-
 	ret = am7xxx_close_device(dev);
 	if (ret < 0) {
 		perror("am7xxx_close_device");
@@ -220,7 +228,7 @@ int main(int argc, char *argv[])
 		goto cleanup;
 	}
 
-	ret = am7xxx_open_device(ctx, &dev, 0);
+	ret = am7xxx_open_device(ctx, &dev, device_index);
 	if (ret < 0) {
 		perror("am7xxx_open_device");
 		exit_code = EXIT_FAILURE;
@@ -251,15 +259,18 @@ int main(int argc, char *argv[])
 	}
 
 	/* When setting AM7XXX_ZOOM_TEST don't display the actual image */
-	if (zoom == AM7XXX_ZOOM_TEST)
+	if (zoom == AM7XXX_ZOOM_TEST) {
+		printf("AM7XXX_ZOOM_TEST requested, not sending actual image.\n");
 		goto cleanup;
-
+	}
 
 	if ((unsigned int)width > device_info.native_width ||
 	    (unsigned int)height > device_info.native_height)
-		fprintf(stderr, "WARNING: image not fitting the native resolution, it may be displayed wrongly!\n");
+		fprintf(stderr,
+			"WARNING: image is %dx%d, not fitting the native resolution, it may be displayed wrongly!\n",
+			width, height);
 
-	ret = am7xxx_send_image(dev, format, width, height, image, size);
+	ret = am7xxx_send_image(dev, format, width, height, image, (unsigned int)size);
 	if (ret < 0) {
 		perror("am7xxx_send_image");
 		exit_code = EXIT_FAILURE;