flickcurl.h | flickcurl.h | |||
---|---|---|---|---|
skipping to change at line 509 | skipping to change at line 509 | |||
* | * | |||
* A Location in the world with an optional accuracy | * A Location in the world with an optional accuracy | |||
*/ | */ | |||
typedef struct { | typedef struct { | |||
double latitude; | double latitude; | |||
double longitude; | double longitude; | |||
int accuracy; | int accuracy; | |||
} flickcurl_location; | } flickcurl_location; | |||
/** | /** | |||
* flickcurl_note: | ||||
* @id: note identifier (per-photo) | ||||
* @author: author (may be NULL) | ||||
* @authorname: author real name (may be NULL) | ||||
* @x: The left coordinate of the note | ||||
* @y: The top coordinate of the note | ||||
* @w: The width of the note | ||||
* @h: The height of the note | ||||
* @text: The description of the note | ||||
* | ||||
* A note attached to a rectangular area on a photo. | ||||
* | ||||
* A Photo Note. | ||||
*/ | ||||
typedef struct flickcurl_note_s { | ||||
int id; | ||||
char* author; | ||||
char* authorname; | ||||
unsigned int x; | ||||
unsigned int y; | ||||
unsigned int w; | ||||
unsigned int h; | ||||
char* text; | ||||
} flickcurl_note; | ||||
/** | ||||
* flickcurl_place_type: | * flickcurl_place_type: | |||
* @FLICKCURL_PLACE_LOCATION: a general location | * @FLICKCURL_PLACE_LOCATION: a general location | |||
* @FLICKCURL_PLACE_NEIGHBOURHOOD: neighborhood (narrowest place) | * @FLICKCURL_PLACE_NEIGHBOURHOOD: neighborhood (narrowest place) | |||
* @FLICKCURL_PLACE_NEIGHBORHOOD: deprecated | * @FLICKCURL_PLACE_NEIGHBORHOOD: deprecated | |||
* @FLICKCURL_PLACE_LOCALITY: locality | * @FLICKCURL_PLACE_LOCALITY: locality | |||
* @FLICKCURL_PLACE_COUNTY: county | * @FLICKCURL_PLACE_COUNTY: county | |||
* @FLICKCURL_PLACE_REGION: region | * @FLICKCURL_PLACE_REGION: region | |||
* @FLICKCURL_PLACE_COUNTRY: country | * @FLICKCURL_PLACE_COUNTRY: country | |||
* @FLICKCURL_PLACE_CONTINENT: continent (widest place) (Flickcurl 1.8) | * @FLICKCURL_PLACE_CONTINENT: continent (widest place) (Flickcurl 1.8) | |||
* @FLICKCURL_PLACE_LAST: internal offset to last in enum list | * @FLICKCURL_PLACE_LAST: internal offset to last in enum list | |||
skipping to change at line 717 | skipping to change at line 743 | |||
/** | /** | |||
* flickcurl_photo: | * flickcurl_photo: | |||
* @id: photo/video ID | * @id: photo/video ID | |||
* @uri: photo/video page URI | * @uri: photo/video page URI | |||
* @tags: array of tags (may be NULL) | * @tags: array of tags (may be NULL) | |||
* @tags_count: size of tags array | * @tags_count: size of tags array | |||
* @fields: metadata fields | * @fields: metadata fields | |||
* @place: place | * @place: place | |||
* @video: video (may be NULL) | * @video: video (may be NULL) | |||
* @media_type: "photo" or "video" | * @media_type: "photo" or "video" | |||
* @notes: array of notes (may be NULL) | ||||
* @notes_count: size of notes array | ||||
* | * | |||
* A photo or video. | * A photo or video. | |||
* | * | |||
*/ | */ | |||
typedef struct flickcurl_photo_s { | typedef struct flickcurl_photo_s { | |||
char *id; | char *id; | |||
char *uri; | char *uri; | |||
flickcurl_tag** tags; | flickcurl_tag** tags; | |||
int tags_count; | int tags_count; | |||
flickcurl_photo_field fields[PHOTO_FIELD_LAST + 1]; | flickcurl_photo_field fields[PHOTO_FIELD_LAST + 1]; | |||
flickcurl_place* place; | flickcurl_place* place; | |||
flickcurl_video* video; | flickcurl_video* video; | |||
char *media_type; | char *media_type; | |||
flickcurl_note** notes; | ||||
int notes_count; | ||||
} flickcurl_photo; | } flickcurl_photo; | |||
/** | /** | |||
* flickcurl_license: | * flickcurl_license: | |||
* @id: license ID | * @id: license ID | |||
* @url: license URL | * @url: license URL | |||
* @name: license short name | * @name: license short name | |||
* | * | |||
* A photo license. | * A photo license. | |||
* | * | |||
skipping to change at line 1107 | skipping to change at line 1138 | |||
flickcurl_person_field fields[PERSON_FIELD_LAST + 1]; | flickcurl_person_field fields[PERSON_FIELD_LAST + 1]; | |||
} flickcurl_person; | } flickcurl_person; | |||
/** | /** | |||
* flickcurl_photos_list: | * flickcurl_photos_list: | |||
* @format: requested content format or NULL if a list of photos was wanted . On the result from API calls this is set to the requested feed format or "xml" if none was given. | * @format: requested content format or NULL if a list of photos was wanted . On the result from API calls this is set to the requested feed format or "xml" if none was given. | |||
* @photos: list of photos if @format is NULL. Also may be NULL on failure . | * @photos: list of photos if @format is NULL. Also may be NULL on failure . | |||
* @photos_count: number of photos in @photos array if @format is NULL. Und efined on failure | * @photos_count: number of photos in @photos array if @format is NULL. Und efined on failure | |||
* @content: raw content if @format is not NULL. Also may be NULL on failu re. | * @content: raw content if @format is not NULL. Also may be NULL on failu re. | |||
* @content_length: size of @content if @format is not NULL. Undefined on f ailure | * @content_length: size of @content if @format is not NULL. Undefined on f ailure | |||
* @page: current photo list page | ||||
* @per_page: current photo list per-page | ||||
* @total_count: total number of photos available of which the current @pag | ||||
e and @per_page is a slice | ||||
* | * | |||
* Photos List result. | * Photos List result. | |||
*/ | */ | |||
typedef struct { | typedef struct { | |||
char *format; | char *format; | |||
flickcurl_photo** photos; | flickcurl_photo** photos; | |||
int photos_count; | int photos_count; | |||
char* content; | char* content; | |||
size_t content_length; | size_t content_length; | |||
int page; | ||||
int per_page; | ||||
int total_count; | ||||
} flickcurl_photos_list; | } flickcurl_photos_list; | |||
/** | /** | |||
* flickcurl_photos_list_params: | * flickcurl_photos_list_params: | |||
* @version: structure version (currently 1) | * @version: structure version (currently 1) | |||
* @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>. <code>'m edia</code> will return an extra media=VALUE for VALUE "photo" or "video". API addition 2008-04-07. (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>. <code>'m edia</code> will return an extra media=VALUE for VALUE "photo" or "video". API addition 2008-04-07. (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 < 0) | * @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 < 0) | |||
* @page: The page of results to return. If this argument is omitted, it de faults to 1. (or < 0) | * @page: The page of results to return. If this argument is omitted, it de faults to 1. (or < 0) | |||
* @format: Feed format. If given, the photos list result will return raw content. This paramter is EXPERIMENTAL as annouced 2008-08-25 http://code. flickr.com/blog/2008/08/25/api-responses-as-feeds/ The current formats are <code>feed-rss_100</code> for RSS 1.0, <code>feed-rss_200</code> for RSS 2.0, <code>feed-atom_10</code> for Atom 1.0, <code>feed-georss</code> for R SS 2.0 with GeoRSS and W3C Geo for geotagged photos, <code>feed-geoatom</co de> for Atom 1.0 with GeoRSS and W3C Geo for geotagged photos, <code>feed-g eordf</code> for RSS 1.0 with GeoRSS and W3C Geo for geotagged photos, <cod e>feed-kml</code> for KML 2.1, <code>feed-kml_nl</code> for KML 2.1 network link (or NULL) | * @format: Feed format. If given, the photos list result will return raw content. This paramter is EXPERIMENTAL as annouced 2008-08-25 http://code. flickr.com/blog/2008/08/25/api-responses-as-feeds/ The current formats are <code>feed-rss_100</code> for RSS 1.0, <code>feed-rss_200</code> for RSS 2.0, <code>feed-atom_10</code> for Atom 1.0, <code>feed-georss</code> for R SS 2.0 with GeoRSS and W3C Geo for geotagged photos, <code>feed-geoatom</co de> for Atom 1.0 with GeoRSS and W3C Geo for geotagged photos, <code>feed-g eordf</code> for RSS 1.0 with GeoRSS and W3C Geo for geotagged photos, <cod e>feed-kml</code> for KML 2.1, <code>feed-kml_nl</code> for KML 2.1 network link (or NULL) | |||
* | * | |||
skipping to change at line 2097 | skipping to change at line 2134 | |||
FLICKCURL_API | FLICKCURL_API | |||
flickcurl_photoset** flickcurl_photosets_getList(flickcurl* fc, const char* user_id); | flickcurl_photoset** flickcurl_photosets_getList(flickcurl* fc, const char* user_id); | |||
FLICKCURL_API | FLICKCURL_API | |||
flickcurl_photo** flickcurl_photosets_getPhotos(flickcurl* fc, const char* photoset_id, const char* extras, int privacy_filter, int per_page, int page ); | flickcurl_photo** flickcurl_photosets_getPhotos(flickcurl* fc, const char* photoset_id, const char* extras, int privacy_filter, int per_page, int page ); | |||
FLICKCURL_API | FLICKCURL_API | |||
flickcurl_photos_list* flickcurl_photosets_getPhotos_params(flickcurl* fc, const char* photoset_id, int privacy_filter, flickcurl_photos_list_params* list_params); | flickcurl_photos_list* flickcurl_photosets_getPhotos_params(flickcurl* fc, const char* photoset_id, int privacy_filter, flickcurl_photos_list_params* list_params); | |||
FLICKCURL_API | FLICKCURL_API | |||
int flickcurl_photosets_orderSets(flickcurl* fc, const char** photoset_ids_ array); | int flickcurl_photosets_orderSets(flickcurl* fc, const char** photoset_ids_ array); | |||
FLICKCURL_API | FLICKCURL_API | |||
int flickcurl_photosets_removePhoto(flickcurl* fc, const char* photoset_id, const char* photo_id); | int flickcurl_photosets_removePhoto(flickcurl* fc, const char* photoset_id, const char* photo_id); | |||
FLICKCURL_API | ||||
int flickcurl_photosets_removePhotos(flickcurl* fc, const char* photoset_id | ||||
, const char** photo_ids_array); | ||||
FLICKCURL_API | ||||
int flickcurl_photosets_reorderPhotos(flickcurl* fc, const char* photoset_i | ||||
d, const char** photo_ids_array); | ||||
FLICKCURL_API | ||||
int flickcurl_photosets_setPrimaryPhoto(flickcurl* fc, const char* photoset | ||||
_id, const char* photo_id); | ||||
/* flickr.photosets.comments */ | /* flickr.photosets.comments */ | |||
FLICKCURL_API | FLICKCURL_API | |||
char* flickcurl_photosets_comments_addComment(flickcurl* fc, const char* ph otoset_id, const char* comment_text); | char* flickcurl_photosets_comments_addComment(flickcurl* fc, const char* ph otoset_id, const char* comment_text); | |||
FLICKCURL_API | FLICKCURL_API | |||
int flickcurl_photosets_comments_deleteComment(flickcurl* fc, const char* c omment_id); | int flickcurl_photosets_comments_deleteComment(flickcurl* fc, const char* c omment_id); | |||
FLICKCURL_API | FLICKCURL_API | |||
int flickcurl_photosets_comments_editComment(flickcurl* fc, const char* com ment_id, const char* comment_text); | int flickcurl_photosets_comments_editComment(flickcurl* fc, const char* com ment_id, const char* comment_text); | |||
FLICKCURL_API | FLICKCURL_API | |||
flickcurl_comment** flickcurl_photosets_comments_getList(flickcurl* fc, con st char* photoset_id); | flickcurl_comment** flickcurl_photosets_comments_getList(flickcurl* fc, con st char* photoset_id); | |||
skipping to change at line 2130 | skipping to change at line 2173 | |||
/* 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.stats */ | /* flickr.stats */ | |||
FLICKCURL_API | FLICKCURL_API | |||
int flickcurl_stats_getCSVFiles(flickcurl* fc); | ||||
FLICKCURL_API | ||||
flickcurl_stat** flickcurl_stats_getCollectionDomains(flickcurl* fc, const char* date, const char* collection_id, int per_page, int page); | flickcurl_stat** flickcurl_stats_getCollectionDomains(flickcurl* fc, const char* date, const char* collection_id, int per_page, int page); | |||
FLICKCURL_API | FLICKCURL_API | |||
flickcurl_stat** flickcurl_stats_getCollectionReferrers(flickcurl* fc, cons t char* date, const char* domain, const char* collection_id, int per_page, int page); | flickcurl_stat** flickcurl_stats_getCollectionReferrers(flickcurl* fc, cons t char* date, const char* domain, const char* collection_id, int per_page, int page); | |||
FLICKCURL_API | FLICKCURL_API | |||
int flickcurl_stats_getCollectionStats(flickcurl* fc, const char* date, con st char* collection_id); | int flickcurl_stats_getCollectionStats(flickcurl* fc, const char* date, con st char* collection_id); | |||
FLICKCURL_API | FLICKCURL_API | |||
flickcurl_stat** flickcurl_stats_getPhotoDomains(flickcurl* fc, const char* date, const char* photo_id, int per_page, int page); | flickcurl_stat** flickcurl_stats_getPhotoDomains(flickcurl* fc, const char* date, const char* photo_id, int per_page, int page); | |||
FLICKCURL_API | FLICKCURL_API | |||
flickcurl_stat** flickcurl_stats_getPhotoReferrers(flickcurl* fc, const cha r* date, const char* domain, const char* photo_id, int per_page, int page); | flickcurl_stat** flickcurl_stats_getPhotoReferrers(flickcurl* fc, const cha r* date, const char* domain, const char* photo_id, int per_page, int page); | |||
FLICKCURL_API | FLICKCURL_API | |||
End of changes. 7 change blocks. | ||||
0 lines changed or deleted | 49 lines changed or added | |||