Support GP_FILE_TYPE_AUDIO. Put in lots of "const".

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

6 files changed, 83 insertions, 39 deletions

diff --git a/frontends/command-line/actions.c b/frontends/command-line/actions.c
index 61e6489c4..0f38c729b 100644
--- a/frontends/command-line/actions.c
+++ b/frontends/command-line/actions.c
@@ -8,7 +8,9 @@
 /* Folder actions 						*/
 /* ------------------------------------------------------------ */
 
-int print_folder(char *subfolder, image_action action, int reverse) {
+int
+print_folder (const char *subfolder, image_action action, int reverse)
+{
 	char *c;
 	
 	/* remove the basename for clarity purposes */
@@ -23,7 +25,8 @@ int print_folder(char *subfolder, image_action action, int reverse) {
 /* File actions 						*/
 /* ------------------------------------------------------------ */
 
-int print_picture_action(char *folder, char *filename)
+int
+print_picture_action (const char *folder, const char *filename)
 {
 	static int x=0;
 
@@ -54,21 +57,31 @@ int print_picture_action(char *folder, char *filename)
 	return (GP_OK);
 }
 
-int save_picture_action(char *folder, char *filename) {
-
+int
+save_picture_action (const char *folder, const char *filename)
+{
 	return (save_picture_to_file(folder, filename, GP_FILE_TYPE_NORMAL));
 }
 
-int save_thumbnail_action(char *folder, char *filename) {
-	
-	return (save_picture_to_file(folder, filename, GP_FILE_TYPE_PREVIEW));
+int
+save_thumbnail_action (const char *folder, const char *filename)
+{
+	return (save_picture_to_file (folder, filename, GP_FILE_TYPE_PREVIEW));
 }
 
-int save_raw_action(char *folder, char *filename) {
-	return (save_picture_to_file(folder, filename, GP_FILE_TYPE_RAW));
+int
+save_raw_action (const char *folder, const char *filename)
+{
+	return (save_picture_to_file (folder, filename, GP_FILE_TYPE_RAW));
 }
 
-int delete_picture_action(char *folder, char *filename) {
+int
+save_audio_action (const char *folder, const char *filename)
+{
+	return (save_picture_to_file (folder, filename, GP_FILE_TYPE_AUDIO));
+}
 
+int delete_picture_action (const char *folder, const char *filename)
+{
 	return (gp_camera_file_delete(glob_camera, folder, filename));
 }
diff --git a/frontends/command-line/actions.h b/frontends/command-line/actions.h
index c6185627c..7e700ddcf 100644
--- a/frontends/command-line/actions.h
+++ b/frontends/command-line/actions.h
@@ -1,9 +1,13 @@
-typedef int image_action(char *folder, char *filename);
-typedef int folder_action(char *subfolder, image_action action, int reverse);
+typedef int image_action  (const char *folder, const char *filename);
+typedef int folder_action (const char *subfolder, image_action action,
+			   int reverse);
 
-int print_folder(char *subfolder, image_action action, int reverse);
-int print_picture_action(char *folder, char *filename);
-int save_picture_action(char *folder, char *filename);
-int save_thumbnail_action(char *folder, char *filename);
-int save_raw_action(char *folder, char *filename);
-int delete_picture_action(char *folder, char *filename);
+int print_folder          (const char *subfolder, image_action action,
+			   int reverse);
+
+int print_picture_action  (const char *folder, const char *filename);
+int save_picture_action   (const char *folder, const char *filename);
+int save_thumbnail_action (const char *folder, const char *filename);
+int save_raw_action       (const char *folder, const char *filename);
+int save_audio_action     (const char *folder, const char *filename);
+int delete_picture_action (const char *folder, const char *filename);
diff --git a/frontends/command-line/foreach.c b/frontends/command-line/foreach.c
index 6b208266f..44b201b72 100644
--- a/frontends/command-line/foreach.c
+++ b/frontends/command-line/foreach.c
@@ -12,7 +12,7 @@
 #include "foreach.h"
 
 int
-for_each_subfolder (char *folder, folder_action faction, 
+for_each_subfolder (const char *folder, folder_action faction, 
 		    image_action iaction, int recurse)
 {
 	CameraList folderlist;
@@ -79,7 +79,7 @@ for_each_subfolder (char *folder, folder_action faction,
 }
 
 int
-for_each_image (char *folder, image_action iaction, int reverse)
+for_each_image (const char *folder, image_action iaction, int reverse)
 {
 	CameraList filelist;
 	int i, res;
@@ -115,7 +115,7 @@ for_each_image (char *folder, image_action iaction, int reverse)
 
 
 int
-for_each_image_in_range (char *folder, char *range, image_action action,
+for_each_image_in_range (const char *folder, char *range, image_action action,
 			 int reverse)
 {
 	char	index[MAX_IMAGE_NUMBER];
diff --git a/frontends/command-line/foreach.h b/frontends/command-line/foreach.h
index d2add4c9f..8ec3dce38 100644
--- a/frontends/command-line/foreach.h
+++ b/frontends/command-line/foreach.h
@@ -1,3 +1,6 @@
-int for_each_subfolder (char *folder, folder_action faction, image_action action, int reverse);
-int for_each_image(char *folder, image_action iaction, int reverse);
-int for_each_image_in_range(char *folder, char *range, image_action action, int reverse);
+int for_each_subfolder      (const char *folder, folder_action faction,
+			     image_action action, int reverse);
+int for_each_image          (const char *folder, image_action iaction,
+			     int reverse);
+int for_each_image_in_range (const char *folder, char *range,
+			     image_action action, int reverse);
diff --git a/frontends/command-line/main.c b/frontends/command-line/main.c
index 8e42b4fd4..8cd3b0e4c 100644
--- a/frontends/command-line/main.c
+++ b/frontends/command-line/main.c
@@ -114,6 +114,8 @@ OPTION_CALLBACK(get_thumbnail);
 OPTION_CALLBACK(get_all_thumbnails);
 OPTION_CALLBACK(get_raw_data);
 OPTION_CALLBACK(get_all_raw_data);
+OPTION_CALLBACK(get_audio_data);
+OPTION_CALLBACK(get_all_audio_data);
 OPTION_CALLBACK(delete_picture);
 OPTION_CALLBACK(delete_all_pictures);
 OPTION_CALLBACK(upload_picture);
@@ -172,13 +174,15 @@ Option option[] = {
 {"T", "get-all-thumbnails","",          "Get all thumbnails from folder",get_all_thumbnails,0},
 {"r", "get-raw-data", "range",      "Get raw data given in range", get_raw_data, 0},
 {"", "get-all-raw-data", "",        "Get all raw data from folder", get_all_raw_data, 0},
-{"d", "delete-picture", "range",        "Delete pictures given in range", delete_picture, 0},
-{"D", "delete-all-images","",         "Delete all pictures in folder",delete_all_pictures,0},
-{"u", "upload-image", "filename",     "Upload a picture to camera",   upload_picture, 0},
-{"" , "capture-preview","",             "Capture a quick preview",      capture_preview, 0},
-{"" , "capture-image",  "",             "Capture an image",             capture_image,  0},
-{"" , "capture-movie",  "",             "Capture a movie ",             capture_movie,  0},
-{"" , "capture-sound",  "",             "Capture an audio clip",        capture_sound,  0},
+{"", "get-audio-data", "range", N_("Get audio data given in range"), get_audio_data, 0},
+{"", "get-all-audio-data", "", N_("Get all audio data from folder"), get_all_audio_data, 0},
+{"d", "delete-picture", "range", N_("Delete pictures given in range"), delete_picture, 0},
+{"D", "delete-all-images","", N_("Delete all pictures in folder"), delete_all_pictures,0},
+{"u", "upload-image", "filename", N_("Upload a picture to camera"), upload_picture, 0},
+{"" , "capture-preview", "", N_("Capture a quick preview"), capture_preview, 0},
+{"" , "capture-image",  "", N_("Capture an image"), capture_image,  0},
+{"" , "capture-movie",  "", N_("Capture a movie "), capture_movie,  0},
+{"" , "capture-sound",  "", N_("Capture an audio clip"), capture_sound, 0},
 #if HAVE_CDK
 {"" , "config",		"", 		"Configure",			config,		0},
 #endif
@@ -524,7 +528,7 @@ OPTION_CALLBACK(model)
 }
 
 static void
-debug_func (int level, const char *domain, const char *format,
+debug_func (GPLogLevel level, const char *domain, const char *format,
 	    va_list args, void *data)
 {
 	if (level == GP_LOG_ERROR)
@@ -587,7 +591,7 @@ OPTION_CALLBACK (list_folders)
 {
         CHECK_RESULT (set_globals ());
 
-        return for_each_subfolder(glob_folder, print_folder, NULL, glob_recurse);
+        return for_each_subfolder (glob_folder, print_folder, NULL, glob_recurse);
 }
 
 #if HAVE_CDK
@@ -717,7 +721,8 @@ save_camera_file_to_file (CameraFile *file, CameraFileType type)
 
 
 int
-save_picture_to_file (char *folder, char *filename, CameraFileType type)
+save_picture_to_file (const char *folder, const char *filename,
+		      CameraFileType type)
 {
         int res;
 
@@ -765,11 +770,11 @@ get_picture_common(char *arg, CameraFileType type )
 
         switch (type) {
         case GP_FILE_TYPE_PREVIEW:
-                return for_each_image_in_range(glob_folder, arg, save_thumbnail_action, 0);
+                return for_each_image_in_range (glob_folder, arg, save_thumbnail_action, 0);
         case GP_FILE_TYPE_NORMAL:
-                return for_each_image_in_range(glob_folder, arg, save_picture_action, 0);
+                return for_each_image_in_range (glob_folder, arg, save_picture_action, 0);
         case GP_FILE_TYPE_RAW:
-                return for_each_image_in_range(glob_folder, arg, save_raw_action, 0);
+                return for_each_image_in_range (glob_folder, arg, save_raw_action, 0);
         default:
                 return (GP_ERROR_NOT_SUPPORTED);
         }
@@ -827,6 +832,22 @@ OPTION_CALLBACK (get_all_raw_data)
         return for_each_subfolder(glob_folder, for_each_image, save_raw_action, glob_recurse);
 }
 
+OPTION_CALLBACK (get_audio_data)
+{
+	return (get_picture_common (arg, GP_FILE_TYPE_AUDIO));
+}
+
+OPTION_CALLBACK (get_all_audio_data)
+{
+	CHECK_RESULT (set_globals ());
+	CHECK_RESULT (for_each_image (glob_folder, save_audio_action, 0));
+
+	if (!glob_recurse)
+		return (GP_OK);
+
+	return for_each_subfolder (glob_folder, for_each_image, save_audio_action, glob_recurse);
+}
+
 OPTION_CALLBACK (delete_picture)
 {
         cli_debug_print("Deleting picture(s) %s", arg);
diff --git a/frontends/command-line/main.h b/frontends/command-line/main.h
index f982206e2..4284e9afe 100644
--- a/frontends/command-line/main.h
+++ b/frontends/command-line/main.h
@@ -25,5 +25,8 @@ typedef struct {
 
 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	save_picture_to_file (const char *folder, const char *filename,
+			      CameraFileType type);
+
+int 	get_picture_common (char *arg, CameraFileType type);