| libmtp.h | libmtp.h | |||
|---|---|---|---|---|
| /** | /** | |||
| * \file libmtp.h | * \file libmtp.h | |||
| * Interface to the Media Transfer Protocol library. | * Interface to the Media Transfer Protocol library. | |||
| * | * | |||
| * Copyright (C) 2005-2011 Linus Walleij <triad@df.lth.se> | * Copyright (C) 2005-2012 Linus Walleij <triad@df.lth.se> | |||
| * Copyright (C) 2005-2008 Richard A. Low <richard@wentnet.com> | * Copyright (C) 2005-2008 Richard A. Low <richard@wentnet.com> | |||
| * Copyright (C) 2007 Ted Bullock <tbullock@canada.com> | * Copyright (C) 2007 Ted Bullock <tbullock@canada.com> | |||
| * Copyright (C) 2008 Florent Mertens <flomertens@gmail.com> | * Copyright (C) 2008 Florent Mertens <flomertens@gmail.com> | |||
| * | * | |||
| * This library is free software; you can redistribute it and/or | * This library is free software; you can redistribute it and/or | |||
| * modify it under the terms of the GNU Lesser General Public | * modify it under the terms of the GNU Lesser General Public | |||
| * License as published by the Free Software Foundation; either | * License as published by the Free Software Foundation; either | |||
| * version 2 of the License, or (at your option) any later version. | * version 2 of the License, or (at your option) any later version. | |||
| * | * | |||
| * This library is distributed in the hope that it will be useful, | * This library is distributed in the hope that it will be useful, | |||
| 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.3 | #define LIBMTP_VERSION 1.1.4 | |||
| #define LIBMTP_VERSION_STRING "1.1.3" | #define LIBMTP_VERSION_STRING "1.1.4" | |||
| /* 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 68 | skipping to change at line 68 | |||
| #include <time.h> | #include <time.h> | |||
| /** | /** | |||
| * @defgroup types libmtp global type definitions | * @defgroup types libmtp global type definitions | |||
| * @{ | * @{ | |||
| */ | */ | |||
| /** | /** | |||
| * The debug flags defined here are the external flags used | * The debug flags defined here are the external flags used | |||
| * by the libmtp library interface. | * by the libmtp library interface. | |||
| * | ||||
| * Please keep this list in sync with libmtp.c. | ||||
| */ | */ | |||
| #define LIBMTP_DEBUG_NONE 0x00 | #define LIBMTP_DEBUG_NONE 0x00 | |||
| #define LIBMTP_DEBUG_PTP 0x01 | #define LIBMTP_DEBUG_PTP 0x01 | |||
| #define LIBMTP_DEBUG_PLST 0x02 | #define LIBMTP_DEBUG_PLST 0x02 | |||
| #define LIBMTP_DEBUG_USB 0x04 | #define LIBMTP_DEBUG_USB 0x04 | |||
| #define LIBMTP_DEBUG_DATA 0x08 | #define LIBMTP_DEBUG_DATA 0x08 | |||
| #define LIBMTP_DEBUG_ALL 0xFF | #define LIBMTP_DEBUG_ALL 0xFF | |||
| /** | /** | |||
| * The filetypes defined here are the external types used | * The filetypes defined here are the external types used | |||
| skipping to change at line 203 | skipping to change at line 205 | |||
| a == LIBMTP_FILETYPE_JP2 ||\ | a == LIBMTP_FILETYPE_JP2 ||\ | |||
| a == LIBMTP_FILETYPE_JPX ||\ | a == LIBMTP_FILETYPE_JPX ||\ | |||
| a == LIBMTP_FILETYPE_WINDOWSIMAGEFORMAT) | a == LIBMTP_FILETYPE_WINDOWSIMAGEFORMAT) | |||
| /** | /** | |||
| * \def LIBMTP_FILETYPE_IS_ADDRESSBOOK | * \def LIBMTP_FILETYPE_IS_ADDRESSBOOK | |||
| * Addressbook and Business card filetype test | * Addressbook and Business card filetype test | |||
| */ | */ | |||
| #define LIBMTP_FILETYPE_IS_ADDRESSBOOK(a)\ | #define LIBMTP_FILETYPE_IS_ADDRESSBOOK(a)\ | |||
| (a == LIBMTP_FILETYPE_VCARD2 ||\ | (a == LIBMTP_FILETYPE_VCARD2 ||\ | |||
| a == LIBMTP_FILETYPE_VCARD2) | a == LIBMTP_FILETYPE_VCARD3) | |||
| /** | /** | |||
| * \def LIBMTP_FILETYPE_IS_CALENDAR | * \def LIBMTP_FILETYPE_IS_CALENDAR | |||
| * Calendar and Appointment filetype test | * Calendar and Appointment filetype test | |||
| */ | */ | |||
| #define LIBMTP_FILETYPE_IS_CALENDAR(a)\ | #define LIBMTP_FILETYPE_IS_CALENDAR(a)\ | |||
| (a == LIBMTP_FILETYPE_VCALENDAR1 ||\ | (a == LIBMTP_FILETYPE_VCALENDAR1 ||\ | |||
| a == LIBMTP_FILETYPE_VCALENDAR2) | a == LIBMTP_FILETYPE_VCALENDAR2) | |||
| /** | /** | |||
| End of changes. 4 change blocks. | ||||
| 4 lines changed or deleted | 6 lines changed or added | |||