OLD | NEW |
1 Index: examples/Makefile.am | 1 Index: examples/Makefile.am |
2 =================================================================== | 2 =================================================================== |
3 --- examples/Makefile.am (revision 148515) | 3 --- examples/Makefile.am (revision 148515) |
4 +++ examples/Makefile.am (working copy) | 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 \ |
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
181 =================================================================== | 181 =================================================================== |
182 --- src/Makefile.am (revision 148515) | 182 --- src/Makefile.am (revision 148515) |
183 +++ src/Makefile.am (working copy) | 183 +++ src/Makefile.am (working copy) |
184 @@ -1,9 +1,9 @@ | 184 @@ -1,9 +1,9 @@ |
185 lib_LTLIBRARIES = libmtp.la | 185 lib_LTLIBRARIES = libmtp.la |
186 | 186 |
187 libmtp_la_CFLAGS = @LIBUSB_CFLAGS@ | 187 libmtp_la_CFLAGS = @LIBUSB_CFLAGS@ |
188 -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 \ |
189 +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 \ |
190 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 \ |
191 -» music-players.h device-flags.h playlist-spl.h | 191 -» music-players.h device-flags.h playlist-spl.h mtpz.h |
192 +» music-players.h device-flags.h | 192 +» music-players.h device-flags.h mtpz.h |
193 | 193 |
194 if LIBUSB1_COMPILE | 194 if LIBUSB1_COMPILE |
195 libmtp_la_SOURCES += libusb1-glue.c | 195 libmtp_la_SOURCES += libusb1-glue.c |
196 Index: src/libmtp.h.in | 196 Index: src/libmtp.h.in |
197 =================================================================== | 197 =================================================================== |
198 --- src/libmtp.h.in (revision 148515) | 198 --- src/libmtp.h.in (revision 148515) |
199 +++ src/libmtp.h.in (working copy) | 199 +++ src/libmtp.h.in (working copy) |
200 @@ -966,7 +966,7 @@ | 200 @@ -966,7 +966,7 @@ |
201 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
*); |
202 /** @} */ | 202 /** @} */ |
203 | 203 |
204 - | 204 - |
205 +#if 0 | 205 +#if 0 |
206 /** | 206 /** |
207 * @} | 207 * @} |
208 * @defgroup playlists The audio/video playlist management API. | 208 * @defgroup playlists The audio/video playlist management API. |
209 @@ -979,6 +979,7 @@ | 209 @@ -979,6 +979,7 @@ |
210 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)
; |
211 int LIBMTP_Update_Playlist(LIBMTP_mtpdevice_t *, LIBMTP_playlist_t * const); | 211 int LIBMTP_Update_Playlist(LIBMTP_mtpdevice_t *, LIBMTP_playlist_t * const); |
212 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 *); |
213 +#endif | 213 +#endif |
214 | 214 |
215 /** | 215 /** |
216 * @} | 216 * @} |
217 Index: src/Makefile.in | 217 Index: src/Makefile.in |
218 =================================================================== | 218 =================================================================== |
219 --- src/Makefile.in (revision 148515) | 219 --- src/Makefile.in (revision 148515) |
220 +++ src/Makefile.in (working copy) | 220 +++ src/Makefile.in (working copy) |
221 @@ -85,15 +85,15 @@ | 221 @@ -85,16 +85,16 @@ |
222 LTLIBRARIES = $(lib_LTLIBRARIES) | 222 LTLIBRARIES = $(lib_LTLIBRARIES) |
223 am__DEPENDENCIES_1 = | 223 am__DEPENDENCIES_1 = |
224 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 \ |
225 - 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 \ |
226 - 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 \ |
227 + util.h gphoto2-endian.h _stdint.h ptp.c ptp.h \ | 227 + util.h gphoto2-endian.h _stdint.h ptp.c ptp.h \ |
228 + libusb-glue.h music-players.h device-flags.h \ | 228 + libusb-glue.h music-players.h device-flags.h \ |
229 » libusb1-glue.c libusb-glue.c libopenusb1-glue.c | 229 » mtpz.h mtpz.c libusb1-glue.c libusb-glue.c libopenusb1-glue.c |
230 @LIBUSB1_COMPILE_TRUE@am__objects_1 = libmtp_la-libusb1-glue.lo | 230 @MTPZ_COMPILE_TRUE@am__objects_1 = libmtp_la-mtpz.lo |
231 @LIBUSB0_COMPILE_TRUE@am__objects_2 = libmtp_la-libusb-glue.lo | 231 @LIBUSB1_COMPILE_TRUE@am__objects_2 = libmtp_la-libusb1-glue.lo |
232 @LIBOPENUSB_COMPILE_TRUE@am__objects_3 = \ | 232 @LIBUSB0_COMPILE_TRUE@am__objects_3 = libmtp_la-libusb-glue.lo |
| 233 @LIBOPENUSB_COMPILE_TRUE@am__objects_4 = \ |
233 @LIBOPENUSB_COMPILE_TRUE@ libmtp_la-libopenusb1-glue.lo | 234 @LIBOPENUSB_COMPILE_TRUE@ libmtp_la-libopenusb1-glue.lo |
234 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 \ |
235 - 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 \ |
236 + libmtp_la-util.lo libmtp_la-ptp.lo \ | 237 + libmtp_la-util.lo libmtp_la-ptp.lo \ |
237 » $(am__objects_1) $(am__objects_2) $(am__objects_3) | 238 » $(am__objects_1) $(am__objects_2) $(am__objects_3) \ |
| 239 » $(am__objects_4) |
238 libmtp_la_OBJECTS = $(am_libmtp_la_OBJECTS) | 240 libmtp_la_OBJECTS = $(am_libmtp_la_OBJECTS) |
239 libmtp_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ | |
240 @@ -252,8 +252,8 @@ | 241 @@ -252,8 +252,8 @@ |
241 lib_LTLIBRARIES = libmtp.la | 242 lib_LTLIBRARIES = libmtp.la |
242 libmtp_la_CFLAGS = @LIBUSB_CFLAGS@ | 243 libmtp_la_CFLAGS = @LIBUSB_CFLAGS@ |
243 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 \ |
244 - 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 \ |
245 - 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 \ |
246 + gphoto2-endian.h _stdint.h ptp.c ptp.h \ | 247 + gphoto2-endian.h _stdint.h ptp.c ptp.h \ |
247 + libusb-glue.h music-players.h device-flags.h \ | 248 + libusb-glue.h music-players.h device-flags.h \ |
248 » $(am__append_1) $(am__append_2) $(am__append_3) | 249 » mtpz.h $(am__append_1) $(am__append_2) $(am__append_3) \ |
| 250 » $(am__append_4) |
249 include_HEADERS = libmtp.h | 251 include_HEADERS = libmtp.h |
250 EXTRA_DIST = libmtp.h.in libmtp.sym ptp-pack.c | 252 @@ -373,7 +373,6 @@ |
251 @@ -372,7 +372,6 @@ | |
252 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmtp_la-libopenusb1-glue.Plo
@am__quote@ | |
253 @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@ |
254 @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@ |
| 255 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmtp_la-mtpz.Plo@am__quote@ |
255 -@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@ |
256 @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@ |
257 @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@ |
258 @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@ |
259 @@ -419,13 +418,6 @@ | 260 @@ -419,13 +418,6 @@ |
260 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp)
@AMDEPBACKSLASH@ | 261 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp)
@AMDEPBACKSLASH@ |
261 @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 | 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 |
262 | 263 |
263 -libmtp_la-playlist-spl.lo: playlist-spl.c | 264 -libmtp_la-playlist-spl.lo: playlist-spl.c |
264 -@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 | 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 |
265 -@am__fastdepCC_TRUE@ $(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 |
266 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='playlist-spl.c' object='libmtp_l
a-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@ |
267 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp)
@AMDEPBACKSLASH@ | 268 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp)
@AMDEPBACKSLASH@ |
268 -@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 | 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 |
269 - | 270 - |
270 libmtp_la-ptp.lo: ptp.c | 271 libmtp_la-ptp.lo: ptp.c |
271 @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 | 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 |
272 @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libmtp_la-ptp.Tpo $(DEPDIR)/libmtp_l
a-ptp.Plo | 273 @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libmtp_la-ptp.Tpo $(DEPDIR)/libmtp_l
a-ptp.Plo |
OLD | NEW |