| 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 1.1.4 | #define LIBMTP_VERSION 1.1.5 | |||
| #define LIBMTP_VERSION_STRING "1.1.4" | #define LIBMTP_VERSION_STRING "1.1.5" | |||
| /* 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 | |||
| /* | /* | |||
| * Types that do not exist in Windows | * Types that do not exist in Windows | |||
| * sys/types.h, but they exist in mingw32 | * sys/types.h, but they exist in mingw32 | |||
| skipping to change at line 772 | skipping to change at line 772 | |||
| LIBMTP_devicestorage_t *next; /**< Next storage, follow this link until N ULL */ | LIBMTP_devicestorage_t *next; /**< Next storage, follow this link until N ULL */ | |||
| LIBMTP_devicestorage_t *prev; /**< Previous storage */ | LIBMTP_devicestorage_t *prev; /**< Previous storage */ | |||
| }; | }; | |||
| /** | /** | |||
| * LIBMTP Event structure | * LIBMTP Event structure | |||
| * TODO: add all externally visible events here | * TODO: add all externally visible events here | |||
| */ | */ | |||
| enum LIBMTP_event_enum { | enum LIBMTP_event_enum { | |||
| LIBMTP_EVENT_NONE, | LIBMTP_EVENT_NONE, | |||
| LIBMTP_EVENT_STORE_ADDED, | ||||
| }; | }; | |||
| typedef enum LIBMTP_event_enum LIBMTP_event_t; | typedef enum LIBMTP_event_enum LIBMTP_event_t; | |||
| /** @} */ | /** @} */ | |||
| /* Make functions available for C++ */ | /* Make functions available for C++ */ | |||
| #ifdef __cplusplus | #ifdef __cplusplus | |||
| extern "C" { | extern "C" { | |||
| #endif | #endif | |||
| skipping to change at line 917 | skipping to change at line 918 | |||
| const char *); | const char *); | |||
| LIBMTP_filesampledata_t *LIBMTP_new_filesampledata_t(void); | LIBMTP_filesampledata_t *LIBMTP_new_filesampledata_t(void); | |||
| void LIBMTP_destroy_filesampledata_t(LIBMTP_filesampledata_t *); | void LIBMTP_destroy_filesampledata_t(LIBMTP_filesampledata_t *); | |||
| int LIBMTP_Get_Representative_Sample_Format(LIBMTP_mtpdevice_t *, | int LIBMTP_Get_Representative_Sample_Format(LIBMTP_mtpdevice_t *, | |||
| LIBMTP_filetype_t const, | LIBMTP_filetype_t const, | |||
| LIBMTP_filesampledata_t **); | LIBMTP_filesampledata_t **); | |||
| int LIBMTP_Send_Representative_Sample(LIBMTP_mtpdevice_t *, uint32_t const, | int LIBMTP_Send_Representative_Sample(LIBMTP_mtpdevice_t *, uint32_t const, | |||
| LIBMTP_filesampledata_t *); | LIBMTP_filesampledata_t *); | |||
| int LIBMTP_Get_Representative_Sample(LIBMTP_mtpdevice_t *, uint32_t const, | int LIBMTP_Get_Representative_Sample(LIBMTP_mtpdevice_t *, uint32_t const, | |||
| LIBMTP_filesampledata_t *); | LIBMTP_filesampledata_t *); | |||
| int LIBMTP_Get_Thumbnail(LIBMTP_mtpdevice_t *, uint32_t const, | ||||
| unsigned char **data, unsigned int *size); | ||||
| /** | /** | |||
| * @} | * @} | |||
| * @defgroup tracks The track management API. | * @defgroup tracks The track management API. | |||
| * @{ | * @{ | |||
| */ | */ | |||
| LIBMTP_track_t *LIBMTP_new_track_t(void); | LIBMTP_track_t *LIBMTP_new_track_t(void); | |||
| void LIBMTP_destroy_track_t(LIBMTP_track_t*); | void LIBMTP_destroy_track_t(LIBMTP_track_t*); | |||
| LIBMTP_track_t *LIBMTP_Get_Tracklisting(LIBMTP_mtpdevice_t*); | LIBMTP_track_t *LIBMTP_Get_Tracklisting(LIBMTP_mtpdevice_t*); | |||
| LIBMTP_track_t *LIBMTP_Get_Tracklisting_With_Callback(LIBMTP_mtpdevice_t*, | LIBMTP_track_t *LIBMTP_Get_Tracklisting_With_Callback(LIBMTP_mtpdevice_t*, | |||
| skipping to change at line 1010 | skipping to change at line 1013 | |||
| * @{ | * @{ | |||
| */ | */ | |||
| int LIBMTP_Delete_Object(LIBMTP_mtpdevice_t *, uint32_t); | int LIBMTP_Delete_Object(LIBMTP_mtpdevice_t *, uint32_t); | |||
| int LIBMTP_Set_Object_Filename(LIBMTP_mtpdevice_t *, uint32_t , char *); | int LIBMTP_Set_Object_Filename(LIBMTP_mtpdevice_t *, uint32_t , char *); | |||
| /** | /** | |||
| * @} | * @} | |||
| * @defgroup files The events API. | * @defgroup files The events API. | |||
| * @{ | * @{ | |||
| */ | */ | |||
| int LIBMTP_Read_Event(LIBMTP_mtpdevice_t *, LIBMTP_event_t *); | int LIBMTP_Read_Event(LIBMTP_mtpdevice_t *, LIBMTP_event_t *, uint32_t *); | |||
| /** @} */ | /** @} */ | |||
| /* End of C++ exports */ | /* End of C++ exports */ | |||
| #ifdef __cplusplus | #ifdef __cplusplus | |||
| } | } | |||
| #endif | #endif | |||
| #endif /* LIBMTP_H_INCLUSION_GUARD */ | #endif /* LIBMTP_H_INCLUSION_GUARD */ | |||
| End of changes. 4 change blocks. | ||||
| 3 lines changed or deleted | 6 lines changed or added | |||