OLD | NEW |
1 diff --git a/examples/Makefile.am b/examples/Makefile.am | 1 Index: examples/Makefile.am |
2 index 46ac70f..0bac1b3 100644 | 2 =================================================================== |
3 --- a/examples/Makefile.am | 3 --- examples/Makefile.am» (revision 148515) |
4 +++ b/examples/Makefile.am | 4 +++ examples/Makefile.am» (working copy) |
5 @@ -1,6 +1,6 @@ | 5 @@ -1,6 +1,6 @@ |
6 bin_PROGRAMS=mtp-connect mtp-detect mtp-tracks mtp-files \ | 6 bin_PROGRAMS=mtp-connect mtp-detect mtp-tracks mtp-files \ |
7 - mtp-folders mtp-trexist mtp-playlists mtp-getplaylist \ | 7 - mtp-folders mtp-trexist mtp-playlists mtp-getplaylist \ |
8 - mtp-format mtp-albumart mtp-albums mtp-newplaylist mtp-emptyfolders \ | 8 - mtp-format mtp-albumart mtp-albums mtp-newplaylist mtp-emptyfolders \ |
9 + mtp-folders mtp-trexist \ | 9 + mtp-folders mtp-trexist \ |
10 + mtp-format mtp-albumart mtp-albums mtp-emptyfolders \ | 10 + mtp-format mtp-albumart mtp-albums mtp-emptyfolders \ |
11 mtp-thumb mtp-reset mtp-filetree | 11 mtp-thumb mtp-reset mtp-filetree |
12 | 12 |
13 mtp_connect_SOURCES=connect.c connect.h delfile.c getfile.c newfolder.c \ | 13 mtp_connect_SOURCES=connect.c connect.h delfile.c getfile.c newfolder.c \ |
14 @@ -11,9 +11,6 @@ mtp_tracks_SOURCES=tracks.c util.c util.h common.h | 14 @@ -11,9 +11,6 @@ |
15 mtp_files_SOURCES=files.c util.c util.h common.h | 15 mtp_files_SOURCES=files.c util.c util.h common.h |
16 mtp_folders_SOURCES=folders.c util.c util.h common.h | 16 mtp_folders_SOURCES=folders.c util.c util.h common.h |
17 mtp_trexist_SOURCES=trexist.c util.c util.h common.h | 17 mtp_trexist_SOURCES=trexist.c util.c util.h common.h |
18 -mtp_playlists_SOURCES=playlists.c util.c util.h common.h | 18 -mtp_playlists_SOURCES=playlists.c util.c util.h common.h |
19 -mtp_getplaylist_SOURCES=getplaylist.c util.c util.h common.h | 19 -mtp_getplaylist_SOURCES=getplaylist.c util.c util.h common.h |
20 -mtp_newplaylist_SOURCES=newplaylist.c util.c util.h common.h | 20 -mtp_newplaylist_SOURCES=newplaylist.c util.c util.h common.h |
21 mtp_format_SOURCES=format.c util.c util.h common.h | 21 mtp_format_SOURCES=format.c util.c util.h common.h |
22 mtp_albumart_SOURCES=albumart.c util.c util.h common.h | 22 mtp_albumart_SOURCES=albumart.c util.c util.h common.h |
23 mtp_albums_SOURCES=albums.c util.c util.h common.h | 23 mtp_albums_SOURCES=albums.c util.c util.h common.h |
24 diff --git a/examples/Makefile.in b/examples/Makefile.in | 24 Index: examples/Makefile.in |
25 index 8d6e224..85e1a8b 100644 | 25 =================================================================== |
26 --- a/examples/Makefile.in | 26 --- examples/Makefile.in» (revision 148515) |
27 +++ b/examples/Makefile.in | 27 +++ examples/Makefile.in» (working copy) |
28 @@ -90,10 +90,10 @@ build_triplet = @build@ | 28 @@ -36,10 +36,10 @@ |
29 host_triplet = @host@ | 29 host_triplet = @host@ |
30 bin_PROGRAMS = mtp-connect$(EXEEXT) mtp-detect$(EXEEXT) \ | 30 bin_PROGRAMS = mtp-connect$(EXEEXT) mtp-detect$(EXEEXT) \ |
31 mtp-tracks$(EXEEXT) mtp-files$(EXEEXT) mtp-folders$(EXEEXT) \ | 31 mtp-tracks$(EXEEXT) mtp-files$(EXEEXT) mtp-folders$(EXEEXT) \ |
32 - mtp-trexist$(EXEEXT) mtp-playlists$(EXEEXT) \ | 32 - mtp-trexist$(EXEEXT) mtp-playlists$(EXEEXT) \ |
33 - mtp-getplaylist$(EXEEXT) mtp-format$(EXEEXT) \ | 33 - mtp-getplaylist$(EXEEXT) mtp-format$(EXEEXT) \ |
34 + mtp-trexist$(EXEEXT) \ | 34 + mtp-trexist$(EXEEXT) \ |
35 + mtp-format$(EXEEXT) \ | 35 + mtp-format$(EXEEXT) \ |
36 mtp-albumart$(EXEEXT) mtp-albums$(EXEEXT) \ | 36 mtp-albumart$(EXEEXT) mtp-albums$(EXEEXT) \ |
37 - mtp-newplaylist$(EXEEXT) mtp-emptyfolders$(EXEEXT) \ | 37 - mtp-newplaylist$(EXEEXT) mtp-emptyfolders$(EXEEXT) \ |
38 + mtp-emptyfolders$(EXEEXT) \ | 38 + mtp-emptyfolders$(EXEEXT) \ |
39 mtp-thumb$(EXEEXT) mtp-reset$(EXEEXT) mtp-filetree$(EXEEXT) | 39 mtp-thumb$(EXEEXT) mtp-reset$(EXEEXT) mtp-filetree$(EXEEXT) |
40 subdir = examples | 40 subdir = examples |
41 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | 41 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in |
42 @@ -153,18 +153,6 @@ am_mtp_format_OBJECTS = format.$(OBJEXT) util.$(OBJEXT) | 42 @@ -95,18 +95,6 @@ |
43 mtp_format_OBJECTS = $(am_mtp_format_OBJECTS) | 43 mtp_format_OBJECTS = $(am_mtp_format_OBJECTS) |
44 mtp_format_LDADD = $(LDADD) | 44 mtp_format_LDADD = $(LDADD) |
45 mtp_format_DEPENDENCIES = ../src/libmtp.la | 45 mtp_format_DEPENDENCIES = ../src/libmtp.la |
46 -am_mtp_getplaylist_OBJECTS = getplaylist.$(OBJEXT) util.$(OBJEXT) | 46 -am_mtp_getplaylist_OBJECTS = getplaylist.$(OBJEXT) util.$(OBJEXT) |
47 -mtp_getplaylist_OBJECTS = $(am_mtp_getplaylist_OBJECTS) | 47 -mtp_getplaylist_OBJECTS = $(am_mtp_getplaylist_OBJECTS) |
48 -mtp_getplaylist_LDADD = $(LDADD) | 48 -mtp_getplaylist_LDADD = $(LDADD) |
49 -mtp_getplaylist_DEPENDENCIES = ../src/libmtp.la | 49 -mtp_getplaylist_DEPENDENCIES = ../src/libmtp.la |
50 -am_mtp_newplaylist_OBJECTS = newplaylist.$(OBJEXT) util.$(OBJEXT) | 50 -am_mtp_newplaylist_OBJECTS = newplaylist.$(OBJEXT) util.$(OBJEXT) |
51 -mtp_newplaylist_OBJECTS = $(am_mtp_newplaylist_OBJECTS) | 51 -mtp_newplaylist_OBJECTS = $(am_mtp_newplaylist_OBJECTS) |
52 -mtp_newplaylist_LDADD = $(LDADD) | 52 -mtp_newplaylist_LDADD = $(LDADD) |
53 -mtp_newplaylist_DEPENDENCIES = ../src/libmtp.la | 53 -mtp_newplaylist_DEPENDENCIES = ../src/libmtp.la |
54 -am_mtp_playlists_OBJECTS = playlists.$(OBJEXT) util.$(OBJEXT) | 54 -am_mtp_playlists_OBJECTS = playlists.$(OBJEXT) util.$(OBJEXT) |
55 -mtp_playlists_OBJECTS = $(am_mtp_playlists_OBJECTS) | 55 -mtp_playlists_OBJECTS = $(am_mtp_playlists_OBJECTS) |
56 -mtp_playlists_LDADD = $(LDADD) | 56 -mtp_playlists_LDADD = $(LDADD) |
57 -mtp_playlists_DEPENDENCIES = ../src/libmtp.la | 57 -mtp_playlists_DEPENDENCIES = ../src/libmtp.la |
58 am_mtp_reset_OBJECTS = reset.$(OBJEXT) util.$(OBJEXT) | 58 am_mtp_reset_OBJECTS = reset.$(OBJEXT) util.$(OBJEXT) |
59 mtp_reset_OBJECTS = $(am_mtp_reset_OBJECTS) | 59 mtp_reset_OBJECTS = $(am_mtp_reset_OBJECTS) |
60 mtp_reset_LDADD = $(LDADD) | 60 mtp_reset_LDADD = $(LDADD) |
61 @@ -219,16 +207,14 @@ SOURCES = $(mtp_albumart_SOURCES) $(mtp_albums_SOURCES) \ | 61 @@ -140,16 +128,14 @@ |
62 $(mtp_connect_SOURCES) $(mtp_detect_SOURCES) \ | 62 $(mtp_connect_SOURCES) $(mtp_detect_SOURCES) \ |
63 $(mtp_emptyfolders_SOURCES) $(mtp_files_SOURCES) \ | 63 $(mtp_emptyfolders_SOURCES) $(mtp_files_SOURCES) \ |
64 $(mtp_filetree_SOURCES) $(mtp_folders_SOURCES) \ | 64 $(mtp_filetree_SOURCES) $(mtp_folders_SOURCES) \ |
65 - $(mtp_format_SOURCES) $(mtp_getplaylist_SOURCES) \ | 65 - $(mtp_format_SOURCES) $(mtp_getplaylist_SOURCES) \ |
66 - $(mtp_newplaylist_SOURCES) $(mtp_playlists_SOURCES) \ | 66 - $(mtp_newplaylist_SOURCES) $(mtp_playlists_SOURCES) \ |
67 + $(mtp_format_SOURCES) \ | 67 + $(mtp_format_SOURCES) \ |
68 $(mtp_reset_SOURCES) $(mtp_thumb_SOURCES) \ | 68 $(mtp_reset_SOURCES) $(mtp_thumb_SOURCES) \ |
69 $(mtp_tracks_SOURCES) $(mtp_trexist_SOURCES) | 69 $(mtp_tracks_SOURCES) $(mtp_trexist_SOURCES) |
70 DIST_SOURCES = $(mtp_albumart_SOURCES) $(mtp_albums_SOURCES) \ | 70 DIST_SOURCES = $(mtp_albumart_SOURCES) $(mtp_albums_SOURCES) \ |
71 $(mtp_connect_SOURCES) $(mtp_detect_SOURCES) \ | 71 $(mtp_connect_SOURCES) $(mtp_detect_SOURCES) \ |
72 $(mtp_emptyfolders_SOURCES) $(mtp_files_SOURCES) \ | 72 $(mtp_emptyfolders_SOURCES) $(mtp_files_SOURCES) \ |
73 $(mtp_filetree_SOURCES) $(mtp_folders_SOURCES) \ | 73 $(mtp_filetree_SOURCES) $(mtp_folders_SOURCES) \ |
74 - $(mtp_format_SOURCES) $(mtp_getplaylist_SOURCES) \ | 74 - $(mtp_format_SOURCES) $(mtp_getplaylist_SOURCES) \ |
75 - $(mtp_newplaylist_SOURCES) $(mtp_playlists_SOURCES) \ | 75 - $(mtp_newplaylist_SOURCES) $(mtp_playlists_SOURCES) \ |
76 + $(mtp_format_SOURCES) \ | 76 + $(mtp_format_SOURCES) \ |
77 $(mtp_reset_SOURCES) $(mtp_thumb_SOURCES) \ | 77 $(mtp_reset_SOURCES) $(mtp_thumb_SOURCES) \ |
78 $(mtp_tracks_SOURCES) $(mtp_trexist_SOURCES) | 78 $(mtp_tracks_SOURCES) $(mtp_trexist_SOURCES) |
79 am__can_run_installinfo = \ | 79 ETAGS = etags |
80 @@ -397,9 +383,6 @@ mtp_tracks_SOURCES = tracks.c util.c util.h common.h | 80 @@ -294,9 +280,6 @@ |
81 mtp_files_SOURCES = files.c util.c util.h common.h | 81 mtp_files_SOURCES = files.c util.c util.h common.h |
82 mtp_folders_SOURCES = folders.c util.c util.h common.h | 82 mtp_folders_SOURCES = folders.c util.c util.h common.h |
83 mtp_trexist_SOURCES = trexist.c util.c util.h common.h | 83 mtp_trexist_SOURCES = trexist.c util.c util.h common.h |
84 -mtp_playlists_SOURCES = playlists.c util.c util.h common.h | 84 -mtp_playlists_SOURCES = playlists.c util.c util.h common.h |
85 -mtp_getplaylist_SOURCES = getplaylist.c util.c util.h common.h | 85 -mtp_getplaylist_SOURCES = getplaylist.c util.c util.h common.h |
86 -mtp_newplaylist_SOURCES = newplaylist.c util.c util.h common.h | 86 -mtp_newplaylist_SOURCES = newplaylist.c util.c util.h common.h |
87 mtp_format_SOURCES = format.c util.c util.h common.h | 87 mtp_format_SOURCES = format.c util.c util.h common.h |
88 mtp_albumart_SOURCES = albumart.c util.c util.h common.h | 88 mtp_albumart_SOURCES = albumart.c util.c util.h common.h |
89 mtp_albums_SOURCES = albums.c util.c util.h common.h | 89 mtp_albums_SOURCES = albums.c util.c util.h common.h |
90 @@ -529,18 +512,6 @@ mtp-format$(EXEEXT): $(mtp_format_OBJECTS) $(mtp_format_DEP
ENDENCIES) $(EXTRA_mt | 90 @@ -411,15 +394,6 @@ |
| 91 mtp-format$(EXEEXT): $(mtp_format_OBJECTS) $(mtp_format_DEPENDENCIES) $(EXTRA_m
tp_format_DEPENDENCIES) |
91 @rm -f mtp-format$(EXEEXT) | 92 @rm -f mtp-format$(EXEEXT) |
92 » $(AM_V_CCLD)$(LINK) $(mtp_format_OBJECTS) $(mtp_format_LDADD) $(LIBS) | 93 » $(LINK) $(mtp_format_OBJECTS) $(mtp_format_LDADD) $(LIBS) |
93 | |
94 -mtp-getplaylist$(EXEEXT): $(mtp_getplaylist_OBJECTS) $(mtp_getplaylist_DEPENDEN
CIES) $(EXTRA_mtp_getplaylist_DEPENDENCIES) | 94 -mtp-getplaylist$(EXEEXT): $(mtp_getplaylist_OBJECTS) $(mtp_getplaylist_DEPENDEN
CIES) $(EXTRA_mtp_getplaylist_DEPENDENCIES) |
95 - @rm -f mtp-getplaylist$(EXEEXT) | 95 - @rm -f mtp-getplaylist$(EXEEXT) |
96 -» $(AM_V_CCLD)$(LINK) $(mtp_getplaylist_OBJECTS) $(mtp_getplaylist_LDADD)
$(LIBS) | 96 -» $(LINK) $(mtp_getplaylist_OBJECTS) $(mtp_getplaylist_LDADD) $(LIBS) |
97 - | |
98 -mtp-newplaylist$(EXEEXT): $(mtp_newplaylist_OBJECTS) $(mtp_newplaylist_DEPENDEN
CIES) $(EXTRA_mtp_newplaylist_DEPENDENCIES) | 97 -mtp-newplaylist$(EXEEXT): $(mtp_newplaylist_OBJECTS) $(mtp_newplaylist_DEPENDEN
CIES) $(EXTRA_mtp_newplaylist_DEPENDENCIES) |
99 - @rm -f mtp-newplaylist$(EXEEXT) | 98 - @rm -f mtp-newplaylist$(EXEEXT) |
100 -» $(AM_V_CCLD)$(LINK) $(mtp_newplaylist_OBJECTS) $(mtp_newplaylist_LDADD)
$(LIBS) | 99 -» $(LINK) $(mtp_newplaylist_OBJECTS) $(mtp_newplaylist_LDADD) $(LIBS) |
101 - | |
102 -mtp-playlists$(EXEEXT): $(mtp_playlists_OBJECTS) $(mtp_playlists_DEPENDENCIES)
$(EXTRA_mtp_playlists_DEPENDENCIES) | 100 -mtp-playlists$(EXEEXT): $(mtp_playlists_OBJECTS) $(mtp_playlists_DEPENDENCIES)
$(EXTRA_mtp_playlists_DEPENDENCIES) |
103 - @rm -f mtp-playlists$(EXEEXT) | 101 - @rm -f mtp-playlists$(EXEEXT) |
104 -» $(AM_V_CCLD)$(LINK) $(mtp_playlists_OBJECTS) $(mtp_playlists_LDADD) $(LI
BS) | 102 -» $(LINK) $(mtp_playlists_OBJECTS) $(mtp_playlists_LDADD) $(LIBS) |
105 - | |
106 mtp-reset$(EXEEXT): $(mtp_reset_OBJECTS) $(mtp_reset_DEPENDENCIES) $(EXTRA_mtp_
reset_DEPENDENCIES) | 103 mtp-reset$(EXEEXT): $(mtp_reset_OBJECTS) $(mtp_reset_DEPENDENCIES) $(EXTRA_mtp_
reset_DEPENDENCIES) |
107 @rm -f mtp-reset$(EXEEXT) | 104 @rm -f mtp-reset$(EXEEXT) |
108 » $(AM_V_CCLD)$(LINK) $(mtp_reset_OBJECTS) $(mtp_reset_LDADD) $(LIBS) | 105 » $(LINK) $(mtp_reset_OBJECTS) $(mtp_reset_LDADD) $(LIBS) |
109 @@ -574,11 +545,8 @@ distclean-compile: | 106 @@ -450,11 +424,8 @@ |
110 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/folders.Po@am__quote@ | 107 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/folders.Po@am__quote@ |
111 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/format.Po@am__quote@ | 108 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/format.Po@am__quote@ |
112 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getfile.Po@am__quote@ | 109 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getfile.Po@am__quote@ |
113 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getplaylist.Po@am__quote@ | 110 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getplaylist.Po@am__quote@ |
114 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/newfolder.Po@am__quote@ | 111 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/newfolder.Po@am__quote@ |
115 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/newplaylist.Po@am__quote@ | 112 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/newplaylist.Po@am__quote@ |
116 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pathutils.Po@am__quote@ | 113 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pathutils.Po@am__quote@ |
117 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/playlists.Po@am__quote@ | 114 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/playlists.Po@am__quote@ |
118 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reset.Po@am__quote@ | 115 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reset.Po@am__quote@ |
119 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sendfile.Po@am__quote@ | 116 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sendfile.Po@am__quote@ |
120 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sendtr.Po@am__quote@ | 117 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sendtr.Po@am__quote@ |
121 diff --git a/src/libmtp.c b/src/libmtp.c | 118 Index: src/libmtp.c |
122 index 665f334..b38b7a2 100644 | 119 =================================================================== |
123 --- a/src/libmtp.c | 120 --- src/libmtp.c» (revision 148515) |
124 +++ b/src/libmtp.c | 121 +++ src/libmtp.c» (working copy) |
125 @@ -40,7 +40,9 @@ | 122 @@ -40,7 +40,9 @@ |
126 #include "ptp.h" | 123 #include "ptp.h" |
127 #include "libusb-glue.h" | 124 #include "libusb-glue.h" |
128 #include "device-flags.h" | 125 #include "device-flags.h" |
129 +#if 0 | 126 +#if 0 |
130 #include "playlist-spl.h" | 127 #include "playlist-spl.h" |
131 +#endif | 128 +#endif |
132 #include "util.h" | 129 #include "util.h" |
133 | 130 |
134 #include "mtpz.h" | 131 #include <stdlib.h> |
135 @@ -6965,6 +6967,7 @@ int LIBMTP_Set_Track_Name(LIBMTP_mtpdevice_t *device, | 132 @@ -6764,6 +6766,7 @@ |
136 return ret; | 133 return ret; |
137 } | 134 } |
138 | 135 |
139 +#if 0 | 136 +#if 0 |
140 /** | 137 /** |
141 * This function renames a single playlist object file holder. | 138 * This function renames a single playlist object file holder. |
142 * This simply means that the <code>PTP_OPC_ObjectFileName</code> | 139 * This simply means that the <code>PTP_OPC_ObjectFileName</code> |
143 @@ -7001,6 +7004,7 @@ int LIBMTP_Set_Playlist_Name(LIBMTP_mtpdevice_t *device, | 140 @@ -6800,6 +6803,7 @@ |
144 playlist->name = strdup(newname); | 141 playlist->name = strdup(newname); |
145 return ret; | 142 return ret; |
146 } | 143 } |
147 +#endif | 144 +#endif |
148 | 145 |
149 /** | 146 /** |
150 * This function renames a single album. | 147 * This function renames a single album. |
151 @@ -7418,6 +7422,7 @@ uint32_t LIBMTP_Create_Folder(LIBMTP_mtpdevice_t *device,
char *name, | 148 @@ -7217,6 +7221,7 @@ |
152 return new_id; | 149 return new_id; |
153 } | 150 } |
154 | 151 |
155 +#if 0 | 152 +#if 0 |
156 /** | 153 /** |
157 * This creates a new playlist metadata structure and allocates memory | 154 * This creates a new playlist metadata structure and allocates memory |
158 * for it. Notice that if you add strings to this structure they | 155 * for it. Notice that if you add strings to this structure they |
159 @@ -7614,6 +7619,7 @@ LIBMTP_playlist_t *LIBMTP_Get_Playlist(LIBMTP_mtpdevice_t
*device, uint32_t cons | 156 @@ -7413,6 +7418,7 @@ |
160 | 157 |
161 return pl; | 158 return pl; |
162 } | 159 } |
163 +#endif | 160 +#endif |
164 | 161 |
165 /** | 162 /** |
166 * This function creates a new abstract list such as a playlist | 163 * This function creates a new abstract list such as a playlist |
167 @@ -8170,6 +8176,7 @@ static int update_abstract_list(LIBMTP_mtpdevice_t *device
, | 164 @@ -7967,6 +7973,7 @@ |
168 } | 165 } |
169 | 166 |
170 | 167 |
171 +#if 0 | 168 +#if 0 |
172 /** | 169 /** |
173 * This routine creates a new playlist based on the metadata | 170 * This routine creates a new playlist based on the metadata |
174 * supplied. If the <code>tracks</code> field of the metadata | 171 * supplied. If the <code>tracks</code> field of the metadata |
175 @@ -8268,6 +8275,7 @@ int LIBMTP_Update_Playlist(LIBMTP_mtpdevice_t *device, | 172 @@ -8065,6 +8072,7 @@ |
176 metadata->tracks, | 173 metadata->tracks, |
177 metadata->no_tracks); | 174 metadata->no_tracks); |
178 } | 175 } |
179 +#endif | 176 +#endif |
180 | 177 |
181 /** | 178 /** |
182 * This creates a new album metadata structure and allocates memory | 179 * This creates a new album metadata structure and allocates memory |
183 diff --git a/src/Makefile.am b/src/Makefile.am | 180 Index: src/Makefile.am |
184 index d00e372..39f1c61 100644 | 181 =================================================================== |
185 --- a/src/Makefile.am | 182 --- src/Makefile.am» (revision 148515) |
186 +++ b/src/Makefile.am | 183 +++ src/Makefile.am» (working copy) |
187 @@ -1,9 +1,9 @@ | 184 @@ -1,9 +1,9 @@ |
188 lib_LTLIBRARIES = libmtp.la | 185 lib_LTLIBRARIES = libmtp.la |
189 | 186 |
190 libmtp_la_CFLAGS = @LIBUSB_CFLAGS@ | 187 libmtp_la_CFLAGS = @LIBUSB_CFLAGS@ |
191 -libmtp_la_SOURCES = libmtp.c unicode.c unicode.h util.c util.h playlist-spl.c \ | 188 -libmtp_la_SOURCES = libmtp.c unicode.c unicode.h util.c util.h playlist-spl.c \ |
192 +libmtp_la_SOURCES = libmtp.c unicode.c unicode.h util.c util.h \ | 189 +libmtp_la_SOURCES = libmtp.c unicode.c unicode.h util.c util.h \ |
193 gphoto2-endian.h _stdint.h ptp.c ptp.h libusb-glue.h \ | 190 gphoto2-endian.h _stdint.h ptp.c ptp.h libusb-glue.h \ |
194 -» music-players.h device-flags.h playlist-spl.h mtpz.h \ | 191 -» music-players.h device-flags.h playlist-spl.h mtpz.h |
195 +» music-players.h device-flags.h mtpz.h \ | 192 +» music-players.h device-flags.h mtpz.h |
196 » chdk_live_view.h chdk_ptp.h | |
197 | 193 |
198 if MTPZ_COMPILE | 194 if LIBUSB1_COMPILE |
199 diff --git a/src/libmtp.h.in b/src/libmtp.h.in | 195 libmtp_la_SOURCES += libusb1-glue.c |
200 index ac37b3e..4b742e1 100644 | 196 Index: src/libmtp.h.in |
201 --- a/src/libmtp.h.in | 197 =================================================================== |
202 +++ b/src/libmtp.h.in | 198 --- src/libmtp.h.in» (revision 148515) |
203 @@ -1001,7 +1001,7 @@ uint32_t LIBMTP_Create_Folder(LIBMTP_mtpdevice_t*, char *,
uint32_t, uint32_t); | 199 +++ src/libmtp.h.in» (working copy) |
| 200 @@ -966,7 +966,7 @@ |
204 int LIBMTP_Set_Folder_Name(LIBMTP_mtpdevice_t *, LIBMTP_folder_t *, const char
*); | 201 int LIBMTP_Set_Folder_Name(LIBMTP_mtpdevice_t *, LIBMTP_folder_t *, const char
*); |
205 /** @} */ | 202 /** @} */ |
206 | 203 |
207 - | 204 - |
208 +#if 0 | 205 +#if 0 |
209 /** | 206 /** |
210 * @} | 207 * @} |
211 * @defgroup playlists The audio/video playlist management API. | 208 * @defgroup playlists The audio/video playlist management API. |
212 @@ -1014,6 +1014,7 @@ LIBMTP_playlist_t *LIBMTP_Get_Playlist(LIBMTP_mtpdevice_t
*, uint32_t const); | 209 @@ -979,6 +979,7 @@ |
213 int LIBMTP_Create_New_Playlist(LIBMTP_mtpdevice_t *, LIBMTP_playlist_t * const)
; | 210 int LIBMTP_Create_New_Playlist(LIBMTP_mtpdevice_t *, LIBMTP_playlist_t * const)
; |
214 int LIBMTP_Update_Playlist(LIBMTP_mtpdevice_t *, LIBMTP_playlist_t * const); | 211 int LIBMTP_Update_Playlist(LIBMTP_mtpdevice_t *, LIBMTP_playlist_t * const); |
215 int LIBMTP_Set_Playlist_Name(LIBMTP_mtpdevice_t *, LIBMTP_playlist_t *, const c
har *); | 212 int LIBMTP_Set_Playlist_Name(LIBMTP_mtpdevice_t *, LIBMTP_playlist_t *, const c
har *); |
216 +#endif | 213 +#endif |
217 | 214 |
218 /** | 215 /** |
219 * @} | 216 * @} |
220 diff --git a/src/Makefile.in b/src/Makefile.in | 217 Index: src/Makefile.in |
221 index 5cdbab8..2c4cc96 100644 | 218 =================================================================== |
222 --- a/src/Makefile.in | 219 --- src/Makefile.in» (revision 148515) |
223 +++ b/src/Makefile.in | 220 +++ src/Makefile.in» (working copy) |
224 @@ -140,8 +140,8 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(include
dir)" | 221 @@ -85,16 +85,16 @@ |
225 LTLIBRARIES = $(lib_LTLIBRARIES) | 222 LTLIBRARIES = $(lib_LTLIBRARIES) |
226 am__DEPENDENCIES_1 = | 223 am__DEPENDENCIES_1 = |
227 am__libmtp_la_SOURCES_DIST = libmtp.c unicode.c unicode.h util.c \ | 224 am__libmtp_la_SOURCES_DIST = libmtp.c unicode.c unicode.h util.c \ |
228 - util.h playlist-spl.c gphoto2-endian.h _stdint.h ptp.c ptp.h \ | 225 - util.h playlist-spl.c gphoto2-endian.h _stdint.h ptp.c ptp.h \ |
229 - libusb-glue.h music-players.h device-flags.h playlist-spl.h \ | 226 - libusb-glue.h music-players.h device-flags.h playlist-spl.h \ |
230 + util.h gphoto2-endian.h _stdint.h ptp.c ptp.h \ | 227 + util.h gphoto2-endian.h _stdint.h ptp.c ptp.h \ |
231 + libusb-glue.h music-players.h device-flags.h \ | 228 + libusb-glue.h music-players.h device-flags.h \ |
232 » mtpz.h chdk_live_view.h chdk_ptp.h mtpz.c libusb1-glue.c \ | 229 » mtpz.h mtpz.c libusb1-glue.c libusb-glue.c libopenusb1-glue.c |
233 » libusb-glue.c libopenusb1-glue.c | |
234 @MTPZ_COMPILE_TRUE@am__objects_1 = libmtp_la-mtpz.lo | 230 @MTPZ_COMPILE_TRUE@am__objects_1 = libmtp_la-mtpz.lo |
235 @@ -150,7 +150,7 @@ am__libmtp_la_SOURCES_DIST = libmtp.c unicode.c unicode.h ut
il.c \ | 231 @LIBUSB1_COMPILE_TRUE@am__objects_2 = libmtp_la-libusb1-glue.lo |
| 232 @LIBUSB0_COMPILE_TRUE@am__objects_3 = libmtp_la-libusb-glue.lo |
236 @LIBOPENUSB_COMPILE_TRUE@am__objects_4 = \ | 233 @LIBOPENUSB_COMPILE_TRUE@am__objects_4 = \ |
237 @LIBOPENUSB_COMPILE_TRUE@ libmtp_la-libopenusb1-glue.lo | 234 @LIBOPENUSB_COMPILE_TRUE@ libmtp_la-libopenusb1-glue.lo |
238 am_libmtp_la_OBJECTS = libmtp_la-libmtp.lo libmtp_la-unicode.lo \ | 235 am_libmtp_la_OBJECTS = libmtp_la-libmtp.lo libmtp_la-unicode.lo \ |
239 - libmtp_la-util.lo libmtp_la-playlist-spl.lo libmtp_la-ptp.lo \ | 236 - libmtp_la-util.lo libmtp_la-playlist-spl.lo libmtp_la-ptp.lo \ |
240 + libmtp_la-util.lo libmtp_la-ptp.lo \ | 237 + libmtp_la-util.lo libmtp_la-ptp.lo \ |
241 $(am__objects_1) $(am__objects_2) $(am__objects_3) \ | 238 $(am__objects_1) $(am__objects_2) $(am__objects_3) \ |
242 $(am__objects_4) | 239 $(am__objects_4) |
243 libmtp_la_OBJECTS = $(am_libmtp_la_OBJECTS) | 240 libmtp_la_OBJECTS = $(am_libmtp_la_OBJECTS) |
244 @@ -360,8 +360,8 @@ top_srcdir = @top_srcdir@ | 241 @@ -252,8 +252,8 @@ |
245 lib_LTLIBRARIES = libmtp.la | 242 lib_LTLIBRARIES = libmtp.la |
246 libmtp_la_CFLAGS = @LIBUSB_CFLAGS@ | 243 libmtp_la_CFLAGS = @LIBUSB_CFLAGS@ |
247 libmtp_la_SOURCES = libmtp.c unicode.c unicode.h util.c util.h \ | 244 libmtp_la_SOURCES = libmtp.c unicode.c unicode.h util.c util.h \ |
248 - playlist-spl.c gphoto2-endian.h _stdint.h ptp.c ptp.h \ | 245 - playlist-spl.c gphoto2-endian.h _stdint.h ptp.c ptp.h \ |
249 - libusb-glue.h music-players.h device-flags.h playlist-spl.h \ | 246 - libusb-glue.h music-players.h device-flags.h playlist-spl.h \ |
250 + gphoto2-endian.h _stdint.h ptp.c ptp.h \ | 247 + gphoto2-endian.h _stdint.h ptp.c ptp.h \ |
251 + libusb-glue.h music-players.h device-flags.h \ | 248 + libusb-glue.h music-players.h device-flags.h \ |
252 » mtpz.h chdk_live_view.h chdk_ptp.h $(am__append_1) \ | 249 » mtpz.h $(am__append_1) $(am__append_2) $(am__append_3) \ |
253 » $(am__append_2) $(am__append_3) $(am__append_4) | 250 » $(am__append_4) |
254 include_HEADERS = libmtp.h | 251 include_HEADERS = libmtp.h |
255 @@ -486,7 +486,6 @@ distclean-compile: | 252 @@ -373,7 +373,6 @@ |
256 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmtp_la-libusb-glue.Plo@am__
quote@ | 253 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmtp_la-libusb-glue.Plo@am__
quote@ |
257 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmtp_la-libusb1-glue.Plo@am_
_quote@ | 254 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmtp_la-libusb1-glue.Plo@am_
_quote@ |
258 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmtp_la-mtpz.Plo@am__quote@ | 255 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmtp_la-mtpz.Plo@am__quote@ |
259 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmtp_la-playlist-spl.Plo@am_
_quote@ | 256 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmtp_la-playlist-spl.Plo@am_
_quote@ |
260 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmtp_la-ptp.Plo@am__quote@ | 257 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmtp_la-ptp.Plo@am__quote@ |
261 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmtp_la-unicode.Plo@am__quot
e@ | 258 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmtp_la-unicode.Plo@am__quot
e@ |
262 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmtp_la-util.Plo@am__quote@ | 259 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmtp_la-util.Plo@am__quote@ |
263 @@ -533,13 +532,6 @@ libmtp_la-util.lo: util.c | 260 @@ -419,13 +418,6 @@ |
264 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp)
@AMDEPBACKSLASH@ | 261 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp)
@AMDEPBACKSLASH@ |
265 @am__fastdepCC_FALSE@» $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM
_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmtp_la_CFLAGS) $(CFLAGS) -c -o libmt
p_la-util.lo `test -f 'util.c' || echo '$(srcdir)/'`util.c | 262 @am__fastdepCC_FALSE@» $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS)
--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CP
PFLAGS) $(libmtp_la_CFLAGS) $(CFLAGS) -c -o libmtp_la-util.lo `test -f 'util.c'
|| echo '$(srcdir)/'`util.c |
266 | 263 |
267 -libmtp_la-playlist-spl.lo: playlist-spl.c | 264 -libmtp_la-playlist-spl.lo: playlist-spl.c |
268 -@am__fastdepCC_TRUE@» $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLA
GS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(libmtp_la_CFLAGS) $(CFLAGS) -MT libmtp_la-playlist
-spl.lo -MD -MP -MF $(DEPDIR)/libmtp_la-playlist-spl.Tpo -c -o libmtp_la-playlis
t-spl.lo `test -f 'playlist-spl.c' || echo '$(srcdir)/'`playlist-spl.c | 265 -@am__fastdepCC_TRUE@» $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS)
--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CP
PFLAGS) $(libmtp_la_CFLAGS) $(CFLAGS) -MT libmtp_la-playlist-spl.lo -MD -MP -MF
$(DEPDIR)/libmtp_la-playlist-spl.Tpo -c -o libmtp_la-playlist-spl.lo `test -f 'p
laylist-spl.c' || echo '$(srcdir)/'`playlist-spl.c |
269 -@am__fastdepCC_TRUE@» $(AM_V_at)$(am__mv) $(DEPDIR)/libmtp_la-playlist-spl.Tpo
$(DEPDIR)/libmtp_la-playlist-spl.Plo | 266 -@am__fastdepCC_TRUE@» $(am__mv) $(DEPDIR)/libmtp_la-playlist-spl.Tpo $(DEPDIR)
/libmtp_la-playlist-spl.Plo |
270 -@AMDEP_TRUE@@am__fastdepCC_FALSE@» $(AM_V_CC)source='playlist-spl.c' object
='libmtp_la-playlist-spl.lo' libtool=yes @AMDEPBACKSLASH@ | 267 -@AMDEP_TRUE@@am__fastdepCC_FALSE@» source='playlist-spl.c' object='libmtp_l
a-playlist-spl.lo' libtool=yes @AMDEPBACKSLASH@ |
271 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp)
@AMDEPBACKSLASH@ | 268 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp)
@AMDEPBACKSLASH@ |
272 -@am__fastdepCC_FALSE@» $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM
_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmtp_la_CFLAGS) $(CFLAGS) -c -o libmt
p_la-playlist-spl.lo `test -f 'playlist-spl.c' || echo '$(srcdir)/'`playlist-spl
.c | 269 -@am__fastdepCC_FALSE@» $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS)
--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CP
PFLAGS) $(libmtp_la_CFLAGS) $(CFLAGS) -c -o libmtp_la-playlist-spl.lo `test -f '
playlist-spl.c' || echo '$(srcdir)/'`playlist-spl.c |
273 - | 270 - |
274 libmtp_la-ptp.lo: ptp.c | 271 libmtp_la-ptp.lo: ptp.c |
275 @am__fastdepCC_TRUE@» $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLA
GS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(libmtp_la_CFLAGS) $(CFLAGS) -MT libmtp_la-ptp.lo -
MD -MP -MF $(DEPDIR)/libmtp_la-ptp.Tpo -c -o libmtp_la-ptp.lo `test -f 'ptp.c' |
| echo '$(srcdir)/'`ptp.c | 272 @am__fastdepCC_TRUE@» $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS)
--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CP
PFLAGS) $(libmtp_la_CFLAGS) $(CFLAGS) -MT libmtp_la-ptp.lo -MD -MP -MF $(DEPDIR)
/libmtp_la-ptp.Tpo -c -o libmtp_la-ptp.lo `test -f 'ptp.c' || echo '$(srcdir)/'`
ptp.c |
276 @am__fastdepCC_TRUE@» $(AM_V_at)$(am__mv) $(DEPDIR)/libmtp_la-ptp.Tpo $(DEPDIR
)/libmtp_la-ptp.Plo | 273 @am__fastdepCC_TRUE@» $(am__mv) $(DEPDIR)/libmtp_la-ptp.Tpo $(DEPDIR)/libmtp_l
a-ptp.Plo |
OLD | NEW |