2001-10-30 Lutz M�ller <urc8@rz.uni-karlsruhe.de>

        * frontends/command-line/main.[c,h]: Fix --capture-image


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2858 67ed7778-7388-44ab-90cf-0a291f65f57c

2 files changed, 5 insertions, 6 deletions

diff --git a/frontends/command-line/main.c b/frontends/command-line/main.c
index 75b3be605..8e94f840c 100644
--- a/frontends/command-line/main.c
+++ b/frontends/command-line/main.c
@@ -889,8 +889,8 @@ OPTION_CALLBACK (remove_dir)
 	return (GP_OK);
 }
 
-int
-capture_generic (int type, char *name)
+static int
+capture_generic (CameraCaptureType type, char *name)
 {
         CameraFilePath path;
         char *pathsep;
@@ -921,17 +921,17 @@ capture_generic (int type, char *name)
 
 OPTION_CALLBACK (capture_image)
 {
-	return (capture_generic (GP_OPERATION_CAPTURE_IMAGE, arg));
+	return (capture_generic (GP_CAPTURE_IMAGE, arg));
 }
 
 OPTION_CALLBACK (capture_movie)
 {
-        return (capture_generic (GP_OPERATION_CAPTURE_VIDEO, arg));
+        return (capture_generic (GP_CAPTURE_MOVIE, arg));
 }
 
 OPTION_CALLBACK (capture_sound)
 {
-        return (capture_generic (GP_OPERATION_CAPTURE_AUDIO, arg));
+        return (capture_generic (GP_CAPTURE_SOUND, arg));
 }
 
 OPTION_CALLBACK (capture_preview)
diff --git a/frontends/command-line/main.h b/frontends/command-line/main.h
index d76c0b414..f982206e2 100644
--- a/frontends/command-line/main.h
+++ b/frontends/command-line/main.h
@@ -27,4 +27,3 @@ void 	cli_debug_print(char *format, ...);
 void 	cli_error_print(char *format, ...);
 int	save_picture_to_file(char *folder, char *filename, CameraFileType type);
 int 	get_picture_common(char *arg, CameraFileType type);
-int 	capture_generic (int type, char *capture_choice);