flickcurl.h | flickcurl.h | |||
---|---|---|---|---|
skipping to change at line 376 | skipping to change at line 376 | |||
char* author; | char* author; | |||
char* authorname; | char* authorname; | |||
int datecreate; | int datecreate; | |||
char* permalink; | char* permalink; | |||
char* text; | char* text; | |||
} flickcurl_comment; | } flickcurl_comment; | |||
/** | /** | |||
* flickcurl_perms: | * flickcurl_perms: | |||
* @is_public: non-0 to set the photo to public else private | * @is_public: non-0 to set the photo to public else private | |||
* @is_contact: | * @is_contact: non-0 to make the photo visible to contacts when private | |||
* @is_friend: non-0 to make the photo visible to friends when private | * @is_friend: non-0 to make the photo visible to friends when private | |||
* @is_family: non-0 to make the photo visible to family when private | * @is_family: non-0 to make the photo visible to family when private | |||
* @perm_comment: who can add comments to the photo and it's notes. one of: 0 nobody, 1 friends & family, 2 contacts, 3 everybody | * @perm_comment: who can add comments to the photo and it's notes. one of: 0 nobody, 1 friends & family, 2 contacts, 3 everybody | |||
* @perm_addmeta: who can add notes and tags to the photo. one of: 0 nobody / just the owner, 1 friends & family, 2 contacts, 3 everybody | * @perm_addmeta: who can add notes and tags to the photo. one of: 0 nobody / just the owner, 1 friends & family, 2 contacts, 3 everybody | |||
* | * | |||
* Permissions as used by flickcurl_photos_getPerms() and | * Permissions as used by flickcurl_photos_getPerms() and | |||
* flickcurl_photos_setPerms() which use public, friend, family, | * flickcurl_photos_setPerms() which use public, friend, family, | |||
* perm_comment and perm-addmeta. flickr.photos.geo.setPerms() uses | * perm_comment and perm-addmeta. flickr.photos.geo.setPerms() uses | |||
* public, contact, friend and family. | * public, contact, friend and family. | |||
* | * | |||
skipping to change at line 489 | skipping to change at line 489 | |||
char* id; | char* id; | |||
char* author; | char* author; | |||
char* authorname; | char* authorname; | |||
char* raw; | char* raw; | |||
char* cooked; | char* cooked; | |||
int machine_tag; | int machine_tag; | |||
int count; | int count; | |||
} flickcurl_tag; | } flickcurl_tag; | |||
/** | /** | |||
* flickcurl_tag_cluster: | ||||
* @count: number of tags | ||||
* @tags: tags in this cluster | ||||
* | ||||
* A cluster (set) of tag names | ||||
*/ | ||||
typedef struct { | ||||
int count; | ||||
char** tags; | ||||
} flickcurl_tag_cluster; | ||||
/** | ||||
* flickcurl_tag_clusters: | ||||
* @count: number of tag clusters | ||||
* @clusters: tag clusters | ||||
* | ||||
* A set of clusters of tag names | ||||
*/ | ||||
typedef struct { | ||||
int count; | ||||
flickcurl_tag_cluster** clusters; | ||||
} flickcurl_tag_clusters; | ||||
/** | ||||
* flickcurl_photo_field: | * flickcurl_photo_field: | |||
* @string: string field value | * @string: string field value | |||
* @integer: integer field value | * @integer: integer field value | |||
* @type: field type | * @type: field type | |||
* | * | |||
* Field of a photo structure | * Field of a photo structure | |||
*/ | */ | |||
typedef struct { | typedef struct { | |||
char* string; | char* string; | |||
flickcurl_photo_field_type integer; | flickcurl_photo_field_type integer; | |||
skipping to change at line 871 | skipping to change at line 895 | |||
* @safe_search: Safe search setting: 1 safe, 2 moderate, 3 restricted. | * @safe_search: Safe search setting: 1 safe, 2 moderate, 3 restricted. | |||
* @content_type: Content Type setting: 1 for photos only, 2 for screenshot s only, 3 for 'other' only, 4 for all types. (or NULL) | * @content_type: Content Type setting: 1 for photos only, 2 for screenshot s only, 3 for 'other' only, 4 for all types. (or NULL) | |||
* @machine_tags: Machine tag search syntax | * @machine_tags: Machine tag search syntax | |||
* @machine_tag_mode: Either 'any' for an OR combination of tags, or 'all' for an AND combination. Defaults to 'any' if not specified. | * @machine_tag_mode: Either 'any' for an OR combination of tags, or 'all' for an AND combination. Defaults to 'any' if not specified. | |||
* @group_id: The id of a group who's pool to search. If specified, only m atching photos posted to the group's pool will be returned. (or NULL) | * @group_id: The id of a group who's pool to search. If specified, only m atching photos posted to the group's pool will be returned. (or NULL) | |||
* @extras: A comma-delimited list of extra information to fetch for each r eturned record. Currently supported fields are: <code>license</code>, <code >date_upload</code>, <code>date_taken</code>, <code>owner_name</code>, <cod e>icon_server</code>, <code>original_format</code>, <code>last_update</code >, <code>geo</code>, <code>tags</code>, <code>machine_tags</code>. (or NULL ) | * @extras: A comma-delimited list of extra information to fetch for each r eturned record. Currently supported fields are: <code>license</code>, <code >date_upload</code>, <code>date_taken</code>, <code>owner_name</code>, <cod e>icon_server</code>, <code>original_format</code>, <code>last_update</code >, <code>geo</code>, <code>tags</code>, <code>machine_tags</code>. (or NULL ) | |||
* @per_page: Number of photos to return per page. If this argument is omit ted, it defaults to 100. The maximum allowed value is 500. (or NULL) | * @per_page: Number of photos to return per page. If this argument is omit ted, it defaults to 100. The maximum allowed value is 500. (or NULL) | |||
* @page: The page of results to return. If this argument is omitted, it de faults to 1. (or NULL) | * @page: The page of results to return. If this argument is omitted, it de faults to 1. (or NULL) | |||
* @place_id: A Flickr place id. (only used if bbox argument isn't present) . Experimental. Geo queries require some sort of limiting agent in order t o prevent the database from crying. This is basically like the check agains t "parameterless searches" for queries without a geo component. A tag, fo r instance, is considered a limiting agent as are user defined min_date_tak en and min_date_upload parameters - If no limiting factor is passed we retu rn only photos added in the last 12 hours (though we may extend the limit i n the future) (or NULL) | * @place_id: A Flickr place id. (only used if bbox argument isn't present) . Experimental. Geo queries require some sort of limiting agent in order t o prevent the database from crying. This is basically like the check agains t "parameterless searches" for queries without a geo component. A tag, fo r instance, is considered a limiting agent as are user defined min_date_tak en and min_date_upload parameters - If no limiting factor is passed we retu rn only photos added in the last 12 hours (though we may extend the limit i n the future) (or NULL) | |||
* @media: "photos" or "videos" (or NULL) | * @media: "photos" or "videos" (or NULL) | |||
* @has_geo: non-0 if a photo has been geotagged (or 0) | ||||
* @lat: A valid latitude, in decimal format, for doing radial geo queries | ||||
(or ignored if radius is 0.0) | ||||
* @lon: A valid longitude, in decimal format, for doing radial geo queries | ||||
(or ignored if radius is 0.0) | ||||
* @radius: A valid radius used for geo queries, greater than zero and less | ||||
than 20 miles (or 32 kilometers), for use with point-based geo queries. Th | ||||
e default value is 5 (km) (or 0.0 for not used) | ||||
* @radius_units: The unit of measure when doing radial geo queries. Valid | ||||
options are "mi" (miles) and "km" (kilometers). The default is "km" (or NUL | ||||
L) | ||||
* @contacts: (Experimental) Requires @user_id field be set and limits quer | ||||
ies to photos beloing to that user's photos. Valid arguments are 'all' or | ||||
'ff' for just friends and family. | ||||
* | * | |||
* Search parameters for flickcurl_photos_search() | * Search parameters for flickcurl_photos_search() | |||
*/ | */ | |||
typedef struct { | typedef struct { | |||
char* user_id; | char* user_id; | |||
char* tags; | char* tags; | |||
char* tag_mode; | char* tag_mode; | |||
char* text; | char* text; | |||
int min_upload_date; | int min_upload_date; | |||
int max_upload_date; | int max_upload_date; | |||
skipping to change at line 898 | skipping to change at line 928 | |||
int safe_search; | int safe_search; | |||
int content_type; | int content_type; | |||
char* machine_tags; | char* machine_tags; | |||
char* machine_tag_mode; | char* machine_tag_mode; | |||
char* group_id; | char* group_id; | |||
char* extras; | char* extras; | |||
int per_page; | int per_page; | |||
int page; | int page; | |||
char* place_id; | char* place_id; | |||
char* media; | char* media; | |||
int has_geo; | ||||
double lat; | ||||
double lon; | ||||
double radius; | ||||
char* radius_units; | ||||
char* contacts; | ||||
} flickcurl_search_params; | } flickcurl_search_params; | |||
/** | /** | |||
* flickcurl_photoset: | * flickcurl_photoset: | |||
* @id: photoset ID | * @id: photoset ID | |||
* @primary: primary photo ID | * @primary: primary photo ID | |||
* @secret: secret | * @secret: secret | |||
* @server: server | * @server: server | |||
* @farm: farm | * @farm: farm | |||
* @photos_count: count of photos in set | * @photos_count: count of photos in set | |||
skipping to change at line 1137 | skipping to change at line 1173 | |||
const char* flickcurl_get_api_key(flickcurl *fc); | const char* flickcurl_get_api_key(flickcurl *fc); | |||
FLICKCURL_API | FLICKCURL_API | |||
const char* flickcurl_get_shared_secret(flickcurl *fc); | const char* flickcurl_get_shared_secret(flickcurl *fc); | |||
FLICKCURL_API | FLICKCURL_API | |||
const char* flickcurl_get_auth_token(flickcurl *fc); | const char* flickcurl_get_auth_token(flickcurl *fc); | |||
/* other flickcurl class destructors */ | /* other flickcurl class destructors */ | |||
FLICKCURL_API | FLICKCURL_API | |||
void flickcurl_free_tag(flickcurl_tag *t); | void flickcurl_free_tag(flickcurl_tag *t); | |||
FLICKCURL_API | FLICKCURL_API | |||
void flickcurl_free_tag_clusters(flickcurl_tag_clusters *tcs); | ||||
FLICKCURL_API | ||||
void flickcurl_free_photo(flickcurl_photo *photo); | void flickcurl_free_photo(flickcurl_photo *photo); | |||
FLICKCURL_API | FLICKCURL_API | |||
void flickcurl_free_photos(flickcurl_photo** photos); | void flickcurl_free_photos(flickcurl_photo** photos); | |||
FLICKCURL_API | FLICKCURL_API | |||
void flickcurl_free_photoset(flickcurl_photoset *photoset); | void flickcurl_free_photoset(flickcurl_photoset *photoset); | |||
FLICKCURL_API | FLICKCURL_API | |||
void flickcurl_free_photosets(flickcurl_photoset **photosets_object); | void flickcurl_free_photosets(flickcurl_photoset **photosets_object); | |||
/* void flickcurl_free_license(flickcurl_person *license); */ | /* void flickcurl_free_license(flickcurl_person *license); */ | |||
FLICKCURL_API | FLICKCURL_API | |||
void flickcurl_free_person(flickcurl_person *person); | void flickcurl_free_person(flickcurl_person *person); | |||
skipping to change at line 1485 | skipping to change at line 1523 | |||
/* flickr.reflection */ | /* flickr.reflection */ | |||
FLICKCURL_API | FLICKCURL_API | |||
void flickcurl_free_method(flickcurl_method *method); | void flickcurl_free_method(flickcurl_method *method); | |||
FLICKCURL_API | FLICKCURL_API | |||
char** flickcurl_reflection_getMethods(flickcurl* fc); | char** flickcurl_reflection_getMethods(flickcurl* fc); | |||
FLICKCURL_API | FLICKCURL_API | |||
flickcurl_method* flickcurl_reflection_getMethodInfo(flickcurl* fc, const c har* name); | flickcurl_method* flickcurl_reflection_getMethodInfo(flickcurl* fc, const c har* name); | |||
/* flickr.tag */ | /* flickr.tag */ | |||
FLICKCURL_API | FLICKCURL_API | |||
flickcurl_tag_clusters* flickcurl_tags_getClusters(flickcurl* fc, const cha | ||||
r* tag); | ||||
FLICKCURL_API | ||||
flickcurl_tag** flickcurl_tags_getHotList(flickcurl* fc, const char* period , int tag_count); | flickcurl_tag** flickcurl_tags_getHotList(flickcurl* fc, const char* period , int tag_count); | |||
FLICKCURL_API | FLICKCURL_API | |||
flickcurl_tag** flickcurl_tags_getListPhoto(flickcurl* fc, const char* phot o_id); | flickcurl_tag** flickcurl_tags_getListPhoto(flickcurl* fc, const char* phot o_id); | |||
FLICKCURL_API | FLICKCURL_API | |||
flickcurl_tag** flickcurl_tags_getListUser(flickcurl* fc, const char* user_ id); | flickcurl_tag** flickcurl_tags_getListUser(flickcurl* fc, const char* user_ id); | |||
FLICKCURL_API | FLICKCURL_API | |||
flickcurl_tag** flickcurl_tags_getListUserPopular(flickcurl* fc, const char * user_id, int pop_count); | flickcurl_tag** flickcurl_tags_getListUserPopular(flickcurl* fc, const char * user_id, int pop_count); | |||
FLICKCURL_API | FLICKCURL_API | |||
flickcurl_tag** flickcurl_tags_getListUserRaw(flickcurl* fc, const char* ta g); | flickcurl_tag** flickcurl_tags_getListUserRaw(flickcurl* fc, const char* ta g); | |||
FLICKCURL_API | FLICKCURL_API | |||
End of changes. 6 change blocks. | ||||
1 lines changed or deleted | 50 lines changed or added | |||