libmtp.h   libmtp.h 
skipping to change at line 31 skipping to change at line 31
* 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.2.1 #define LIBMTP_VERSION 0.2.2
#define LIBMTP_VERSION_STRING "0.2.1" #define LIBMTP_VERSION_STRING "0.2.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 123 skipping to change at line 123
* 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,
LIBMTP_ERROR_STORAGE_FULL, LIBMTP_ERROR_STORAGE_FULL,
LIBMTP_ERROR_CONNECTING LIBMTP_ERROR_CONNECTING,
LIBMTP_ERROR_CANCELLED
} LIBMTP_error_number_t; } LIBMTP_error_number_t;
typedef struct LIBMTP_device_entry_struct LIBMTP_device_entry_t; /**< @see LIBMTP_device_entry_struct */ typedef struct LIBMTP_device_entry_struct LIBMTP_device_entry_t; /**< @see LIBMTP_device_entry_struct */
typedef struct LIBMTP_error_struct LIBMTP_error_t; /**< @see LIBMTP_error_s truct */ typedef struct LIBMTP_error_struct LIBMTP_error_t; /**< @see LIBMTP_error_s truct */
typedef struct LIBMTP_mtpdevice_struct LIBMTP_mtpdevice_t; /**< @see LIBMTP _mtpdevice_struct */ typedef struct LIBMTP_mtpdevice_struct LIBMTP_mtpdevice_t; /**< @see LIBMTP _mtpdevice_struct */
typedef struct LIBMTP_file_struct LIBMTP_file_t; /**< @see LIBMTP_file_stru ct */ typedef struct LIBMTP_file_struct LIBMTP_file_t; /**< @see LIBMTP_file_stru ct */
typedef struct LIBMTP_track_struct LIBMTP_track_t; /**< @see LIBMTP_track_s truct */ typedef struct LIBMTP_track_struct LIBMTP_track_t; /**< @see LIBMTP_track_s truct */
typedef struct LIBMTP_playlist_struct LIBMTP_playlist_t; /**< @see LIBMTP_p laylist_struct */ typedef struct LIBMTP_playlist_struct LIBMTP_playlist_t; /**< @see LIBMTP_p laylist_struct */
typedef struct LIBMTP_album_struct LIBMTP_album_t; /**< @see LIBMTP_album_s truct */ typedef struct LIBMTP_album_struct LIBMTP_album_t; /**< @see LIBMTP_album_s truct */
typedef struct LIBMTP_folder_struct LIBMTP_folder_t; /**< @see LIBMTP_folde r_t */ typedef struct LIBMTP_folder_struct LIBMTP_folder_t; /**< @see LIBMTP_folde r_t */
typedef struct LIBMTP_object_struct LIBMTP_object_t; /**< @see LIBMTP_objec t_t */ typedef struct LIBMTP_object_struct LIBMTP_object_t; /**< @see LIBMTP_objec t_t */
skipping to change at line 179 skipping to change at line 180
struct LIBMTP_error_struct { struct LIBMTP_error_struct {
LIBMTP_error_number_t errornumber; LIBMTP_error_number_t errornumber;
char *error_text; char *error_text;
LIBMTP_error_t *next; LIBMTP_error_t *next;
}; };
/** /**
* Main MTP device object struct * Main MTP device object struct
*/ */
struct LIBMTP_mtpdevice_struct { struct LIBMTP_mtpdevice_struct {
/** Interface number of this device */ /**
uint8_t interface_number; * Object bitsize, typically 32 or 64.
*/
uint8_t object_bitsize;
/** /**
* Parameters for this device, must be cast into * Parameters for this device, must be cast into
* \c (PTPParams*) before internal use. * \c (PTPParams*) before internal use.
*/ */
void *params; void *params;
/** /**
* USB device for this device, must be cast into * USB device for this device, must be cast into
* \c (PTP_USB*) before internal use. * \c (PTP_USB*) before internal use.
*/ */
void *usbinfo; void *usbinfo;
 End of changes. 3 change blocks. 
5 lines changed or deleted 8 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/