Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(161)

Side by Side Diff: src/libmtp.h.in

Issue 11358153: Update libmtp from pre 1.1.4 git to 1.1.5 release. (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/libmtp/
Patch Set: disable mptz Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /** 1 /**
2 * \file libmtp.h 2 * \file libmtp.h
3 * Interface to the Media Transfer Protocol library. 3 * Interface to the Media Transfer Protocol library.
4 * 4 *
5 * Copyright (C) 2005-2012 Linus Walleij <triad@df.lth.se> 5 * Copyright (C) 2005-2012 Linus Walleij <triad@df.lth.se>
6 * Copyright (C) 2005-2008 Richard A. Low <richard@wentnet.com> 6 * Copyright (C) 2005-2008 Richard A. Low <richard@wentnet.com>
7 * Copyright (C) 2007 Ted Bullock <tbullock@canada.com> 7 * Copyright (C) 2007 Ted Bullock <tbullock@canada.com>
8 * Copyright (C) 2008 Florent Mertens <flomertens@gmail.com> 8 * Copyright (C) 2008 Florent Mertens <flomertens@gmail.com>
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 #include <time.h> 58 #include <time.h>
59 59
60 /** 60 /**
61 * @defgroup types libmtp global type definitions 61 * @defgroup types libmtp global type definitions
62 * @{ 62 * @{
63 */ 63 */
64 64
65 /** 65 /**
66 * The debug flags defined here are the external flags used 66 * The debug flags defined here are the external flags used
67 * by the libmtp library interface. 67 * by the libmtp library interface.
68 *
69 * Please keep this list in sync with libmtp.c.
68 */ 70 */
69 #define LIBMTP_DEBUG_NONE 0x00 71 #define LIBMTP_DEBUG_NONE 0x00
70 #define LIBMTP_DEBUG_PTP 0x01 72 #define LIBMTP_DEBUG_PTP 0x01
71 #define LIBMTP_DEBUG_PLST 0x02 73 #define LIBMTP_DEBUG_PLST 0x02
72 #define LIBMTP_DEBUG_USB 0x04 74 #define LIBMTP_DEBUG_USB 0x04
73 #define LIBMTP_DEBUG_DATA 0x08 75 #define LIBMTP_DEBUG_DATA 0x08
74 #define LIBMTP_DEBUG_ALL 0xFF 76 #define LIBMTP_DEBUG_ALL 0xFF
75 77
76 78
77 /** 79 /**
(...skipping 683 matching lines...) Expand 10 before | Expand all | Expand 10 after
761 LIBMTP_devicestorage_t *next; /**< Next storage, follow this link until NULL * / 763 LIBMTP_devicestorage_t *next; /**< Next storage, follow this link until NULL * /
762 LIBMTP_devicestorage_t *prev; /**< Previous storage */ 764 LIBMTP_devicestorage_t *prev; /**< Previous storage */
763 }; 765 };
764 766
765 /** 767 /**
766 * LIBMTP Event structure 768 * LIBMTP Event structure
767 * TODO: add all externally visible events here 769 * TODO: add all externally visible events here
768 */ 770 */
769 enum LIBMTP_event_enum { 771 enum LIBMTP_event_enum {
770 LIBMTP_EVENT_NONE, 772 LIBMTP_EVENT_NONE,
773 LIBMTP_EVENT_STORE_ADDED,
771 }; 774 };
772 typedef enum LIBMTP_event_enum LIBMTP_event_t; 775 typedef enum LIBMTP_event_enum LIBMTP_event_t;
773 776
774 /** @} */ 777 /** @} */
775 778
776 /* Make functions available for C++ */ 779 /* Make functions available for C++ */
777 #ifdef __cplusplus 780 #ifdef __cplusplus
778 extern "C" { 781 extern "C" {
779 #endif 782 #endif
780 783
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
906 const char *); 909 const char *);
907 LIBMTP_filesampledata_t *LIBMTP_new_filesampledata_t(void); 910 LIBMTP_filesampledata_t *LIBMTP_new_filesampledata_t(void);
908 void LIBMTP_destroy_filesampledata_t(LIBMTP_filesampledata_t *); 911 void LIBMTP_destroy_filesampledata_t(LIBMTP_filesampledata_t *);
909 int LIBMTP_Get_Representative_Sample_Format(LIBMTP_mtpdevice_t *, 912 int LIBMTP_Get_Representative_Sample_Format(LIBMTP_mtpdevice_t *,
910 LIBMTP_filetype_t const, 913 LIBMTP_filetype_t const,
911 LIBMTP_filesampledata_t **); 914 LIBMTP_filesampledata_t **);
912 int LIBMTP_Send_Representative_Sample(LIBMTP_mtpdevice_t *, uint32_t const, 915 int LIBMTP_Send_Representative_Sample(LIBMTP_mtpdevice_t *, uint32_t const,
913 LIBMTP_filesampledata_t *); 916 LIBMTP_filesampledata_t *);
914 int LIBMTP_Get_Representative_Sample(LIBMTP_mtpdevice_t *, uint32_t const, 917 int LIBMTP_Get_Representative_Sample(LIBMTP_mtpdevice_t *, uint32_t const,
915 LIBMTP_filesampledata_t *); 918 LIBMTP_filesampledata_t *);
919 int LIBMTP_Get_Thumbnail(LIBMTP_mtpdevice_t *, uint32_t const,
920 unsigned char **data, unsigned int *size);
916 921
917 /** 922 /**
918 * @} 923 * @}
919 * @defgroup tracks The track management API. 924 * @defgroup tracks The track management API.
920 * @{ 925 * @{
921 */ 926 */
922 LIBMTP_track_t *LIBMTP_new_track_t(void); 927 LIBMTP_track_t *LIBMTP_new_track_t(void);
923 void LIBMTP_destroy_track_t(LIBMTP_track_t*); 928 void LIBMTP_destroy_track_t(LIBMTP_track_t*);
924 LIBMTP_track_t *LIBMTP_Get_Tracklisting(LIBMTP_mtpdevice_t*); 929 LIBMTP_track_t *LIBMTP_Get_Tracklisting(LIBMTP_mtpdevice_t*);
925 LIBMTP_track_t *LIBMTP_Get_Tracklisting_With_Callback(LIBMTP_mtpdevice_t*, 930 LIBMTP_track_t *LIBMTP_Get_Tracklisting_With_Callback(LIBMTP_mtpdevice_t*,
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
1001 * @{ 1006 * @{
1002 */ 1007 */
1003 int LIBMTP_Delete_Object(LIBMTP_mtpdevice_t *, uint32_t); 1008 int LIBMTP_Delete_Object(LIBMTP_mtpdevice_t *, uint32_t);
1004 int LIBMTP_Set_Object_Filename(LIBMTP_mtpdevice_t *, uint32_t , char *); 1009 int LIBMTP_Set_Object_Filename(LIBMTP_mtpdevice_t *, uint32_t , char *);
1005 1010
1006 /** 1011 /**
1007 * @} 1012 * @}
1008 * @defgroup files The events API. 1013 * @defgroup files The events API.
1009 * @{ 1014 * @{
1010 */ 1015 */
1011 int LIBMTP_Read_Event(LIBMTP_mtpdevice_t *, LIBMTP_event_t *); 1016 int LIBMTP_Read_Event(LIBMTP_mtpdevice_t *, LIBMTP_event_t *, uint32_t *);
1012 1017
1013 1018
1014 /** @} */ 1019 /** @} */
1015 1020
1016 /* End of C++ exports */ 1021 /* End of C++ exports */
1017 #ifdef __cplusplus 1022 #ifdef __cplusplus
1018 } 1023 }
1019 #endif 1024 #endif
1020 1025
1021 #endif /* LIBMTP_H_INCLUSION_GUARD */ 1026 #endif /* LIBMTP_H_INCLUSION_GUARD */
1022 1027
OLDNEW
« config.h ('K') | « src/libmtp.sym ('k') | src/libopenusb1-glue.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698