summaryrefslogtreecommitdiff
path: root/vapi
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2021-05-24 15:24:15 +0200
committerJörg Frings-Fürst <debian@jff.email>2021-05-24 15:24:15 +0200
commite859597670d8a11e35aaa73dcb1856d607b7a8b7 (patch)
tree1513b35b0c01cdc7b47cb29567f42c3e8090d7e6 /vapi
parent9d91a24bd761fdf390f046763c772c3c9f6acb52 (diff)
parentde1fe3ed59903afa50e57455ef362f91da88f877 (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'vapi')
-rw-r--r--vapi/libgphoto2.vapi23
-rw-r--r--vapi/libraw.vapi2
2 files changed, 10 insertions, 15 deletions
diff --git a/vapi/libgphoto2.vapi b/vapi/libgphoto2.vapi
index 22f70ee..e1c2246 100644
--- a/vapi/libgphoto2.vapi
+++ b/vapi/libgphoto2.vapi
@@ -64,7 +64,7 @@ namespace GPhoto {
public Result set_port_info(PortInfo info);
public Result get_abilities(out CameraAbilities abilities);
public Result set_abilities(CameraAbilities abilities);
- public Result get_storageinfo(CameraStorageInformation **sifs, out int count, Context context);
+ public Result get_storageinfo([CCode (array_length_pos=1)]out CameraStorageInformation[] sifs, Context context);
// Folders
[CCode (cname="gp_camera_folder_list_folders")]
@@ -74,7 +74,7 @@ namespace GPhoto {
[CCode (cname="gp_camera_folder_delete_all")]
public Result delete_all_files(string folder, Context context);
[CCode (cname="gp_camera_folder_put_file")]
- public Result put_file(string folder, CameraFile file, Context context);
+ public Result put_file(string folder, string filename, CameraFileType type, CameraFile file, Context context);
[CCode (cname="gp_camera_folder_make_dir")]
public Result make_dir(string folder, string name, Context context);
[CCode (cname="gp_camera_folder_remove_dir")]
@@ -140,7 +140,6 @@ namespace GPhoto {
public enum CameraFileInfoFields {
NONE,
TYPE,
- NAME,
SIZE,
WIDTH,
HEIGHT,
@@ -159,10 +158,9 @@ namespace GPhoto {
public CameraFileInfoFields fields;
public CameraFileStatus status;
public ulong size;
- public string type;
+ public char type[64];
public uint width;
public uint height;
- public string name;
public CameraFilePermissions permissions;
public time_t mtime;
}
@@ -176,12 +174,9 @@ namespace GPhoto {
public CameraFileInfoFields fields;
public CameraFileStatus status;
public ulong size;
- public string type;
+ public char type[64];
public uint width;
public uint height;
- public string name;
- public CameraFilePermissions permissions;
- public time_t mtime;
}
[CCode (
@@ -266,7 +261,7 @@ namespace GPhoto {
public Result append(string name, string value);
public Result reset();
public Result sort();
- public Result find_by_name(out int? index, string name);
+ public Result find_by_name(out int index, string name);
public Result get_name(int index, out unowned string name);
public Result get_value(int index, out unowned string value);
public Result set_name(int index, string name);
@@ -314,9 +309,9 @@ namespace GPhoto {
)]
public struct CameraStorageInformation {
public CameraStorageInfoFields fields;
- public string basedir;
- public string label;
- public string description;
+ public char basedir[256];
+ public char label[256];
+ public char description[256];
public int type;
public int fstype;
public int access;
@@ -485,7 +480,7 @@ namespace GPhoto {
[CCode (
cheader_filename="gphoto2/gphoto2-version.h",
- cprefix="GP_VERSION"
+ cprefix="GP_VERSION_"
)]
public enum VersionVerbosity {
SHORT,
diff --git a/vapi/libraw.vapi b/vapi/libraw.vapi
index b1b5875..146f447 100644
--- a/vapi/libraw.vapi
+++ b/vapi/libraw.vapi
@@ -248,7 +248,7 @@ public struct Thumbnail {
public uint tlength;
public int tcolors;
[CCode (array_length_cname="tlength")]
- public uint8[] thumb;
+ public unowned uint8[] thumb;
}
[CCode (cname="enum LibRaw_thumbnail_formats", cprefix="LIBRAW_THUMBNAIL_")]