| libmtp.h | libmtp.h | |||
|---|---|---|---|---|
| skipping to change at line 32 | skipping to change at line 32 | |||
| * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |||
| * Boston, MA 02111-1307, USA. | * Boston, MA 02111-1307, USA. | |||
| * | * | |||
| * <code> | * <code> | |||
| * #include <libmtp.h> | * #include <libmtp.h> | |||
| * </code> | * </code> | |||
| */ | */ | |||
| #ifndef LIBMTP_H_INCLUSION_GUARD | #ifndef LIBMTP_H_INCLUSION_GUARD | |||
| #define LIBMTP_H_INCLUSION_GUARD | #define LIBMTP_H_INCLUSION_GUARD | |||
| #define LIBMTP_VERSION 0.3.1 | #define LIBMTP_VERSION 0.3.2 | |||
| #define LIBMTP_VERSION_STRING "0.3.1" | #define LIBMTP_VERSION_STRING "0.3.2" | |||
| /* This handles MSVC pecularities */ | /* This handles MSVC pecularities */ | |||
| #ifdef _MSC_VER | #ifdef _MSC_VER | |||
| #include <windows.h> | #include <windows.h> | |||
| #define __WIN32__ | #define __WIN32__ | |||
| #define snprintf _snprintf | #define snprintf _snprintf | |||
| #define ssize_t SSIZE_T | #define ssize_t SSIZE_T | |||
| #endif | #endif | |||
| #include <stdio.h> | #include <stdio.h> | |||
| skipping to change at line 114 | skipping to change at line 114 | |||
| LIBMTP_FILETYPE_XML, | LIBMTP_FILETYPE_XML, | |||
| LIBMTP_FILETYPE_XLS, | LIBMTP_FILETYPE_XLS, | |||
| LIBMTP_FILETYPE_PPT, | LIBMTP_FILETYPE_PPT, | |||
| LIBMTP_FILETYPE_MHT, | LIBMTP_FILETYPE_MHT, | |||
| LIBMTP_FILETYPE_JP2, | LIBMTP_FILETYPE_JP2, | |||
| LIBMTP_FILETYPE_JPX, | LIBMTP_FILETYPE_JPX, | |||
| LIBMTP_FILETYPE_UNKNOWN | LIBMTP_FILETYPE_UNKNOWN | |||
| } LIBMTP_filetype_t; | } LIBMTP_filetype_t; | |||
| /** | /** | |||
| * Helpful macros to determine filetype properties | * \def LIBMTP_FILETYPE_IS_AUDIO | |||
| * Audio filetype test. | ||||
| * | ||||
| * For filetypes that can be either audio | ||||
| * or video, use LIBMTP_FILETYPE_IS_AUDIOVIDEO | ||||
| */ | */ | |||
| #define LIBMTP_FILETYPE_IS_AUDIO(a)\ | #define LIBMTP_FILETYPE_IS_AUDIO(a)\ | |||
| (a == LIBMTP_FILETYPE_WAV ||\ | (a == LIBMTP_FILETYPE_WAV ||\ | |||
| a == LIBMTP_FILETYPE_MP3 ||\ | a == LIBMTP_FILETYPE_MP3 ||\ | |||
| a == LIBMTP_FILETYPE_MP2 ||\ | a == LIBMTP_FILETYPE_MP2 ||\ | |||
| a == LIBMTP_FILETYPE_WMA ||\ | a == LIBMTP_FILETYPE_WMA ||\ | |||
| a == LIBMTP_FILETYPE_OGG ||\ | a == LIBMTP_FILETYPE_OGG ||\ | |||
| a == LIBMTP_FILETYPE_FLAC ||\ | a == LIBMTP_FILETYPE_FLAC ||\ | |||
| a == LIBMTP_FILETYPE_AAC ||\ | a == LIBMTP_FILETYPE_AAC ||\ | |||
| a == LIBMTP_FILETYPE_M4A ||\ | a == LIBMTP_FILETYPE_M4A ||\ | |||
| a == LIBMTP_FILETYPE_UNDEF_AUDIO) | a == LIBMTP_FILETYPE_UNDEF_AUDIO) | |||
| /** | ||||
| * \def LIBMTP_FILETYPE_IS_VIDEO | ||||
| * Video filetype test. | ||||
| * | ||||
| * For filetypes that can be either audio | ||||
| * or video, use LIBMTP_FILETYPE_IS_AUDIOVIDEO | ||||
| */ | ||||
| #define LIBMTP_FILETYPE_IS_VIDEO(a)\ | #define LIBMTP_FILETYPE_IS_VIDEO(a)\ | |||
| (a == LIBMTP_FILETYPE_WMV ||\ | (a == LIBMTP_FILETYPE_WMV ||\ | |||
| a == LIBMTP_FILETYPE_AVI ||\ | a == LIBMTP_FILETYPE_AVI ||\ | |||
| a == LIBMTP_FILETYPE_MPEG ||\ | a == LIBMTP_FILETYPE_MPEG ||\ | |||
| a == LIBMTP_FILETYPE_UNDEF_VIDEO) | a == LIBMTP_FILETYPE_UNDEF_VIDEO) | |||
| /** | ||||
| * \def LIBMTP_FILETYPE_IS_AUDIOVIDEO | ||||
| * Audio and&slash;or video filetype test. | ||||
| */ | ||||
| #define LIBMTP_FILETYPE_IS_AUDIOVIDEO(a)\ | #define LIBMTP_FILETYPE_IS_AUDIOVIDEO(a)\ | |||
| (a == LIBMTP_FILETYPE_MP4 ||\ | (a == LIBMTP_FILETYPE_MP4 ||\ | |||
| a == LIBMTP_FILETYPE_ASF ||\ | a == LIBMTP_FILETYPE_ASF ||\ | |||
| a == LIBMTP_FILETYPE_QT) | a == LIBMTP_FILETYPE_QT) | |||
| /** | ||||
| * \def LIBMTP_FILETYPE_IS_TRACK | ||||
| * Test if filetype is a track. | ||||
| * Use this to determine if the File API or Track API | ||||
| * should be used to upload or download an object. | ||||
| */ | ||||
| #define LIBMTP_FILETYPE_IS_TRACK(a)\ | #define LIBMTP_FILETYPE_IS_TRACK(a)\ | |||
| (LIBMTP_FILETYPE_IS_AUDIO(a) ||\ | (LIBMTP_FILETYPE_IS_AUDIO(a) ||\ | |||
| LIBMTP_FILETYPE_IS_VIDEO(a) ||\ | LIBMTP_FILETYPE_IS_VIDEO(a) ||\ | |||
| LIBMTP_FILETYPE_IS_AUDIOVIDEO(a)) | LIBMTP_FILETYPE_IS_AUDIOVIDEO(a)) | |||
| /** | /** | |||
| * \def LIBMTP_FILETYPE_IS_IMAGE | ||||
| * Image filetype test | ||||
| */ | ||||
| #define LIBMTP_FILETYPE_IS_IMAGE(a)\ | ||||
| (a == LIBMTP_FILETYPE_JPEG ||\ | ||||
| a == LIBMTP_FILETYPE_JFIF ||\ | ||||
| a == LIBMTP_FILETYPE_TIFF ||\ | ||||
| a == LIBMTP_FILETYPE_BMP ||\ | ||||
| a == LIBMTP_FILETYPE_GIF ||\ | ||||
| a == LIBMTP_FILETYPE_PICT ||\ | ||||
| a == LIBMTP_FILETYPE_PNG ||\ | ||||
| a == LIBMTP_FILETYPE_JP2 ||\ | ||||
| a == LIBMTP_FILETYPE_JPX ||\ | ||||
| a == LIBMTP_FILETYPE_WINDOWSIMAGEFORMAT) | ||||
| /** | ||||
| * \def LIBMTP_FILETYPE_IS_ADDRESSBOOK | ||||
| * Addressbook and Business card filetype test | ||||
| */ | ||||
| #define LIBMTP_FILETYPE_IS_ADDRESSBOOK(a)\ | ||||
| (a == LIBMTP_FILETYPE_VCARD2 ||\ | ||||
| a == LIBMTP_FILETYPE_VCARD2) | ||||
| /** | ||||
| * \def LIBMTP_FILETYPE_IS_CALENDAR | ||||
| * Calendar and Appointment filetype test | ||||
| */ | ||||
| #define LIBMTP_FILETYPE_IS_CALENDAR(a)\ | ||||
| (a == LIBMTP_FILETYPE_VCALENDAR1 ||\ | ||||
| a == LIBMTP_FILETYPE_VCALENDAR2) | ||||
| /** | ||||
| * These are the numbered error codes. You can also | * These are the numbered error codes. You can also | |||
| * get string representations for errors. | * get string representations for errors. | |||
| */ | */ | |||
| typedef enum { | typedef enum { | |||
| LIBMTP_ERROR_NONE, | LIBMTP_ERROR_NONE, | |||
| LIBMTP_ERROR_GENERAL, | LIBMTP_ERROR_GENERAL, | |||
| LIBMTP_ERROR_PTP_LAYER, | LIBMTP_ERROR_PTP_LAYER, | |||
| LIBMTP_ERROR_USB_LAYER, | LIBMTP_ERROR_USB_LAYER, | |||
| LIBMTP_ERROR_MEMORY_ALLOCATION, | LIBMTP_ERROR_MEMORY_ALLOCATION, | |||
| LIBMTP_ERROR_NO_DEVICE_ATTACHED, | LIBMTP_ERROR_NO_DEVICE_ATTACHED, | |||
| End of changes. 6 change blocks. | ||||
| 3 lines changed or deleted | 59 lines changed or added | |||