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-2012 Linus Walleij <triad@df.lth.se> * Copyright (C) 2005-2013 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.6 #define LIBMTP_VERSION 1.1.7
#define LIBMTP_VERSION_STRING "1.1.6" #define LIBMTP_VERSION_STRING "1.1.7"
/* 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 405 skipping to change at line 405
LIBMTP_DATATYPE_UINT8, LIBMTP_DATATYPE_UINT8,
LIBMTP_DATATYPE_INT16, LIBMTP_DATATYPE_INT16,
LIBMTP_DATATYPE_UINT16, LIBMTP_DATATYPE_UINT16,
LIBMTP_DATATYPE_INT32, LIBMTP_DATATYPE_INT32,
LIBMTP_DATATYPE_UINT32, LIBMTP_DATATYPE_UINT32,
LIBMTP_DATATYPE_INT64, LIBMTP_DATATYPE_INT64,
LIBMTP_DATATYPE_UINT64, LIBMTP_DATATYPE_UINT64,
} LIBMTP_datatype_t; } LIBMTP_datatype_t;
/** /**
* These are device capabilities
*/
typedef enum {
/**
* This capability tells whether you can call the funcion getting
* partial objects, @see LIBMTP_GetPartialObject()
*/
LIBMTP_DEVICECAP_GetPartialObject,
/**
* This capability tells whether you can call the function sending
* partial objects. @see LIBMTP_SendPartialObject()
*/
LIBMTP_DEVICECAP_SendPartialObject,
/**
* This capability tells whether you can call the functions editing
* objects in-place on a device.
* @see LIBMTP_BeginEditObject()
* @see LIBMTP_EndEditObject()
* @see LIBMTP_TruncateObject()
*/
LIBMTP_DEVICECAP_EditObjects,
} LIBMTP_devicecap_t;
/**
* 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,
skipping to change at line 827 skipping to change at line 851
char *LIBMTP_Get_Friendlyname(LIBMTP_mtpdevice_t*); char *LIBMTP_Get_Friendlyname(LIBMTP_mtpdevice_t*);
int LIBMTP_Set_Friendlyname(LIBMTP_mtpdevice_t*, char const * const); int LIBMTP_Set_Friendlyname(LIBMTP_mtpdevice_t*, char const * const);
char *LIBMTP_Get_Syncpartner(LIBMTP_mtpdevice_t*); char *LIBMTP_Get_Syncpartner(LIBMTP_mtpdevice_t*);
int LIBMTP_Set_Syncpartner(LIBMTP_mtpdevice_t*, char const * const); int LIBMTP_Set_Syncpartner(LIBMTP_mtpdevice_t*, char const * const);
int LIBMTP_Get_Batterylevel(LIBMTP_mtpdevice_t *, int LIBMTP_Get_Batterylevel(LIBMTP_mtpdevice_t *,
uint8_t * const, uint8_t * const,
uint8_t * const); uint8_t * const);
int LIBMTP_Get_Secure_Time(LIBMTP_mtpdevice_t *, char ** const); int LIBMTP_Get_Secure_Time(LIBMTP_mtpdevice_t *, char ** const);
int LIBMTP_Get_Device_Certificate(LIBMTP_mtpdevice_t *, char ** const); int LIBMTP_Get_Device_Certificate(LIBMTP_mtpdevice_t *, char ** const);
int LIBMTP_Get_Supported_Filetypes(LIBMTP_mtpdevice_t *, uint16_t ** const, uint16_t * const); int LIBMTP_Get_Supported_Filetypes(LIBMTP_mtpdevice_t *, uint16_t ** const, uint16_t * const);
int LIBMTP_Check_Capability(LIBMTP_mtpdevice_t *, LIBMTP_devicecap_t);
LIBMTP_error_t *LIBMTP_Get_Errorstack(LIBMTP_mtpdevice_t*); LIBMTP_error_t *LIBMTP_Get_Errorstack(LIBMTP_mtpdevice_t*);
void LIBMTP_Clear_Errorstack(LIBMTP_mtpdevice_t*); void LIBMTP_Clear_Errorstack(LIBMTP_mtpdevice_t*);
void LIBMTP_Dump_Errorstack(LIBMTP_mtpdevice_t*); void LIBMTP_Dump_Errorstack(LIBMTP_mtpdevice_t*);
#define LIBMTP_STORAGE_SORTBY_NOTSORTED 0 #define LIBMTP_STORAGE_SORTBY_NOTSORTED 0
#define LIBMTP_STORAGE_SORTBY_FREESPACE 1 #define LIBMTP_STORAGE_SORTBY_FREESPACE 1
#define LIBMTP_STORAGE_SORTBY_MAXSPACE 2 #define LIBMTP_STORAGE_SORTBY_MAXSPACE 2
int LIBMTP_Get_Storage(LIBMTP_mtpdevice_t *, int const); int LIBMTP_Get_Storage(LIBMTP_mtpdevice_t *, int const);
int LIBMTP_Format_Storage(LIBMTP_mtpdevice_t *, LIBMTP_devicestorage_t *); int LIBMTP_Format_Storage(LIBMTP_mtpdevice_t *, LIBMTP_devicestorage_t *);
 End of changes. 4 change blocks. 
3 lines changed or deleted 28 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/