[Pkg-gtkpod-devel] r339 - in libgpod/branches/upstream/current: . bindings bindings/python bindings/python/examples bindings/python/tests docs docs/reference docs/reference/html docs/reference/tmpl docs/reference/xml m4 po src tests tools
djpig at alioth.debian.org
djpig at alioth.debian.org
Sat Jan 24 10:34:01 UTC 2009
Author: djpig
Date: 2009-01-24 10:34:00 +0000 (Sat, 24 Jan 2009)
New Revision: 339
Added:
libgpod/branches/upstream/current/bindings/python/examples/fix_empty_artist_field.py
libgpod/branches/upstream/current/docs/reference/html/libgpod-Chapter-Data.html
libgpod/branches/upstream/current/docs/reference/tmpl/chapterdata.sgml
libgpod/branches/upstream/current/docs/reference/xml/chapterdata.xml
libgpod/branches/upstream/current/po/zh_CN.po
libgpod/branches/upstream/current/src/gchecksum.c
libgpod/branches/upstream/current/src/gchecksum.h
libgpod/branches/upstream/current/src/itdb_chapterdata.c
libgpod/branches/upstream/current/src/itdb_plist.c
libgpod/branches/upstream/current/src/itdb_plist.h
libgpod/branches/upstream/current/src/itdb_sysinfo_extended_parser.c
libgpod/branches/upstream/current/src/itdb_sysinfo_extended_parser.h
libgpod/branches/upstream/current/src/itdb_thumb.c
libgpod/branches/upstream/current/src/itdb_thumb.h
libgpod/branches/upstream/current/tests/test-sysinfo-extended-parsing.c
Removed:
libgpod/branches/upstream/current/src/itdb_sysinfo.c
Modified:
libgpod/branches/upstream/current/ChangeLog
libgpod/branches/upstream/current/Makefile.am
libgpod/branches/upstream/current/Makefile.in
libgpod/branches/upstream/current/NEWS
libgpod/branches/upstream/current/README
libgpod/branches/upstream/current/README.SysInfo
libgpod/branches/upstream/current/TROUBLESHOOTING
libgpod/branches/upstream/current/aclocal.m4
libgpod/branches/upstream/current/bindings/Makefile.in
libgpod/branches/upstream/current/bindings/python/Makefile.am
libgpod/branches/upstream/current/bindings/python/Makefile.in
libgpod/branches/upstream/current/bindings/python/README
libgpod/branches/upstream/current/bindings/python/examples/Makefile.am
libgpod/branches/upstream/current/bindings/python/examples/Makefile.in
libgpod/branches/upstream/current/bindings/python/examples/save_photos.py
libgpod/branches/upstream/current/bindings/python/gpod.i.in
libgpod/branches/upstream/current/bindings/python/gtkpod.py
libgpod/branches/upstream/current/bindings/python/ipod.py
libgpod/branches/upstream/current/bindings/python/tests/Makefile.in
libgpod/branches/upstream/current/bindings/python/tests/tests.py
libgpod/branches/upstream/current/config.guess
libgpod/branches/upstream/current/config.h.in
libgpod/branches/upstream/current/config.sub
libgpod/branches/upstream/current/configure
libgpod/branches/upstream/current/configure.ac
libgpod/branches/upstream/current/depcomp
libgpod/branches/upstream/current/docs/Makefile.in
libgpod/branches/upstream/current/docs/reference/Makefile.am
libgpod/branches/upstream/current/docs/reference/Makefile.in
libgpod/branches/upstream/current/docs/reference/html/ch01.html
libgpod/branches/upstream/current/docs/reference/html/index.html
libgpod/branches/upstream/current/docs/reference/html/index.sgml
libgpod/branches/upstream/current/docs/reference/html/itunesdb.html
libgpod/branches/upstream/current/docs/reference/html/libgpod-Artwork.html
libgpod/branches/upstream/current/docs/reference/html/libgpod-Device.html
libgpod/branches/upstream/current/docs/reference/html/libgpod-File-handling-functions.html
libgpod/branches/upstream/current/docs/reference/html/libgpod-Low-level-functions.html
libgpod/branches/upstream/current/docs/reference/html/libgpod-Photo-database.html
libgpod/branches/upstream/current/docs/reference/html/libgpod-Playlists.html
libgpod/branches/upstream/current/docs/reference/html/libgpod-Smart-Playlists.html
libgpod/branches/upstream/current/docs/reference/html/libgpod-The-Itdb-iTunesDB-structure.html
libgpod/branches/upstream/current/docs/reference/html/libgpod-Time-handling.html
libgpod/branches/upstream/current/docs/reference/html/libgpod-Tracks.html
libgpod/branches/upstream/current/docs/reference/html/libgpod.devhelp
libgpod/branches/upstream/current/docs/reference/html/libgpod.devhelp2
libgpod/branches/upstream/current/docs/reference/html/photodb.html
libgpod/branches/upstream/current/docs/reference/html/style.css
libgpod/branches/upstream/current/docs/reference/libgpod-docs.xml
libgpod/branches/upstream/current/docs/reference/libgpod-sections.txt
libgpod/branches/upstream/current/docs/reference/tmpl/artwork.sgml
libgpod/branches/upstream/current/docs/reference/tmpl/device.sgml
libgpod/branches/upstream/current/docs/reference/tmpl/itunesdb-copying.sgml
libgpod/branches/upstream/current/docs/reference/tmpl/itunesdb-db.sgml
libgpod/branches/upstream/current/docs/reference/tmpl/itunesdb-lowlevel.sgml
libgpod/branches/upstream/current/docs/reference/tmpl/itunesdb-time.sgml
libgpod/branches/upstream/current/docs/reference/tmpl/libgpod-unused.sgml
libgpod/branches/upstream/current/docs/reference/tmpl/photodb.sgml
libgpod/branches/upstream/current/docs/reference/tmpl/track.sgml
libgpod/branches/upstream/current/docs/reference/xml/Internal.xml
libgpod/branches/upstream/current/docs/reference/xml/artwork.xml
libgpod/branches/upstream/current/docs/reference/xml/device.xml
libgpod/branches/upstream/current/docs/reference/xml/itunesdb-copying.xml
libgpod/branches/upstream/current/docs/reference/xml/itunesdb-db.xml
libgpod/branches/upstream/current/docs/reference/xml/itunesdb-lowlevel.xml
libgpod/branches/upstream/current/docs/reference/xml/itunesdb-time.xml
libgpod/branches/upstream/current/docs/reference/xml/photodb.xml
libgpod/branches/upstream/current/docs/reference/xml/playlists.xml
libgpod/branches/upstream/current/docs/reference/xml/smart-playlists.xml
libgpod/branches/upstream/current/docs/reference/xml/track.xml
libgpod/branches/upstream/current/gtk-doc.make
libgpod/branches/upstream/current/install-sh
libgpod/branches/upstream/current/intltool-extract.in
libgpod/branches/upstream/current/intltool-merge.in
libgpod/branches/upstream/current/intltool-update.in
libgpod/branches/upstream/current/libgpod-1.0.pc.in
libgpod/branches/upstream/current/ltmain.sh
libgpod/branches/upstream/current/m4/Makefile.in
libgpod/branches/upstream/current/m4/gtk-doc.m4
libgpod/branches/upstream/current/m4/intltool.m4
libgpod/branches/upstream/current/m4/python.m4
libgpod/branches/upstream/current/missing
libgpod/branches/upstream/current/mkinstalldirs
libgpod/branches/upstream/current/po/Makefile.in.in
libgpod/branches/upstream/current/po/POTFILES.in
libgpod/branches/upstream/current/po/de.po
libgpod/branches/upstream/current/po/es.po
libgpod/branches/upstream/current/po/fr.po
libgpod/branches/upstream/current/po/he.po
libgpod/branches/upstream/current/po/it.po
libgpod/branches/upstream/current/po/ja.po
libgpod/branches/upstream/current/po/ro.po
libgpod/branches/upstream/current/po/sv.po
libgpod/branches/upstream/current/src/Makefile.am
libgpod/branches/upstream/current/src/Makefile.in
libgpod/branches/upstream/current/src/db-artwork-debug.c
libgpod/branches/upstream/current/src/db-artwork-debug.h
libgpod/branches/upstream/current/src/db-artwork-parser.c
libgpod/branches/upstream/current/src/db-artwork-parser.h
libgpod/branches/upstream/current/src/db-artwork-writer.c
libgpod/branches/upstream/current/src/db-image-parser.c
libgpod/branches/upstream/current/src/db-image-parser.h
libgpod/branches/upstream/current/src/db-itunes-parser.h
libgpod/branches/upstream/current/src/db-parse-context.c
libgpod/branches/upstream/current/src/db-parse-context.h
libgpod/branches/upstream/current/src/itdb.h
libgpod/branches/upstream/current/src/itdb_artwork.c
libgpod/branches/upstream/current/src/itdb_device.c
libgpod/branches/upstream/current/src/itdb_device.h
libgpod/branches/upstream/current/src/itdb_itunesdb.c
libgpod/branches/upstream/current/src/itdb_photoalbum.c
libgpod/branches/upstream/current/src/itdb_playlist.c
libgpod/branches/upstream/current/src/itdb_private.h
libgpod/branches/upstream/current/src/itdb_track.c
libgpod/branches/upstream/current/src/ithumb-writer.c
libgpod/branches/upstream/current/tests/Makefile.am
libgpod/branches/upstream/current/tests/Makefile.in
libgpod/branches/upstream/current/tests/get-timezone.c
libgpod/branches/upstream/current/tests/itdb_main.c
libgpod/branches/upstream/current/tests/test-covers.c
libgpod/branches/upstream/current/tests/test-fw-id.c
libgpod/branches/upstream/current/tests/test-init-ipod.c
libgpod/branches/upstream/current/tests/test-ls.c
libgpod/branches/upstream/current/tests/test-photos.c
libgpod/branches/upstream/current/tests/test-rebuild-db.cc
libgpod/branches/upstream/current/tools/Makefile.in
libgpod/branches/upstream/current/tools/hal-callout.c
libgpod/branches/upstream/current/tools/ipod-scsi-inquiry.c
Log:
[svn-upgrade] Integrating new upstream version, libgpod (0.7.0)
Modified: libgpod/branches/upstream/current/ChangeLog
===================================================================
--- libgpod/branches/upstream/current/ChangeLog 2008-12-25 18:06:29 UTC (rev 338)
+++ libgpod/branches/upstream/current/ChangeLog 2009-01-24 10:34:00 UTC (rev 339)
@@ -1,5 +1,1115 @@
-====== libgpod 0.6.0 ======
+2009-01-18 Todd Zullinger <tmzullinger at users.sourceforge.net>
+ * configure.ac: Bump version for 0.7.0 final
+
+ * src/db-artwork-parser.c: Quiet artwork mhii_link warning
+
+2009-01-17 Christophe Fergeau <teuf at gnome.org>
+
+ * src/itdb_device.c: Silver iPod Classic 160GB is B145, not B155
+ (noticed thanks to a Banshee bug report, verified on ebay sales of
+ such iPods)
+
+2009-01-14 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+ * po/ro.po: updated Romanian translation. Thanks to Alex
+ Eftimie.
+
+2009-01-13 Todd Zullinger <tmzullinger at users.sourceforge.net>
+
+ * README.SysInfo, TROUBLESHOOTING: Add some notes on the hal
+ callout
+
+ * TROUBLESHOOTING: Minor grammatical fixes
+
+2009-01-13 Christophe Fergeau <teuf at gnome.org>
+
+ * itdb_sysinfo_extended_parser.c: use a gint instead of a gchar as a
+ loop index since we are comparing against >= 0
+
+2009-01-11 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+ * src/itdb_itunesdb.c (itdb_rename_files): remove the
+ "iTunesStats" file used by Shuffles instead of the "Play Counts"
+ file after writing the iTunesSD -- otherwise the playcounts are
+ never reset. Thanks to Peter Maydell for pointing this
+ out. Fixes tracker item #2481322.
+
+2009-01-06 Todd Zullinger <tmzullinger at users.sourceforge.net>
+
+ * po/zh_CN.po: Add simple Chinese translation (Tan Zhixin)
+
+2009-01-05 Todd Zullinger <tmzullinger at users.sourceforge.net>
+
+ * po/de.po: Update German translation (Jonas Cleve)
+
+2009-01-02 Todd Zullinger <tmzullinger at users.sourceforge.net>
+
+ * configure.ac: Bump version for 0.7.0rc2
+
+ * docs/reference/tmpl/track.sgml, src/itdb.h:
+ Document Itdb_Track->album_id
+
+ * bindings/python/ipod.py:
+ Make Track.get_coverart() return None if artwork is absent
+
+2009-01-02 Christophe Fergeau <teuf at gnome.org>
+
+ * NEWS: more news, hope the packagers will notice the new
+ libxml2-devel dependency...
+
+2009-01-02 Christophe Fergeau <teuf at gnome.org>
+
+ * src/Makefile.am: we need to link with -lm since ithumb-writer.c
+ uses round and ceil
+
+2009-01-02 Christophe Fergeau <teuf at gnome.org>
+
+ * NEWS: update NEWS file, I probably forgot some things, feel free
+ to update it :)
+
+2009-01-01 Christophe Fergeau <teuf at gnome.org>
+
+ * src/itdb_device.c: fix static artwork formats for the nano4g, C&P
+ is really a bad thing ;)
+
+2009-01-01 Christophe Fergeau <teuf at gnome.org>
+
+ * src/itdb.h: add album_id field to Itdb_Track. It's unused yet but
+ will be used later and adding it now will avoid ABI breakage later
+ ;)
+
+2008-12-29 Christophe Fergeau <teuf at gnome.org>
+
+ * src/itdb_device.c: add serial number for silver and pink
+ 16GB nano 4g, the last missing ones :)
+
+2008-12-28 Todd Zullinger <tmzullinger at users.sourceforge.net>
+
+ * bindings/python/gtkpod.py:
+ Python: fix sha DeprecationWarning with python-2.6 (thanks to
+ Alex Ghitza)
+
+2008-12-26 Todd Zullinger <tmzullinger at users.sourceforge.net>
+
+ * po/es.po: Update Spanish translation (Alejandro Lamas Daviña)
+
+2008-12-22 Christophe Fergeau <teuf at gnome.org>
+
+ * src/itdb_device.c: I didn't mean to commit that hunk
+ from Neil's patch, adding a model name here with no
+ matching entry in the model enum would break building
+ a user visible list of known ipod models
+
+2008-12-22 Christophe Fergeau <teuf at gnome.org>
+
+ * src/itdb_device.c: add ipod shuffle info from Neil Campbell
+
+2008-12-22 Christophe Fergeau <teuf at gnome.org>
+
+ * src/itdb_device.c: add serial number for yellow and green
+ 16GB nano 4g.
+
+2008-12-18 Christophe Fergeau <teuf at gnome.org>
+
+ * src/itdb_device.c: add serial number for purple 16GB nano 4g,
+ thanks to Ronald for providing the information
+
+2008-12-16 Daniele Forsi <dforsi at users.sourceforge.net>
+
+ * po/it.po: updated Italian translation
+
+2008-12-15 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+ * src/itdb_plist.c: substitute g_base64_decode() between version
+ 2.8 and 2.11 of glib.
+
+ * src/itdb_device.c: handle timezone correctly on CYGWIN
+
+ Patches courtesy of Éric Lassauge.
+
+2008-12-13 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+ * po/fr.po: Update French translation (Éric Lassauge)
+
+2008-12-12 Christophe Fergeau <teuf at gnome.org>
+
+ * src/itdb_device.c: add hardcoded table for nano4g artwork
+ formats. I haven't tested I got everything perfectly right so there
+ might be issues with them. Thanks to Tijs van Roon for pinpointing
+ these missing tables
+
+2008-12-12 Christophe Fergeau <teuf at gnome.org>
+
+ * src/itdb_device.c: add serial number for 16GB Orange Nano 4g,
+ thanks to Tijs van Roon for providing the data
+
+2008-12-10 Todd Zullinger <tmzullinger at users.sourceforge.net>
+
+ * po/he.po: Update Hebrew translation (Assaf Gillat)
+
+ * po/sv.po: Update Swedish translation (Stefan Asserhäll)
+
+2008-12-08 Todd Zullinger <tmzullinger at users.sourceforge.net>
+
+ * configure.ac: Bump version and soname for 0.7.0rc1
+
+ * po/de.po
+ po/es.po
+ po/fr.po
+ po/he.po
+ po/it.po
+ po/ja.po
+ po/libgpod.pot
+ po/ro.po
+ po/sv.po: Update po files
+
+2008-12-07 Todd Zullinger <tmzullinger at users.sourceforge.net>
+
+ * docs/reference/libgpod-docs.xml
+ docs/reference/libgpod-sections.txt
+ docs/reference/tmpl/artwork.sgml
+ docs/reference/tmpl/chapterdata.sgml
+ docs/reference/tmpl/device.sgml
+ docs/reference/tmpl/itunesdb-copying.sgml
+ docs/reference/tmpl/itunesdb-db.sgml
+ docs/reference/tmpl/itunesdb-lowlevel.sgml
+ docs/reference/tmpl/itunesdb-time.sgml
+ docs/reference/tmpl/libgpod-unused.sgml
+ docs/reference/tmpl/photodb.sgml
+ docs/reference/tmpl/track.sgml
+ src/itdb.h
+ src/itdb_artwork.c
+ src/itdb_chapterdata.c
+ src/itdb_device.c
+ src/itdb_device.h
+ src/itdb_itunesdb.c
+ src/itdb_photoalbum.c
+ src/itdb_playlist.c
+ src/itdb_plist.c
+ src/itdb_sysinfo_extended_parser.c
+ src/itdb_thumb.c
+ src/itdb_thumb.h
+ src/itdb_track.c
+ src/ithumb-writer.c:
+ Update API documentation
+
+ Add new functions and missing enums, macros, and structs to the proper
+ places in the documentation, remove old/unused functions, and clean up
+ various minor issues.
+
+2008-12-07 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+ * itdb_itunesdb.c (jump_table_letter): don't terminate when
+ an invalid utf8 string is encountered (replaced g_assert() with
+ g_return_val_if_fail()).
+
+2008-11-30 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+ * configure.ac: don't add "-Wall" to CFLAGS
+ unconditionally. I believe this line was overlooked when this
+ issue was fixed earlier. Thanks to Tim Mooney.
+
+2008-11-30 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+ * src/db-parse-context.h: remove unneeded G_GNUC_INTERNAL at the
+ end of a declaration as this can cause problems with some
+ compilers (and doesn't seem to make sense in the first
+ place). Thanks to Tim Mooney.
+
+2008-11-17 Christophe Fergeau <teuf at gnome.org>
+
+ * src/ithumb-writer.c: rework the way we calculate that thumbnails
+ must be resized to when being transferred to the ipod. The old way
+ had rounding errors which led to display bugs on the nano4g (in the
+ album list)
+
+2008-11-17 Christophe Fergeau <teuf at gnome.org>
+
+ * src/ithumb-writer.c: stricter sanity check
+
+2008-11-17 Christophe Fergeau <teuf at gnome.org>
+
+ * src/ithumb-writer.c: add checks for int overflows on malloc args
+
+2008-11-14 Todd Zullinger <tmzullinger at users.sourceforge.net>
+
+ * docs/reference/tmpl/track.sgml
+ src/itdb.h:
+ Remove chapterdata_raw and chapterdata_raw_length from
+ Itdb_Track
+
+ These are no longer needed now that proper Chapter Data
+ support is available (since svn revision 1936/1937).
+
+2008-10-21 Christophe Fergeau <teuf at gnome.org>
+
+ * src/itdb_device.c: SN YX6 corresponds to a Shuffle model B225
+ according to a report on #gtkpod
+
+2008-10-21 Christophe Fergeau <teuf at gnome.org>
+
+ * src/itdb_device.c: use information from SysInfoExtended to tell
+ if an ipod supports photos or not instead of only using the
+ hard-coded tables in libgpod
+
+2008-10-21 Christophe Fergeau <teuf at gnome.org>
+
+ * src/itdb_device.c: add serial number for 16GB blue ipod nano,
+ thanks to Thomas Pani for providing that SN.
+
+2008-10-13 Christophe Fergeau <teuf at gnome.org>
+
+ * src/itdb_device.c: add serial number for 16GB black ipod nano,
+ thanks to Doug Larrick for providing that SN :)
+
+2008-10-07 Christophe Fergeau <teuf at gnome.org>
+
+ * src/db-artwork-debug.c: use %z modifier to print size_t values
+ and G_GINT64_MODIFIER to print 64 bit values, fix compilation
+ on 64 bit systems when artwork debugging is enabled
+
+2008-10-08 Christophe Fergeau <teuf at gnome.org>
+
+ * src/itdb_device.h: switch members in Itdb_ArtworkFormat from
+ guint16 to gint since the SysInfoExtended parser will assume
+ they are gint value and will try to write to them through a
+ gint* pointer (ie it will overwrite whatever is around the
+ guint16 value if we don't change it)
+
+2008-10-07 Christophe Fergeau <teuf at gnome.org>
+
+ * src/itdb_device.c: fix itdb_device_supports_artwork to properly
+ take into account data from SysInfoExtended if available
+
+2008-10-07 Christophe Fergeau <teuf at gnome.org>
+
+ * src/itdb_sysinfoextended_parser.c: artwork is stored in <array>
+ nodes (which are parsed to a GValueArray), reflect that in the
+ SysInfoExtended parsing code.
+
+2008-10-07 Christophe Fergeau <teuf at gnome.org>
+
+ * src/itdb_plist.c: fix handling on blank nodes (ie nodes
+ containing only white spaces), fixes parsing of SysInfoExtended files
+ as well ;)
+
+2008-10-07 Christophe Fergeau <teuf at gnome.org>
+
+ * src/itdb_plist.c: add support for <array> tags to the plist
+ parser, this is needed to support SysInfoExtended files as found on
+ on the 4g nanos
+
+2008-10-05 Christophe Fergeau <teuf at gnome.org>
+
+ * src/itdb_device.c: add serial number for the 8GB Silver Nano 4g
+ and model number for the 4GB Blue Nano 4g
+
+2008-10-01 Christophe Fergeau <teuf at gnome.org>
+
+ * src/itdb_device.c: a few more fixes in device model
+ numbers/serials
+
+2008-10-01 Christophe Fergeau <teuf at gnome.org>
+
+ * src/itdb_device.c: add missing name for the yellow ipod nano
+
+2008-10-01 Christophe Fergeau <teuf at gnome.org>
+
+ * src/itdb_device.c: and add SN for the 8GB Red Nano
+
+2008-10-01 Christophe Fergeau <teuf at gnome.org>
+
+ * src/itdb_device.c: add SN for 16GB Red Nano
+
+2008-10-01 Christophe Fergeau <teuf at gnome.org>
+
+ * src/itdb.h: add enum entries for the new ipod classic and the new
+ nanos
+ * src/itdb_device.c: add entries for the new nanos and the new ipod
+ classic, add some serial numbers for older ipod models
+
+2008-09-11 Christophe Fergeau <teuf at gnome.org>
+
+ * src/itdb_device.c: add missing string description for the red ipod
+ shuffle that was added some time ago, without it gtkpod was badly
+ broken wrt ipod model selection :-/
+
+2008-08-23 Todd Zullinger <tmzullinger at users.sourceforge.net>
+
+ * bindings/python/ipod.py
+ bindings/python/tests/tests.py:
+ Add a quiet parameter to Database.remove() and use it in
+ tests
+
+ * bindings/python/ipod.py:
+ Be more consistent with other python container objects and
+ classes
+
+ This enables testing whether a key exists in an object (e.g.
+ "'title' in track") as well as iterating over a Track or
+ Photo object's keys, values, or items. The items() and
+ pairs() methods were renamed to values() and items(),
+ respectively, in the Track and Photo classes.
+
+ * bindings/python/tests/tests.py:
+ Whitespace cleanup
+
+ * bindings/python/ipod.py:
+ Set the mediatype field for Track objects
+
+2008-08-20 Todd Zullinger <tmzullinger at users.sourceforge.net>
+
+ * bindings/python/examples/save_photos.py
+ bindings/python/gpod.i.in
+ bindings/python/ipod.py
+ bindings/python/tests/tests.py:
+ Update python bindings to work with the new thumbnail API.
+
+ This removes sw_get_artwork_thumbnails() and the Thumbnail
+ class from the python bindings. The get_pixbuf() function
+ is now in the Photo class.
+
+2008-08-09 Paul Richardson <phantom_sf at users.sourceforge.net>
+
+ * Added eclipse project related files to svn:ignore
+ * src/db-artwork-parser.c
+ src/itdb.h
+ src/itdb_photoalbum.c:
+ Added to Itdb_PhotoAlbum, a reference to its parent Photo DB.
+ When albums are constructed upon loading of the Photo DB, the
+ reference is added as part of initialisation.
+
+2008-08-09 Todd Zullinger <tmzullinger at users.sourceforge.net>
+
+ * src/itdb_playlist.c
+ tests/test-ls.c: Remove uses of deprecated itdb_time_* functions
+
+2008-08-03 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+ * src/ithumb-writer (ithumb_writer_handle_pixbuf_transform):
+ handle rotation correctly: don't interchange width and height
+ for the thumbnail on the iPod.
+
+2008-08-02 Todd Zullinger <tmzullinger at users.sourceforge.net>
+
+ * src/itdb_track.c: Fix typo in itdb_track_get_thumbnail() doc
+ comment
+
+2008-07-31 Christophe Fergeau <teuf at gnome.org>
+
+ * configure.ac: s/test -a/test -e/ since this is what I really
+ meant, thanks tmz
+
+2008-07-31 Christophe Fergeau <teuf at gnome.org>
+
+ * configure.ac: instead of looking for .svn or {arch}, look for
+ autogen.sh to decide if we are compiling a version checked out from
+ svn or a release tarball.
+
+2008-07-31 Christophe Fergeau <teuf at gnome.org>
+
+ * src/itdb_device.h:
+ * src/itdb_plist.h: move itdb_device_error_quark from itdb_plist.h
+ to itdb_device.h
+
+2008-07-30 Todd Zullinger <tmzullinger at users.sourceforge.net>
+
+ * docs/reference/tmpl/track.sgml
+ src/itdb.h
+ src/itdb_itunesdb.c: Rename unk146 to explicit_flag in
+ Itdb_Track now that it's purpose is known
+
+2008-07-27 Christophe Fergeau <teuf at gnome.org>
+
+ * src/itdb_sysinfo_extended_parser.c:
+ * src/itdb_plist.c: add gtk-doc documentation
+
+2008-07-27 Christophe Fergeau <teuf at gnome.org>
+
+ * src/itdb_sysinfo_extended_parser.c:
+ * src/itdb_sysinfo_extended_parser.h: add a GError argument to
+ SysInfoExtended parsing functions
+ * src/itdb_device.c: pass NULL GError argument to call to
+ SysInfoExtended functions
+ * tests/test-sysinfo-extended.c: add a GError argument when calling
+ SysInfoExtended parsing functions
+
+2008-07-27 Christophe Fergeau <teuf at gnome.org>
+
+ * src/itdb_device.c: add itdb_device_error_quark()
+ * src/itdb_plist.h:
+ * src/itdb_plist.c: add error handling to XML parsing (using
+ GError)
+ * src/itdb_sysinfo_extended_parser.c: pass a NULL GError to call to
+ plist parsing function
+
+2008-07-26 Christophe Fergeau <teuf at gnome.org>
+
+ * tests/test-fw-id.c: (main): add missing call to g_type_init
+
+2008-07-20 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+ * src/ithumb-writer.c (pack_RGB_565), (pack_RGB_555)
+ (pack_RGB_888): handle horizontal padding correctly
+ (affected pictures in portrait format).
+
+ * src/itdb_device.c: added some comments.
+
+2008-07-18 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+ * src/itdb_device.c (itdb_device_set_timezone_info): avoid g_stat
+ on NULL filename. Thanks to Andrea.
+
+2008-07-18 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+ * src/itdb_device.c: assume the following generations do not
+ support sparse artwork:
+ ITDB_IPOD_GENERATION_NANO_1:
+ ITDB_IPOD_GENERATION_NANO_2:
+ ITDB_IPOD_GENERATION_VIDEO_1:
+ ITDB_IPOD_GENERATION_VIDEO_2:
+
+2008-07-17 Todd Zullinger <tmzullinger at users.sourceforge.net>
+
+ * README
+ bindings/python/gpod.i.in
+ bindings/python/ipod.py
+ docs/reference/libgpod-sections.txt
+ docs/reference/tmpl/artwork.sgml
+ docs/reference/tmpl/itunesdb-db.sgml
+ src/itdb.h: Remove references to itdb_thumb_get_gdk_pixbuf()
+
+2008-07-10 Christophe Fergeau <teuf at gnome.org>
+
+ * src/db-artwork-writer.c: if we fail to write ithmb files for some
+ reason, don't go on trying to write the ArtworkDB/PhotoDB as well
+
+2008-07-09 Todd Zullinger <tmzullinger at users.sourceforge.net>
+
+ * po/POTFILES.in: add src/itdb_thumb.c
+
+2008-07-09 Christophe Fergeau <teuf at gnome.org>
+
+ * configure.ac: properly detect newer libsgutils (the so name was
+ changed)
+ * tools/ipod-scsi-inquiry.c: add missing include
+ Based on a patch from Dan Horák (dan at danny.cz)
+
+2008-07-06 Christophe Fergeau <teuf at gnome.org>
+
+ * src/itdb_device.c: fix model number information grabbed from
+ podsleuth
+
+2008-07-06 Christophe Fergeau <teuf at gnome.org>
+
+ * src/itdb_device.c: add a mapping from serial numbers to model
+ numbers to make it easy to go from a serial number read from
+ SysInfoExtended to an Itdb_IpodInfo
+
+2008-07-06 Christophe Fergeau <teuf at gnome.org>
+
+ * src/itdb_device.c:
+ * src/itdb_device.h: add missing red ipod shuffles as well as 2GB
+ shuffles to the list of known ipod models
+
+2008-07-06 Christophe Fergeau <teuf at gnome.org>
+
+ * src/itdb_device.c:
+ * src/itdb_device.h: add itdb_device_get_storage_info method
+ * src/itdb_itunesdb.c: use that method instead of directly using
+ statvfs, makes it easier to port things over to MSVC8
+
+2008-07-05 Christophe Fergeau <teuf at gnome.org>
+
+ Patch from: Songbird (http://getsongbird.com/)
+
+ * src/db-itunes-parser.h: remove unused constant
+ * src/db-parse-context.c:
+ * src/db-parse-context.h: use GMappedFile instead of directly using
+ mmap, it's needed for MSVC8 portability
+
+2008-07-05 Christophe Fergeau <teuf at gnome.org>
+
+ Patch from: Songbird (http://getsongbird.com/)
+
+ * src/itdb_itunesdb.c
+ * src/itdb_track.c: get rid of inner functions since it is a gcc
+ specific extension and MSVC8 doesn't like that
+
+2008-07-05 Christophe Fergeau <teuf at gnome.org>
+
+ Patch from: Songbird (http://getsongbird.com/)
+
+ * src/db-artwork-parser.c
+ * src/db-parse-context.c
+ * src/db-parse-context.h: get rid of unused argument to
+ db_parse_context_destroy (it was always set to TRUE)
+
+2008-07-06 Christophe Fergeau <teuf at gnome.org>
+
+ * src/ithumb-writer.c: fix bug in the function scaling and cropping
+ thumbnails, in the non-cropping case, the returned pixbuf size
+ didn't reflect the size of the scaled pixbuf
+
+2008-07-05 Christophe Fergeau <teuf at gnome.org>
+
+ * src/db-artwork-parser.c: fix small memory leak
+
+2008-07-05 Christophe Fergeau <teuf at gnome.org>
+
+ * src/ithumb-writer.c: fix typo in thumbnail rearranging code, we
+ were wrongly appending Itdb_Thumb_Ipod instances to lists of
+ Itdb_Thumb_Ipod_Item
+
+2008-07-05 Christophe Fergeau <teuf at gnome.org>
+
+ * src/db-artwork-writer.c: properly set padding to 0 in mhods type 3
+
+2008-07-05 Christophe Fergeau <teuf at gnome.org>
+
+ Patch from: Songbird (http://getsongbird.com/)
+
+ * src/ithumb-writer.c: don't leak the list of image formats we get
+ from the ItdbDevice
+
+2008-06-29 Daniele Forsi <dforsi at users.sourceforge.net>
+
+ * src/itdb_itunesdb.c src/itdb_thumb.c src/itdb_device.c
+ src/itdb_photoalbum.c: fix typos in comments
+
+2008-06-29 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+ * src/ithumb-writer.c (itdb_write_ithumb_files): fix bug when
+ writing photos (loop variable "it" re-used inside loop).
+ Rename loop variable to "itw" also in case of writing artwork.
+
+ * src/itdb_thumb.c (itdb_thumb_to_pixbuf_at_size):
+
+ If requesting a thumb from the iPod smaller than available, none
+ would be returned. Fixed. Thumbs from the iPod would not be
+ scaled even if requested. Fixed.
+
+ If requesting a thumb from a file or existing pixbuf, scaling
+ was done even if none was requested (width/height =
+ 0/-1). Fixed.
+
+ Introduced selection of smallest available thumbnail
+ (width/height = 0) besides largest available thumbnail
+ (width/height = -1).
+
+ TODO: consider aspect ratio of requested picture (currently it
+ is very likely that some of the square thumbs are returned...)
+
+ src/itdb_artwork.c (itdb_artwork_get_thumbnail):
+ Introduced selection of smallest available thumbnail
+ (width/height = 0) besides largest available thumbnail
+ (width/height = -1). (Only necessary documentation.)
+
+2008-06-28 Christophe Fergeau <teuf at gnome.org>
+
+ patch by: Mike Heffner <mikeh at fesnel.com>
+
+ * src/Makefile.am:
+ * src/db-artwork-writer.c: fix compilation with older glib (without
+ GChecksum)
+
+2008-06-24 Christophe Fergeau <teuf at gnome.org>
+
+ * src/itdb_device.c: rework timezone handling: handle timezones as
+ stored on 5g ipods (hopefully) and fallback to using the computer
+ timezone if we can't figure out the ipod timezone
+ * tests/get-timezone.c: use functions from libgpod to get the
+ timezone instead of duplicating some itdb_device code
+
+2008-06-15 Christophe Fergeau <teuf at gnome.org>
+
+ * src/itdb_device.c: oops, forgot a ','
+
+2008-06-14 Christophe Fergeau <teuf at gnome.org>
+
+ * src/itdb_device.c: fix some entries in the ipod_model_table by
+ using libipoddevice and podsleuth as a reference
+
+2008-06-14 Christophe Fergeau <teuf at gnome.org>
+
+ * src/itdb_track.c: remove bogus function to check if the ipod
+ supports video: it didn't take into account the new ipods released
+ after the 1st ipod video
+
+2008-06-09 Christophe Fergeau <teuf at gnome.org>
+
+ * src/itdb_device.h:
+ * src/itdb_sysinfo_extended_parser.c:
+ * src/ithumb-writer.c: use background color and alignement
+ information from SysInfoExtended if available
+
+2008-06-09 Christophe Fergeau <teuf at gnome.org>
+
+ * src/db-artwork-writer.c:
+ * src/itdb_device.c:
+ * src/itdb_device.h:
+ * src/itdb_sysinfo_extended_parser.c:
+ * src/itdb_sysinfo_extended_parser.h: implements
+ itdb_device_supports_sparse_artwork (instead of the old stub always
+ returning TRUE). Use data from SysInfoExtended if it's available,
+ use hardcoded table from libgpod if not.
+
+2008-06-09 Christophe Fergeau <teuf at gnome.org>
+
+ * src/itdb_device.c:
+ * src/itdb_device.h:
+ * src/itdb_sysinfo_extended_parser.c:
+ * src/itdb_sysinfo_extended_parser.h: merge Itdb_ArtworkFormat and
+ SysInfoImageFormat, use artwork formats from SysInfoExtended when
+ it's available instead of using the hardcoded tables from libgpod
+
+2008-06-09 Christophe Fergeau <teuf at gnome.org>
+
+ * src/db-artwork-writer.c:
+ * src/db-image-parser.h:
+ * src/itdb.h:
+ * src/itdb_device.c:
+ * src/itdb_device.h:
+ * src/ithumb-writer.c: get rid of ItdbThumbType, it's replaced by
+ pointers to the appropriate Itdb_ArtworkFormat for the thumbnail
+ type when it's needed
+
+2008-06-09 Christophe Fergeau <teuf at gnome.org>
+
+ * src/db-artwork-parser.c: remove duplicated artwork/photo support
+ testing functions
+ * src/db-artwork-parser.h: ditto
+ * src/itdb_itunesdb.c: s/ipod_supports_XXX/itdb_device_supports_XXX
+ * src/itdb_photoalbum.c: ditto
+ * src/itdb.h: use a const Itdb_Device argument for
+ itdb_device_supports_*, add ITDB_IPOD_GENERATION_IPHONE_1 to
+ Itdb_IpodGeneration, get rid of ITDB_IPOD_GENERATION_FIFTH and
+ ITDB_IPOD_GENERATION_SIXTH
+ * src/itdb_device.c: split functions to get artwork format from the
+ ipod in 2 separate functions: instead of
+ itdb_device_get_artwork_formats we now have
+ itdb_device_get_photo_formats and itdb_device_get_cover_art_formats
+ * src/itdb_device.h:
+ * src/db-image-parser.c: use the separate
+ get_cover_art_formats/get_photos_formats functions
+ * src/db-artwork-writer.c: ditto
+ * src/ithumb-writer.c: ditto
+
+2008-06-09 Christophe Fergeau <teuf at gnome.org>
+
+ * src/gchecksum.c: fix compilation (it's only compiled on system with
+ older glib versions)
+
+2008-06-09 Christophe Fergeau <teuf at gnome.org>
+
+ * src/db-artwork-writer.c:
+ * src/itdb_artwork.c:
+ * src/itdb_thumb.c:
+ * src/itdb_thumb.h: fix compilation when gdk-pixbuf isn't present
+
+2008-06-02 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+ * src/itdb_track.c (itdb_track_remove_thumbnails): set mhii_link
+ to 0.
+
+ * src/db-artwork-parser.c (mhfd_associate_itunesdb_artwork):
+ remove thumbnails if mhii_link is invalid.
+
+2008-06-02 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+ * src/gchecksum.c
+ src/gchecksum.h
+ src/Makefile.am
+ configure.ac: copied gchecksum from glib 2.16.3. It's used if we
+ compile on a system that does not have glib 2.16 or
+ higher. Testing is needed whether it's really pulled in in those
+ cases -- I'm using 2.16.3 myself.
+
+ * src/itdb_itunesdb.c (mk_mhit): write mhii_link.
+
+ * src/db-artwork-writer.c: code to handle sparse artwork
+ correctly.
+
+ (ipod_supports_sparse_artwork): currently hard-coded to
+ TRUE. Will be changed in the future to reflect the information
+ given in the SysInfoExtended. Change yourself if your iPod does
+ not support Sparse Artwork (sharing of thumbnails between
+ several tracks).
+
+2008-06-01 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+ * src/itdb_thumb.c
+ remove some unnecessary checks for NULL pointer
+ (itdb_thumb_duplicate): move g_list_reverse() outside the loop
+ modifying the list.
+
+2008-05-30 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+ * src/itdb_thumb.c
+ src/itdb_thumb.h
+ src/ithumb-writer.c
+ src/itdb_photoalbum.c: fixed a number of compile-time warnings.
+
+2008-05-30 Christophe Fergeau <teuf at gnome.org>
+
+ Patch from Ian Stewart
+
+ * src/itdb_itunesdb.c: don't pass NULL sort_composer names down to
+ jump_table_letter, fixes a crash reported by Andy Busch
+
+2008-05-30 Christophe Fergeau <teuf at gnome.org>
+
+ * src/Makefile.am:
+ * src/db-artwork-parser.c:
+ * src/db-artwork-writer.c:
+ * src/db-image-parser.c:
+ * src/db-image-parser.h:
+ * src/itdb.h:
+ * src/itdb_artwork.c:
+ * src/itdb_device.h:
+ * src/itdb_photoalbum.c:
+ * src/itdb_track.c:
+ * src/ithumb-writer.c:
+ * tests/test-covers.c:
+ * tests/test-photos.c: rework Itdb_Thumb type. Now it's split into
+ different subtypes depending on what it represents (GdkPixbuf,
+ thumbnail read from the ipod, ...). Itdb_Artwork now contains only a
+ pointer to a single Itdb_Thumb (it used to contain a GList * of
+ Itdb_Thumb) since the only time when the list is useful is for thumbs
+ read from the ipod. Using a list for the other types of thumbnails
+ created some complications when trying to set art on an Itdb_Track that
+ wasn't attached to an Itdb_iTunesDB.
+
+2008-05-29 Christophe Fergeau <teuf at gnome.org>
+
+ * src/itunesdb.c:
+ * src/ithumb-writer.c: add missing static to internal functions
+
+2008-05-28 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+ * src/db-artwork-parser.c (parse_mhii): removed artwork_fallback
+ variable upon Christophe's suggestion and streamlined code.
+
+2008-05-28 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+ * src/itdb_track.c (itdb_track_set_thumbnails_internal): set
+ artwork ID to 0 after removing thumbnails.
+
+ * src/db-artwork-parser.c (parse_mhii): move out dbid association
+ to a separate function.
+
+ (mhfd_associate_itunesdb_artwork): handle dbid and mhii_link
+ association of artwork to track
+
+ (parse_mhfd): loop over the number of mhsd hunks instead of
+ hardcoding it. Call mhfd_associate_itunesdb_artwork().
+
+ * src/itdb_itunesdb.c (get_mhit): read the mhii_link field.
+
+ * src/db-artwork-writer.c (write_mhli): handle unset artwork
+ correctly.
+
+ (itdb_track_filter_thumbnails): remove thumbnails correctly.
+
+ * src/db-parse-context.c (db_parse_context_get_sub_context): copy
+ newly introduced artwork field.
+
+ * tests/test-covers.c: print mhii_link.
+
+ * src/itdb.h: (Itdb_Track) added mhii_link. (Itdb_Artwork): added
+ dbid.
+
+ * src/itdb.h, src/db-artwork-parser.c, src/db-artwork-writer.c,
+ src/itdb_device.c, src/ithumb-writer.c, src/itdb_artwork.c:
+ added ITDB_THUMB_CHAPTER_SMALL/LARGE.
+
+ * src/itdb_device.c: ipod_classic_1_artwork_info: correct
+ ITDB_THUMB_COVER_SMALL/LARGE entries.
+
+2008-05-25 Christophe Fergeau <teuf at gnome.org>
+
+ * configure.ac: libxml presence is mandatory unless
+ --disable-libxml is passed to configure
+
+2008-05-25 Christophe Fergeau <teuf at gnome.org>
+
+ * src/itdb_device.c: don't insert NULL firewire IDs in the SysInfo
+ hash table
+
+2008-05-25 Christophe Fergeau <teuf at gnome.org>
+
+ * configure.ac: rework libxml detection
+ * src/Makefile.am: remove LIBXML_CFLAGS/LIBXML_LIBS since they are
+ no longer used
+ * src/itdb_plist.c: add stub functions when libxml isn't available
+ * src/itdb_sysinfo_extended_parser.c: include config.h
+
+2008-05-25 Christophe Fergeau <teuf at gnome.org>
+
+ * src/db-artwork-debug.c:
+ * src/db-artwork-writer.c:
+ * src/db-image-parser.c:
+ * src/db-itunes-parser.h:
+ * src/itdb_device.h:
+ * src/ithumb-writer.c: rename correlation_id to format_id (this is
+ how that value is called in SysInfoExtended)
+
+2008-05-25 Christophe Fergeau <teuf at gnome.org>
+
+ * configure.ac: check libxml presence
+ * src/Makefile.am: add new files, remove obsolete ones
+ * src/itdb_plist.h:
+ * src/itdb_plist.c: plist parser, this parses a plist XML file to a
+ GHashTable of GValue *. This parser should be generic, ie it
+ doesn't know it's parsing SysInfoExtended, it only cares about it
+ being a plist file
+ * src/itdb_sysinfo_extended_parser.h:
+ * src/itdb_sysinfo_extended_parser.c: convert the parsed plist data
+ to data structures usable by libgpod
+ * src/itdb_device.h:
+ * src/itdb_device.c: parses SysInfoExtended in addition to SysInfo
+ * src/itdb_sysinfo.c: this hacky parser is obsoleted by the new
+ (much more complete) SysInfoExtended parser, so it's removed
+ * tests/Makefile.am:
+ * tests/test-sysinfo-extended-parsing.c: small test program for the
+ new parser
+
+2008-05-25 Christophe Fergeau <teuf at gnome.org>
+
+ Patch from Ian Stewart <ian.stewart at ozemail.com.au>
+
+ * src/itdb_itunesdb.c: add jump letter support (mhod53)
+
+2008-05-24 Christophe Fergeau <teuf at gnome.org>
+
+ * src/ithumb-writer.c: factor some code out of
+ ithumb_writer_write_thumbnail into separate functions to make the
+ code more readable
+
+2008-05-24 Christophe Fergeau <teuf at gnome.org>
+
+ Patch from Jacob Hoffman-Andrews <jsha at newview.org>
+
+ * src/itdb_device.h: add 'crop' field to Itdb_ArtworkFormat
+ * src/itdb_device.c: fill this 'crop' field for the iphone
+ * src/ithumb-writer.c: use that new 'crop' field to crop the
+ thumbnails when the Itdb_ArtworkFormat requires it.
+
+2008-05-24 Christophe Fergeau <teuf at gnome.org>
+
+ Patch from Jacob Hoffman-Andrews <jsha at newview.org>
+
+ * tools/hal-callout.c: add missing #include <unistd.h>
+
+2008-05-17 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+ * tests/test-covers.c: print more info (marginally)
+
+2008-05-11 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+ * src/itdb_photoalbum.c
+ src/itdb_private.h
+ src/db-artwork-writer.c: renamed itdb_get_free_photo_id() to
+ itdb_get_max_photo_id() and implemented Jacob Hoffman-Andrew's
+ patch about the photo_ids and album_ids being shared.
+
+ * tests/test-covers.c: print more info (marginally)
+
+2008-05-10 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+ * tests/test-covers.c: print more status messages.
+
+2008-05-01 Todd Zullinger <tmzullinger at users.sourceforge.net>
+
+ * configure.ac:
+ Bump version to 0.6.1SVN
+
+ * bindings/python/ipod.py: write shuffle data (thanks to Diogo
+ Dutra)
+
+2008-04-19 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+ * bindings/python/examples/Makefile.am
+ Added fix_empty_artist_field.py provided by Thomas Perl.
+
+2008-03-29 Todd Zullinger <tmzullinger at users.sourceforge.net>
+
+ * bindings/python/Makefile.am
+ docs/reference/Makefile.am
+ src/Makefile.am: cleanup more of our dirs with make uninstall
+
+ * tests/test-rebuild-db.cc: include string.h to fix builds
+ with gcc 4.3 (fixes SF tracker #1928618)
+
+2008-03-02 Todd Zullinger <tmzullinger at users.sourceforge.net>
+
+ * configure.ac
+ m4/python.m4: shell portability fixes (courtesy of Klaus Heinz)
+
+2008-02-13 Todd Zullinger <tmzullinger at users.sourceforge.net>
+
+ * bindings/python/ipod.py: Track.set_thumbnail() was renamed
+ to Track.set_coverart_from_file() a long time ago
+
+2008-02-03 Christophe Fergeau <teuf at gnome.org>
+
+ * src/db-artwork-debug.c:
+ * src/db-artwork-debug.h: fix mhod type1 and mhod type3 dumping
+ when debugging is enabled
+
+2008-02-03 Christophe Fergeau <teuf at gnome.org>
+
+ * src/db-artwork-debug.h: merge mhod type1 and mhod type3 dumping
+ functions
+ * src/db-artwork-writer.c: adjust to the change above
+ * src/db-artwork-parser.c: merge mhod type1 and mhod type3 parsing
+ * src/db-itunes-parser.h: remove obsolete comment
+
+2008-02-03 Christophe Fergeau <teuf at gnome.org>
+
+ * src/db-artwork-parser.c: use enum name instead of hardcoded int
+ * src/db-artwork-writer.c: add comments about values that aren't
+ swapped because they are 8 bit values
+
+2008-02-03 Christophe Fergeau <teuf at gnome.org>
+
+ * src/db-itunes-parser.h: merge ArtworkDB_MhodHeaderArtworkType3
+ and MhodHeaderArtworkType1 into a single struct called
+ ArtworkDB_MhodHeaderString
+ * src/db-artwork-parser.c:
+ * src/db-artwork-writer.c: adjust to the above change
+
+2008-02-03 Christophe Fergeau <teuf at gnome.org>
+
+ * src/db-artwork-parser.c: add missing g_free that could cause
+ memory leaks
+
+2008-01-30 Christophe Fergeau <teuf at gnome.org>
+
+ Patch by Martin Aumueller
+
+ * tests/test-ls.c: make sure the various fields we are trying to
+ print aren't NULL, this fixes a crash that was observed with
+ iphones
+
+2007-11-15 Christophe Fergeau <teuf at gnome.org>
+
+ * src/itdb_itunesdb.c: don't use itdb_filename_ipod2fs to generate
+ the filename to put on the shuffle since on windows that would use
+ \ as a path separator instead of the correct /
+
+2007-11-15 Christophe Fergeau <teuf at gnome.org>
+
+ * src/itdb_private.h:
+ * src/itdb_itunesdb.c: add itdb_file_set_contents to workaround a
+ rename issue on sshfs (existing files on the FS can't be
+ atomatically erased during a rename). Use it in wcontents_write
+ * src/db-artwork-writer.c: use itdb_file_set_contents to write the
+ ArtworkDB
+
+2007-11-15 Christophe Fergeau <teuf at gnome.org>
+
+ * src/db-artwork-writer.c:
+ * src/db-parse-context.c:
+ * src/itdb_device.c:
+ * src/itdb_itunesdb.c:
+ * src/ithumb-writer.c: don't include unistd.h on systems which
+ don't have it
+
+2007-11-16 Christophe Fergeau <teuf at gnome.org>
+
+ * src/itdb_itunesdb.c: rework itdb_cp for MacOSX/Windows
+ portability
+
+2008-01-26 Michael Tiffany <tiffman at users.sourceforge.net>
+
+ * src/itdb_chapterdata.c: file missed being added in
+ previous checkin
+
+2008-01-26 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+ * src/itdb_track.c
+ * src/itdb_itunesdb.c
+ * src/itdb_chapterdata
+ * src/itdb.h
+ * src/Makefile.am: applied chapterdata patch by Michael Tiffany.
+
+2008-01-02 Christophe Fergeau <teuf at gnome.org>
+
+ * src/itdb_device.c: fix ITDB_THUMB_PHOTO_FULL_SCREEN format on
+ ipod classic and nano video, thanks to Tomas Carnecky for pointing
+ that out
+
+2007-12-13 Todd Zullinger <tmzullinger at users.sourceforge.net>
+
+ * Makefile.am: add ACLOCAL_AMFLAGS to fix some autoreconf
+ issues (thanks to Frank Lichtenheld at Debian)
+
+2007-11-26 Todd Zullinger <tmzullinger at users.sourceforge.net>
+
+ * configure.ac
+ libgpod-1.0.pc.in:
+ conditionally add gdk-pixbuf to pkg-config Requires.
+ exit with an error if gdk-pixbuf or pygobject are explicitly
+ requested and not found.
+ add AM_PROG_CC_C_O to make automake happy about per-target
+ flags in tests/Makefile.am
+
+2007-11-25 Todd Zullinger <tmzullinger at users.sourceforge.net>
+
+ * autogen.sh: pass any user-specified options to configure
+
+2007-11-17 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+ * src/itdb_playlist.c (itdb_splr_eval): track length in rules for
+ smart playlists was treated as seconds, but the iPod treats them
+ as milliseconds. If you told libgpod to create a smart playlist
+ with tracks less than 100 secs in length, but the life update of
+ the iPod would interpret that rule as "tracks less than 100 msec
+ in length", giving a vastly different result. Tested with iPod
+ Nano 1G and iPod nano Video (3G).
+
+ Requires corresponding fix in GUIs using this function.
+
+2007-11-16 Christophe Fergeau <teuf at gnome.org>
+
+ * src/itdb_device.c: fix typoes in iPod Touch model lists
+
+2007-11-14 Christophe <teuf at gnome.org>
+
+ * src/itdb_itunesdb.c: use libgpod as the prefix of music files to
+ be copied to the ipod instead of gtkpod
+
+2007-11-14 Christophe <teuf at gnome.org>
+
+ * src/itdb_itunesdb.c: get rid of local g_mkdir_with_parents copy
+ since we now depend on glib 2.8 which have it. Replace mkdir with
+ g_mkdir
+
+2007-11-14 Christophe <teuf at gnome.org>
+
+ * src/itdb_itunesdb.c: ignore invalid UTF-8 paths which might have
+ been added to the iPod by the user
+
+2007-11-14 Christophe <teuf at gnome.org>
+
+ * src/itdb_photoalbum.c: use g_list_remove all instead of an
+ inefficient combination of g_list_find + g_list_remove
+
+2007-11-14 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+ * src/itdb_photoalbum.c (itdb_photodb_photoalbum_remove): make
+ sure same photo isn't freed multiple times if it was added in an
+ album multiple times.
+
+2007-11-13 Christophe Fergeau <teuf at gnome.org>
+
+ * src/itdb_photoalbum.c: fix bug in itdb_photodb_photoalbum_remove,
+ when removing all the photos from the photodatabase, we were
+ erasing elements and iterating over the list at the same time,
+ which resulted in the function not working properly
+
2007-11-10 Christophe Fergeau <teuf at gnome.org>
* Makefile.am: add README.SysInfo to EXTRADIST
Modified: libgpod/branches/upstream/current/Makefile.am
===================================================================
--- libgpod/branches/upstream/current/Makefile.am 2008-12-25 18:06:29 UTC (rev 338)
+++ libgpod/branches/upstream/current/Makefile.am 2009-01-24 10:34:00 UTC (rev 339)
@@ -3,6 +3,8 @@
# build documentation when doing a distcheck.
DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
+ACLOCAL_AMFLAGS = -I m4
+
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libgpod-1.0.pc
Modified: libgpod/branches/upstream/current/Makefile.in
===================================================================
--- libgpod/branches/upstream/current/Makefile.in 2008-12-25 18:06:29 UTC (rev 338)
+++ libgpod/branches/upstream/current/Makefile.in 2009-01-24 10:34:00 UTC (rev 339)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -36,12 +32,12 @@
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
+subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(srcdir)/libgpod-1.0.pc.in $(top_srcdir)/configure AUTHORS \
COPYING ChangeLog INSTALL NEWS compile config.guess config.sub \
depcomp install-sh ltmain.sh missing mkinstalldirs py-compile
-subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
@@ -49,7 +45,7 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
+ configure.lineno config.status.lineno
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES = libgpod-1.0.pc
@@ -57,10 +53,11 @@
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
- install-exec-recursive install-info-recursive \
- install-recursive installcheck-recursive installdirs-recursive \
- pdf-recursive ps-recursive uninstall-info-recursive \
- uninstall-recursive
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -70,6 +67,8 @@
am__installdirs = "$(DESTDIR)$(pkgconfigdir)"
pkgconfigDATA_INSTALL = $(INSTALL_DATA)
DATA = $(pkgconfig_DATA)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
@@ -85,10 +84,8 @@
distuninstallcheck_listfiles = find . -type f -print
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
-ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ACLOCAL_AMFLAGS = -I m4
ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
AUTOCONF = @AUTOCONF@
@@ -115,35 +112,24 @@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
GDKPIXBUF_CFLAGS = @GDKPIXBUF_CFLAGS@
GDKPIXBUF_LIBS = @GDKPIXBUF_LIBS@
+GDKPIXBUF_REQ = @GDKPIXBUF_REQ@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_LIBS = @GLIB_LIBS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
+GTKDOC_CHECK = @GTKDOC_CHECK@
HALCALLOUTSDIR = @HALCALLOUTSDIR@
HAL_CFLAGS = @HAL_CFLAGS@
HAL_LIBS = @HAL_LIBS@
-HAVE_GDKPIXBUF_FALSE = @HAVE_GDKPIXBUF_FALSE@
-HAVE_GDKPIXBUF_TRUE = @HAVE_GDKPIXBUF_TRUE@
-HAVE_HAL_FALSE = @HAVE_HAL_FALSE@
-HAVE_HAL_TRUE = @HAVE_HAL_TRUE@
-HAVE_PYGOBJECT_FALSE = @HAVE_PYGOBJECT_FALSE@
-HAVE_PYGOBJECT_TRUE = @HAVE_PYGOBJECT_TRUE@
-HAVE_PYTHON_FALSE = @HAVE_PYTHON_FALSE@
-HAVE_PYTHON_TRUE = @HAVE_PYTHON_TRUE@
-HAVE_SGUTILS_FALSE = @HAVE_SGUTILS_FALSE@
-HAVE_SGUTILS_TRUE = @HAVE_SGUTILS_TRUE@
-HAVE_TAGLIB_FALSE = @HAVE_TAGLIB_FALSE@
-HAVE_TAGLIB_TRUE = @HAVE_TAGLIB_TRUE@
HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -184,15 +170,17 @@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LIBXML_CFLAGS = @LIBXML_CFLAGS@
+LIBXML_LIBS = @LIBXML_LIBS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -228,13 +216,13 @@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -246,6 +234,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -277,8 +266,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
SUBDIRS = src tools tests po m4 docs bindings
# build documentation when doing a distcheck.
@@ -339,7 +331,7 @@
config.h: stamp-h1
@if test ! -f $@; then \
rm -f stamp-h1; \
- $(MAKE) stamp-h1; \
+ $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
else :; fi
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@@ -363,10 +355,9 @@
distclean-libtool:
-rm -f libtool
-uninstall-info-am:
install-pkgconfigDATA: $(pkgconfig_DATA)
@$(NORMAL_INSTALL)
- test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)"
+ test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
@list='$(pkgconfig_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -413,8 +404,7 @@
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
@@ -458,8 +448,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -484,8 +474,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -495,13 +485,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
@@ -516,24 +505,22 @@
distdir: $(DISTFILES)
$(am__remove_distdir)
- mkdir $(distdir)
- $(mkdir_p) $(distdir)/. $(distdir)/bindings/python $(distdir)/docs/reference $(distdir)/m4 $(distdir)/po
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ test -d $(distdir) || mkdir $(distdir)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -547,7 +534,7 @@
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
- || $(mkdir_p) "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
distdir=`$(am__cd) $(distdir) && pwd`; \
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -555,6 +542,8 @@
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$top_distdir" \
distdir="$$distdir/$$subdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
distdir) \
|| exit 1; \
fi; \
@@ -562,7 +551,7 @@
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r $(distdir)
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
@@ -572,6 +561,10 @@
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
+dist-lzma: distdir
+ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+ $(am__remove_distdir)
+
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
@@ -598,6 +591,8 @@
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+ *.tar.lzma*) \
+ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
@@ -637,7 +632,7 @@
$(am__remove_distdir)
@(echo "$(distdir) archives ready for distribution: "; \
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
- sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
+ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
distuninstallcheck:
@cd $(distuninstallcheck_dir) \
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
@@ -662,7 +657,7 @@
installdirs: installdirs-recursive
installdirs-am:
for dir in "$(DESTDIR)$(pkgconfigdir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-recursive
install-exec: install-exec-recursive
@@ -711,12 +706,20 @@
install-data-am: install-pkgconfigDATA
+install-dvi: install-dvi-recursive
+
install-exec-am:
+install-html: install-html-recursive
+
install-info: install-info-recursive
install-man:
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
installcheck-am:
maintainer-clean: maintainer-clean-recursive
@@ -737,25 +740,26 @@
ps-am:
-uninstall-am: uninstall-info-am uninstall-pkgconfigDATA
+uninstall-am: uninstall-pkgconfigDATA
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+ install-strip
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
- check-am clean clean-generic clean-libtool clean-recursive \
- ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
- dist-shar dist-tarZ dist-zip distcheck distclean \
- distclean-generic distclean-hdr distclean-libtool \
- distclean-recursive distclean-tags distcleancheck distdir \
- distuninstallcheck dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
- install-pkgconfigDATA install-strip installcheck \
- installcheck-am installdirs installdirs-am maintainer-clean \
- maintainer-clean-generic maintainer-clean-recursive \
- mostlyclean mostlyclean-generic mostlyclean-libtool \
- mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
- uninstall uninstall-am uninstall-info-am \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am am--refresh check check-am clean clean-generic \
+ clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
+ dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \
+ distclean distclean-generic distclean-hdr distclean-libtool \
+ distclean-tags distcleancheck distdir distuninstallcheck dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-pkgconfigDATA install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ installdirs-am maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+ ps ps-am tags tags-recursive uninstall uninstall-am \
uninstall-pkgconfigDATA
# Tell versions [3.59,3.63) of GNU make to not export all variables.
Modified: libgpod/branches/upstream/current/NEWS
===================================================================
--- libgpod/branches/upstream/current/NEWS 2008-12-25 18:06:29 UTC (rev 338)
+++ libgpod/branches/upstream/current/NEWS 2009-01-24 10:34:00 UTC (rev 339)
@@ -1,3 +1,80 @@
+Overview of changes in libgpod 0.7.0
+====================================
+
+* support for iPod Nano 4th generation
+
+This includes support for cover art.
+Please note that this release DOES NOT support iPhones and iPod Touch
+with firmware 2.x
+
+* support for "sparse artwork" writing
+
+This lets us write more compact artwork files to the iPod, which in turn makes
+the UI more responsive (and saves disk space on the iPod).
+
+* jump table support
+
+These are the big letters that show up in the album/artist list when someone
+quickly scrolls through them. Thanks a lot to Ian Stewart for implementing it.
+
+* chapter data support
+
+Chapter data allows large files (movies, audio books, podcasts) to be divided
+into smaller sections. Thanks to Michael Tiffany for this feature.
+
+* improved timezone handling
+
+This should now work up to 5G iPods, for newer iPods, libgpod will assume
+timestamps are in UTC.
+
+* translation updates
+
+Thanks to all of our translators :)
+
+* much more complete API doc
+
+All of the public API is now documented with gtk-doc.
+
+* simplification of the cover art handling API
+
+The API for artwork for developers using libgpod should be more
+straightforward, if things are missing, don't hesitate to get in touch
+with us ;)
+
+* extensive plist parser
+
+In libgpod 0.6.0, libgpod got a very basic parser for the SysInfoExtended file
+(which is a XML plist description). This parser was rewritten for this release
+to parse the whole file. This parser depends on libxml2 but its compilation
+will be disabled if libxml2 and its development headers can't be found.
+
+* add mapping from iPod serial numbers to iPod models
+
+The iPod serial number can be obtained programmatically, and its last 3 digits
+are characteristic of an iPod (type, generation, color, capacity). libgpod
+can now find out an iPod model using this serial number.
+
+* portability improvements to windows and macosx
+
+This is probably not perfect yet, but the goal is to improve it as much as
+possible so don't hesitate to send bug reports if some things are still not
+working. Thanks to the songbird project and Éric Lassauge.
+
+* reworked handling of artwork formats
+
+libgpod can now automatically use the artwork formats described in
+SysInfoExtended even if the iPod model is unknown, this should make it possible
+for libgpod to support artwork on newly released iPod models without the need
+to upgrade.
+
+* python bindings are more consistent with other python container objects
+
+This enables testing whether a key exists in an object (e.g. "'title' in track")
+as well as iterating over a Track or Photo object's keys, values, or items.
+
+* bug fixes and code cleanup all over the place
+
+
Overview of changes in libgpod 0.6.0
====================================
Modified: libgpod/branches/upstream/current/README
===================================================================
--- libgpod/branches/upstream/current/README 2008-12-25 18:06:29 UTC (rev 338)
+++ libgpod/branches/upstream/current/README 2009-01-24 10:34:00 UTC (rev 339)
@@ -48,11 +48,9 @@
are available. Please see itdb.h for details (itdb_playlist_*()).
Each track can have a thumbnail associated with it. You can retrieve a
-GdkPixmap of the thumbnail using itdb_thumb_get_gdk_pixbuf() (tracks
-have thumbnails of the following types associated:
-ITDB_THUMB_COVER_SMALL and _LARGE). You can remove a thumbnail with
-itdb_track_remove_thumbnails(). And finally, you can set a new
-thumbnail using itdb_track_set_thumbnails().
+GdkPixmap of the thumbnail using itdb_artwork_get_pixbuf(). You can
+remove a thumbnail with itdb_track_remove_thumbnails(). And finally,
+you can set a new thumbnail using itdb_track_set_thumbnails().
Please note that iTunes additionally stores the artwork as tags in the
original music file. That's also from where the data is read when
Modified: libgpod/branches/upstream/current/README.SysInfo
===================================================================
--- libgpod/branches/upstream/current/README.SysInfo 2008-12-25 18:06:29 UTC (rev 338)
+++ libgpod/branches/upstream/current/README.SysInfo 2009-01-24 10:34:00 UTC (rev 339)
@@ -3,21 +3,32 @@
needs to know the so-called iPod "firewire id", otherwise the iPod won't
recognize what libgpod wrote to it and will behave as if it's empty.
-There are two ways to set up the iPod to make libgpod able to find its firewire
-id.
+There are several ways to set up an iPod so libgpod can find its firewire id.
-The 1st one is mostly automated. First, make sure you have libsgutils installed
-before running configure/autogen.sh. If you built libgpod without it, install
-it and run configure/make/make install. You should now have an
-ipod-read-sysinfo-extended tool available. Run it with the iPod device path
-(eg /dev/sda) and the iPod mount point (eg /mnt/ipod) as arguments. This may
-require root privileges. ipod-read-sysinfo-extended will read an XML
-file from the iPod and write it as
-/mnt/ipod/iPod_Control/Device/SysInfoExtended. See
-http://ipodlinux.org/Device_Information for more details about the method used.
-Having that file is enough for libgpod to figure out the iPod firewire id.
+The preferred method is automatic. Make sure you have hal and libsgutils
+installed before running configure/autogen.sh. If you built libgpod without
+them, run configure/make/make install after you install them.
-The 2nd method requires more manual intervention. First, you need to get your
+A hal callout and .fdi file will be built and installed. This will query an iPod
+when it is plugged in and save the SysInfoExtended file in the proper place.
+This should be entirely automatic. If you have trouble with this, see the
+TROUBLESHOOTING file for some hints.
+
+If you build with libsgutils but without hal, the next best method is mostly
+automatic. You should have an ipod-read-sysinfo-extended tool available. Run it
+with the iPod device path and the iPod mount point /mnt/ipod) as arguments. For
+example:
+
+ $ ipod-read-sysinfo-extended /dev/sda /mnt/ipod
+
+This may require root privileges. It reads an XML file from the iPod and writes
+it as /mnt/ipod/iPod_Control/Device/SysInfoExtended. More details on this method
+can be found at http://ipodlinux.org/Device_Information.
+
+Having the SysInfoExtended file created by ipod-read-sysinfo-extended or the hal
+callout is enough for libgpod to figure out the iPod firewire id.
+
+The last method requires more manual intervention. First, you need to get your
firewire id manually. To do that, run "sudo lsusb -v | grep -i Serial" (without
the "") with your iPod plugged in, this should print a 16 character long string
like 00A1234567891231. For an iPod Touch, this number will be much longer than
Modified: libgpod/branches/upstream/current/TROUBLESHOOTING
===================================================================
--- libgpod/branches/upstream/current/TROUBLESHOOTING 2008-12-25 18:06:29 UTC (rev 338)
+++ libgpod/branches/upstream/current/TROUBLESHOOTING 2009-01-24 10:34:00 UTC (rev 339)
@@ -67,15 +67,15 @@
* Compiling for 64bit systems
-The current automake/autobuild setup doesn't set the correct
+The current autoconf/automake setup doesn't set the correct
installation path on 64bit systems. To work around this issue and to
get the libraries installed in the correct locations you need to
-pecify a couple extra parameters to autoge .sh (or configure). If your
+specify a couple extra parameters to autogen.sh (or configure). If your
installation prefix is '/opt/gnome' use the following:
-./autogen.sh --prefix=/opt/gnome --enable-libsuffix=64 --libdir=/opt/gnome/lib6
+./autogen.sh --prefix=/opt/gnome --enable-libsuffix=64 --libdir=/opt/gnome/lib64
-If you use a diferent prefix, replace '/opt/gnome' accordingly.
+If you use a different prefix, replace '/opt/gnome' accordingly.
Added on 2007/1/15: Note that I don't have any problems on my Debian
4.1.1-13 system and won't have to do any of this.
@@ -95,3 +95,21 @@
------------------------------------------------------------
+* The hal callout doesn't run automatically to setup SysInfoExtended
+
+If you have hal and libsgutils installed before running autogen.sh or configure,
+a hal callout and .fdi file will be built and installed. This will query an iPod
+when it is plugged in and save the SysInfoExtended file in the proper place.
+This should be completely automatic. However, for this to work, the callout must
+be installed in hal's callout path. $libdir/hal/scripts is the most portable
+location (hal's $libdir can be found using pkg-config). If you are building
+libgpod from source with the default $prefix (/usr/local), you need to take care
+to install the callout and .fdi file in the proper locations. The easiest way to
+do this at the moment is by passing the locations to the make command. For
+example:
+
+ $ ./configure && make
+ ...
+ $ make haldir="$(pkg-config --variable libdir hal)/hal/scripts" \
+ fdidir="$(pkg-config --variable prefix hal)/share/hal/fdi" \
+ install
Modified: libgpod/branches/upstream/current/aclocal.m4
===================================================================
--- libgpod/branches/upstream/current/aclocal.m4 2008-12-25 18:06:29 UTC (rev 338)
+++ libgpod/branches/upstream/current/aclocal.m4 2009-01-24 10:34:00 UTC (rev 339)
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005 Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -11,6 +11,14 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
+m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(AC_AUTOCONF_VERSION, [2.61],,
+[m4_warning([this file was generated for autoconf 2.61.
+You have another version of autoconf. It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically `autoreconf'.])])
+
# Copyright (C) 1995-2002 Free Software Foundation, Inc.
# Copyright (C) 2001-2003,2004 Red Hat, Inc.
#
@@ -114,8 +122,7 @@
#-----------------
glib_DEFUN([GLIB_WITH_NLS],
dnl NLS is obligatory
- [AC_REQUIRE([AC_CANONICAL_HOST])dnl
- USE_NLS=yes
+ [USE_NLS=yes
AC_SUBST(USE_NLS)
gt_cv_have_gettext=no
@@ -447,7 +454,7 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-# serial 51 Debian 1.5.24-1ubuntu1 AC_PROG_LIBTOOL
+# serial 51 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -999,6 +1006,7 @@
esac
;;
*64-bit*)
+ libsuff=64
case $host in
x86_64-*kfreebsd*-gnu)
LD="${LD-ld} -m elf_x86_64_fbsd"
@@ -2057,11 +2065,13 @@
# Some rework will be needed to allow for fast_install
# before this can be enabled.
hardcode_into_libs=yes
+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -2073,18 +2083,6 @@
dynamic_linker='GNU/Linux ld.so'
;;
-netbsdelf*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='NetBSD ld.elf_so'
- ;;
-
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -2859,7 +2857,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-netbsd* | netbsdelf*-gnu)
+netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
@@ -3893,7 +3891,7 @@
;;
esac
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
@@ -5574,7 +5572,7 @@
;;
esac
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
;;
osf3* | osf4* | osf5*)
case $cc_basename in
@@ -5949,9 +5947,6 @@
cygwin* | mingw*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
;;
- linux* | k*bsd*-gnu)
- _LT_AC_TAGVAR(link_all_deplibs, $1)=no
- ;;
*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -6157,13 +6152,12 @@
$echo "local: *; };" >> $output_objdir/$libname.ver~
$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
- _LT_AC_TAGVAR(link_all_deplibs, $1)=no
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -6595,7 +6589,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
@@ -7094,16 +7088,14 @@
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
# ---------------------------------------------
m4_define([_PKG_CONFIG],
-[if test -n "$PKG_CONFIG"; then
- if test -n "$$1"; then
- pkg_cv_[]$1="$$1"
- else
- PKG_CHECK_EXISTS([$3],
- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
- [pkg_failed=yes])
- fi
-else
- pkg_failed=untried
+[if test -n "$$1"; then
+ pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+ PKG_CHECK_EXISTS([$3],
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+ [pkg_failed=yes])
+ else
+ pkg_failed=untried
fi[]dnl
])# _PKG_CONFIG
@@ -7147,9 +7139,9 @@
if test $pkg_failed = yes; then
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
else
- $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
@@ -7184,7 +7176,7 @@
fi[]dnl
])# PKG_CHECK_MODULES
-# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -7194,14 +7186,31 @@
# ----------------------------
# Automake X.Y traces this macro to ensure aclocal.m4 has been
# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
+# (This private macro should not be called outside this file.)
+AC_DEFUN([AM_AUTOMAKE_VERSION],
+[am__api_version='1.10'
+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+dnl require some minimum version. Point them to the right macro.
+m4_if([$1], [1.10.1], [],
+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
+# _AM_AUTOCONF_VERSION(VERSION)
+# -----------------------------
+# aclocal traces this macro to find the Autoconf version.
+# This is a private macro too. Using m4_define simplifies
+# the logic in aclocal, which can simply ignore this definition.
+m4_define([_AM_AUTOCONF_VERSION], [])
+
# AM_SET_CURRENT_AUTOMAKE_VERSION
# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
- [AM_AUTOMAKE_VERSION([1.9.6])])
+[AM_AUTOMAKE_VERSION([1.10.1])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
@@ -7258,14 +7267,14 @@
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 7
+# serial 8
# AM_CONDITIONAL(NAME, SHELL-CONDITION)
# -------------------------------------
@@ -7274,8 +7283,10 @@
[AC_PREREQ(2.52)dnl
ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])
-AC_SUBST([$1_FALSE])
+AC_SUBST([$1_TRUE])dnl
+AC_SUBST([$1_FALSE])dnl
+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
if $2; then
$1_TRUE=
$1_FALSE='#'
@@ -7289,15 +7300,14 @@
Usually this means the macro was only invoked conditionally.]])
fi])])
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 8
+# serial 9
# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
# written in clear, in which case automake, when reading aclocal.m4,
@@ -7325,6 +7335,7 @@
ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
[$1], CXX, [depcc="$CXX" am_compiler_list=],
[$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+ [$1], UPC, [depcc="$UPC" am_compiler_list=],
[$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
[depcc="$$1" am_compiler_list=])
@@ -7390,6 +7401,7 @@
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
$SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
>/dev/null 2>conftest.err &&
+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -7442,7 +7454,8 @@
AMDEPBACKSLASH='\'
fi
AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])
+AC_SUBST([AMDEPBACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
])
# Generate code to set up dependency tracking. -*- Autoconf -*-
@@ -7467,8 +7480,9 @@
# some people rename them; so instead we look at the file content.
# Grep'ing the first line is not enough: some people post-process
# each Makefile.in and add a new line on top of each file to say so.
- # So let's grep whole file.
- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+ # Grep'ing the whole file is not good either: AIX grep has a line
+ # limit of 2048, but all sed's we know have understand at least 4000.
+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
dirpart=`AS_DIRNAME("$mf")`
else
continue
@@ -7527,14 +7541,14 @@
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2008 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 12
+# serial 13
# This macro actually does too much. Some checks are only needed if
# your package does certain things. But this isn't really a big deal.
@@ -7551,16 +7565,20 @@
# arguments mandatory, and then we can depend on a new Autoconf
# release and drop the old call support.
AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.58])dnl
+[AC_PREREQ([2.60])dnl
dnl Autoconf wants to disallow AM_ names. We explicitly allow
dnl the ones we care about.
m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
AC_REQUIRE([AC_PROG_INSTALL])dnl
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
- test -f $srcdir/config.status; then
- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+ # is not polluted with repeated "-I."
+ AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
+ # test to see if srcdir already configured
+ if test -f $srcdir/config.status; then
+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+ fi
fi
# test whether we have cygpath
@@ -7580,6 +7598,9 @@
AC_SUBST([PACKAGE], [$1])dnl
AC_SUBST([VERSION], [$2])],
[_AM_SET_OPTIONS([$1])dnl
+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+ [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
@@ -7615,6 +7636,10 @@
[_AM_DEPENDENCIES(CXX)],
[define([AC_PROG_CXX],
defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+ [_AM_DEPENDENCIES(OBJC)],
+ [define([AC_PROG_OBJC],
+ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
])
])
@@ -7628,16 +7653,17 @@
# our stamp files there.
AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
[# Compute $1's index in $config_headers.
+_am_arg=$1
_am_stamp_count=1
for _am_header in $config_headers :; do
case $_am_header in
- $1 | $1:* )
+ $_am_arg | $_am_arg:* )
break ;;
* )
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
#
@@ -7650,7 +7676,7 @@
# Define $install_sh.
AC_DEFUN([AM_PROG_INSTALL_SH],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
AC_SUBST(install_sh)])
# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
@@ -7755,16 +7781,50 @@
rm -f confinc confmf
])
+# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 5
+
+# AM_PROG_CC_C_O
+# --------------
+# Like AC_PROG_CC_C_O, but changed for automake.
+AC_DEFUN([AM_PROG_CC_C_O],
+[AC_REQUIRE([AC_PROG_CC_C_O])dnl
+AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([compile])dnl
+# FIXME: we rely on the cache variable name because
+# there is no other way.
+set dummy $CC
+ac_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
+if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
+ # Losing compiler, so override with the script.
+ # FIXME: It is wrong to rewrite CC.
+ # But if we don't then we get into trouble of one sort or another.
+ # A longer-term fix would be to have automake use am__CC in this case,
+ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+ CC="$am_aux_dir/compile $CC"
+fi
+dnl Make sure AC_PROG_CC is never called again, or it will override our
+dnl setting of CC.
+m4_define([AC_PROG_CC],
+ [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
+])
+
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 4
+# serial 5
# AM_MISSING_PROG(NAME, PROGRAM)
# ------------------------------
@@ -7780,6 +7840,7 @@
# If it does, set am_missing_run to use it, otherwise, to nothing.
AC_DEFUN([AM_MISSING_HAS_RUN],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([missing])dnl
test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
# Use eval to expand $SHELL
if eval "$MISSING --run true"; then
@@ -7790,7 +7851,7 @@
fi
])
-# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -7798,60 +7859,23 @@
# AM_PROG_MKDIR_P
# ---------------
-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-#
-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
-# created by `make install' are always world readable, even if the
-# installer happens to have an overly restrictive umask (e.g. 077).
-# This was a mistake. There are at least two reasons why we must not
-# use `-m 0755':
-# - it causes special bits like SGID to be ignored,
-# - it may be too restrictive (some setups expect 775 directories).
-#
-# Do not use -m 0755 and let people choose whatever they expect by
-# setting umask.
-#
-# We cannot accept any implementation of `mkdir' that recognizes `-p'.
-# Some implementations (such as Solaris 8's) are not thread-safe: if a
-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
-# concurrently, both version can detect that a/ is missing, but only
-# one can create it and the other will error out. Consequently we
-# restrict ourselves to GNU make (using the --version option ensures
-# this.)
+# Check for `mkdir -p'.
AC_DEFUN([AM_PROG_MKDIR_P],
-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
- # We used to keeping the `.' as first argument, in order to
- # allow $(mkdir_p) to be used without argument. As in
- # $(mkdir_p) $(somedir)
- # where $(somedir) is conditionally defined. However this is wrong
- # for two reasons:
- # 1. if the package is installed by a user who cannot write `.'
- # make install will fail,
- # 2. the above comment should most certainly read
- # $(mkdir_p) $(DESTDIR)$(somedir)
- # so it does not work when $(somedir) is undefined and
- # $(DESTDIR) is not.
- # To support the latter case, we have to write
- # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
- # so the `.' trick is pointless.
- mkdir_p='mkdir -p --'
-else
- # On NextStep and OpenStep, the `mkdir' command does not
- # recognize any option. It will interpret all options as
- # directories to create, and then abort because `.' already
- # exists.
- for d in ./-p ./--version;
- do
- test -d $d && rmdir $d
- done
- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
- if test -f "$ac_aux_dir/mkinstalldirs"; then
- mkdir_p='$(mkinstalldirs)'
- else
- mkdir_p='$(install_sh) -d'
- fi
-fi
-AC_SUBST([mkdir_p])])
+[AC_PREREQ([2.60])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
+dnl while keeping a definition of mkdir_p for backward compatibility.
+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
+dnl Makefile.ins that do not define MKDIR_P, so we do our own
+dnl adjustment using top_builddir (which is defined more often than
+dnl MKDIR_P).
+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
+case $mkdir_p in
+ [[\\/$]]* | ?:[[\\/]]*) ;;
+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+])
# Helper functions for option handling. -*- Autoconf -*-
@@ -8144,9 +8168,21 @@
if test "$cross_compiling" != no; then
AC_CHECK_TOOL([STRIP], [strip], :)
fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
+# Copyright (C) 2006 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
+# This macro is traced by Automake.
+AC_DEFUN([_AM_SUBST_NOTMAKE])
+
# Check how to create a tarball. -*- Autoconf -*-
# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
Modified: libgpod/branches/upstream/current/bindings/Makefile.in
===================================================================
--- libgpod/branches/upstream/current/bindings/Makefile.in 2008-12-25 18:06:29 UTC (rev 338)
+++ libgpod/branches/upstream/current/bindings/Makefile.in 2009-01-24 10:34:00 UTC (rev 339)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -13,15 +13,11 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -50,10 +46,13 @@
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
- install-exec-recursive install-info-recursive \
- install-recursive installcheck-recursive installdirs-recursive \
- pdf-recursive ps-recursive uninstall-info-recursive \
- uninstall-recursive
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = python
@@ -61,8 +60,6 @@
ACLOCAL = @ACLOCAL@
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
AUTOCONF = @AUTOCONF@
@@ -89,35 +86,24 @@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
GDKPIXBUF_CFLAGS = @GDKPIXBUF_CFLAGS@
GDKPIXBUF_LIBS = @GDKPIXBUF_LIBS@
+GDKPIXBUF_REQ = @GDKPIXBUF_REQ@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_LIBS = @GLIB_LIBS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
+GTKDOC_CHECK = @GTKDOC_CHECK@
HALCALLOUTSDIR = @HALCALLOUTSDIR@
HAL_CFLAGS = @HAL_CFLAGS@
HAL_LIBS = @HAL_LIBS@
-HAVE_GDKPIXBUF_FALSE = @HAVE_GDKPIXBUF_FALSE@
-HAVE_GDKPIXBUF_TRUE = @HAVE_GDKPIXBUF_TRUE@
-HAVE_HAL_FALSE = @HAVE_HAL_FALSE@
-HAVE_HAL_TRUE = @HAVE_HAL_TRUE@
-HAVE_PYGOBJECT_FALSE = @HAVE_PYGOBJECT_FALSE@
-HAVE_PYGOBJECT_TRUE = @HAVE_PYGOBJECT_TRUE@
-HAVE_PYTHON_FALSE = @HAVE_PYTHON_FALSE@
-HAVE_PYTHON_TRUE = @HAVE_PYTHON_TRUE@
-HAVE_SGUTILS_FALSE = @HAVE_SGUTILS_FALSE@
-HAVE_SGUTILS_TRUE = @HAVE_SGUTILS_TRUE@
-HAVE_TAGLIB_FALSE = @HAVE_TAGLIB_FALSE@
-HAVE_TAGLIB_TRUE = @HAVE_TAGLIB_TRUE@
HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -158,15 +144,17 @@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LIBXML_CFLAGS = @LIBXML_CFLAGS@
+LIBXML_LIBS = @LIBXML_LIBS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -202,13 +190,13 @@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -220,6 +208,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -251,8 +240,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
@HAVE_PYTHON_TRUE at SUBDIRS = python
all: all-recursive
@@ -293,10 +285,6 @@
clean-libtool:
-rm -rf .libs _libs
-distclean-libtool:
- -rm -f libtool
-uninstall-info-am:
-
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
# To change the values of `make' variables: instead of editing Makefiles,
@@ -328,8 +316,7 @@
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
@@ -373,8 +360,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -399,8 +386,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -410,13 +397,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
@@ -430,22 +416,21 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -459,7 +444,7 @@
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
- || $(mkdir_p) "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
distdir=`$(am__cd) $(distdir) && pwd`; \
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -467,6 +452,8 @@
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$top_distdir" \
distdir="$$distdir/$$subdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
distdir) \
|| exit 1; \
fi; \
@@ -506,8 +493,7 @@
distclean: distclean-recursive
-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
- distclean-tags
+distclean-am: clean-am distclean-generic distclean-tags
dvi: dvi-recursive
@@ -521,12 +507,20 @@
install-data-am:
+install-dvi: install-dvi-recursive
+
install-exec-am:
+install-html: install-html-recursive
+
install-info: install-info-recursive
install-man:
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
installcheck-am:
maintainer-clean: maintainer-clean-recursive
@@ -545,22 +539,24 @@
ps-am:
-uninstall-am: uninstall-info-am
+uninstall-am:
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+ install-strip
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
- clean clean-generic clean-libtool clean-recursive ctags \
- ctags-recursive distclean distclean-generic distclean-libtool \
- distclean-recursive distclean-tags distdir dvi dvi-am html \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am check check-am clean clean-generic clean-libtool \
+ ctags ctags-recursive distclean distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
html-am info info-am install install-am install-data \
- install-data-am install-exec install-exec-am install-info \
- install-info-am install-man install-strip installcheck \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
installcheck-am installdirs installdirs-am maintainer-clean \
- maintainer-clean-generic maintainer-clean-recursive \
- mostlyclean mostlyclean-generic mostlyclean-libtool \
- mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
- uninstall uninstall-am uninstall-info-am
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+ uninstall uninstall-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
Modified: libgpod/branches/upstream/current/bindings/python/Makefile.am
===================================================================
--- libgpod/branches/upstream/current/bindings/python/Makefile.am 2008-12-25 18:06:29 UTC (rev 338)
+++ libgpod/branches/upstream/current/bindings/python/Makefile.am 2009-01-24 10:34:00 UTC (rev 339)
@@ -60,4 +60,7 @@
test:
$(MAKE) -C tests test
+
+uninstall-hook:
+ -rmdir --ignore-fail-on-non-empty $(DESTDIR)$(gpoddir)
endif
Modified: libgpod/branches/upstream/current/bindings/python/Makefile.in
===================================================================
--- libgpod/branches/upstream/current/bindings/python/Makefile.in 2008-12-25 18:06:29 UTC (rev 338)
+++ libgpod/branches/upstream/current/bindings/python/Makefile.in 2009-01-24 10:34:00 UTC (rev 339)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,11 @@
@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -64,30 +60,37 @@
@HAVE_PYTHON_TRUE@ $(top_builddir)/src/libgpod.la
@HAVE_PYTHON_TRUE at nodist__gpod_la_OBJECTS = _gpod_la-gpod_wrap.lo
_gpod_la_OBJECTS = $(nodist__gpod_la_OBJECTS)
+_gpod_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(_gpod_la_LDFLAGS) \
+ $(LDFLAGS) -o $@
@HAVE_PYTHON_TRUE at am__gpod_la_rpath = -rpath $(gpoddir)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ $(LDFLAGS) -o $@
SOURCES = $(nodist__gpod_la_SOURCES)
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
- install-exec-recursive install-info-recursive \
- install-recursive installcheck-recursive installdirs-recursive \
- pdf-recursive ps-recursive uninstall-info-recursive \
- uninstall-recursive
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
am__gpod_PYTHON_DIST = __init__.py gtkpod.py ipod.py
gpodPYTHON_INSTALL = $(INSTALL_DATA)
nodist_gpodPYTHON_INSTALL = $(INSTALL_DATA)
py_compile = $(top_srcdir)/py-compile
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
@@ -95,8 +98,6 @@
ACLOCAL = @ACLOCAL@
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
AUTOCONF = @AUTOCONF@
@@ -123,35 +124,24 @@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
GDKPIXBUF_CFLAGS = @GDKPIXBUF_CFLAGS@
GDKPIXBUF_LIBS = @GDKPIXBUF_LIBS@
+GDKPIXBUF_REQ = @GDKPIXBUF_REQ@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_LIBS = @GLIB_LIBS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
+GTKDOC_CHECK = @GTKDOC_CHECK@
HALCALLOUTSDIR = @HALCALLOUTSDIR@
HAL_CFLAGS = @HAL_CFLAGS@
HAL_LIBS = @HAL_LIBS@
-HAVE_GDKPIXBUF_FALSE = @HAVE_GDKPIXBUF_FALSE@
-HAVE_GDKPIXBUF_TRUE = @HAVE_GDKPIXBUF_TRUE@
-HAVE_HAL_FALSE = @HAVE_HAL_FALSE@
-HAVE_HAL_TRUE = @HAVE_HAL_TRUE@
-HAVE_PYGOBJECT_FALSE = @HAVE_PYGOBJECT_FALSE@
-HAVE_PYGOBJECT_TRUE = @HAVE_PYGOBJECT_TRUE@
-HAVE_PYTHON_FALSE = @HAVE_PYTHON_FALSE@
-HAVE_PYTHON_TRUE = @HAVE_PYTHON_TRUE@
-HAVE_SGUTILS_FALSE = @HAVE_SGUTILS_FALSE@
-HAVE_SGUTILS_TRUE = @HAVE_SGUTILS_TRUE@
-HAVE_TAGLIB_FALSE = @HAVE_TAGLIB_FALSE@
-HAVE_TAGLIB_TRUE = @HAVE_TAGLIB_TRUE@
HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -192,15 +182,17 @@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LIBXML_CFLAGS = @LIBXML_CFLAGS@
+LIBXML_LIBS = @LIBXML_LIBS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -236,13 +228,13 @@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -254,6 +246,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -285,8 +278,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
SUBDIRS = examples tests
EXTRA_DIST = \
README.in \
@@ -358,21 +354,21 @@
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
install-gpodLTLIBRARIES: $(gpod_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(gpoddir)" || $(mkdir_p) "$(DESTDIR)$(gpoddir)"
+ test -z "$(gpoddir)" || $(MKDIR_P) "$(DESTDIR)$(gpoddir)"
@list='$(gpod_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=install $(gpodLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(gpoddir)/$$f'"; \
- $(LIBTOOL) --mode=install $(gpodLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(gpoddir)/$$f"; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(gpodLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(gpoddir)/$$f'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(gpodLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(gpoddir)/$$f"; \
else :; fi; \
done
uninstall-gpodLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @set -x; list='$(gpod_LTLIBRARIES)'; for p in $$list; do \
+ @list='$(gpod_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(gpoddir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(gpoddir)/$$p"; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(gpoddir)/$$p'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(gpoddir)/$$p"; \
done
clean-gpodLTLIBRARIES:
@@ -384,7 +380,7 @@
rm -f "$${dir}/so_locations"; \
done
_gpod.la: $(_gpod_la_OBJECTS) $(_gpod_la_DEPENDENCIES)
- $(LINK) $(am__gpod_la_rpath) $(_gpod_la_LDFLAGS) $(_gpod_la_OBJECTS) $(_gpod_la_LIBADD) $(LIBS)
+ $(_gpod_la_LINK) $(am__gpod_la_rpath) $(_gpod_la_OBJECTS) $(_gpod_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -395,45 +391,41 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/_gpod_la-gpod_wrap.Plo at am__quote@
.c.o:
- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
- at am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ at am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
_gpod_la-gpod_wrap.lo: gpod_wrap.c
- at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(_gpod_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT _gpod_la-gpod_wrap.lo -MD -MP -MF "$(DEPDIR)/_gpod_la-gpod_wrap.Tpo" -c -o _gpod_la-gpod_wrap.lo `test -f 'gpod_wrap.c' || echo '$(srcdir)/'`gpod_wrap.c; \
- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/_gpod_la-gpod_wrap.Tpo" "$(DEPDIR)/_gpod_la-gpod_wrap.Plo"; else rm -f "$(DEPDIR)/_gpod_la-gpod_wrap.Tpo"; exit 1; fi
+ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(_gpod_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT _gpod_la-gpod_wrap.lo -MD -MP -MF $(DEPDIR)/_gpod_la-gpod_wrap.Tpo -c -o _gpod_la-gpod_wrap.lo `test -f 'gpod_wrap.c' || echo '$(srcdir)/'`gpod_wrap.c
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/_gpod_la-gpod_wrap.Tpo $(DEPDIR)/_gpod_la-gpod_wrap.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gpod_wrap.c' object='_gpod_la-gpod_wrap.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(_gpod_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o _gpod_la-gpod_wrap.lo `test -f 'gpod_wrap.c' || echo '$(srcdir)/'`gpod_wrap.c
+ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(_gpod_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o _gpod_la-gpod_wrap.lo `test -f 'gpod_wrap.c' || echo '$(srcdir)/'`gpod_wrap.c
mostlyclean-libtool:
-rm -f *.lo
clean-libtool:
-rm -rf .libs _libs
-
-distclean-libtool:
- -rm -f libtool
-uninstall-info-am:
install-gpodPYTHON: $(gpod_PYTHON)
@$(NORMAL_INSTALL)
- test -z "$(gpoddir)" || $(mkdir_p) "$(DESTDIR)$(gpoddir)"
+ test -z "$(gpoddir)" || $(MKDIR_P) "$(DESTDIR)$(gpoddir)"
@list='$(gpod_PYTHON)'; dlist=''; for p in $$list; do\
if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
if test -f $$b$$p; then \
@@ -461,7 +453,7 @@
done
install-nodist_gpodPYTHON: $(nodist_gpod_PYTHON)
@$(NORMAL_INSTALL)
- test -z "$(gpoddir)" || $(mkdir_p) "$(DESTDIR)$(gpoddir)"
+ test -z "$(gpoddir)" || $(MKDIR_P) "$(DESTDIR)$(gpoddir)"
@list='$(nodist_gpod_PYTHON)'; dlist=''; for p in $$list; do\
if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
if test -f $$b$$p; then \
@@ -519,8 +511,7 @@
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
@@ -564,8 +555,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -590,8 +581,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -601,13 +592,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
@@ -621,22 +611,21 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -650,7 +639,7 @@
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
- || $(mkdir_p) "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
distdir=`$(am__cd) $(distdir) && pwd`; \
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -658,6 +647,8 @@
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$top_distdir" \
distdir="$$distdir/$$subdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
distdir) \
|| exit 1; \
fi; \
@@ -669,7 +660,7 @@
installdirs: installdirs-recursive
installdirs-am:
for dir in "$(DESTDIR)$(gpoddir)" "$(DESTDIR)$(gpoddir)" "$(DESTDIR)$(gpoddir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) install-recursive
@@ -699,6 +690,7 @@
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+ at HAVE_PYTHON_FALSE@uninstall-hook:
clean: clean-recursive
clean-am: clean-generic clean-gpodLTLIBRARIES clean-libtool \
@@ -708,7 +700,7 @@
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
- distclean-libtool distclean-tags
+ distclean-tags
dvi: dvi-recursive
@@ -723,12 +715,20 @@
install-data-am: install-gpodLTLIBRARIES install-gpodPYTHON \
install-nodist_gpodPYTHON
+install-dvi: install-dvi-recursive
+
install-exec-am:
+install-html: install-html-recursive
+
install-info: install-info-recursive
install-man:
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
installcheck-am:
maintainer-clean: maintainer-clean-recursive
@@ -750,26 +750,30 @@
ps-am:
uninstall-am: uninstall-gpodLTLIBRARIES uninstall-gpodPYTHON \
- uninstall-info-am uninstall-nodist_gpodPYTHON
+ uninstall-nodist_gpodPYTHON
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+ install-strip uninstall-am
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
- clean clean-generic clean-gpodLTLIBRARIES clean-libtool \
- clean-recursive ctags ctags-recursive distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-recursive distclean-tags distdir dvi dvi-am html \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am check check-am clean clean-generic \
+ clean-gpodLTLIBRARIES clean-libtool ctags ctags-recursive \
+ distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
html-am info info-am install install-am install-data \
- install-data-am install-exec install-exec-am \
- install-gpodLTLIBRARIES install-gpodPYTHON install-info \
- install-info-am install-man install-nodist_gpodPYTHON \
- install-strip installcheck installcheck-am installdirs \
- installdirs-am maintainer-clean maintainer-clean-generic \
- maintainer-clean-recursive mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-gpodLTLIBRARIES install-gpodPYTHON \
+ install-html install-html-am install-info install-info-am \
+ install-man install-nodist_gpodPYTHON install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs installdirs-am \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
- uninstall-gpodLTLIBRARIES uninstall-gpodPYTHON \
- uninstall-info-am uninstall-nodist_gpodPYTHON
+ uninstall-gpodLTLIBRARIES uninstall-gpodPYTHON uninstall-hook \
+ uninstall-nodist_gpodPYTHON
README: README.in gpod.i
@@ -796,6 +800,9 @@
@HAVE_PYTHON_TRUE at test:
@HAVE_PYTHON_TRUE@ $(MAKE) -C tests test
+
+ at HAVE_PYTHON_TRUE@uninstall-hook:
+ at HAVE_PYTHON_TRUE@ -rmdir --ignore-fail-on-non-empty $(DESTDIR)$(gpoddir)
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Modified: libgpod/branches/upstream/current/bindings/python/README
===================================================================
--- libgpod/branches/upstream/current/bindings/python/README 2008-12-25 18:06:29 UTC (rev 338)
+++ libgpod/branches/upstream/current/bindings/python/README 2009-01-24 10:34:00 UTC (rev 339)
@@ -38,7 +38,6 @@
The current helper functions are:
-sw_get_artwork_thumbnails
sw_get_list_len
sw_get_photo
sw_get_photoalbum
Modified: libgpod/branches/upstream/current/bindings/python/examples/Makefile.am
===================================================================
--- libgpod/branches/upstream/current/bindings/python/examples/Makefile.am 2008-12-25 18:06:29 UTC (rev 338)
+++ libgpod/branches/upstream/current/bindings/python/examples/Makefile.am 2009-01-24 10:34:00 UTC (rev 339)
@@ -2,6 +2,7 @@
add_song.py \
coverart_fetch.py \
create_mp3_tags_from_itdb.py \
+ fix_empty_artist_field.py \
play_with_ipod_api.py \
play_with_smart_playlists.py \
save_photos.py \
Modified: libgpod/branches/upstream/current/bindings/python/examples/Makefile.in
===================================================================
--- libgpod/branches/upstream/current/bindings/python/examples/Makefile.in 2008-12-25 18:06:29 UTC (rev 338)
+++ libgpod/branches/upstream/current/bindings/python/examples/Makefile.in 2009-01-24 10:34:00 UTC (rev 339)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -13,15 +13,11 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -52,8 +48,6 @@
ACLOCAL = @ACLOCAL@
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
AUTOCONF = @AUTOCONF@
@@ -80,35 +74,24 @@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
GDKPIXBUF_CFLAGS = @GDKPIXBUF_CFLAGS@
GDKPIXBUF_LIBS = @GDKPIXBUF_LIBS@
+GDKPIXBUF_REQ = @GDKPIXBUF_REQ@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_LIBS = @GLIB_LIBS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
+GTKDOC_CHECK = @GTKDOC_CHECK@
HALCALLOUTSDIR = @HALCALLOUTSDIR@
HAL_CFLAGS = @HAL_CFLAGS@
HAL_LIBS = @HAL_LIBS@
-HAVE_GDKPIXBUF_FALSE = @HAVE_GDKPIXBUF_FALSE@
-HAVE_GDKPIXBUF_TRUE = @HAVE_GDKPIXBUF_TRUE@
-HAVE_HAL_FALSE = @HAVE_HAL_FALSE@
-HAVE_HAL_TRUE = @HAVE_HAL_TRUE@
-HAVE_PYGOBJECT_FALSE = @HAVE_PYGOBJECT_FALSE@
-HAVE_PYGOBJECT_TRUE = @HAVE_PYGOBJECT_TRUE@
-HAVE_PYTHON_FALSE = @HAVE_PYTHON_FALSE@
-HAVE_PYTHON_TRUE = @HAVE_PYTHON_TRUE@
-HAVE_SGUTILS_FALSE = @HAVE_SGUTILS_FALSE@
-HAVE_SGUTILS_TRUE = @HAVE_SGUTILS_TRUE@
-HAVE_TAGLIB_FALSE = @HAVE_TAGLIB_FALSE@
-HAVE_TAGLIB_TRUE = @HAVE_TAGLIB_TRUE@
HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -149,15 +132,17 @@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LIBXML_CFLAGS = @LIBXML_CFLAGS@
+LIBXML_LIBS = @LIBXML_LIBS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -193,13 +178,13 @@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -211,6 +196,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -242,12 +228,16 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
EXTRA_DIST = \
add_song.py \
coverart_fetch.py \
create_mp3_tags_from_itdb.py \
+ fix_empty_artist_field.py \
play_with_ipod_api.py \
play_with_smart_playlists.py \
save_photos.py \
@@ -292,10 +282,6 @@
clean-libtool:
-rm -rf .libs _libs
-
-distclean-libtool:
- -rm -f libtool
-uninstall-info-am:
tags: TAGS
TAGS:
@@ -304,22 +290,21 @@
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -364,7 +349,7 @@
distclean: distclean-am
-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
dvi: dvi-am
@@ -378,12 +363,20 @@
install-data-am:
+install-dvi: install-dvi-am
+
install-exec-am:
+install-html: install-html-am
+
install-info: install-info-am
install-man:
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -402,17 +395,20 @@
ps-am:
-uninstall-am: uninstall-info-am
+uninstall-am:
+.MAKE: install-am install-strip
+
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
distclean distclean-generic distclean-libtool distdir dvi \
dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-exec install-exec-am \
- install-info install-info-am install-man install-strip \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
- uninstall-info-am
+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
Added: libgpod/branches/upstream/current/bindings/python/examples/fix_empty_artist_field.py
===================================================================
--- libgpod/branches/upstream/current/bindings/python/examples/fix_empty_artist_field.py (rev 0)
+++ libgpod/branches/upstream/current/bindings/python/examples/fix_empty_artist_field.py 2009-01-24 10:34:00 UTC (rev 339)
@@ -0,0 +1,52 @@
+#!/usr/bin/python
+"""
+Fix iTunesDB tracks that have filename-like titles, but no artist
+-----------------------------------------------------------------
+
+Edit tracks that have no artist, but a title that looks like a
+MP3 filename, by trying to split the title into Artist and Title
+fields and then updating the fields in the iTunesDB.
+
+Author: Thomas Perl <thpinfo.com>, 2008-03-28
+"""
+
+import gpod
+import os.path
+import sys
+
+if len(sys.argv) == 1:
+ print 'Usage: python %s /path/to/ipod' % os.path.basename(sys.argv[0])
+ print __doc__
+ sys.exit(-1)
+else:
+ mount_point = sys.argv[-1]
+
+try:
+ db = gpod.Database(mount_point)
+except gpod.ipod.DatabaseException, dbe:
+ print 'Error opening your iPod database: %s' % dbe
+ sys.exit(-2)
+
+(updated, count) = (0, len(db))
+
+print 'Database opened: %d tracks to consider' % count
+for track in db:
+ # If the track has a ".mp3" title and no artist, try to fix it
+ if track['title'].lower().endswith('.mp3') and track['artist'] is None:
+ # Assume "Artist - Title.mp3" file names
+ items = os.path.splitext(track['title'])[0].split(' - ')
+ if len(items) == 2:
+ (artist, title) = items
+ print 'Correcting: %s' % track['title']
+ track['artist'] = artist
+ track['title'] = artist
+ updated += 1
+ else:
+ # Doesn't look like "Artist - Title.mp3", leave untouched
+ print 'Leaving untouched: %s' % repr(items)
+
+print 'Saving iPod database...'
+db.close()
+
+print 'Finished. %d tracks updated, %d tracks untouched' % (updated, count-updated)
+
Modified: libgpod/branches/upstream/current/bindings/python/examples/save_photos.py
===================================================================
--- libgpod/branches/upstream/current/bindings/python/examples/save_photos.py 2008-12-25 18:06:29 UTC (rev 338)
+++ libgpod/branches/upstream/current/bindings/python/examples/save_photos.py 2009-01-24 10:34:00 UTC (rev 339)
@@ -24,7 +24,7 @@
import gpod
-if not hasattr(gpod.Thumbnail, 'get_pixbuf'):
+if not hasattr(gpod.Photo, 'get_pixbuf'):
print 'Sorry, gpod was built without pixbuf support.'
raise SystemExit
@@ -35,9 +35,7 @@
print " ", album
for photo in album:
print " ", photo
- for thumbnail, n in zip(photo.thumbnails,
- range(0,len(photo.thumbnails))):
- print " ", thumbnail
- thumbnail.get_pixbuf().save("/tmp/%d-%d.png" % (photo['id'],n),"png")
+ for w,h,s in ((0,0,'small'), (-1,-1,'large')):
+ photo.get_pixbuf(w,h).save("/tmp/%d-%s.png" % (photo['id'],s),"png")
photodb.close()
Modified: libgpod/branches/upstream/current/bindings/python/gpod.i.in
===================================================================
--- libgpod/branches/upstream/current/bindings/python/gpod.i.in 2008-12-25 18:06:29 UTC (rev 338)
+++ libgpod/branches/upstream/current/bindings/python/gpod.i.in 2009-01-24 10:34:00 UTC (rev 339)
@@ -21,7 +21,7 @@
License along with this code; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- $Id: gpod.i.in 1674 2007-08-08 07:14:36Z nicholas $
+ $Id: gpod.i.in 2108 2008-08-20 17:37:32Z tmzullinger $
Please send any fixes, improvements or suggestions to
<nick-gtkpod at nickpiper co uk>.
@@ -82,7 +82,6 @@
PyObject* sw_get_photoalbum(GList *list, gint index);
PyObject* sw_get_photos(Itdb_PhotoDB *db);
PyObject* sw_get_photo(GList *list, gint index);
-PyObject* sw_get_artwork_thumbnails(Itdb_Artwork *artwork);
PyObject* sw_get_photoalbum_members(Itdb_PhotoAlbum *album);
PyObject* sw_ipod_device_to_dict(Itdb_Device *device);
void sw__track_extra_destroy (PyObject *data);
@@ -208,18 +207,6 @@
return list;
}
- PyObject* sw_get_artwork_thumbnails(Itdb_Artwork *artwork) {
- PyObject *list;
- gint i;
- GList *l;
- list = PyList_New(g_list_length(artwork->thumbnails));
- for (l = artwork->thumbnails, i = 0; l; l = l->next, ++i) {
- PyList_SET_ITEM(list, i, SWIG_NewPointerObj((void*)(l->data), SWIGTYPE_p__Itdb_Thumb, 0));
- }
- return list;
- }
-
-
PyObject* sw_get_photoalbum(GList *list, gint index) {
GList *position;
if ( (index >= g_list_length(list)) || index < 0 ) {
@@ -487,9 +474,11 @@
#ifdef HAVE_GDKPIXBUF
#ifdef HAVE_PYGOBJECT
-%typemap(out) gpointer itdb_thumb_get_gdk_pixbuf {
+%typemap(out) gpointer itdb_artwork_get_pixbuf {
$result = pygobject_new((GObject *)$1);
- g_object_unref($1);
+ if ($1) {
+ g_object_unref($1);
+ }
}
%typemap(in) gpointer pixbuf {
@@ -515,7 +504,6 @@
PyObject* sw_get_photos(Itdb_PhotoDB *db);
PyObject* sw_get_photo(GList *list, gint index);
PyObject* sw_get_photoalbum_members(Itdb_PhotoAlbum *album);
-PyObject* sw_get_artwork_thumbnails(Itdb_Artwork *artwork);
PyObject* sw_ipod_device_to_dict(Itdb_Device *device);
%include "@top_srcdir@/src/itdb.h"
Modified: libgpod/branches/upstream/current/bindings/python/gtkpod.py
===================================================================
--- libgpod/branches/upstream/current/bindings/python/gtkpod.py 2008-12-25 18:06:29 UTC (rev 338)
+++ libgpod/branches/upstream/current/bindings/python/gtkpod.py 2009-01-24 10:34:00 UTC (rev 339)
@@ -1,9 +1,17 @@
"""Read and write Gtkpod extended info files."""
-import sha
import os
import types
+# The hashlib module is only available in python >= 2.5,
+# while the sha module is deprecated in 2.6.
+try:
+ import hashlib
+ sha1 = hashlib.sha1
+except ImportError:
+ import sha
+ sha1 = sha.sha
+
# This file is originally stolen from pypod-0.5.0
# http://superduper.net/index.py?page=pypod
# and reworked significantly since then.
@@ -21,7 +29,7 @@
import struct
# only hash the first 16k
hash_len = 4*4096
- hash = sha.sha()
+ hash = sha1()
size = os.path.getsize(filename)
hash.update(struct.pack("<L", size))
hash.update(open(filename).read(hash_len))
Modified: libgpod/branches/upstream/current/bindings/python/ipod.py
===================================================================
--- libgpod/branches/upstream/current/bindings/python/ipod.py 2008-12-25 18:06:29 UTC (rev 338)
+++ libgpod/branches/upstream/current/bindings/python/ipod.py 2009-01-24 10:34:00 UTC (rev 339)
@@ -111,6 +111,9 @@
if not gpod.itdb_write_file(self._itdb, self._itdb_file, None):
raise DatabaseException("Unable to save iTunes database %s" % self)
+ if gpod.itdb_get_mountpoint(self._itdb):
+ if not gpod.itdb_shuffle_write(self._itdb, None):
+ raise DatabaseException("Unable to save shuffle database on %s" % self._itdb.mountpoint)
itdbext_file = "%s.ext" % (self._itdb_file)
gtkpod.write(itdbext_file, self, self._itdb_file)
@@ -152,7 +155,7 @@
gpod.itdb_track_add(self._itdb, track._track, pos)
track.__database = self # so the db doesn't get gc'd
- def remove(self, item, harddisk=False, ipod=True):
+ def remove(self, item, harddisk=False, ipod=True, quiet=False):
"""Remove a playlist or track from a database.
item is either a playlist or track object.
@@ -161,6 +164,8 @@
If ipod is True the item will be removed from the iPod.
+ If quiet is True no message will be printed for removed tracks
+
"""
if isinstance(item, Playlist):
@@ -186,7 +191,8 @@
filename = item.ipod_filename()
if filename and os.path.exists(filename):
os.unlink(filename)
- print "unlinked %s" % filename
+ if not quiet:
+ print "unlinked %s" % filename
gpod.itdb_track_unlink(item._track)
else:
raise DatabaseException("Unable to remove a %s from database" % type(item))
@@ -291,13 +297,18 @@
k.startswith("reserved") or
k == "chapterdata")]
- def __init__(self, filename=None,
+ def __init__(self, filename=None, mediatype=gpod.ITDB_MEDIATYPE_AUDIO,
proxied_track=None, podcast=False, ownerdb=None):
"""Create a Track object.
If from_file or filename is set, the file specified will be
used to create the track.
+ The mediatype parameter sets the mediatype for the track. It
+ defaults to audio, unless 'podcast' is True, in which case it
+ is set to podcast. See gpod.ITDB_MEDIATYPE_* for other valid
+ mediatypes.
+
If proxied_track is set, it is expected to be an Itdb_Track
object.
@@ -315,7 +326,7 @@
self._set_userdata_utf8('filename',filename)
possible_image = os.path.join(os.path.split(filename)[0],'folder.jpg')
if os.path.exists(possible_image):
- self.set_thumbnail(possible_image)
+ self.set_coverart_from_file(possible_image)
try:
audiofile = MP3(self._userdata_into_default_locale('filename'))
except Exception, e:
@@ -351,6 +362,8 @@
else:
self._track = gpod.itdb_track_new()
self.set_podcast(podcast)
+ if not 'mediatype' in self:
+ self['mediatype'] = mediatype
def _set_userdata_utf8(self, key, value):
self['userdata']['%s_locale' % key] = value
@@ -390,8 +403,10 @@
pixbuf)
def get_coverart(self):
- return Photo(proxied_photo=self._track.artwork,
- ownerdb=self._track.itdb)
+ if gpod.itdb_track_has_thumbnails(self._track):
+ return Photo(proxied_photo=self._track.artwork,
+ ownerdb=self._track.itdb)
+ return None
def copy_to_ipod(self):
"""Copy the track to the iPod."""
@@ -434,6 +449,7 @@
self['skip_when_shuffling'] = 0x01
self['remember_playback_position'] = 0x01
self['flag4'] = 0x01 # Show Title/Album on the 'Now Playing' page
+ self['mediatype'] = gpod.ITDB_MEDIATYPE_PODCAST
else:
self['skip_when_shuffling'] = 0x00
self['remember_playback_position'] = 0x00
@@ -448,13 +464,38 @@
repr(self['title']),
repr(self['album']))
+ def __iter__(self):
+ for k in self.keys():
+ yield k
+
+ def has_key(self, key):
+ try:
+ value = self[key]
+ except KeyError:
+ return False
+ return True
+
+ def __contains__(self, key):
+ return self.has_key(key)
+
+ def iteritems(self):
+ for k in self:
+ yield (k, self[k])
+
+ def iterkeys(self):
+ return self.__iter__()
+
+ def itervalues(self):
+ for _, v in self.iteritems():
+ yield v
+
def keys(self):
return list(self._proxied_attributes)
- def items(self):
+ def values(self):
return [self[k] for k in self._proxied_attributes]
- def pairs(self):
+ def items(self):
return [(k, self[k]) for k in self._proxied_attributes]
def __getitem__(self, item):
@@ -931,13 +972,38 @@
self['digitized_date'].strftime("%c"),
repr(self['artwork_size']))
+ def __iter__(self):
+ for k in self.keys():
+ yield k
+
+ def has_key(self, key):
+ try:
+ value = self[key]
+ except KeyError:
+ return False
+ return True
+
+ def __contains__(self, key):
+ return self.has_key(key)
+
+ def iteritems(self):
+ for k in self:
+ yield (k, self[k])
+
+ def iterkeys(self):
+ return self.__iter__()
+
+ def itervalues(self):
+ for _, v in self.iteritems():
+ yield v
+
def keys(self):
return list(self._proxied_attributes)
- def items(self):
+ def values(self):
return [self[k] for k in self._proxied_attributes]
- def pairs(self):
+ def items(self):
return [(k, self[k]) for k in self._proxied_attributes]
def __getitem__(self, item):
@@ -961,69 +1027,18 @@
else:
raise KeyError('No such key: %s' % item)
- def get_thumbnails(self):
- return [Thumbnail(proxied_thumbnail=t,
- ownerobject=self) for t in gpod.sw_get_artwork_thumbnails(
- self._photo)]
+ if pixbuf_support:
+ def get_pixbuf(self, width=-1, height=-1):
+ """Get a pixbuf from a Photo.
- thumbnails = property(get_thumbnails)
+ width: the width of the pixbuf to retrieve, -1 for the biggest
+ possible size and 0 for the smallest possible size (with no scaling)
-class Thumbnail:
- """A thumbnail in an Photo."""
-
- _proxied_attributes = [k for k in gpod._Itdb_Thumb.__dict__.keys()
- if not (k.startswith("_") or k.startswith("reserved"))]
-
- def __init__(self, proxied_thumbnail=None, ownerobject=None):
- """Create a thumbnail object."""
-
- if not proxied_thumbnail:
- raise NotImplemented("Can't create new Thumbnails from scratch, create Photos instead")
-
- self._thumbnail = proxied_thumbnail
- self.__ownerobject = ownerobject
-
- def __str__(self):
- return self.__repr__()
-
- def __repr__(self):
- return "<Thumbnail Filename:%s Size:%d Width:%d Height:%d>" % (
- repr(self['filename']),
- self['size'],
- self['width'],
- self['height'])
-
- def keys(self):
- return list(self._proxied_attributes)
-
- def items(self):
- return [self[k] for k in self._proxied_attributes]
-
- def pairs(self):
- return [(k, self[k]) for k in self._proxied_attributes]
-
- def __getitem__(self, item):
- if item in self._proxied_attributes:
- return getattr(self._thumbnail, item)
- else:
- raise KeyError('No such key: %s' % item)
-
- def __setitem__(self, item, value):
- if type(value) == types.UnicodeType:
- value = value.encode('UTF-8','replace')
- if item in self._proxied_attributes:
- return setattr(self._thumbnail, item, value)
- else:
- raise KeyError('No such key: %s' % item)
-
- if pixbuf_support:
- def get_pixbuf(self):
- # this deals with coverart and photo albums
- if hasattr(self.__ownerobject._database,"_itdb"):
- return gpod.itdb_thumb_get_gdk_pixbuf(
- self.__ownerobject._database._itdb.device,
- self._thumbnail)
- else:
- return gpod.itdb_thumb_get_gdk_pixbuf(
- self.__ownerobject._database.device,
- self._thumbnail)
+ height: the height of the pixbuf to retrieve, -1 for the biggest
+ possible size and 0 for the smallest possible size (with no scaling)
+ """
+ device = self._database.device
+ if hasattr(self._database,"_itdb"):
+ device = self._database._itdb.device
+ return gpod.itdb_artwork_get_pixbuf(device, self._photo,
+ width, height)
Modified: libgpod/branches/upstream/current/bindings/python/tests/Makefile.in
===================================================================
--- libgpod/branches/upstream/current/bindings/python/tests/Makefile.in 2008-12-25 18:06:29 UTC (rev 338)
+++ libgpod/branches/upstream/current/bindings/python/tests/Makefile.in 2009-01-24 10:34:00 UTC (rev 339)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -13,15 +13,11 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -52,8 +48,6 @@
ACLOCAL = @ACLOCAL@
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
AUTOCONF = @AUTOCONF@
@@ -80,35 +74,24 @@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
GDKPIXBUF_CFLAGS = @GDKPIXBUF_CFLAGS@
GDKPIXBUF_LIBS = @GDKPIXBUF_LIBS@
+GDKPIXBUF_REQ = @GDKPIXBUF_REQ@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_LIBS = @GLIB_LIBS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
+GTKDOC_CHECK = @GTKDOC_CHECK@
HALCALLOUTSDIR = @HALCALLOUTSDIR@
HAL_CFLAGS = @HAL_CFLAGS@
HAL_LIBS = @HAL_LIBS@
-HAVE_GDKPIXBUF_FALSE = @HAVE_GDKPIXBUF_FALSE@
-HAVE_GDKPIXBUF_TRUE = @HAVE_GDKPIXBUF_TRUE@
-HAVE_HAL_FALSE = @HAVE_HAL_FALSE@
-HAVE_HAL_TRUE = @HAVE_HAL_TRUE@
-HAVE_PYGOBJECT_FALSE = @HAVE_PYGOBJECT_FALSE@
-HAVE_PYGOBJECT_TRUE = @HAVE_PYGOBJECT_TRUE@
-HAVE_PYTHON_FALSE = @HAVE_PYTHON_FALSE@
-HAVE_PYTHON_TRUE = @HAVE_PYTHON_TRUE@
-HAVE_SGUTILS_FALSE = @HAVE_SGUTILS_FALSE@
-HAVE_SGUTILS_TRUE = @HAVE_SGUTILS_TRUE@
-HAVE_TAGLIB_FALSE = @HAVE_TAGLIB_FALSE@
-HAVE_TAGLIB_TRUE = @HAVE_TAGLIB_TRUE@
HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -149,15 +132,17 @@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LIBXML_CFLAGS = @LIBXML_CFLAGS@
+LIBXML_LIBS = @LIBXML_LIBS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -193,13 +178,13 @@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -211,6 +196,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -242,8 +228,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
EXTRA_DIST = \
resources \
tests.py
@@ -286,10 +275,6 @@
clean-libtool:
-rm -rf .libs _libs
-
-distclean-libtool:
- -rm -f libtool
-uninstall-info-am:
tags: TAGS
TAGS:
@@ -298,22 +283,21 @@
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -361,7 +345,7 @@
distclean: distclean-am
-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
dvi: dvi-am
@@ -375,12 +359,20 @@
install-data-am:
+install-dvi: install-dvi-am
+
install-exec-am:
+install-html: install-html-am
+
install-info: install-info-am
install-man:
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -399,17 +391,21 @@
ps-am:
-uninstall-am: uninstall-info-am
+uninstall-am:
+.MAKE: install-am install-strip
+
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
dist-hook distclean distclean-generic distclean-libtool \
distdir dvi dvi-am html html-am info info-am install \
- install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
+ install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- uninstall uninstall-am uninstall-info-am
+ uninstall uninstall-am
dist-hook:
Modified: libgpod/branches/upstream/current/bindings/python/tests/tests.py
===================================================================
--- libgpod/branches/upstream/current/bindings/python/tests/tests.py 2008-12-25 18:06:29 UTC (rev 338)
+++ libgpod/branches/upstream/current/bindings/python/tests/tests.py 2009-01-24 10:34:00 UTC (rev 339)
@@ -18,7 +18,7 @@
os.mkdir(music_dir)
for i in range(0,20):
os.mkdir(os.path.join(music_dir,"f%02d" % i))
- self.db = gpod.Database(self.mp)
+ self.db = gpod.Database(self.mp)
def tearDown(self):
shutil.rmtree(self.mp)
@@ -38,13 +38,13 @@
trackname = os.path.join(self.mp,
'iPod_Control',
'tiny.mp3')
-
+
pl = self.db.new_Playlist('my title')
self.assertEqual(len(pl),0)
t = self.db.new_Track(filename=trackname)
pl.add(t)
self.assertEqual(len(pl),1)
-
+
def testAddTrack(self):
trackname = os.path.join(self.mp,
'iPod_Control',
@@ -62,7 +62,7 @@
track = self.db[0]
track_file = track.ipod_filename()
self.assertEqual(len(self.db),n)
- self.db.remove(track, ipod=True)
+ self.db.remove(track, ipod=True, quiet=True)
self.failIf(os.path.exists(track_file))
def testDatestampSetting(self):
@@ -79,9 +79,14 @@
t['time_added'] = time.mktime(date.timetuple())
self.assertEqual(date.year, t['time_added'].year)
self.assertEqual(date.second, t['time_added'].second)
-
+
+ def testTrackContainerMethods(self):
+ self.testAddTrack()
+ track = self.db[0]
+ self.failUnless('title' in track)
+
def testVersion(self):
- self.assertEqual(type(gpod.version_info),
+ self.assertEqual(type(gpod.version_info),
types.TupleType)
class TestPhotoDatabase(unittest.TestCase):
@@ -134,7 +139,7 @@
def testEnumeratePhotoAlbums(self):
[photo for photo in self.db.PhotoAlbums]
-
+
def testAddPhoto(self):
photoname = os.path.join(self.mp,
'iPod_Control',
@@ -182,10 +187,10 @@
for album in self.db.PhotoAlbums:
[photo for photo in album]
- def testEnumeratePhotosThumbs(self):
- for album in self.db.PhotoAlbums:
- for photo in album:
- [thumb for thumb in photo.thumbnails]
-
+ def testPhotoContainerMethods(self):
+ self.testAddPhoto()
+ photo = self.db[0]
+ self.failUnless('id' in photo)
+
if __name__ == '__main__':
unittest.main()
Modified: libgpod/branches/upstream/current/config.guess
===================================================================
--- libgpod/branches/upstream/current/config.guess 2008-12-25 18:06:29 UTC (rev 338)
+++ libgpod/branches/upstream/current/config.guess 2009-01-24 10:34:00 UTC (rev 339)
@@ -1,10 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-# Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+# Free Software Foundation, Inc.
-timestamp='2007-03-06'
+timestamp='2008-01-08'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -56,8 +56,8 @@
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -330,7 +330,7 @@
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
- i86pc:SunOS:5.*:*)
+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
sun4*:SunOS:6*:*)
@@ -532,7 +532,7 @@
echo rs6000-ibm-aix3.2
fi
exit ;;
- *:AIX:*:[45])
+ *:AIX:*:[456])
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
IBM_ARCH=rs6000
@@ -793,12 +793,15 @@
exit ;;
*:Interix*:[3456]*)
case ${UNAME_MACHINE} in
- x86)
+ x86)
echo i586-pc-interix${UNAME_RELEASE}
exit ;;
EM64T | authenticamd)
echo x86_64-unknown-interix${UNAME_RELEASE}
exit ;;
+ IA64)
+ echo ia64-unknown-interix${UNAME_RELEASE}
+ exit ;;
esac ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
@@ -833,7 +836,14 @@
echo ${UNAME_MACHINE}-pc-minix
exit ;;
arm*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ eval $set_cc_for_build
+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+ | grep -q __ARM_EABI__
+ then
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ else
+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+ fi
exit ;;
avr32*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -954,8 +964,8 @@
x86_64:Linux:*:*)
echo x86_64-unknown-linux-gnu
exit ;;
- xtensa:Linux:*:*)
- echo xtensa-unknown-linux-gnu
+ xtensa*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
i*86:Linux:*:*)
# The BFD linker knows what the default object file format is, so
Modified: libgpod/branches/upstream/current/config.h.in
===================================================================
--- libgpod/branches/upstream/current/config.h.in 2008-12-25 18:06:29 UTC (rev 338)
+++ libgpod/branches/upstream/current/config.h.in 2009-01-24 10:34:00 UTC (rev 339)
@@ -31,6 +31,9 @@
/* Define if your <locale.h> file defines LC_MESSAGES. */
#undef HAVE_LC_MESSAGES
+/* Whether libxml is installed, it's used to parse SysInfoExtended */
+#undef HAVE_LIBXML
+
/* Define to 1 if you have the <locale.h> header file. */
#undef HAVE_LOCALE_H
@@ -65,6 +68,9 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
+#undef NO_MINUS_C_MINUS_O
+
/* Name of package */
#undef PACKAGE
Modified: libgpod/branches/upstream/current/config.sub
===================================================================
--- libgpod/branches/upstream/current/config.sub 2008-12-25 18:06:29 UTC (rev 338)
+++ libgpod/branches/upstream/current/config.sub 2009-01-24 10:34:00 UTC (rev 339)
@@ -1,10 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-# Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+# Free Software Foundation, Inc.
-timestamp='2007-01-18'
+timestamp='2008-01-16'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -72,8 +72,8 @@
version="\
GNU config.sub ($timestamp)
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -369,10 +369,14 @@
| v850-* | v850e-* | vax-* \
| we32k-* \
| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
- | xstormy16-* | xtensa-* \
+ | xstormy16-* | xtensa*-* \
| ymp-* \
| z8k-*)
;;
+ # Recognize the basic CPU types without company name, with glob match.
+ xtensa*)
+ basic_machine=$basic_machine-unknown
+ ;;
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
386bsd)
@@ -443,6 +447,14 @@
basic_machine=ns32k-sequent
os=-dynix
;;
+ blackfin)
+ basic_machine=bfin-unknown
+ os=-linux
+ ;;
+ blackfin-*)
+ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+ os=-linux
+ ;;
c90)
basic_machine=c90-cray
os=-unicos
@@ -475,8 +487,8 @@
basic_machine=craynv-cray
os=-unicosmp
;;
- cr16c)
- basic_machine=cr16c-unknown
+ cr16)
+ basic_machine=cr16-unknown
os=-elf
;;
crds | unos)
@@ -668,6 +680,14 @@
basic_machine=m68k-isi
os=-sysv
;;
+ m68knommu)
+ basic_machine=m68k-unknown
+ os=-linux
+ ;;
+ m68knommu-*)
+ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+ os=-linux
+ ;;
m88k-omron*)
basic_machine=m88k-omron
;;
@@ -683,6 +703,10 @@
basic_machine=i386-pc
os=-mingw32
;;
+ mingw32ce)
+ basic_machine=arm-unknown
+ os=-mingw32ce
+ ;;
miniframe)
basic_machine=m68000-convergent
;;
@@ -809,6 +833,14 @@
basic_machine=i860-intel
os=-osf
;;
+ parisc)
+ basic_machine=hppa-unknown
+ os=-linux
+ ;;
+ parisc-*)
+ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+ os=-linux
+ ;;
pbd)
basic_machine=sparc-tti
;;
@@ -1017,6 +1049,10 @@
basic_machine=tic6x-unknown
os=-coff
;;
+ tile*)
+ basic_machine=tile-unknown
+ os=-linux-gnu
+ ;;
tx39)
basic_machine=mipstx39-unknown
;;
Modified: libgpod/branches/upstream/current/configure
===================================================================
--- libgpod/branches/upstream/current/configure 2008-12-25 18:06:29 UTC (rev 338)
+++ libgpod/branches/upstream/current/configure 2009-01-24 10:34:00 UTC (rev 339)
@@ -813,6 +813,7 @@
INSTALL_PROGRAM
INSTALL_SCRIPT
INSTALL_DATA
+am__isrc
CYGPATH_W
PACKAGE
VERSION
@@ -897,6 +898,9 @@
INTLTOOL_THEME_RULE
INTLTOOL_SERVICE_RULE
INTLTOOL_POLICY_RULE
+XGETTEXT
+MSGMERGE
+MSGFMT
INTLTOOL_EXTRACT
INTLTOOL_MERGE
INTLTOOL_UPDATE
@@ -906,6 +910,10 @@
PKG_CONFIG
LIBGPOD_CFLAGS
LIBGPOD_LIBS
+GLIB_CFLAGS
+GLIB_LIBS
+WITH_INTERNAL_GCHECKSUM_TRUE
+WITH_INTERNAL_GCHECKSUM_FALSE
SGUTILS_LIBS
HAVE_SGUTILS_TRUE
HAVE_SGUTILS_FALSE
@@ -918,20 +926,21 @@
TAGLIB_LIBS
HAVE_TAGLIB_TRUE
HAVE_TAGLIB_FALSE
+LIBXML_CFLAGS
+LIBXML_LIBS
GDKPIXBUF_CFLAGS
GDKPIXBUF_LIBS
HAVE_GDKPIXBUF_TRUE
HAVE_GDKPIXBUF_FALSE
+GDKPIXBUF_REQ
PYGOBJECT_CFLAGS
PYGOBJECT_LIBS
HAVE_PYGOBJECT_TRUE
HAVE_PYGOBJECT_FALSE
GETTEXT_PACKAGE
USE_NLS
-MSGFMT
MSGFMT_OPTS
GMSGFMT
-XGETTEXT
CATALOGS
CATOBJEXT
GMOFILES
@@ -943,6 +952,7 @@
POSUB
MKINSTALLDIRS
HTML_DIR
+GTKDOC_CHECK
ENABLE_GTK_DOC_TRUE
ENABLE_GTK_DOC_FALSE
GTK_DOC_USE_LIBTOOL_TRUE
@@ -983,10 +993,14 @@
PKG_CONFIG
LIBGPOD_CFLAGS
LIBGPOD_LIBS
+GLIB_CFLAGS
+GLIB_LIBS
HAL_CFLAGS
HAL_LIBS
TAGLIB_CFLAGS
TAGLIB_LIBS
+LIBXML_CFLAGS
+LIBXML_LIBS
GDKPIXBUF_CFLAGS
GDKPIXBUF_LIBS
PYGOBJECT_CFLAGS
@@ -1577,6 +1591,7 @@
--enable-fast-install[=PKGS]
optimize for fast installation [default=yes]
--disable-libtool-lock avoid locking (might break parallel builds)
+ --disable-libxml SysInfoExtended won't be parsed
--disable-gdk-pixbuf ArtworkDB will be disabled without gdk-pixbuf
--disable-pygobject Python API will lack GdkPixbuf support without
PyGOBJECT
@@ -1590,6 +1605,8 @@
--with-pic try to use only PIC/non-PIC objects [default=use
both]
--with-tags[=TAGS] include additional configurations [automatic]
+ --with-internal-gchecksum
+ Build using internal copy of gchecksum
--without-hal Disable HAL support
--with-hal-callouts-dir=DIR
Directory where HAL expects its callout scripts to
@@ -1616,11 +1633,16 @@
C compiler flags for LIBGPOD, overriding pkg-config
LIBGPOD_LIBS
linker flags for LIBGPOD, overriding pkg-config
+ GLIB_CFLAGS C compiler flags for GLIB, overriding pkg-config
+ GLIB_LIBS linker flags for GLIB, overriding pkg-config
HAL_CFLAGS C compiler flags for HAL, overriding pkg-config
HAL_LIBS linker flags for HAL, overriding pkg-config
TAGLIB_CFLAGS
C compiler flags for TAGLIB, overriding pkg-config
TAGLIB_LIBS linker flags for TAGLIB, overriding pkg-config
+ LIBXML_CFLAGS
+ C compiler flags for LIBXML, overriding pkg-config
+ LIBXML_LIBS linker flags for LIBXML, overriding pkg-config
GDKPIXBUF_CFLAGS
C compiler flags for GDKPIXBUF, overriding pkg-config
GDKPIXBUF_LIBS
@@ -2063,7 +2085,7 @@
# LIBGPOD_SO_VERSION - see comments
#
LIBGPOD_MAJOR_VERSION=0
-LIBGPOD_MINOR_VERSION=6
+LIBGPOD_MINOR_VERSION=7
LIBGPOD_MICRO_VERSION=0
# If you need a modifier for the version number.
# Normally empty, but can be used to make "fixup" releases.
@@ -2076,7 +2098,7 @@
# changes to the signature and the semantic)
# ? :+1 : ? == just internal changes
# CURRENT : REVISION : AGE
-LIBGPOD_SO_VERSION=3:0:0
+LIBGPOD_SO_VERSION=4:0:0
@@ -2084,7 +2106,8 @@
-am__api_version="1.9"
+am__api_version='1.10'
+
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
if test -f "$ac_dir/install-sh"; then
@@ -2267,39 +2290,54 @@
echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
-if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
- # We used to keeping the `.' as first argument, in order to
- # allow $(mkdir_p) to be used without argument. As in
- # $(mkdir_p) $(somedir)
- # where $(somedir) is conditionally defined. However this is wrong
- # for two reasons:
- # 1. if the package is installed by a user who cannot write `.'
- # make install will fail,
- # 2. the above comment should most certainly read
- # $(mkdir_p) $(DESTDIR)$(somedir)
- # so it does not work when $(somedir) is undefined and
- # $(DESTDIR) is not.
- # To support the latter case, we have to write
- # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
- # so the `.' trick is pointless.
- mkdir_p='mkdir -p --'
+{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
+if test -z "$MKDIR_P"; then
+ if test "${ac_cv_path_mkdir+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- # On NextStep and OpenStep, the `mkdir' command does not
- # recognize any option. It will interpret all options as
- # directories to create, and then abort because `.' already
- # exists.
- for d in ./-p ./--version;
- do
- test -d $d && rmdir $d
- done
- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
- if test -f "$ac_aux_dir/mkinstalldirs"; then
- mkdir_p='$(mkinstalldirs)'
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in mkdir gmkdir; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+ case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+ 'mkdir (GNU coreutils) '* | \
+ 'mkdir (coreutils) '* | \
+ 'mkdir (fileutils) '4.1*)
+ ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+ break 3;;
+ esac
+ done
+ done
+done
+IFS=$as_save_IFS
+
+fi
+
+ if test "${ac_cv_path_mkdir+set}" = set; then
+ MKDIR_P="$ac_cv_path_mkdir -p"
else
- mkdir_p='$(install_sh) -d'
+ # As a last resort, use the slow shell script. Don't cache a
+ # value for MKDIR_P within a source directory, because that will
+ # break other packages using the cache if that directory is
+ # removed, or if the value is a relative name.
+ test -d ./--version && rmdir ./--version
+ MKDIR_P="$ac_install_sh -d"
fi
fi
+{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+echo "${ECHO_T}$MKDIR_P" >&6; }
+mkdir_p="$MKDIR_P"
+case $mkdir_p in
+ [\\/$]* | ?:[\\/]*) ;;
+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+
for ac_prog in gawk mawk nawk awk
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -2381,12 +2419,16 @@
fi
rmdir .tst 2>/dev/null
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
- test -f $srcdir/config.status; then
- { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+ # is not polluted with repeated "-I."
+ am__isrc=' -I$(srcdir)'
+ # test to see if srcdir already configured
+ if test -f $srcdir/config.status; then
+ { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
{ (exit 1); exit 1; }; }
+ fi
fi
# test whether we have cygpath
@@ -2429,7 +2471,7 @@
MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
# Installed binaries are usually stripped using `strip' when the user
# run `make install-strip'. However `strip' might not be the right
@@ -2533,7 +2575,7 @@
fi
fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
@@ -2562,9 +2604,7 @@
{ echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
-
-
-if test $USE_MAINTAINER_MODE = yes; then
+ if test $USE_MAINTAINER_MODE = yes; then
MAINTAINER_MODE_TRUE=
MAINTAINER_MODE_FALSE='#'
else
@@ -3553,9 +3593,7 @@
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
fi
-
-
-if test "x$enable_dependency_tracking" != xno; then
+ if test "x$enable_dependency_tracking" != xno; then
AMDEP_TRUE=
AMDEP_FALSE='#'
else
@@ -3565,7 +3603,6 @@
-
depcc="$CC" am_compiler_list=
{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
@@ -3633,6 +3670,7 @@
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
$SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
>/dev/null 2>conftest.err &&
+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -3662,9 +3700,7 @@
echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
-
-if
+ if
test "x$enable_dependency_tracking" != xno \
&& test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
am__fastdepCC_TRUE=
@@ -3675,7 +3711,133 @@
fi
+if test "x$CC" != xcc; then
+ { echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5
+echo $ECHO_N "checking whether $CC and cc understand -c and -o together... $ECHO_C" >&6; }
+else
+ { echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5
+echo $ECHO_N "checking whether cc understands -c and -o together... $ECHO_C" >&6; }
+fi
+set dummy $CC; ac_cc=`echo $2 |
+ sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
+if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+# Make sure it works both with $CC and with simple cc.
+# We do the test twice because some compilers refuse to overwrite an
+# existing .o file with -o, though they will create one.
+ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
+rm -f conftest2.*
+if { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ test -f conftest2.$ac_objext && { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); };
+then
+ eval ac_cv_prog_cc_${ac_cc}_c_o=yes
+ if test "x$CC" != xcc; then
+ # Test first that cc exists at all.
+ if { ac_try='cc -c conftest.$ac_ext >&5'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
+ rm -f conftest2.*
+ if { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ test -f conftest2.$ac_objext && { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); };
+ then
+ # cc works too.
+ :
+ else
+ # cc exists but doesn't like -o.
+ eval ac_cv_prog_cc_${ac_cc}_c_o=no
+ fi
+ fi
+ fi
+else
+ eval ac_cv_prog_cc_${ac_cc}_c_o=no
+fi
+rm -f core conftest*
+
+fi
+if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+
+cat >>confdefs.h <<\_ACEOF
+#define NO_MINUS_C_MINUS_O 1
+_ACEOF
+
+fi
+
+# FIXME: we rely on the cache variable name because
+# there is no other way.
+set dummy $CC
+ac_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
+if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
+ # Losing compiler, so override with the script.
+ # FIXME: It is wrong to rewrite CC.
+ # But if we don't then we get into trouble of one sort or another.
+ # A longer-term fix would be to have automake use am__CC in this case,
+ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+ CC="$am_aux_dir/compile $CC"
+fi
+
+
+
# AC_PROG_CXX is only needed for the test program tests/test-rebuild-db.cc.
# You can safely remove AC_PROG_CXX and the test program (edit tests/Makefile.am)
# if you should run into problems.
@@ -4110,6 +4272,7 @@
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
$SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
>/dev/null 2>conftest.err &&
+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -4139,9 +4302,7 @@
echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-
-
-if
+ if
test "x$enable_dependency_tracking" != xno \
&& test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
am__fastdepCXX_TRUE=
@@ -5326,7 +5487,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-netbsd* | netbsdelf*-gnu)
+netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
@@ -5446,7 +5607,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5449 "configure"' > conftest.$ac_ext
+ echo '#line 5610 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5511,6 +5672,7 @@
esac
;;
*64-bit*)
+ libsuff=64
case $host in
x86_64-*kfreebsd*-gnu)
LD="${LD-ld} -m elf_x86_64_fbsd"
@@ -7306,11 +7468,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7309: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7471: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7313: \$? = $ac_status" >&5
+ echo "$as_me:7475: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7596,11 +7758,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7599: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7761: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7603: \$? = $ac_status" >&5
+ echo "$as_me:7765: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7700,11 +7862,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7703: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7865: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7707: \$? = $ac_status" >&5
+ echo "$as_me:7869: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -7964,13 +8126,12 @@
$echo "local: *; };" >> $output_objdir/$libname.ver~
$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
- link_all_deplibs=no
else
ld_shlibs=no
fi
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -8514,7 +8675,7 @@
link_all_deplibs=yes
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
@@ -9209,11 +9370,13 @@
# Some rework will be needed to allow for fast_install
# before this can be enabled.
hardcode_into_libs=yes
+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -9225,18 +9388,6 @@
dynamic_linker='GNU/Linux ld.so'
;;
-netbsdelf*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='NetBSD ld.elf_so'
- ;;
-
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -10062,7 +10213,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10065 "configure"
+#line 10216 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10162,7 +10313,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10165 "configure"
+#line 10316 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11772,7 +11923,7 @@
;;
esac
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
@@ -12473,7 +12624,7 @@
;;
esac
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
;;
osf3* | osf4* | osf5*)
case $cc_basename in
@@ -12582,11 +12733,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12585: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12736: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:12589: \$? = $ac_status" >&5
+ echo "$as_me:12740: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -12686,11 +12837,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12689: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12840: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12693: \$? = $ac_status" >&5
+ echo "$as_me:12844: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -12758,9 +12909,6 @@
cygwin* | mingw*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
;;
- linux* | k*bsd*-gnu)
- link_all_deplibs_CXX=no
- ;;
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -13190,11 +13338,13 @@
# Some rework will be needed to allow for fast_install
# before this can be enabled.
hardcode_into_libs=yes
+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -13206,18 +13356,6 @@
dynamic_linker='GNU/Linux ld.so'
;;
-netbsdelf*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='NetBSD ld.elf_so'
- ;;
-
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -14263,11 +14401,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14266: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14404: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14270: \$? = $ac_status" >&5
+ echo "$as_me:14408: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -14367,11 +14505,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14370: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14508: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14374: \$? = $ac_status" >&5
+ echo "$as_me:14512: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14631,13 +14769,12 @@
$echo "local: *; };" >> $output_objdir/$libname.ver~
$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
- link_all_deplibs_F77=no
else
ld_shlibs_F77=no
fi
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -15161,7 +15298,7 @@
link_all_deplibs_F77=yes
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
@@ -15804,11 +15941,13 @@
# Some rework will be needed to allow for fast_install
# before this can be enabled.
hardcode_into_libs=yes
+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -15820,18 +15959,6 @@
dynamic_linker='GNU/Linux ld.so'
;;
-netbsdelf*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='NetBSD ld.elf_so'
- ;;
-
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -16567,11 +16694,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16570: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16697: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16574: \$? = $ac_status" >&5
+ echo "$as_me:16701: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16857,11 +16984,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16860: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16987: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16864: \$? = $ac_status" >&5
+ echo "$as_me:16991: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16961,11 +17088,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16964: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17091: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16968: \$? = $ac_status" >&5
+ echo "$as_me:17095: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -17225,13 +17352,12 @@
$echo "local: *; };" >> $output_objdir/$libname.ver~
$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
- link_all_deplibs_GCJ=no
else
ld_shlibs_GCJ=no
fi
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -17775,7 +17901,7 @@
link_all_deplibs_GCJ=yes
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
@@ -18418,11 +18544,13 @@
# Some rework will be needed to allow for fast_install
# before this can be enabled.
hardcode_into_libs=yes
+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -18434,18 +18562,6 @@
dynamic_linker='GNU/Linux ld.so'
;;
-netbsdelf*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='NetBSD ld.elf_so'
- ;;
-
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -19734,6 +19850,141 @@
+# Check the gettext tools to make sure they are GNU
+# Extract the first word of "xgettext", so it can be a program name with args.
+set dummy xgettext; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_XGETTEXT+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $XGETTEXT in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+XGETTEXT=$ac_cv_path_XGETTEXT
+if test -n "$XGETTEXT"; then
+ { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
+echo "${ECHO_T}$XGETTEXT" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+# Extract the first word of "msgmerge", so it can be a program name with args.
+set dummy msgmerge; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_MSGMERGE+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $MSGMERGE in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+MSGMERGE=$ac_cv_path_MSGMERGE
+if test -n "$MSGMERGE"; then
+ { echo "$as_me:$LINENO: result: $MSGMERGE" >&5
+echo "${ECHO_T}$MSGMERGE" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+# Extract the first word of "msgfmt", so it can be a program name with args.
+set dummy msgfmt; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_MSGFMT+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $MSGFMT in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+MSGFMT=$ac_cv_path_MSGFMT
+if test -n "$MSGFMT"; then
+ { echo "$as_me:$LINENO: result: $MSGFMT" >&5
+echo "${ECHO_T}$MSGFMT" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
+ { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
+echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
+mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
+mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
+if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
+ { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
+echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
# Use the tools built into the package, not the ones that are installed.
INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract'
@@ -20084,11 +20335,10 @@
{ echo "$as_me:$LINENO: checking for LIBGPOD" >&5
echo $ECHO_N "checking for LIBGPOD... $ECHO_C" >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$LIBGPOD_CFLAGS"; then
- pkg_cv_LIBGPOD_CFLAGS="$LIBGPOD_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$LIBGPOD_CFLAGS"; then
+ pkg_cv_LIBGPOD_CFLAGS="$LIBGPOD_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.8.0 gobject-2.0\"") >&5
($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.8.0 gobject-2.0") 2>&5
ac_status=$?
@@ -20098,15 +20348,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$LIBGPOD_LIBS"; then
- pkg_cv_LIBGPOD_LIBS="$LIBGPOD_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$LIBGPOD_LIBS"; then
+ pkg_cv_LIBGPOD_LIBS="$LIBGPOD_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.8.0 gobject-2.0\"") >&5
($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.8.0 gobject-2.0") 2>&5
ac_status=$?
@@ -20116,9 +20364,8 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
@@ -20131,9 +20378,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LIBGPOD_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= 2.8.0 gobject-2.0"`
+ LIBGPOD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.8.0 gobject-2.0" 2>&1`
else
- LIBGPOD_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= 2.8.0 gobject-2.0"`
+ LIBGPOD_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= 2.8.0 gobject-2.0" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBGPOD_PKG_ERRORS" >&5
@@ -20190,7 +20437,6 @@
echo "${ECHO_T}yes" >&6; }
:
fi
-LIBGPOD_CFLAGS="$LIBGPOD_CFLAGS -Wall"
expanded_libdir=`(
case $prefix in
@@ -20204,7 +20450,165 @@
eval echo $libdir
)`
-{ echo "$as_me:$LINENO: checking for sg_ll_inquiry in -lsgutils" >&5
+
+
+
+# Check whether --with-internal-gchecksum was given.
+if test "${with_internal_gchecksum+set}" = set; then
+ withval=$with_internal_gchecksum;
+else
+ with_internal_gchecksum=no
+fi
+
+
+if test "x$with_internal_gchecksum" = "xno"; then
+
+pkg_failed=no
+{ echo "$as_me:$LINENO: checking for GLIB" >&5
+echo $ECHO_N "checking for GLIB... $ECHO_C" >&6; }
+
+if test -n "$GLIB_CFLAGS"; then
+ pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.16.0\"") >&5
+ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.16.0") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.16.0" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$GLIB_LIBS"; then
+ pkg_cv_GLIB_LIBS="$GLIB_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.16.0\"") >&5
+ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.16.0") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.16.0" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.16.0" 2>&1`
+ else
+ GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= 2.16.0" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$GLIB_PKG_ERRORS" >&5
+
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ with_internal_gchecksum=yes
+elif test $pkg_failed = untried; then
+ with_internal_gchecksum=yes
+else
+ GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS
+ GLIB_LIBS=$pkg_cv_GLIB_LIBS
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ with_internal_gchecksum=no
+fi
+fi
+
+ if test "x$with_internal_gchecksum" = "xyes"; then
+ WITH_INTERNAL_GCHECKSUM_TRUE=
+ WITH_INTERNAL_GCHECKSUM_FALSE='#'
+else
+ WITH_INTERNAL_GCHECKSUM_TRUE='#'
+ WITH_INTERNAL_GCHECKSUM_FALSE=
+fi
+
+
+{ echo "$as_me:$LINENO: checking for sg_ll_inquiry in -lsgutils2" >&5
+echo $ECHO_N "checking for sg_ll_inquiry in -lsgutils2... $ECHO_C" >&6; }
+if test "${ac_cv_lib_sgutils2_sg_ll_inquiry+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsgutils2 $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char sg_ll_inquiry ();
+int
+main ()
+{
+return sg_ll_inquiry ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_sgutils2_sg_ll_inquiry=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_sgutils2_sg_ll_inquiry=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_sgutils2_sg_ll_inquiry" >&5
+echo "${ECHO_T}$ac_cv_lib_sgutils2_sg_ll_inquiry" >&6; }
+if test $ac_cv_lib_sgutils2_sg_ll_inquiry = yes; then
+ SGUTILS_LIBS="-lsgutils2"; have_sgutils=yes
+else
+ have_sgutils=no
+fi
+
+if test "x$have_sgutils" != xyes; then
+ { echo "$as_me:$LINENO: checking for sg_ll_inquiry in -lsgutils" >&5
echo $ECHO_N "checking for sg_ll_inquiry in -lsgutils... $ECHO_C" >&6; }
if test "${ac_cv_lib_sgutils_sg_ll_inquiry+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20271,10 +20675,9 @@
have_sgutils=no
fi
+fi
-
-
-if test x"$have_sgutils" = xyes; then
+ if test x"$have_sgutils" = xyes; then
HAVE_SGUTILS_TRUE=
HAVE_SGUTILS_FALSE='#'
else
@@ -20307,11 +20710,10 @@
{ echo "$as_me:$LINENO: checking for HAL" >&5
echo $ECHO_N "checking for HAL... $ECHO_C" >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$HAL_CFLAGS"; then
- pkg_cv_HAL_CFLAGS="$HAL_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$HAL_CFLAGS"; then
+ pkg_cv_HAL_CFLAGS="$HAL_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hal >= 0.5 hal < 0.6\"") >&5
($PKG_CONFIG --exists --print-errors "hal >= 0.5 hal < 0.6") 2>&5
ac_status=$?
@@ -20321,15 +20723,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$HAL_LIBS"; then
- pkg_cv_HAL_LIBS="$HAL_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$HAL_LIBS"; then
+ pkg_cv_HAL_LIBS="$HAL_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hal >= 0.5 hal < 0.6\"") >&5
($PKG_CONFIG --exists --print-errors "hal >= 0.5 hal < 0.6") 2>&5
ac_status=$?
@@ -20339,9 +20739,8 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
@@ -20354,9 +20753,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- HAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "hal >= 0.5 hal < 0.6"`
+ HAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "hal >= 0.5 hal < 0.6" 2>&1`
else
- HAL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "hal >= 0.5 hal < 0.6"`
+ HAL_PKG_ERRORS=`$PKG_CONFIG --print-errors "hal >= 0.5 hal < 0.6" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$HAL_PKG_ERRORS" >&5
@@ -20379,7 +20778,7 @@
{ (exit 1); exit 1; }; }
fi
- if test "x$enable_hal" == "xyes"; then
+ if test "x$enable_hal" = "xyes"; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_HAL 1
@@ -20389,9 +20788,7 @@
fi
fi
-
-
-if test x"$enable_hal" = xyes; then
+ if test x"$enable_hal" = xyes; then
HAVE_HAL_TRUE=
HAVE_HAL_FALSE='#'
else
@@ -20407,11 +20804,10 @@
{ echo "$as_me:$LINENO: checking for TAGLIB" >&5
echo $ECHO_N "checking for TAGLIB... $ECHO_C" >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$TAGLIB_CFLAGS"; then
- pkg_cv_TAGLIB_CFLAGS="$TAGLIB_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$TAGLIB_CFLAGS"; then
+ pkg_cv_TAGLIB_CFLAGS="$TAGLIB_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"taglib\"") >&5
($PKG_CONFIG --exists --print-errors "taglib") 2>&5
ac_status=$?
@@ -20421,15 +20817,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$TAGLIB_LIBS"; then
- pkg_cv_TAGLIB_LIBS="$TAGLIB_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$TAGLIB_LIBS"; then
+ pkg_cv_TAGLIB_LIBS="$TAGLIB_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"taglib\"") >&5
($PKG_CONFIG --exists --print-errors "taglib") 2>&5
ac_status=$?
@@ -20439,9 +20833,8 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
@@ -20454,9 +20847,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- TAGLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "taglib"`
+ TAGLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "taglib" 2>&1`
else
- TAGLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "taglib"`
+ TAGLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "taglib" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$TAGLIB_PKG_ERRORS" >&5
@@ -20483,9 +20876,7 @@
fi
-
-
-if test x"$have_taglib" = xyes; then
+ if test x"$have_taglib" = xyes; then
HAVE_TAGLIB_TRUE=
HAVE_TAGLIB_FALSE='#'
else
@@ -20494,61 +20885,180 @@
fi
+# Check whether --enable-libxml was given.
+if test "${enable_libxml+set}" = set; then
+ enableval=$enable_libxml; case "${enableval}" in
+ no) enable_libxml=no ;;
+ *) enable_libxml=yes;;
+esac
+fi
+
+if test x$enable_libxml != xno; then
+
+pkg_failed=no
+{ echo "$as_me:$LINENO: checking for LIBXML" >&5
+echo $ECHO_N "checking for LIBXML... $ECHO_C" >&6; }
+
+if test -n "$LIBXML_CFLAGS"; then
+ pkg_cv_LIBXML_CFLAGS="$LIBXML_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxml-2.0\"") >&5
+ ($PKG_CONFIG --exists --print-errors "libxml-2.0") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_LIBXML_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$LIBXML_LIBS"; then
+ pkg_cv_LIBXML_LIBS="$LIBXML_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxml-2.0\"") >&5
+ ($PKG_CONFIG --exists --print-errors "libxml-2.0") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_LIBXML_LIBS=`$PKG_CONFIG --libs "libxml-2.0" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ LIBXML_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libxml-2.0" 2>&1`
+ else
+ LIBXML_PKG_ERRORS=`$PKG_CONFIG --print-errors "libxml-2.0" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBXML_PKG_ERRORS" >&5
+
+ { { echo "$as_me:$LINENO: error: Package requirements (libxml-2.0) were not met:
+
+$LIBXML_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables LIBXML_CFLAGS
+and LIBXML_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&5
+echo "$as_me: error: Package requirements (libxml-2.0) were not met:
+
+$LIBXML_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables LIBXML_CFLAGS
+and LIBXML_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&2;}
+ { (exit 1); exit 1; }; }
+elif test $pkg_failed = untried; then
+ { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables LIBXML_CFLAGS
+and LIBXML_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details." >&5
+echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables LIBXML_CFLAGS
+and LIBXML_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+else
+ LIBXML_CFLAGS=$pkg_cv_LIBXML_CFLAGS
+ LIBXML_LIBS=$pkg_cv_LIBXML_LIBS
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ :
+fi
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBXML 1
+_ACEOF
+
+ LIBGPOD_CFLAGS="$LIBGPOD_CFLAGS $LIBXML_CFLAGS"
+ LIBGPOD_LIBS="$LIBGPOD_LIBS $LIBXML_LIBS"
+fi
+
# Check whether --enable-gdk-pixbuf was given.
if test "${enable_gdk_pixbuf+set}" = set; then
enableval=$enable_gdk_pixbuf; case "${enableval}" in
- no) have_gdkpixbuf=no ;;
- *) have_gdkpixbuf=yes;;
+ no) enable_gdkpixbuf=no ;;
+ *) enable_gdkpixbuf=yes;;
esac
-else
- have_gdkpixbuf=yes
fi
-if test x$have_gdkpixbuf = xyes; then
+if test x$enable_gdkpixbuf != xno; then
+ GDKPIXBUF_REQ="gdk-pixbuf-2.0"
pkg_failed=no
{ echo "$as_me:$LINENO: checking for GDKPIXBUF" >&5
echo $ECHO_N "checking for GDKPIXBUF... $ECHO_C" >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$GDKPIXBUF_CFLAGS"; then
- pkg_cv_GDKPIXBUF_CFLAGS="$GDKPIXBUF_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gdk-pixbuf-2.0 >= 2.6.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "gdk-pixbuf-2.0 >= 2.6.0") 2>&5
+if test -n "$GDKPIXBUF_CFLAGS"; then
+ pkg_cv_GDKPIXBUF_CFLAGS="$GDKPIXBUF_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GDKPIXBUF_REQ >= 2.6.0\"") >&5
+ ($PKG_CONFIG --exists --print-errors "$GDKPIXBUF_REQ >= 2.6.0") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_GDKPIXBUF_CFLAGS=`$PKG_CONFIG --cflags "gdk-pixbuf-2.0 >= 2.6.0" 2>/dev/null`
+ pkg_cv_GDKPIXBUF_CFLAGS=`$PKG_CONFIG --cflags "$GDKPIXBUF_REQ >= 2.6.0" 2>/dev/null`
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$GDKPIXBUF_LIBS"; then
- pkg_cv_GDKPIXBUF_LIBS="$GDKPIXBUF_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gdk-pixbuf-2.0 >= 2.6.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "gdk-pixbuf-2.0 >= 2.6.0") 2>&5
+if test -n "$GDKPIXBUF_LIBS"; then
+ pkg_cv_GDKPIXBUF_LIBS="$GDKPIXBUF_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GDKPIXBUF_REQ >= 2.6.0\"") >&5
+ ($PKG_CONFIG --exists --print-errors "$GDKPIXBUF_REQ >= 2.6.0") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_GDKPIXBUF_LIBS=`$PKG_CONFIG --libs "gdk-pixbuf-2.0 >= 2.6.0" 2>/dev/null`
+ pkg_cv_GDKPIXBUF_LIBS=`$PKG_CONFIG --libs "$GDKPIXBUF_REQ >= 2.6.0" 2>/dev/null`
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
@@ -20561,9 +21071,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GDKPIXBUF_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gdk-pixbuf-2.0 >= 2.6.0"`
+ GDKPIXBUF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$GDKPIXBUF_REQ >= 2.6.0" 2>&1`
else
- GDKPIXBUF_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gdk-pixbuf-2.0 >= 2.6.0"`
+ GDKPIXBUF_PKG_ERRORS=`$PKG_CONFIG --print-errors "$GDKPIXBUF_REQ >= 2.6.0" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$GDKPIXBUF_PKG_ERRORS" >&5
@@ -20580,18 +21090,24 @@
echo "${ECHO_T}yes" >&6; }
have_gdkpixbuf=yes
fi
- if test x"$have_gdkpixbuf" = xyes; then
- cat >>confdefs.h <<_ACEOF
+ if test x"$enable_gdkpixbuf" = xyes -a x"$have_gdkpixbuf" = xno; then
+ { { echo "$as_me:$LINENO: error: gdk-pixbuf support explicitly requested but gdk-pixbuf couldn't be found" >&5
+echo "$as_me: error: gdk-pixbuf support explicitly requested but gdk-pixbuf couldn't be found" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+fi
+if test x"$have_gdkpixbuf" = xyes; then
+ cat >>confdefs.h <<_ACEOF
#define HAVE_GDKPIXBUF 1
_ACEOF
- fi
LIBGPOD_CFLAGS="$LIBGPOD_CFLAGS $GDKPIXBUF_CFLAGS"
LIBGPOD_LIBS="$LIBGPOD_LIBS $GDKPIXBUF_LIBS"
+else
+ have_gdkpixbuf=no
+ GDKPIXBUF_REQ=""
fi
-
-
-if test x"$have_gdkpixbuf" = xyes; then
+ if test x"$have_gdkpixbuf" = xyes; then
HAVE_GDKPIXBUF_TRUE=
HAVE_GDKPIXBUF_FALSE='#'
else
@@ -20601,29 +21117,27 @@
+
# Check whether --enable-pygobject was given.
if test "${enable_pygobject+set}" = set; then
enableval=$enable_pygobject; case "${enableval}" in
- no) have_pygobject=no ;;
- *) have_pygobject=yes;;
+ no) enable_pygobject=no ;;
+ *) enable_pygobject=yes;;
esac
-else
- have_pygobject=yes
fi
-if test x$have_pygobject = xyes; then
+if test x$enable_pygobject != xno; then
pkg_failed=no
{ echo "$as_me:$LINENO: checking for PYGOBJECT" >&5
echo $ECHO_N "checking for PYGOBJECT... $ECHO_C" >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$PYGOBJECT_CFLAGS"; then
- pkg_cv_PYGOBJECT_CFLAGS="$PYGOBJECT_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$PYGOBJECT_CFLAGS"; then
+ pkg_cv_PYGOBJECT_CFLAGS="$PYGOBJECT_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pygobject-2.0 >= 2.8.0\"") >&5
($PKG_CONFIG --exists --print-errors "pygobject-2.0 >= 2.8.0") 2>&5
ac_status=$?
@@ -20633,15 +21147,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$PYGOBJECT_LIBS"; then
- pkg_cv_PYGOBJECT_LIBS="$PYGOBJECT_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$PYGOBJECT_LIBS"; then
+ pkg_cv_PYGOBJECT_LIBS="$PYGOBJECT_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pygobject-2.0 >= 2.8.0\"") >&5
($PKG_CONFIG --exists --print-errors "pygobject-2.0 >= 2.8.0") 2>&5
ac_status=$?
@@ -20651,9 +21163,8 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
@@ -20666,9 +21177,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- PYGOBJECT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "pygobject-2.0 >= 2.8.0"`
+ PYGOBJECT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "pygobject-2.0 >= 2.8.0" 2>&1`
else
- PYGOBJECT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pygobject-2.0 >= 2.8.0"`
+ PYGOBJECT_PKG_ERRORS=`$PKG_CONFIG --print-errors "pygobject-2.0 >= 2.8.0" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$PYGOBJECT_PKG_ERRORS" >&5
@@ -20685,18 +21196,23 @@
echo "${ECHO_T}yes" >&6; }
have_pygobject=yes
fi
- if test x"$have_pygobject" = xyes; then
- cat >>confdefs.h <<_ACEOF
+ if test x"$enable_pygobject" = xyes -a x"$have_pygobject" = xno; then
+ { { echo "$as_me:$LINENO: error: pygobject support explicitly requested but pygobject couldn't be found" >&5
+echo "$as_me: error: pygobject support explicitly requested but pygobject couldn't be found" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+fi
+if test x"$have_pygobject" = xyes; then
+ cat >>confdefs.h <<_ACEOF
#define HAVE_PYGOBJECT 1
_ACEOF
- fi
LIBGPOD_CFLAGS="$LIBGPOD_CFLAGS $PYGOBJECT_CFLAGS"
LIBGPOD_LIBS="$LIBGPOD_LIBS $PYGOBJECT_LIBS"
+else
+ have_pygobject=no
fi
-
-
-if test x"$have_pygobject" = xyes; then
+ if test x"$have_pygobject" = xyes; then
HAVE_PYGOBJECT_TRUE=
HAVE_PYGOBJECT_FALSE='#'
else
@@ -20705,7 +21221,7 @@
fi
-ALL_LINGUAS="de es fr he it ja ro sv"
+ALL_LINGUAS="de es fr he it ja ro sv zh_CN"
GETTEXT_PACKAGE=libgpod
@@ -20916,7 +21432,7 @@
fi
fi
- USE_NLS=yes
+ USE_NLS=yes
gt_cv_have_gettext=no
@@ -22253,19 +22769,38 @@
fi
- have_gtk_doc=no
if test x$enable_gtk_doc = xyes; then
- if test -z "$PKG_CONFIG"; then
- # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.0\"") >&5
+ ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.0") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ :
+else
+ { { echo "$as_me:$LINENO: error: You need to have gtk-doc >= 1.0 installed to build gtk-doc" >&5
+echo "$as_me: error: You need to have gtk-doc >= 1.0 installed to build gtk-doc" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+ fi
+
+ { echo "$as_me:$LINENO: checking whether to build gtk-doc documentation" >&5
+echo $ECHO_N "checking whether to build gtk-doc documentation... $ECHO_C" >&6; }
+ { echo "$as_me:$LINENO: result: $enable_gtk_doc" >&5
+echo "${ECHO_T}$enable_gtk_doc" >&6; }
+
+ for ac_prog in gtkdoc-check
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- case $PKG_CONFIG in
+ case $GTKDOC_CHECK in
[\\/]* | ?:[\\/]*)
- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+ ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -22275,7 +22810,7 @@
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -22283,47 +22818,24 @@
done
IFS=$as_save_IFS
- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
;;
esac
fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
- { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6; }
+GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
+if test -n "$GTKDOC_CHECK"; then
+ { echo "$as_me:$LINENO: result: $GTKDOC_CHECK" >&5
+echo "${ECHO_T}$GTKDOC_CHECK" >&6; }
else
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
fi
- fi
- if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then
- have_gtk_doc=yes
- fi
+ test -n "$GTKDOC_CHECK" && break
+done
- gtk_doc_min_version=1.0
- if test "$have_gtk_doc" = yes; then
- { echo "$as_me:$LINENO: checking gtk-doc version >= $gtk_doc_min_version" >&5
-echo $ECHO_N "checking gtk-doc version >= $gtk_doc_min_version... $ECHO_C" >&6; }
- if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
- else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
- have_gtk_doc=no
- fi
- fi
- if test "$have_gtk_doc" != yes; then
- enable_gtk_doc=no
- fi
- fi
-
-
-
-if test x$enable_gtk_doc = xyes; then
+ if test x$enable_gtk_doc = xyes; then
ENABLE_GTK_DOC_TRUE=
ENABLE_GTK_DOC_FALSE='#'
else
@@ -22331,9 +22843,7 @@
ENABLE_GTK_DOC_FALSE=
fi
-
-
-if test -n "$LIBTOOL"; then
+ if test -n "$LIBTOOL"; then
GTK_DOC_USE_LIBTOOL_TRUE=
GTK_DOC_USE_LIBTOOL_FALSE='#'
else
@@ -22370,7 +22880,7 @@
{ echo "$as_me:$LINENO: result: $with_python" >&5
echo "${ECHO_T}$with_python" >&6; }
- if test "X$with_python" == Xyes; then
+ if test "X$with_python" = Xyes; then
if test -z "$PYTHON"; then
# Extract the first word of "python", so it can be a program name with args.
set dummy python; ac_word=$2
@@ -22653,7 +23163,7 @@
CPPFLAGS="$save_CPPFLAGS"
- if test "X$with_python" == Xyes; then
+ if test "X$with_python" = Xyes; then
if test `uname` = Darwin; then
PYTHON_LDFLAGS="-Wl,-F. -Wl,-F. -bundle"
if $PYTHON -c 'import sys, string; sys.exit(string.find(sys.prefix,"Framework")+1)'; then
@@ -22713,7 +23223,7 @@
- if test "X$with_python" == Xyes; then
+ if test "X$with_python" = Xyes; then
# Extract the first word of "swig", so it can be a program name with args.
set dummy swig; ac_word=$2
@@ -22827,9 +23337,7 @@
with_python="no"
fi
fi
-
-
-if test x$with_python = xyes; then
+ if test x$with_python = xyes; then
HAVE_PYTHON_TRUE=
HAVE_PYTHON_FALSE='#'
else
@@ -22846,7 +23354,7 @@
enableval=$enable_more_warnings; set_more_warnings="$enableval"
else
-if test -d "$srcdir/{arch}" || test -d "$srcdir/.svn"; then
+if test -e "$srcdir/autogen.sh"; then
set_more_warnings=yes
else
set_more_warnings=no
@@ -23063,6 +23571,13 @@
ac_config_commands="$ac_config_commands po/stamp-it"
+if test -z "${WITH_INTERNAL_GCHECKSUM_TRUE}" && test -z "${WITH_INTERNAL_GCHECKSUM_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"WITH_INTERNAL_GCHECKSUM\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"WITH_INTERNAL_GCHECKSUM\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
if test -z "${HAVE_SGUTILS_TRUE}" && test -z "${HAVE_SGUTILS_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"HAVE_SGUTILS\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
@@ -23483,6 +23998,7 @@
ac_pwd='$ac_pwd'
srcdir='$srcdir'
INSTALL='$INSTALL'
+MKDIR_P='$MKDIR_P'
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
@@ -23716,6 +24232,7 @@
INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
INSTALL_DATA!$INSTALL_DATA$ac_delim
+am__isrc!$am__isrc$ac_delim
CYGPATH_W!$CYGPATH_W$ac_delim
PACKAGE!$PACKAGE$ac_delim
VERSION!$VERSION$ac_delim
@@ -23767,7 +24284,6 @@
build_os!$build_os$ac_delim
host!$host$ac_delim
host_cpu!$host_cpu$ac_delim
-host_vendor!$host_vendor$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -23809,6 +24325,7 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+host_vendor!$host_vendor$ac_delim
host_os!$host_os$ac_delim
GREP!$GREP$ac_delim
EGREP!$EGREP$ac_delim
@@ -23841,6 +24358,9 @@
INTLTOOL_THEME_RULE!$INTLTOOL_THEME_RULE$ac_delim
INTLTOOL_SERVICE_RULE!$INTLTOOL_SERVICE_RULE$ac_delim
INTLTOOL_POLICY_RULE!$INTLTOOL_POLICY_RULE$ac_delim
+XGETTEXT!$XGETTEXT$ac_delim
+MSGMERGE!$MSGMERGE$ac_delim
+MSGFMT!$MSGFMT$ac_delim
INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim
INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim
INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim
@@ -23850,6 +24370,10 @@
PKG_CONFIG!$PKG_CONFIG$ac_delim
LIBGPOD_CFLAGS!$LIBGPOD_CFLAGS$ac_delim
LIBGPOD_LIBS!$LIBGPOD_LIBS$ac_delim
+GLIB_CFLAGS!$GLIB_CFLAGS$ac_delim
+GLIB_LIBS!$GLIB_LIBS$ac_delim
+WITH_INTERNAL_GCHECKSUM_TRUE!$WITH_INTERNAL_GCHECKSUM_TRUE$ac_delim
+WITH_INTERNAL_GCHECKSUM_FALSE!$WITH_INTERNAL_GCHECKSUM_FALSE$ac_delim
SGUTILS_LIBS!$SGUTILS_LIBS$ac_delim
HAVE_SGUTILS_TRUE!$HAVE_SGUTILS_TRUE$ac_delim
HAVE_SGUTILS_FALSE!$HAVE_SGUTILS_FALSE$ac_delim
@@ -23862,20 +24386,21 @@
TAGLIB_LIBS!$TAGLIB_LIBS$ac_delim
HAVE_TAGLIB_TRUE!$HAVE_TAGLIB_TRUE$ac_delim
HAVE_TAGLIB_FALSE!$HAVE_TAGLIB_FALSE$ac_delim
+LIBXML_CFLAGS!$LIBXML_CFLAGS$ac_delim
+LIBXML_LIBS!$LIBXML_LIBS$ac_delim
GDKPIXBUF_CFLAGS!$GDKPIXBUF_CFLAGS$ac_delim
GDKPIXBUF_LIBS!$GDKPIXBUF_LIBS$ac_delim
HAVE_GDKPIXBUF_TRUE!$HAVE_GDKPIXBUF_TRUE$ac_delim
HAVE_GDKPIXBUF_FALSE!$HAVE_GDKPIXBUF_FALSE$ac_delim
+GDKPIXBUF_REQ!$GDKPIXBUF_REQ$ac_delim
PYGOBJECT_CFLAGS!$PYGOBJECT_CFLAGS$ac_delim
PYGOBJECT_LIBS!$PYGOBJECT_LIBS$ac_delim
HAVE_PYGOBJECT_TRUE!$HAVE_PYGOBJECT_TRUE$ac_delim
HAVE_PYGOBJECT_FALSE!$HAVE_PYGOBJECT_FALSE$ac_delim
GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim
USE_NLS!$USE_NLS$ac_delim
-MSGFMT!$MSGFMT$ac_delim
MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim
GMSGFMT!$GMSGFMT$ac_delim
-XGETTEXT!$XGETTEXT$ac_delim
CATALOGS!$CATALOGS$ac_delim
CATOBJEXT!$CATOBJEXT$ac_delim
GMOFILES!$GMOFILES$ac_delim
@@ -23887,6 +24412,7 @@
POSUB!$POSUB$ac_delim
MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim
HTML_DIR!$HTML_DIR$ac_delim
+GTKDOC_CHECK!$GTKDOC_CHECK$ac_delim
ENABLE_GTK_DOC_TRUE!$ENABLE_GTK_DOC_TRUE$ac_delim
ENABLE_GTK_DOC_FALSE!$ENABLE_GTK_DOC_FALSE$ac_delim
GTK_DOC_USE_LIBTOOL_TRUE!$GTK_DOC_USE_LIBTOOL_TRUE$ac_delim
@@ -23896,16 +24422,6 @@
PYTHON_PREFIX!$PYTHON_PREFIX$ac_delim
PYTHON_EXEC_PREFIX!$PYTHON_EXEC_PREFIX$ac_delim
PYTHON_PLATFORM!$PYTHON_PLATFORM$ac_delim
-pythondir!$pythondir$ac_delim
-pkgpythondir!$pkgpythondir$ac_delim
-pyexecdir!$pyexecdir$ac_delim
-pkgpyexecdir!$pkgpyexecdir$ac_delim
-PYTHON_INCLUDES!$PYTHON_INCLUDES$ac_delim
-PYTHON_LDFLAGS!$PYTHON_LDFLAGS$ac_delim
-SWIG!$SWIG$ac_delim
-SWIG_LIB!$SWIG_LIB$ac_delim
-HAVE_PYTHON_TRUE!$HAVE_PYTHON_TRUE$ac_delim
-HAVE_PYTHON_FALSE!$HAVE_PYTHON_FALSE$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -23947,11 +24463,21 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+pythondir!$pythondir$ac_delim
+pkgpythondir!$pkgpythondir$ac_delim
+pyexecdir!$pyexecdir$ac_delim
+pkgpyexecdir!$pkgpyexecdir$ac_delim
+PYTHON_INCLUDES!$PYTHON_INCLUDES$ac_delim
+PYTHON_LDFLAGS!$PYTHON_LDFLAGS$ac_delim
+SWIG!$SWIG$ac_delim
+SWIG_LIB!$SWIG_LIB$ac_delim
+HAVE_PYTHON_TRUE!$HAVE_PYTHON_TRUE$ac_delim
+HAVE_PYTHON_FALSE!$HAVE_PYTHON_FALSE$ac_delim
LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 2; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 12; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -24178,6 +24704,11 @@
[\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
*) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
esac
+ ac_MKDIR_P=$MKDIR_P
+ case $MKDIR_P in
+ [\\/$]* | ?:[\\/]* ) ;;
+ */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
+ esac
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
@@ -24231,6 +24762,7 @@
s&@abs_builddir@&$ac_abs_builddir&;t t
s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
s&@INSTALL@&$ac_INSTALL&;t t
+s&@MKDIR_P@&$ac_MKDIR_P&;t t
$ac_datarootdir_hack
" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" >$tmp/out
@@ -24346,21 +24878,22 @@
fi
rm -f "$tmp/out12"
# Compute $ac_file's index in $config_headers.
+_am_arg=$ac_file
_am_stamp_count=1
for _am_header in $config_headers :; do
case $_am_header in
- $ac_file | $ac_file:* )
+ $_am_arg | $_am_arg:* )
break ;;
* )
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
-echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X$ac_file : 'X\(//\)[^/]' \| \
- X$ac_file : 'X\(//\)$' \| \
- X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
-echo X$ac_file |
+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$_am_arg" : 'X\(//\)[^/]' \| \
+ X"$_am_arg" : 'X\(//\)$' \| \
+ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
+echo X"$_am_arg" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -24395,8 +24928,9 @@
# some people rename them; so instead we look at the file content.
# Grep'ing the first line is not enough: some people post-process
# each Makefile.in and add a new line on top of each file to say so.
- # So let's grep whole file.
- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+ # Grep'ing the whole file is not good either: AIX grep has a line
+ # limit of 2048, but all sed's we know have understand at least 4000.
+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
dirpart=`$as_dirname -- "$mf" ||
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$mf" : 'X\(//\)[^/]' \| \
@@ -24595,7 +25129,7 @@
Preprocessor .........: $CC $CPPFLAGS
Compiler .............: $CC $CFLAGS $LIBGPOD_CFLAGS
Linker ...............: $CC $LDFLAGS $LIBS $LIBGPOD_LIBS
- ArtworkDB support ....: $have_gdkpixbuf
+ Artwork support ......: $have_gdkpixbuf
Python bindings ......: $with_python
PyGObject support ....: $have_pygobject
@@ -24603,3 +25137,18 @@
and then 'make install' for installation.
"
+if test x"$enable_libxml" = xno; then
+ echo "
+**WARNING** libxml support is disabled, libgpod won't be able to
+parse SysInfoExtended. This means it can't take advantage of the
+extensive iPod description (image formats, features, ...)
+available from that file
+"
+fi
+
+if test x"$have_gdkpixbuf" = xno; then
+ echo "
+**WARNING** gdkpixbuf support is disabled. libgpod won't be able
+to read or write artwork (covers, photos, ...) from/to the iPod
+"
+fi
Modified: libgpod/branches/upstream/current/configure.ac
===================================================================
--- libgpod/branches/upstream/current/configure.ac 2008-12-25 18:06:29 UTC (rev 338)
+++ libgpod/branches/upstream/current/configure.ac 2009-01-24 10:34:00 UTC (rev 339)
@@ -10,7 +10,7 @@
# LIBGPOD_SO_VERSION - see comments
#
LIBGPOD_MAJOR_VERSION=0
-LIBGPOD_MINOR_VERSION=6
+LIBGPOD_MINOR_VERSION=7
LIBGPOD_MICRO_VERSION=0
# If you need a modifier for the version number.
# Normally empty, but can be used to make "fixup" releases.
@@ -24,7 +24,7 @@
# changes to the signature and the semantic)
# ? :+1 : ? == just internal changes
# CURRENT : REVISION : AGE
-LIBGPOD_SO_VERSION=3:0:0
+LIBGPOD_SO_VERSION=4:0:0
AC_SUBST(LIBGPOD_SO_VERSION)
AC_SUBST(LIBGPOD_MAJOR_VERSION)
@@ -41,6 +41,7 @@
AC_GNU_SOURCE
AC_PROG_CC
+AM_PROG_CC_C_O
# AC_PROG_CXX is only needed for the test program tests/test-rebuild-db.cc.
# You can safely remove AC_PROG_CXX and the test program (edit tests/Makefile.am)
@@ -56,7 +57,6 @@
AC_PROG_INTLTOOL([0.21])
PKG_CHECK_MODULES(LIBGPOD, glib-2.0 >= 2.8.0 gobject-2.0)
-LIBGPOD_CFLAGS="$LIBGPOD_CFLAGS -Wall"
dnl **************************************************
dnl * expand $libdir
@@ -75,12 +75,36 @@
eval echo $libdir
)`
+
dnl **************************************************
+dnl we've copied gchecksum from glib 2.16. Only use the
+dnl copy if the version of glib on the system does not
+dnl provide it.
+dnl **************************************************
+
+AC_ARG_WITH(internal-gchecksum,
+ AC_HELP_STRING([--with-internal-gchecksum],
+ [Build using internal copy of gchecksum]),,
+ with_internal_gchecksum=no)
+
+if test "x$with_internal_gchecksum" = "xno"; then
+ PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.16.0, with_internal_gchecksum=no,
+ with_internal_gchecksum=yes)
+fi
+
+AM_CONDITIONAL(WITH_INTERNAL_GCHECKSUM, test "x$with_internal_gchecksum" = "xyes")
+
+dnl **************************************************
dnl * sgutils is necessary to get the xml device file from the ipod
dnl **************************************************
-AC_CHECK_LIB(sgutils, sg_ll_inquiry,
- [SGUTILS_LIBS="-lsgutils"; have_sgutils=yes],
- have_sgutils=no)
+AC_CHECK_LIB(sgutils2, sg_ll_inquiry,
+ [SGUTILS_LIBS="-lsgutils2"; have_sgutils=yes],
+ have_sgutils=no)
+if test "x$have_sgutils" != xyes; then
+ AC_CHECK_LIB(sgutils, sg_ll_inquiry,
+ [SGUTILS_LIBS="-lsgutils"; have_sgutils=yes],
+ have_sgutils=no)
+fi
AC_SUBST(SGUTILS_LIBS)
AM_CONDITIONAL(HAVE_SGUTILS, test x"$have_sgutils" = xyes)
@@ -105,7 +129,7 @@
AC_MSG_ERROR([HAL support explicitly requested but HAL couldn't be found])
fi
- if test "x$enable_hal" == "xyes"; then
+ if test "x$enable_hal" = "xyes"; then
AC_DEFINE(HAVE_HAL, 1, [Define if you have HAL support])
AC_SUBST(HAL_CFLAGS)
AC_SUBST(HAL_LIBS)
@@ -127,26 +151,48 @@
AC_SUBST(TAGLIB_LIBS)
AM_CONDITIONAL(HAVE_TAGLIB, test x"$have_taglib" = xyes)
+dnl **************************************************
+dnl * libxml is used to parse the plist files (aka SysInfoExtended)
+dnl **************************************************
+AC_ARG_ENABLE(libxml, [AC_HELP_STRING([--disable-libxml],[SysInfoExtended won't be parsed])],
+[case "${enableval}" in
+ no) enable_libxml=no ;;
+ *) enable_libxml=yes;;
+esac])
+AH_TEMPLATE([HAVE_LIBXML], [Whether libxml is installed, it's used to parse SysInfoExtended])
+if test x$enable_libxml != xno; then
+ PKG_CHECK_MODULES(LIBXML, libxml-2.0)
+ AC_DEFINE_UNQUOTED(HAVE_LIBXML, 1)
+ LIBGPOD_CFLAGS="$LIBGPOD_CFLAGS $LIBXML_CFLAGS"
+ LIBGPOD_LIBS="$LIBGPOD_LIBS $LIBXML_LIBS"
+fi
dnl **************************************************
dnl * GDKPIXBUF is optional
dnl **************************************************
-
AC_ARG_ENABLE(gdk-pixbuf, [AC_HELP_STRING([--disable-gdk-pixbuf],[ArtworkDB will be disabled without gdk-pixbuf])],
[case "${enableval}" in
- no) have_gdkpixbuf=no ;;
- *) have_gdkpixbuf=yes;;
-esac], have_gdkpixbuf=yes)
+ no) enable_gdkpixbuf=no ;;
+ *) enable_gdkpixbuf=yes;;
+esac])
AH_TEMPLATE([HAVE_GDKPIXBUF], [Whether gdk-pixbuf is installed, ArtworkDB writing support will be disabled if it can't be found])
-if test x$have_gdkpixbuf = xyes; then
- PKG_CHECK_MODULES(GDKPIXBUF, gdk-pixbuf-2.0 >= 2.6.0, have_gdkpixbuf=yes, have_gdkpixbuf=no)
- if test x"$have_gdkpixbuf" = xyes; then
- AC_DEFINE_UNQUOTED(HAVE_GDKPIXBUF, 1)
+if test x$enable_gdkpixbuf != xno; then
+ GDKPIXBUF_REQ="gdk-pixbuf-2.0"
+ PKG_CHECK_MODULES(GDKPIXBUF, $GDKPIXBUF_REQ >= 2.6.0, have_gdkpixbuf=yes, have_gdkpixbuf=no)
+ if test x"$enable_gdkpixbuf" = xyes -a x"$have_gdkpixbuf" = xno; then
+ AC_MSG_ERROR([gdk-pixbuf support explicitly requested but gdk-pixbuf couldn't be found])
fi
+fi
+if test x"$have_gdkpixbuf" = xyes; then
+ AC_DEFINE_UNQUOTED(HAVE_GDKPIXBUF, 1)
LIBGPOD_CFLAGS="$LIBGPOD_CFLAGS $GDKPIXBUF_CFLAGS"
LIBGPOD_LIBS="$LIBGPOD_LIBS $GDKPIXBUF_LIBS"
+else
+ have_gdkpixbuf=no
+ GDKPIXBUF_REQ=""
fi
AM_CONDITIONAL(HAVE_GDKPIXBUF, test x"$have_gdkpixbuf" = xyes)
+AC_SUBST(GDKPIXBUF_REQ)
dnl **************************************************
dnl * PYGOBJECT is optional
@@ -154,24 +200,29 @@
AC_ARG_ENABLE(pygobject, [AC_HELP_STRING([--disable-pygobject],[Python API will lack GdkPixbuf support without PyGOBJECT])],
[case "${enableval}" in
- no) have_pygobject=no ;;
- *) have_pygobject=yes;;
-esac], have_pygobject=yes)
+ no) enable_pygobject=no ;;
+ *) enable_pygobject=yes;;
+esac])
AH_TEMPLATE([HAVE_PYGOBJECT], [Whether pygobject is installed, Python API will lack GdkPixbuf support without PyGOBJECT])
-if test x$have_pygobject = xyes; then
+if test x$enable_pygobject != xno; then
PKG_CHECK_MODULES(PYGOBJECT, pygobject-2.0 >= 2.8.0, have_pygobject=yes, have_pygobject=no)
- if test x"$have_pygobject" = xyes; then
- AC_DEFINE_UNQUOTED(HAVE_PYGOBJECT, 1)
+ if test x"$enable_pygobject" = xyes -a x"$have_pygobject" = xno; then
+ AC_MSG_ERROR([pygobject support explicitly requested but pygobject couldn't be found])
fi
+fi
+if test x"$have_pygobject" = xyes; then
+ AC_DEFINE_UNQUOTED(HAVE_PYGOBJECT, 1)
LIBGPOD_CFLAGS="$LIBGPOD_CFLAGS $PYGOBJECT_CFLAGS"
LIBGPOD_LIBS="$LIBGPOD_LIBS $PYGOBJECT_LIBS"
+else
+ have_pygobject=no
fi
AM_CONDITIONAL(HAVE_PYGOBJECT, test x"$have_pygobject" = xyes)
dnl **************************************************
dnl * internationalization support
dnl **************************************************
-ALL_LINGUAS="de es fr he it ja ro sv"
+ALL_LINGUAS="de es fr he it ja ro sv zh_CN"
GETTEXT_PACKAGE=libgpod
AC_SUBST(GETTEXT_PACKAGE)
@@ -201,7 +252,7 @@
AC_ARG_ENABLE(more-warnings,
[ --enable-more-warnings Maximum compiler warnings],
set_more_warnings="$enableval",[
-if test -d "$srcdir/{arch}" || test -d "$srcdir/.svn"; then
+if test -e "$srcdir/autogen.sh"; then
set_more_warnings=yes
else
set_more_warnings=no
@@ -270,7 +321,7 @@
Preprocessor .........: $CC $CPPFLAGS
Compiler .............: $CC $CFLAGS $LIBGPOD_CFLAGS
Linker ...............: $CC $LDFLAGS $LIBS $LIBGPOD_LIBS
- ArtworkDB support ....: $have_gdkpixbuf
+ Artwork support ......: $have_gdkpixbuf
Python bindings ......: $with_python
PyGObject support ....: $have_pygobject
@@ -278,3 +329,18 @@
and then 'make install' for installation.
"
+if test x"$enable_libxml" = xno; then
+ echo "
+**WARNING** libxml support is disabled, libgpod won't be able to
+parse SysInfoExtended. This means it can't take advantage of the
+extensive iPod description (image formats, features, ...)
+available from that file
+"
+fi
+
+if test x"$have_gdkpixbuf" = xno; then
+ echo "
+**WARNING** gdkpixbuf support is disabled. libgpod won't be able
+to read or write artwork (covers, photos, ...) from/to the iPod
+"
+fi
Modified: libgpod/branches/upstream/current/depcomp
===================================================================
--- libgpod/branches/upstream/current/depcomp 2008-12-25 18:06:29 UTC (rev 338)
+++ libgpod/branches/upstream/current/depcomp 2009-01-24 10:34:00 UTC (rev 339)
@@ -1,9 +1,10 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
-scriptversion=2005-07-09.11
+scriptversion=2007-03-29.01
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software
+# Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -91,7 +92,20 @@
## gcc 3 implements dependency tracking that does exactly what
## we want. Yay! Note: for some reason libtool 1.4 doesn't like
## it if -MD -MP comes after the -MF stuff. Hmm.
- "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
+## Unfortunately, FreeBSD c89 acceptance of flags depends upon
+## the command line argument order; so add the flags where they
+## appear in depend2.am. Note that the slowdown incurred here
+## affects only configure: in makefiles, %FASTDEP% shortcuts this.
+ for arg
+ do
+ case $arg in
+ -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
+ *) set fnord "$@" "$arg" ;;
+ esac
+ shift # fnord
+ shift # $arg
+ done
+ "$@"
stat=$?
if test $stat -eq 0; then :
else
@@ -201,34 +215,39 @@
# current directory. Also, the AIX compiler puts `$object:' at the
# start of each line; $object doesn't have directory information.
# Version 6 uses the directory in both cases.
- stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
- tmpdepfile="$stripped.u"
+ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+ test "x$dir" = "x$object" && dir=
+ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
if test "$libtool" = yes; then
+ tmpdepfile1=$dir$base.u
+ tmpdepfile2=$base.u
+ tmpdepfile3=$dir.libs/$base.u
"$@" -Wc,-M
else
+ tmpdepfile1=$dir$base.u
+ tmpdepfile2=$dir$base.u
+ tmpdepfile3=$dir$base.u
"$@" -M
fi
stat=$?
- if test -f "$tmpdepfile"; then :
- else
- stripped=`echo "$stripped" | sed 's,^.*/,,'`
- tmpdepfile="$stripped.u"
- fi
-
if test $stat -eq 0; then :
else
- rm -f "$tmpdepfile"
+ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
exit $stat
fi
+ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+ do
+ test -f "$tmpdepfile" && break
+ done
if test -f "$tmpdepfile"; then
- outname="$stripped.o"
# Each line is of the form `foo.o: dependent.h'.
# Do two passes, one to just change these to
# `$object: dependent.h' and one to simply `dependent.h:'.
- sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
- sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
+ sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
+ # That's a tab and a space in the [].
+ sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
else
# The sourcefile does not contain any dependencies, so just
# store a dummy comment line, to avoid errors with the Makefile
@@ -276,6 +295,46 @@
rm -f "$tmpdepfile"
;;
+hp2)
+ # The "hp" stanza above does not work with aCC (C++) and HP's ia64
+ # compilers, which have integrated preprocessors. The correct option
+ # to use with these is +Maked; it writes dependencies to a file named
+ # 'foo.d', which lands next to the object file, wherever that
+ # happens to be.
+ # Much of this is similar to the tru64 case; see comments there.
+ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+ test "x$dir" = "x$object" && dir=
+ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+ if test "$libtool" = yes; then
+ tmpdepfile1=$dir$base.d
+ tmpdepfile2=$dir.libs/$base.d
+ "$@" -Wc,+Maked
+ else
+ tmpdepfile1=$dir$base.d
+ tmpdepfile2=$dir$base.d
+ "$@" +Maked
+ fi
+ stat=$?
+ if test $stat -eq 0; then :
+ else
+ rm -f "$tmpdepfile1" "$tmpdepfile2"
+ exit $stat
+ fi
+
+ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
+ do
+ test -f "$tmpdepfile" && break
+ done
+ if test -f "$tmpdepfile"; then
+ sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
+ # Add `dependent.h:' lines.
+ sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
+ else
+ echo "#dummy" > "$depfile"
+ fi
+ rm -f "$tmpdepfile" "$tmpdepfile2"
+ ;;
+
tru64)
# The Tru64 compiler uses -MD to generate dependencies as a side
# effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
@@ -288,13 +347,13 @@
if test "$libtool" = yes; then
# With Tru64 cc, shared objects can also be used to make a
- # static library. This mecanism is used in libtool 1.4 series to
+ # static library. This mechanism is used in libtool 1.4 series to
# handle both shared and static libraries in a single compilation.
# With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
#
# With libtool 1.5 this exception was removed, and libtool now
# generates 2 separate objects for the 2 libraries. These two
- # compilations output dependencies in in $dir.libs/$base.o.d and
+ # compilations output dependencies in $dir.libs/$base.o.d and
# in $dir$base.o.d. We have to check for both files, because
# one of the two compilations can be disabled. We should prefer
# $dir$base.o.d over $dir.libs/$base.o.d because the latter is
Modified: libgpod/branches/upstream/current/docs/Makefile.in
===================================================================
--- libgpod/branches/upstream/current/docs/Makefile.in 2008-12-25 18:06:29 UTC (rev 338)
+++ libgpod/branches/upstream/current/docs/Makefile.in 2009-01-24 10:34:00 UTC (rev 339)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -13,15 +13,11 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -50,10 +46,13 @@
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
- install-exec-recursive install-info-recursive \
- install-recursive installcheck-recursive installdirs-recursive \
- pdf-recursive ps-recursive uninstall-info-recursive \
- uninstall-recursive
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
@@ -61,8 +60,6 @@
ACLOCAL = @ACLOCAL@
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
AUTOCONF = @AUTOCONF@
@@ -89,35 +86,24 @@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
GDKPIXBUF_CFLAGS = @GDKPIXBUF_CFLAGS@
GDKPIXBUF_LIBS = @GDKPIXBUF_LIBS@
+GDKPIXBUF_REQ = @GDKPIXBUF_REQ@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_LIBS = @GLIB_LIBS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
+GTKDOC_CHECK = @GTKDOC_CHECK@
HALCALLOUTSDIR = @HALCALLOUTSDIR@
HAL_CFLAGS = @HAL_CFLAGS@
HAL_LIBS = @HAL_LIBS@
-HAVE_GDKPIXBUF_FALSE = @HAVE_GDKPIXBUF_FALSE@
-HAVE_GDKPIXBUF_TRUE = @HAVE_GDKPIXBUF_TRUE@
-HAVE_HAL_FALSE = @HAVE_HAL_FALSE@
-HAVE_HAL_TRUE = @HAVE_HAL_TRUE@
-HAVE_PYGOBJECT_FALSE = @HAVE_PYGOBJECT_FALSE@
-HAVE_PYGOBJECT_TRUE = @HAVE_PYGOBJECT_TRUE@
-HAVE_PYTHON_FALSE = @HAVE_PYTHON_FALSE@
-HAVE_PYTHON_TRUE = @HAVE_PYTHON_TRUE@
-HAVE_SGUTILS_FALSE = @HAVE_SGUTILS_FALSE@
-HAVE_SGUTILS_TRUE = @HAVE_SGUTILS_TRUE@
-HAVE_TAGLIB_FALSE = @HAVE_TAGLIB_FALSE@
-HAVE_TAGLIB_TRUE = @HAVE_TAGLIB_TRUE@
HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -158,15 +144,17 @@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LIBXML_CFLAGS = @LIBXML_CFLAGS@
+LIBXML_LIBS = @LIBXML_LIBS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -202,13 +190,13 @@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -220,6 +208,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -251,8 +240,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
SUBDIRS = reference
all: all-recursive
@@ -293,10 +285,6 @@
clean-libtool:
-rm -rf .libs _libs
-distclean-libtool:
- -rm -f libtool
-uninstall-info-am:
-
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
# To change the values of `make' variables: instead of editing Makefiles,
@@ -328,8 +316,7 @@
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
@@ -373,8 +360,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -399,8 +386,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -410,13 +397,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
@@ -430,22 +416,21 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -459,7 +444,7 @@
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
- || $(mkdir_p) "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
distdir=`$(am__cd) $(distdir) && pwd`; \
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -467,6 +452,8 @@
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$top_distdir" \
distdir="$$distdir/$$subdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
distdir) \
|| exit 1; \
fi; \
@@ -506,8 +493,7 @@
distclean: distclean-recursive
-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
- distclean-tags
+distclean-am: clean-am distclean-generic distclean-tags
dvi: dvi-recursive
@@ -521,12 +507,20 @@
install-data-am:
+install-dvi: install-dvi-recursive
+
install-exec-am:
+install-html: install-html-recursive
+
install-info: install-info-recursive
install-man:
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
installcheck-am:
maintainer-clean: maintainer-clean-recursive
@@ -545,22 +539,24 @@
ps-am:
-uninstall-am: uninstall-info-am
+uninstall-am:
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+ install-strip
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
- clean clean-generic clean-libtool clean-recursive ctags \
- ctags-recursive distclean distclean-generic distclean-libtool \
- distclean-recursive distclean-tags distdir dvi dvi-am html \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am check check-am clean clean-generic clean-libtool \
+ ctags ctags-recursive distclean distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
html-am info info-am install install-am install-data \
- install-data-am install-exec install-exec-am install-info \
- install-info-am install-man install-strip installcheck \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
installcheck-am installdirs installdirs-am maintainer-clean \
- maintainer-clean-generic maintainer-clean-recursive \
- mostlyclean mostlyclean-generic mostlyclean-libtool \
- mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
- uninstall uninstall-am uninstall-info-am
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+ uninstall uninstall-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
Modified: libgpod/branches/upstream/current/docs/reference/Makefile.am
===================================================================
--- libgpod/branches/upstream/current/docs/reference/Makefile.am 2008-12-25 18:06:29 UTC (rev 338)
+++ libgpod/branches/upstream/current/docs/reference/Makefile.am 2009-01-24 10:34:00 UTC (rev 339)
@@ -79,3 +79,6 @@
# Build the documentation when creating tarballs
dist-hook-local:
$(MAKE) all
+
+uninstall-hook:
+ -rmdir --ignore-fail-on-non-empty $(DESTDIR)$(TARGET_DIR)
Modified: libgpod/branches/upstream/current/docs/reference/Makefile.in
===================================================================
--- libgpod/branches/upstream/current/docs/reference/Makefile.in 2008-12-25 18:06:29 UTC (rev 338)
+++ libgpod/branches/upstream/current/docs/reference/Makefile.in 2009-01-24 10:34:00 UTC (rev 339)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -19,15 +19,11 @@
####################################
# Everything below here is generic #
####################################
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -59,8 +55,6 @@
ACLOCAL = @ACLOCAL@
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
AUTOCONF = @AUTOCONF@
@@ -87,35 +81,24 @@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
GDKPIXBUF_CFLAGS = @GDKPIXBUF_CFLAGS@
GDKPIXBUF_LIBS = @GDKPIXBUF_LIBS@
+GDKPIXBUF_REQ = @GDKPIXBUF_REQ@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_LIBS = @GLIB_LIBS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
+GTKDOC_CHECK = @GTKDOC_CHECK@
HALCALLOUTSDIR = @HALCALLOUTSDIR@
HAL_CFLAGS = @HAL_CFLAGS@
HAL_LIBS = @HAL_LIBS@
-HAVE_GDKPIXBUF_FALSE = @HAVE_GDKPIXBUF_FALSE@
-HAVE_GDKPIXBUF_TRUE = @HAVE_GDKPIXBUF_TRUE@
-HAVE_HAL_FALSE = @HAVE_HAL_FALSE@
-HAVE_HAL_TRUE = @HAVE_HAL_TRUE@
-HAVE_PYGOBJECT_FALSE = @HAVE_PYGOBJECT_FALSE@
-HAVE_PYGOBJECT_TRUE = @HAVE_PYGOBJECT_TRUE@
-HAVE_PYTHON_FALSE = @HAVE_PYTHON_FALSE@
-HAVE_PYTHON_TRUE = @HAVE_PYTHON_TRUE@
-HAVE_SGUTILS_FALSE = @HAVE_SGUTILS_FALSE@
-HAVE_SGUTILS_TRUE = @HAVE_SGUTILS_TRUE@
-HAVE_TAGLIB_FALSE = @HAVE_TAGLIB_FALSE@
-HAVE_TAGLIB_TRUE = @HAVE_TAGLIB_TRUE@
HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -156,15 +139,17 @@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LIBXML_CFLAGS = @LIBXML_CFLAGS@
+LIBXML_LIBS = @LIBXML_LIBS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -200,13 +185,13 @@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -218,6 +203,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -249,8 +235,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
# We require automake 1.6 at least.
AUTOMAKE_OPTIONS = 1.6
@@ -350,7 +339,12 @@
$(DOC_MODULE).prerequisites \
$(DOC_MODULE).signals
-CLEANFILES = $(SCANOBJ_FILES) $(DOC_MODULE)-unused.txt $(DOC_STAMPS)
+REPORT_FILES = \
+ $(DOC_MODULE)-undocumented.txt \
+ $(DOC_MODULE)-undeclared.txt \
+ $(DOC_MODULE)-unused.txt
+
+CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
all: all-am
.SUFFIXES:
@@ -391,10 +385,6 @@
clean-libtool:
-rm -rf .libs _libs
-
-distclean-libtool:
- -rm -f libtool
-uninstall-info-am:
tags: TAGS
TAGS:
@@ -403,23 +393,21 @@
distdir: $(DISTFILES)
- $(mkdir_p) $(distdir)/../..
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -468,7 +456,7 @@
distclean: distclean-am
-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic distclean-local
dvi: dvi-am
@@ -482,12 +470,20 @@
install-data-am: install-data-local
+install-dvi: install-dvi-am
+
install-exec-am:
+install-html: install-html-am
+
install-info: install-info-am
install-man:
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -507,19 +503,25 @@
ps-am:
-uninstall-am: uninstall-info-am uninstall-local
+uninstall-am: uninstall-local
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+.MAKE: install-am install-strip uninstall-am
+
.PHONY: all all-am all-local check check-am clean clean-generic \
clean-libtool clean-local dist-hook distclean \
- distclean-generic distclean-libtool distdir dvi dvi-am html \
- html-am info info-am install install-am install-data \
- install-data-am install-data-local install-exec \
- install-exec-am install-info install-info-am install-man \
+ distclean-generic distclean-libtool distclean-local distdir \
+ dvi dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-data-local install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic \
maintainer-clean-local mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
- uninstall-info-am uninstall-local
+ uninstall-hook uninstall-local
@ENABLE_GTK_DOC_TRUE at all-local: html-build.stamp
@@ -558,6 +560,9 @@
tmpl.stamp: tmpl-build.stamp
@true
+tmpl/*.sgml:
+ @true
+
#### xml ####
sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
@@ -575,11 +580,11 @@
html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
@echo 'gtk-doc: Building HTML'
@-chmod -R u+w $(srcdir)
- rm -rf $(srcdir)/html
+ rm -rf $(srcdir)/html
mkdir $(srcdir)/html
cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
- @echo 'gtk-doc: Fixing cross-references'
+ @echo 'gtk-doc: Fixing cross-references'
cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
touch html-build.stamp
@@ -589,8 +594,13 @@
rm -f *~ *.bak
rm -rf .libs
+distclean-local:
+ cd $(srcdir) && \
+ rm -rf xml $(REPORT_FILES) \
+ $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+
maintainer-clean-local: clean
- cd $(srcdir) && rm -rf xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+ cd $(srcdir) && rm -rf xml html
install-data-local:
installfiles=`echo $(srcdir)/html/*`; \
@@ -604,6 +614,8 @@
done; \
echo '-- Installing $(srcdir)/html/index.sgml' ; \
$(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \
+ (which gtkdoc-rebase >& /dev/null && \
+ gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR)) || : ; \
fi
uninstall-local:
@@ -624,15 +636,19 @@
-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-cp $(srcdir)/xml/*.xml $(distdir)/xml
cp $(srcdir)/html/* $(distdir)/html
- if test -f $(srcdir)/$(DOC_MODULE).types; then \
- cp $(srcdir)/$(DOC_MODULE).types $(distdir)/$(DOC_MODULE).types; \
- fi
+ -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
+ -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
+ cd $(distdir) && rm -f $(DISTCLEANFILES)
+ -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
.PHONY : dist-hook-local docs
# Build the documentation when creating tarballs
dist-hook-local:
$(MAKE) all
+
+uninstall-hook:
+ -rmdir --ignore-fail-on-non-empty $(DESTDIR)$(TARGET_DIR)
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Modified: libgpod/branches/upstream/current/docs/reference/html/ch01.html
===================================================================
--- libgpod/branches/upstream/current/docs/reference/html/ch01.html 2008-12-25 18:06:29 UTC (rev 338)
+++ libgpod/branches/upstream/current/docs/reference/html/ch01.html 2009-01-24 10:34:00 UTC (rev 339)
@@ -3,12 +3,12 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
<title>iPod database components</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.72.0">
+<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
<link rel="start" href="index.html" title="libgpod Reference Manual">
<link rel="up" href="itunesdb.html" title="Part I. iPod database">
<link rel="prev" href="libgpod-Low-level-functions.html" title="Low-level functions">
<link rel="next" href="libgpod-Tracks.html" title="Tracks">
-<meta name="generator" content="GTK-Doc V1.8 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.9 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
<link rel="part" href="itunesdb.html" title="Part I. iPod database">
<link rel="chapter" href="ch01.html" title="iPod database components">
@@ -24,7 +24,7 @@
</tr></table>
<div class="chapter" lang="en">
<div class="titlepage"><div><div><h2 class="title">
-<a name="id2510524"></a>iPod database components</h2></div></div></div>
+<a name="id2734640"></a>iPod database components</h2></div></div></div>
<div class="toc"><dl>
<dt>
<span class="refentrytitle"><a href="libgpod-Tracks.html">Tracks</a></span><span class="refpurpose"> — Data structure to store metadata about an iPod track</span>
@@ -39,6 +39,9 @@
<span class="refentrytitle"><a href="libgpod-Artwork.html">Artwork</a></span><span class="refpurpose"> — Data structure to store iPod artwork (album covers)</span>
</dt>
<dt>
+<span class="refentrytitle"><a href="libgpod-Chapter-Data.html">Chapter Data</a></span><span class="refpurpose"> — Data structure to store chapter data for tracks</span>
+</dt>
+<dt>
<span class="refentrytitle"><a href="libgpod-Device.html">Device</a></span><span class="refpurpose"> — Data structure holding information about the iPod (model, mount point, etc.)</span>
</dt>
</dl></div>
Modified: libgpod/branches/upstream/current/docs/reference/html/index.html
===================================================================
--- libgpod/branches/upstream/current/docs/reference/html/index.html 2008-12-25 18:06:29 UTC (rev 338)
+++ libgpod/branches/upstream/current/docs/reference/html/index.html 2009-01-24 10:34:00 UTC (rev 339)
@@ -3,11 +3,11 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
<title>libgpod Reference Manual</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.72.0">
+<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
<meta name="description" content="This manual documents the interfaces of the libgpod library and has some short notes to help get you up to speed with using the library. Please see the programs in the tests/ directory of the source distribution for some usage examples. A more complete example can be found in the source for Gtkpod. You can also ask questions on the developer's mailing list: gtkpod-devel at lists.sourceforge.net.">
<link rel="start" href="index.html" title="libgpod Reference Manual">
<link rel="next" href="itunesdb.html" title="Part I. iPod database">
-<meta name="generator" content="GTK-Doc V1.8 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.9 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
<link rel="part" href="itunesdb.html" title="Part I. iPod database">
<link rel="chapter" href="ch01.html" title="iPod database components">
@@ -23,7 +23,7 @@
<span class="firstname">Jorg</span> <span class="surname">Schuler</span>
</h3>
<div class="affiliation"><div class="address"><p><br>
-     <code class="email"><<a href="mailto:jorg.schuler at gmx.de">jorg.schuler at gmx.de</a>></code><br>
+     <code class="email"><<a class="email" href="mailto:jorg.schuler at gmx.de">jorg.schuler at gmx.de</a>></code><br>
  </p></div></div>
</div>
<div class="author">
@@ -31,21 +31,21 @@
<span class="firstname">Christophe</span> <span class="surname">Fergeau</span>
</h3>
<div class="affiliation"><div class="address"><p><br>
-     <code class="email"><<a href="mailto:teuf at gnome.org">teuf at gnome.org</a>></code><br>
+     <code class="email"><<a class="email" href="mailto:teuf at gnome.org">teuf at gnome.org</a>></code><br>
  </p></div></div>
</div>
</div></div>
-<div><p class="releaseinfo">for libgpod <span>0.6.0</span></p></div>
-<div><p class="copyright">Copyright © 2006 Christophe Fergeau</p></div>
+<div><p class="releaseinfo">for libgpod <span>0.7.0</span></p></div>
+<div><p class="copyright">Copyright © 2006-2008 Christophe Fergeau</p></div>
<div><div class="legalnotice">
-<a name="id2515628"></a><p>Permission is granted to copy, distribute and/or modify
+<a name="id2740084"></a><p>Permission is granted to copy, distribute and/or modify
this document under the terms of the <em class="citetitle">GNU Free
Documentation License</em>, Version 1.1 or any later
version published by the Free Software Foundation with no
Invariant Sections, no Front-Cover Texts, and no Back-Cover
Texts. You may obtain a copy of the <em class="citetitle">GNU Free
Documentation License</em> from the Free Software
- Foundation by visiting <a href="http://www.fsf.org" target="_top">their Web site</a> or by writing
+ Foundation by visiting <a class="ulink" href="http://www.fsf.org" target="_top">their Web site</a> or by writing
to: Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.</p>
<p>Many of the names used by companies to distinguish their
@@ -63,10 +63,10 @@
library.
</p>
<p>
- Please see the programs in the <a href="http://gtkpod.svn.sourceforge.net/svnroot/gtkpod/libgpod/trunk/tests/" target="_top">tests/</a>
+ Please see the programs in the <a class="ulink" href="http://gtkpod.svn.sourceforge.net/svnroot/gtkpod/libgpod/trunk/tests/" target="_top">tests/</a>
directory of the source distribution for some usage examples. A more
- complete example can be found in the source for <a href="http://www.gtkpod.org" target="_top"> Gtkpod</a>. You can also ask questions
- on the developer's mailing list: <a href="mailto:gtkpod-devel at lists.sourceforge.net" target="_top">gtkpod-devel at lists.sourceforge.net</a>.
+ complete example can be found in the source for <a class="ulink" href="http://www.gtkpod.org" target="_top"> Gtkpod</a>. You can also ask questions
+ on the developer's mailing list: <a class="ulink" href="mailto:gtkpod-devel at lists.sourceforge.net" target="_top">gtkpod-devel at lists.sourceforge.net</a>.
</p>
</div></div>
</div>
@@ -76,13 +76,14 @@
<dt><span class="part"><a href="itunesdb.html">I. iPod database</a></span></dt>
<dd><dl>
<dt>
-<span class="refentrytitle"><a href="libgpod-The-Itdb-iTunesDB-structure.html">iPod database reading/writing</a></span><span class="refpurpose"> — Functions to create, read, write the iPod database</span>
+<span class="refentrytitle"><a href="libgpod-The-Itdb-iTunesDB-structure.html">iPod database reading/writing</a></span><span class="refpurpose"> — Functions to read, write, and create an iPod database</span>
</dt>
<dt>
<span class="refentrytitle"><a href="libgpod-File-handling-functions.html">File handling functions</a></span><span class="refpurpose"> — Managing files on the iPod</span>
</dt>
<dt>
-<span class="refentrytitle"><a href="libgpod-Time-handling.html">Time handling</a></span><span class="refpurpose"> — Helper functions to convert between Epoch time and Mac (iPod) time</span>
+<span class="refentrytitle"><a href="libgpod-Time-handling.html">Time handling</a></span><span class="refpurpose"> — [DEPRECATED] Helper functions to convert between Epoch time and Mac
+(iPod) time</span>
</dt>
<dt>
<span class="refentrytitle"><a href="libgpod-Low-level-functions.html">Low-level functions</a></span><span class="refpurpose"> — Low-level functions which shouldn't be needed in normal situations</span>
@@ -102,6 +103,9 @@
<span class="refentrytitle"><a href="libgpod-Artwork.html">Artwork</a></span><span class="refpurpose"> — Data structure to store iPod artwork (album covers)</span>
</dt>
<dt>
+<span class="refentrytitle"><a href="libgpod-Chapter-Data.html">Chapter Data</a></span><span class="refpurpose"> — Data structure to store chapter data for tracks</span>
+</dt>
+<dt>
<span class="refentrytitle"><a href="libgpod-Device.html">Device</a></span><span class="refpurpose"> — Data structure holding information about the iPod (model, mount point, etc.)</span>
</dt>
</dl></dd>
Modified: libgpod/branches/upstream/current/docs/reference/html/index.sgml
===================================================================
--- libgpod/branches/upstream/current/docs/reference/html/index.sgml 2008-12-25 18:06:29 UTC (rev 338)
+++ libgpod/branches/upstream/current/docs/reference/html/index.sgml 2009-01-24 10:34:00 UTC (rev 339)
@@ -1,7 +1,11 @@
<ANCHOR id="libgpod-The-Itdb-iTunesDB-structure" href="libgpod/libgpod-The-Itdb-iTunesDB-structure.html">
<ANCHOR id="Itdb-iTunesDB" href="libgpod/libgpod-The-Itdb-iTunesDB-structure.html#Itdb-iTunesDB">
-<ANCHOR id="ItdbUserDataDestroyFunc" href="libgpod/libgpod-The-Itdb-iTunesDB-structure.html#ItdbUserDataDestroyFunc">
-<ANCHOR id="ItdbUserDataDuplicateFunc" href="libgpod/libgpod-The-Itdb-iTunesDB-structure.html#ItdbUserDataDuplicateFunc">
+<ANCHOR id="ItdbFileError" href="libgpod/libgpod-The-Itdb-iTunesDB-structure.html#ItdbFileError">
+<ANCHOR id="ITDB-FILE-ERROR-SEEK:CAPS" href="libgpod/libgpod-The-Itdb-iTunesDB-structure.html#ITDB-FILE-ERROR-SEEK:CAPS">
+<ANCHOR id="ITDB-FILE-ERROR-CORRUPT:CAPS" href="libgpod/libgpod-The-Itdb-iTunesDB-structure.html#ITDB-FILE-ERROR-CORRUPT:CAPS">
+<ANCHOR id="ITDB-FILE-ERROR-NOTFOUND:CAPS" href="libgpod/libgpod-The-Itdb-iTunesDB-structure.html#ITDB-FILE-ERROR-NOTFOUND:CAPS">
+<ANCHOR id="ITDB-FILE-ERROR-RENAME:CAPS" href="libgpod/libgpod-The-Itdb-iTunesDB-structure.html#ITDB-FILE-ERROR-RENAME:CAPS">
+<ANCHOR id="ITDB-FILE-ERROR-ITDB-CORRUPT:CAPS" href="libgpod/libgpod-The-Itdb-iTunesDB-structure.html#ITDB-FILE-ERROR-ITDB-CORRUPT:CAPS">
<ANCHOR id="itdb-new" href="libgpod/libgpod-The-Itdb-iTunesDB-structure.html#itdb-new">
<ANCHOR id="itdb-free" href="libgpod/libgpod-The-Itdb-iTunesDB-structure.html#itdb-free">
<ANCHOR id="itdb-parse" href="libgpod/libgpod-The-Itdb-iTunesDB-structure.html#itdb-parse">
@@ -11,6 +15,8 @@
<ANCHOR id="itdb-tracks-number" href="libgpod/libgpod-The-Itdb-iTunesDB-structure.html#itdb-tracks-number">
<ANCHOR id="itdb-tracks-number-nontransferred" href="libgpod/libgpod-The-Itdb-iTunesDB-structure.html#itdb-tracks-number-nontransferred">
<ANCHOR id="itdb-playlists-number" href="libgpod/libgpod-The-Itdb-iTunesDB-structure.html#itdb-playlists-number">
+<ANCHOR id="ItdbUserDataDestroyFunc" href="libgpod/libgpod-The-Itdb-iTunesDB-structure.html#ItdbUserDataDestroyFunc">
+<ANCHOR id="ItdbUserDataDuplicateFunc" href="libgpod/libgpod-The-Itdb-iTunesDB-structure.html#ItdbUserDataDuplicateFunc">
<ANCHOR id="libgpod-File-handling-functions" href="libgpod/libgpod-File-handling-functions.html">
<ANCHOR id="itdb-cp-track-to-ipod" href="libgpod/libgpod-File-handling-functions.html#itdb-cp-track-to-ipod">
<ANCHOR id="itdb-filename-fs2ipod" href="libgpod/libgpod-File-handling-functions.html#itdb-filename-fs2ipod">
@@ -36,17 +42,23 @@
<ANCHOR id="itdb-get-photos-thumb-dir" href="libgpod/libgpod-Low-level-functions.html#itdb-get-photos-thumb-dir">
<ANCHOR id="itdb-get-path" href="libgpod/libgpod-Low-level-functions.html#itdb-get-path">
<ANCHOR id="itdb-resolve-path" href="libgpod/libgpod-Low-level-functions.html#itdb-resolve-path">
-<ANCHOR id="itdb-shuffle-write" href="libgpod/libgpod-Low-level-functions.html#itdb-shuffle-write">
-<ANCHOR id="itdb-shuffle-write-file" href="libgpod/libgpod-Low-level-functions.html#itdb-shuffle-write-file">
<ANCHOR id="itdb-cp" href="libgpod/libgpod-Low-level-functions.html#itdb-cp">
<ANCHOR id="itdb-cp-get-dest-filename" href="libgpod/libgpod-Low-level-functions.html#itdb-cp-get-dest-filename">
<ANCHOR id="itdb-cp-finalize" href="libgpod/libgpod-Low-level-functions.html#itdb-cp-finalize">
<ANCHOR id="itdb-parse-file" href="libgpod/libgpod-Low-level-functions.html#itdb-parse-file">
<ANCHOR id="itdb-write-file" href="libgpod/libgpod-Low-level-functions.html#itdb-write-file">
+<ANCHOR id="itdb-shuffle-write" href="libgpod/libgpod-Low-level-functions.html#itdb-shuffle-write">
+<ANCHOR id="itdb-shuffle-write-file" href="libgpod/libgpod-Low-level-functions.html#itdb-shuffle-write-file">
<ANCHOR id="itdb-duplicate" href="libgpod/libgpod-Low-level-functions.html#itdb-duplicate">
<ANCHOR id="libgpod-Tracks" href="libgpod/libgpod-Tracks.html">
<ANCHOR id="Itdb-Track" href="libgpod/libgpod-Tracks.html#Itdb-Track">
<ANCHOR id="Itdb-Mediatype" href="libgpod/libgpod-Tracks.html#Itdb-Mediatype">
+<ANCHOR id="ITDB-MEDIATYPE-AUDIO:CAPS" href="libgpod/libgpod-Tracks.html#ITDB-MEDIATYPE-AUDIO:CAPS">
+<ANCHOR id="ITDB-MEDIATYPE-MOVIE:CAPS" href="libgpod/libgpod-Tracks.html#ITDB-MEDIATYPE-MOVIE:CAPS">
+<ANCHOR id="ITDB-MEDIATYPE-PODCAST:CAPS" href="libgpod/libgpod-Tracks.html#ITDB-MEDIATYPE-PODCAST:CAPS">
+<ANCHOR id="ITDB-MEDIATYPE-AUDIOBOOK:CAPS" href="libgpod/libgpod-Tracks.html#ITDB-MEDIATYPE-AUDIOBOOK:CAPS">
+<ANCHOR id="ITDB-MEDIATYPE-MUSICVIDEO:CAPS" href="libgpod/libgpod-Tracks.html#ITDB-MEDIATYPE-MUSICVIDEO:CAPS">
+<ANCHOR id="ITDB-MEDIATYPE-TVSHOW:CAPS" href="libgpod/libgpod-Tracks.html#ITDB-MEDIATYPE-TVSHOW:CAPS">
<ANCHOR id="ITDB-RATING-STEP:CAPS" href="libgpod/libgpod-Tracks.html#ITDB-RATING-STEP:CAPS">
<ANCHOR id="itdb-track-new" href="libgpod/libgpod-Tracks.html#itdb-track-new">
<ANCHOR id="itdb-track-free" href="libgpod/libgpod-Tracks.html#itdb-track-free">
@@ -58,6 +70,8 @@
<ANCHOR id="itdb-track-id-tree-create" href="libgpod/libgpod-Tracks.html#itdb-track-id-tree-create">
<ANCHOR id="itdb-track-id-tree-destroy" href="libgpod/libgpod-Tracks.html#itdb-track-id-tree-destroy">
<ANCHOR id="itdb-track-id-tree-by-id" href="libgpod/libgpod-Tracks.html#itdb-track-id-tree-by-id">
+<ANCHOR id="itdb-track-get-thumbnail" href="libgpod/libgpod-Tracks.html#itdb-track-get-thumbnail">
+<ANCHOR id="itdb-track-has-thumbnails" href="libgpod/libgpod-Tracks.html#itdb-track-has-thumbnails">
<ANCHOR id="itdb-track-set-thumbnails" href="libgpod/libgpod-Tracks.html#itdb-track-set-thumbnails">
<ANCHOR id="itdb-track-set-thumbnails-from-data" href="libgpod/libgpod-Tracks.html#itdb-track-set-thumbnails-from-data">
<ANCHOR id="itdb-track-set-thumbnails-from-pixbuf" href="libgpod/libgpod-Tracks.html#itdb-track-set-thumbnails-from-pixbuf">
@@ -65,6 +79,32 @@
<ANCHOR id="libgpod-Playlists" href="libgpod/libgpod-Playlists.html">
<ANCHOR id="Itdb-Playlist" href="libgpod/libgpod-Playlists.html#Itdb-Playlist">
<ANCHOR id="ItdbPlaylistSortOrder" href="libgpod/libgpod-Playlists.html#ItdbPlaylistSortOrder">
+<ANCHOR id="ITDB-PSO-MANUAL:CAPS" href="libgpod/libgpod-Playlists.html#ITDB-PSO-MANUAL:CAPS">
+<ANCHOR id="ITDB-PSO-TITLE:CAPS" href="libgpod/libgpod-Playlists.html#ITDB-PSO-TITLE:CAPS">
+<ANCHOR id="ITDB-PSO-ALBUM:CAPS" href="libgpod/libgpod-Playlists.html#ITDB-PSO-ALBUM:CAPS">
+<ANCHOR id="ITDB-PSO-ARTIST:CAPS" href="libgpod/libgpod-Playlists.html#ITDB-PSO-ARTIST:CAPS">
+<ANCHOR id="ITDB-PSO-BIRATE:CAPS" href="libgpod/libgpod-Playlists.html#ITDB-PSO-BIRATE:CAPS">
+<ANCHOR id="ITDB-PSO-GENRE:CAPS" href="libgpod/libgpod-Playlists.html#ITDB-PSO-GENRE:CAPS">
+<ANCHOR id="ITDB-PSO-FILETYPE:CAPS" href="libgpod/libgpod-Playlists.html#ITDB-PSO-FILETYPE:CAPS">
+<ANCHOR id="ITDB-PSO-TIME-MODIFIED:CAPS" href="libgpod/libgpod-Playlists.html#ITDB-PSO-TIME-MODIFIED:CAPS">
+<ANCHOR id="ITDB-PSO-TRACK-NR:CAPS" href="libgpod/libgpod-Playlists.html#ITDB-PSO-TRACK-NR:CAPS">
+<ANCHOR id="ITDB-PSO-SIZE:CAPS" href="libgpod/libgpod-Playlists.html#ITDB-PSO-SIZE:CAPS">
+<ANCHOR id="ITDB-PSO-TIME:CAPS" href="libgpod/libgpod-Playlists.html#ITDB-PSO-TIME:CAPS">
+<ANCHOR id="ITDB-PSO-YEAR:CAPS" href="libgpod/libgpod-Playlists.html#ITDB-PSO-YEAR:CAPS">
+<ANCHOR id="ITDB-PSO-SAMPLERATE:CAPS" href="libgpod/libgpod-Playlists.html#ITDB-PSO-SAMPLERATE:CAPS">
+<ANCHOR id="ITDB-PSO-COMMENT:CAPS" href="libgpod/libgpod-Playlists.html#ITDB-PSO-COMMENT:CAPS">
+<ANCHOR id="ITDB-PSO-TIME-ADDED:CAPS" href="libgpod/libgpod-Playlists.html#ITDB-PSO-TIME-ADDED:CAPS">
+<ANCHOR id="ITDB-PSO-EQUALIZER:CAPS" href="libgpod/libgpod-Playlists.html#ITDB-PSO-EQUALIZER:CAPS">
+<ANCHOR id="ITDB-PSO-COMPOSER:CAPS" href="libgpod/libgpod-Playlists.html#ITDB-PSO-COMPOSER:CAPS">
+<ANCHOR id="ITDB-PSO-PLAYCOUNT:CAPS" href="libgpod/libgpod-Playlists.html#ITDB-PSO-PLAYCOUNT:CAPS">
+<ANCHOR id="ITDB-PSO-TIME-PLAYED:CAPS" href="libgpod/libgpod-Playlists.html#ITDB-PSO-TIME-PLAYED:CAPS">
+<ANCHOR id="ITDB-PSO-CD-NR:CAPS" href="libgpod/libgpod-Playlists.html#ITDB-PSO-CD-NR:CAPS">
+<ANCHOR id="ITDB-PSO-RATING:CAPS" href="libgpod/libgpod-Playlists.html#ITDB-PSO-RATING:CAPS">
+<ANCHOR id="ITDB-PSO-RELEASE-DATE:CAPS" href="libgpod/libgpod-Playlists.html#ITDB-PSO-RELEASE-DATE:CAPS">
+<ANCHOR id="ITDB-PSO-BPM:CAPS" href="libgpod/libgpod-Playlists.html#ITDB-PSO-BPM:CAPS">
+<ANCHOR id="ITDB-PSO-GROUPING:CAPS" href="libgpod/libgpod-Playlists.html#ITDB-PSO-GROUPING:CAPS">
+<ANCHOR id="ITDB-PSO-CATEGORY:CAPS" href="libgpod/libgpod-Playlists.html#ITDB-PSO-CATEGORY:CAPS">
+<ANCHOR id="ITDB-PSO-DESCRIPTION:CAPS" href="libgpod/libgpod-Playlists.html#ITDB-PSO-DESCRIPTION:CAPS">
<ANCHOR id="itdb-playlist-new" href="libgpod/libgpod-Playlists.html#itdb-playlist-new">
<ANCHOR id="itdb-playlist-free" href="libgpod/libgpod-Playlists.html#itdb-playlist-free">
<ANCHOR id="itdb-playlist-duplicate" href="libgpod/libgpod-Playlists.html#itdb-playlist-duplicate">
@@ -93,13 +133,102 @@
<ANCHOR id="Itdb-SPLRule" href="libgpod/libgpod-Smart-Playlists.html#Itdb-SPLRule">
<ANCHOR id="Itdb-SPLRules" href="libgpod/libgpod-Smart-Playlists.html#Itdb-SPLRules">
<ANCHOR id="ItdbLimitSort" href="libgpod/libgpod-Smart-Playlists.html#ItdbLimitSort">
+<ANCHOR id="ITDB-LIMITSORT-RANDOM:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-LIMITSORT-RANDOM:CAPS">
+<ANCHOR id="ITDB-LIMITSORT-SONG-NAME:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-LIMITSORT-SONG-NAME:CAPS">
+<ANCHOR id="ITDB-LIMITSORT-ALBUM:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-LIMITSORT-ALBUM:CAPS">
+<ANCHOR id="ITDB-LIMITSORT-ARTIST:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-LIMITSORT-ARTIST:CAPS">
+<ANCHOR id="ITDB-LIMITSORT-GENRE:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-LIMITSORT-GENRE:CAPS">
+<ANCHOR id="ITDB-LIMITSORT-MOST-RECENTLY-ADDED:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-LIMITSORT-MOST-RECENTLY-ADDED:CAPS">
+<ANCHOR id="ITDB-LIMITSORT-LEAST-RECENTLY-ADDED:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-LIMITSORT-LEAST-RECENTLY-ADDED:CAPS">
+<ANCHOR id="ITDB-LIMITSORT-MOST-OFTEN-PLAYED:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-LIMITSORT-MOST-OFTEN-PLAYED:CAPS">
+<ANCHOR id="ITDB-LIMITSORT-LEAST-OFTEN-PLAYED:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-LIMITSORT-LEAST-OFTEN-PLAYED:CAPS">
+<ANCHOR id="ITDB-LIMITSORT-MOST-RECENTLY-PLAYED:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-LIMITSORT-MOST-RECENTLY-PLAYED:CAPS">
+<ANCHOR id="ITDB-LIMITSORT-LEAST-RECENTLY-PLAYED:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-LIMITSORT-LEAST-RECENTLY-PLAYED:CAPS">
+<ANCHOR id="ITDB-LIMITSORT-HIGHEST-RATING:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-LIMITSORT-HIGHEST-RATING:CAPS">
+<ANCHOR id="ITDB-LIMITSORT-LOWEST-RATING:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-LIMITSORT-LOWEST-RATING:CAPS">
<ANCHOR id="ItdbLimitType" href="libgpod/libgpod-Smart-Playlists.html#ItdbLimitType">
+<ANCHOR id="ITDB-LIMITTYPE-MINUTES:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-LIMITTYPE-MINUTES:CAPS">
+<ANCHOR id="ITDB-LIMITTYPE-MB:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-LIMITTYPE-MB:CAPS">
+<ANCHOR id="ITDB-LIMITTYPE-SONGS:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-LIMITTYPE-SONGS:CAPS">
+<ANCHOR id="ITDB-LIMITTYPE-HOURS:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-LIMITTYPE-HOURS:CAPS">
+<ANCHOR id="ITDB-LIMITTYPE-GB:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-LIMITTYPE-GB:CAPS">
<ANCHOR id="ItdbSPLAction" href="libgpod/libgpod-Smart-Playlists.html#ItdbSPLAction">
+<ANCHOR id="ITDB-SPLACTION-IS-INT:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLACTION-IS-INT:CAPS">
+<ANCHOR id="ITDB-SPLACTION-IS-GREATER-THAN:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLACTION-IS-GREATER-THAN:CAPS">
+<ANCHOR id="ITDB-SPLACTION-IS-LESS-THAN:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLACTION-IS-LESS-THAN:CAPS">
+<ANCHOR id="ITDB-SPLACTION-IS-IN-THE-RANGE:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLACTION-IS-IN-THE-RANGE:CAPS">
+<ANCHOR id="ITDB-SPLACTION-IS-IN-THE-LAST:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLACTION-IS-IN-THE-LAST:CAPS">
+<ANCHOR id="ITDB-SPLACTION-BINARY-AND:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLACTION-BINARY-AND:CAPS">
+<ANCHOR id="ITDB-SPLACTION-IS-STRING:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLACTION-IS-STRING:CAPS">
+<ANCHOR id="ITDB-SPLACTION-CONTAINS:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLACTION-CONTAINS:CAPS">
+<ANCHOR id="ITDB-SPLACTION-STARTS-WITH:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLACTION-STARTS-WITH:CAPS">
+<ANCHOR id="ITDB-SPLACTION-ENDS-WITH:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLACTION-ENDS-WITH:CAPS">
+<ANCHOR id="ITDB-SPLACTION-IS-NOT-INT:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLACTION-IS-NOT-INT:CAPS">
+<ANCHOR id="ITDB-SPLACTION-IS-NOT-GREATER-THAN:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLACTION-IS-NOT-GREATER-THAN:CAPS">
+<ANCHOR id="ITDB-SPLACTION-IS-NOT-LESS-THAN:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLACTION-IS-NOT-LESS-THAN:CAPS">
+<ANCHOR id="ITDB-SPLACTION-IS-NOT-IN-THE-RANGE:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLACTION-IS-NOT-IN-THE-RANGE:CAPS">
+<ANCHOR id="ITDB-SPLACTION-IS-NOT-IN-THE-LAST:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLACTION-IS-NOT-IN-THE-LAST:CAPS">
+<ANCHOR id="ITDB-SPLACTION-IS-NOT:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLACTION-IS-NOT:CAPS">
+<ANCHOR id="ITDB-SPLACTION-DOES-NOT-CONTAIN:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLACTION-DOES-NOT-CONTAIN:CAPS">
+<ANCHOR id="ITDB-SPLACTION-DOES-NOT-START-WITH:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLACTION-DOES-NOT-START-WITH:CAPS">
+<ANCHOR id="ITDB-SPLACTION-DOES-NOT-END-WITH:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLACTION-DOES-NOT-END-WITH:CAPS">
<ANCHOR id="ItdbSPLActionLast" href="libgpod/libgpod-Smart-Playlists.html#ItdbSPLActionLast">
+<ANCHOR id="ITDB-SPLACTION-LAST-DAYS-VALUE:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLACTION-LAST-DAYS-VALUE:CAPS">
+<ANCHOR id="ITDB-SPLACTION-LAST-WEEKS-VALUE:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLACTION-LAST-WEEKS-VALUE:CAPS">
+<ANCHOR id="ITDB-SPLACTION-LAST-MONTHS-VALUE:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLACTION-LAST-MONTHS-VALUE:CAPS">
<ANCHOR id="ItdbSPLActionType" href="libgpod/libgpod-Smart-Playlists.html#ItdbSPLActionType">
+<ANCHOR id="ITDB-SPLAT-STRING:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLAT-STRING:CAPS">
+<ANCHOR id="ITDB-SPLAT-INT:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLAT-INT:CAPS">
+<ANCHOR id="ITDB-SPLAT-DATE:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLAT-DATE:CAPS">
+<ANCHOR id="ITDB-SPLAT-RANGE-INT:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLAT-RANGE-INT:CAPS">
+<ANCHOR id="ITDB-SPLAT-RANGE-DATE:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLAT-RANGE-DATE:CAPS">
+<ANCHOR id="ITDB-SPLAT-INTHELAST:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLAT-INTHELAST:CAPS">
+<ANCHOR id="ITDB-SPLAT-PLAYLIST:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLAT-PLAYLIST:CAPS">
+<ANCHOR id="ITDB-SPLAT-NONE:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLAT-NONE:CAPS">
+<ANCHOR id="ITDB-SPLAT-INVALID:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLAT-INVALID:CAPS">
+<ANCHOR id="ITDB-SPLAT-UNKNOWN:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLAT-UNKNOWN:CAPS">
+<ANCHOR id="ITDB-SPLAT-BINARY-AND:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLAT-BINARY-AND:CAPS">
<ANCHOR id="ItdbSPLField" href="libgpod/libgpod-Smart-Playlists.html#ItdbSPLField">
+<ANCHOR id="ITDB-SPLFIELD-SONG-NAME:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLFIELD-SONG-NAME:CAPS">
+<ANCHOR id="ITDB-SPLFIELD-ALBUM:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLFIELD-ALBUM:CAPS">
+<ANCHOR id="ITDB-SPLFIELD-ARTIST:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLFIELD-ARTIST:CAPS">
+<ANCHOR id="ITDB-SPLFIELD-BITRATE:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLFIELD-BITRATE:CAPS">
+<ANCHOR id="ITDB-SPLFIELD-SAMPLE-RATE:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLFIELD-SAMPLE-RATE:CAPS">
+<ANCHOR id="ITDB-SPLFIELD-YEAR:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLFIELD-YEAR:CAPS">
+<ANCHOR id="ITDB-SPLFIELD-GENRE:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLFIELD-GENRE:CAPS">
+<ANCHOR id="ITDB-SPLFIELD-KIND:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLFIELD-KIND:CAPS">
+<ANCHOR id="ITDB-SPLFIELD-DATE-MODIFIED:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLFIELD-DATE-MODIFIED:CAPS">
+<ANCHOR id="ITDB-SPLFIELD-TRACKNUMBER:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLFIELD-TRACKNUMBER:CAPS">
+<ANCHOR id="ITDB-SPLFIELD-SIZE:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLFIELD-SIZE:CAPS">
+<ANCHOR id="ITDB-SPLFIELD-TIME:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLFIELD-TIME:CAPS">
+<ANCHOR id="ITDB-SPLFIELD-COMMENT:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLFIELD-COMMENT:CAPS">
+<ANCHOR id="ITDB-SPLFIELD-DATE-ADDED:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLFIELD-DATE-ADDED:CAPS">
+<ANCHOR id="ITDB-SPLFIELD-COMPOSER:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLFIELD-COMPOSER:CAPS">
+<ANCHOR id="ITDB-SPLFIELD-PLAYCOUNT:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLFIELD-PLAYCOUNT:CAPS">
+<ANCHOR id="ITDB-SPLFIELD-LAST-PLAYED:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLFIELD-LAST-PLAYED:CAPS">
+<ANCHOR id="ITDB-SPLFIELD-DISC-NUMBER:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLFIELD-DISC-NUMBER:CAPS">
+<ANCHOR id="ITDB-SPLFIELD-RATING:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLFIELD-RATING:CAPS">
+<ANCHOR id="ITDB-SPLFIELD-COMPILATION:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLFIELD-COMPILATION:CAPS">
+<ANCHOR id="ITDB-SPLFIELD-BPM:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLFIELD-BPM:CAPS">
+<ANCHOR id="ITDB-SPLFIELD-GROUPING:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLFIELD-GROUPING:CAPS">
+<ANCHOR id="ITDB-SPLFIELD-PLAYLIST:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLFIELD-PLAYLIST:CAPS">
+<ANCHOR id="ITDB-SPLFIELD-VIDEO-KIND:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLFIELD-VIDEO-KIND:CAPS">
+<ANCHOR id="ITDB-SPLFIELD-TVSHOW:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLFIELD-TVSHOW:CAPS">
+<ANCHOR id="ITDB-SPLFIELD-SEASON-NR:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLFIELD-SEASON-NR:CAPS">
+<ANCHOR id="ITDB-SPLFIELD-SKIPCOUNT:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLFIELD-SKIPCOUNT:CAPS">
+<ANCHOR id="ITDB-SPLFIELD-LAST-SKIPPED:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLFIELD-LAST-SKIPPED:CAPS">
+<ANCHOR id="ITDB-SPLFIELD-ALBUMARTIST:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLFIELD-ALBUMARTIST:CAPS">
<ANCHOR id="ItdbSPLFieldType" href="libgpod/libgpod-Smart-Playlists.html#ItdbSPLFieldType">
+<ANCHOR id="ITDB-SPLFT-STRING:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLFT-STRING:CAPS">
+<ANCHOR id="ITDB-SPLFT-INT:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLFT-INT:CAPS">
+<ANCHOR id="ITDB-SPLFT-BOOLEAN:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLFT-BOOLEAN:CAPS">
+<ANCHOR id="ITDB-SPLFT-DATE:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLFT-DATE:CAPS">
+<ANCHOR id="ITDB-SPLFT-PLAYLIST:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLFT-PLAYLIST:CAPS">
+<ANCHOR id="ITDB-SPLFT-UNKNOWN:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLFT-UNKNOWN:CAPS">
+<ANCHOR id="ITDB-SPLFT-BINARY-AND:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLFT-BINARY-AND:CAPS">
<ANCHOR id="ItdbSPLMatch" href="libgpod/libgpod-Smart-Playlists.html#ItdbSPLMatch">
+<ANCHOR id="ITDB-SPLMATCH-AND:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLMATCH-AND:CAPS">
+<ANCHOR id="ITDB-SPLMATCH-OR:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPLMATCH-OR:CAPS">
<ANCHOR id="ITDB-SPL-DATE-IDENTIFIER:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPL-DATE-IDENTIFIER:CAPS">
<ANCHOR id="ITDB-SPL-STRING-MAXLEN:CAPS" href="libgpod/libgpod-Smart-Playlists.html#ITDB-SPL-STRING-MAXLEN:CAPS">
<ANCHOR id="itdb-splr-get-field-type" href="libgpod/libgpod-Smart-Playlists.html#itdb-splr-get-field-type">
@@ -116,22 +245,31 @@
<ANCHOR id="itdb-spl-update-live" href="libgpod/libgpod-Smart-Playlists.html#itdb-spl-update-live">
<ANCHOR id="libgpod-Artwork" href="libgpod/libgpod-Artwork.html">
<ANCHOR id="Itdb-Artwork" href="libgpod/libgpod-Artwork.html#Itdb-Artwork">
-<ANCHOR id="Itdb-Thumb" href="libgpod/libgpod-Artwork.html#Itdb-Thumb">
-<ANCHOR id="ItdbThumbType" href="libgpod/libgpod-Artwork.html#ItdbThumbType">
<ANCHOR id="itdb-artwork-new" href="libgpod/libgpod-Artwork.html#itdb-artwork-new">
<ANCHOR id="itdb-artwork-duplicate" href="libgpod/libgpod-Artwork.html#itdb-artwork-duplicate">
<ANCHOR id="itdb-artwork-free" href="libgpod/libgpod-Artwork.html#itdb-artwork-free">
-<ANCHOR id="itdb-artwork-add-thumbnail" href="libgpod/libgpod-Artwork.html#itdb-artwork-add-thumbnail">
-<ANCHOR id="itdb-artwork-add-thumbnail-from-data" href="libgpod/libgpod-Artwork.html#itdb-artwork-add-thumbnail-from-data">
-<ANCHOR id="itdb-artwork-add-thumbnail-from-pixbuf" href="libgpod/libgpod-Artwork.html#itdb-artwork-add-thumbnail-from-pixbuf">
-<ANCHOR id="itdb-artwork-remove-thumbnail" href="libgpod/libgpod-Artwork.html#itdb-artwork-remove-thumbnail">
+<ANCHOR id="itdb-artwork-get-pixbuf" href="libgpod/libgpod-Artwork.html#itdb-artwork-get-pixbuf">
+<ANCHOR id="itdb-artwork-set-thumbnail" href="libgpod/libgpod-Artwork.html#itdb-artwork-set-thumbnail">
+<ANCHOR id="itdb-artwork-set-thumbnail-from-data" href="libgpod/libgpod-Artwork.html#itdb-artwork-set-thumbnail-from-data">
+<ANCHOR id="itdb-artwork-set-thumbnail-from-pixbuf" href="libgpod/libgpod-Artwork.html#itdb-artwork-set-thumbnail-from-pixbuf">
<ANCHOR id="itdb-artwork-remove-thumbnails" href="libgpod/libgpod-Artwork.html#itdb-artwork-remove-thumbnails">
-<ANCHOR id="itdb-artwork-get-thumb-by-type" href="libgpod/libgpod-Artwork.html#itdb-artwork-get-thumb-by-type">
-<ANCHOR id="itdb-thumb-get-gdk-pixbuf" href="libgpod/libgpod-Artwork.html#itdb-thumb-get-gdk-pixbuf">
+<ANCHOR id="Itdb-Thumb" href="libgpod/libgpod-Artwork.html#Itdb-Thumb">
<ANCHOR id="itdb-thumb-duplicate" href="libgpod/libgpod-Artwork.html#itdb-thumb-duplicate">
<ANCHOR id="itdb-thumb-free" href="libgpod/libgpod-Artwork.html#itdb-thumb-free">
-<ANCHOR id="itdb-thumb-new" href="libgpod/libgpod-Artwork.html#itdb-thumb-new">
-<ANCHOR id="itdb-thumb-get-filename" href="libgpod/libgpod-Artwork.html#itdb-thumb-get-filename">
+<ANCHOR id="itdb-thumb-to-pixbuf-at-size" href="libgpod/libgpod-Artwork.html#itdb-thumb-to-pixbuf-at-size">
+<ANCHOR id="itdb-thumb-to-pixbufs" href="libgpod/libgpod-Artwork.html#itdb-thumb-to-pixbufs">
+<ANCHOR id="libgpod-Chapter-Data" href="libgpod/libgpod-Chapter-Data.html">
+<ANCHOR id="Itdb-Chapter" href="libgpod/libgpod-Chapter-Data.html#Itdb-Chapter">
+<ANCHOR id="Itdb-Chapterdata" href="libgpod/libgpod-Chapter-Data.html#Itdb-Chapterdata">
+<ANCHOR id="itdb-chapter-new" href="libgpod/libgpod-Chapter-Data.html#itdb-chapter-new">
+<ANCHOR id="itdb-chapter-duplicate" href="libgpod/libgpod-Chapter-Data.html#itdb-chapter-duplicate">
+<ANCHOR id="itdb-chapter-free" href="libgpod/libgpod-Chapter-Data.html#itdb-chapter-free">
+<ANCHOR id="itdb-chapterdata-new" href="libgpod/libgpod-Chapter-Data.html#itdb-chapterdata-new">
+<ANCHOR id="itdb-chapterdata-add-chapter" href="libgpod/libgpod-Chapter-Data.html#itdb-chapterdata-add-chapter">
+<ANCHOR id="itdb-chapterdata-duplicate" href="libgpod/libgpod-Chapter-Data.html#itdb-chapterdata-duplicate">
+<ANCHOR id="itdb-chapterdata-remove-chapter" href="libgpod/libgpod-Chapter-Data.html#itdb-chapterdata-remove-chapter">
+<ANCHOR id="itdb-chapterdata-remove-chapters" href="libgpod/libgpod-Chapter-Data.html#itdb-chapterdata-remove-chapters">
+<ANCHOR id="itdb-chapterdata-free" href="libgpod/libgpod-Chapter-Data.html#itdb-chapterdata-free">
<ANCHOR id="libgpod-Device" href="libgpod/libgpod-Device.html">
<ANCHOR id="Itdb-Device" href="libgpod/libgpod-Device.html#Itdb-Device">
<ANCHOR id="itdb-device-new" href="libgpod/libgpod-Device.html#itdb-device-new">
@@ -141,29 +279,89 @@
<ANCHOR id="itdb-device-get-sysinfo" href="libgpod/libgpod-Device.html#itdb-device-get-sysinfo">
<ANCHOR id="itdb-device-set-sysinfo" href="libgpod/libgpod-Device.html#itdb-device-set-sysinfo">
<ANCHOR id="itdb-device-write-sysinfo" href="libgpod/libgpod-Device.html#itdb-device-write-sysinfo">
+<ANCHOR id="Itdb-IpodInfo" href="libgpod/libgpod-Device.html#Itdb-IpodInfo">
<ANCHOR id="itdb-device-get-ipod-info" href="libgpod/libgpod-Device.html#itdb-device-get-ipod-info">
<ANCHOR id="itdb-device-supports-artwork" href="libgpod/libgpod-Device.html#itdb-device-supports-artwork">
<ANCHOR id="itdb-device-supports-photo" href="libgpod/libgpod-Device.html#itdb-device-supports-photo">
+<ANCHOR id="itdb-device-supports-video" href="libgpod/libgpod-Device.html#itdb-device-supports-video">
<ANCHOR id="itdb-info-get-ipod-info-table" href="libgpod/libgpod-Device.html#itdb-info-get-ipod-info-table">
+<ANCHOR id="Itdb-IpodGeneration" href="libgpod/libgpod-Device.html#Itdb-IpodGeneration">
+<ANCHOR id="ITDB-IPOD-GENERATION-UNKNOWN:CAPS" href="libgpod/libgpod-Device.html#ITDB-IPOD-GENERATION-UNKNOWN:CAPS">
+<ANCHOR id="ITDB-IPOD-GENERATION-FIRST:CAPS" href="libgpod/libgpod-Device.html#ITDB-IPOD-GENERATION-FIRST:CAPS">
+<ANCHOR id="ITDB-IPOD-GENERATION-SECOND:CAPS" href="libgpod/libgpod-Device.html#ITDB-IPOD-GENERATION-SECOND:CAPS">
+<ANCHOR id="ITDB-IPOD-GENERATION-THIRD:CAPS" href="libgpod/libgpod-Device.html#ITDB-IPOD-GENERATION-THIRD:CAPS">
+<ANCHOR id="ITDB-IPOD-GENERATION-FOURTH:CAPS" href="libgpod/libgpod-Device.html#ITDB-IPOD-GENERATION-FOURTH:CAPS">
+<ANCHOR id="ITDB-IPOD-GENERATION-PHOTO:CAPS" href="libgpod/libgpod-Device.html#ITDB-IPOD-GENERATION-PHOTO:CAPS">
+<ANCHOR id="ITDB-IPOD-GENERATION-MOBILE:CAPS" href="libgpod/libgpod-Device.html#ITDB-IPOD-GENERATION-MOBILE:CAPS">
+<ANCHOR id="ITDB-IPOD-GENERATION-MINI-1:CAPS" href="libgpod/libgpod-Device.html#ITDB-IPOD-GENERATION-MINI-1:CAPS">
+<ANCHOR id="ITDB-IPOD-GENERATION-MINI-2:CAPS" href="libgpod/libgpod-Device.html#ITDB-IPOD-GENERATION-MINI-2:CAPS">
+<ANCHOR id="ITDB-IPOD-GENERATION-SHUFFLE-1:CAPS" href="libgpod/libgpod-Device.html#ITDB-IPOD-GENERATION-SHUFFLE-1:CAPS">
+<ANCHOR id="ITDB-IPOD-GENERATION-SHUFFLE-2:CAPS" href="libgpod/libgpod-Device.html#ITDB-IPOD-GENERATION-SHUFFLE-2:CAPS">
+<ANCHOR id="ITDB-IPOD-GENERATION-SHUFFLE-3:CAPS" href="libgpod/libgpod-Device.html#ITDB-IPOD-GENERATION-SHUFFLE-3:CAPS">
+<ANCHOR id="ITDB-IPOD-GENERATION-NANO-1:CAPS" href="libgpod/libgpod-Device.html#ITDB-IPOD-GENERATION-NANO-1:CAPS">
+<ANCHOR id="ITDB-IPOD-GENERATION-NANO-2:CAPS" href="libgpod/libgpod-Device.html#ITDB-IPOD-GENERATION-NANO-2:CAPS">
+<ANCHOR id="ITDB-IPOD-GENERATION-NANO-3:CAPS" href="libgpod/libgpod-Device.html#ITDB-IPOD-GENERATION-NANO-3:CAPS">
+<ANCHOR id="ITDB-IPOD-GENERATION-NANO-4:CAPS" href="libgpod/libgpod-Device.html#ITDB-IPOD-GENERATION-NANO-4:CAPS">
+<ANCHOR id="ITDB-IPOD-GENERATION-VIDEO-1:CAPS" href="libgpod/libgpod-Device.html#ITDB-IPOD-GENERATION-VIDEO-1:CAPS">
+<ANCHOR id="ITDB-IPOD-GENERATION-VIDEO-2:CAPS" href="libgpod/libgpod-Device.html#ITDB-IPOD-GENERATION-VIDEO-2:CAPS">
+<ANCHOR id="ITDB-IPOD-GENERATION-CLASSIC-1:CAPS" href="libgpod/libgpod-Device.html#ITDB-IPOD-GENERATION-CLASSIC-1:CAPS">
+<ANCHOR id="ITDB-IPOD-GENERATION-CLASSIC-2:CAPS" href="libgpod/libgpod-Device.html#ITDB-IPOD-GENERATION-CLASSIC-2:CAPS">
+<ANCHOR id="ITDB-IPOD-GENERATION-TOUCH-1:CAPS" href="libgpod/libgpod-Device.html#ITDB-IPOD-GENERATION-TOUCH-1:CAPS">
+<ANCHOR id="ITDB-IPOD-GENERATION-IPHONE-1:CAPS" href="libgpod/libgpod-Device.html#ITDB-IPOD-GENERATION-IPHONE-1:CAPS">
<ANCHOR id="itdb-info-get-ipod-generation-string" href="libgpod/libgpod-Device.html#itdb-info-get-ipod-generation-string">
+<ANCHOR id="Itdb-IpodModel" href="libgpod/libgpod-Device.html#Itdb-IpodModel">
+<ANCHOR id="ITDB-IPOD-MODEL-INVALID:CAPS" href="libgpod/libgpod-Device.html#ITDB-IPOD-MODEL-INVALID:CAPS">
+<ANCHOR id="ITDB-IPOD-MODEL-UNKNOWN:CAPS" href="libgpod/libgpod-Device.html#ITDB-IPOD-MODEL-UNKNOWN:CAPS">
+<ANCHOR id="ITDB-IPOD-MODEL-COLOR:CAPS" href="libgpod/libgpod-Device.html#ITDB-IPOD-MODEL-COLOR:CAPS">
+<ANCHOR id="ITDB-IPOD-MODEL-COLOR-U2:CAPS" href="libgpod/libgpod-Device.html#ITDB-IPOD-MODEL-COLOR-U2:CAPS">
+<ANCHOR id="ITDB-IPOD-MODEL-REGULAR:CAPS" href="libgpod/libgpod-Device.html#ITDB-IPOD-MODEL-REGULAR:CAPS">
+<ANCHOR id="ITDB-IPOD-MODEL-REGULAR-U2:CAPS" href="libgpod/libgpod-Device.html#ITDB-IPOD-MODEL-REGULAR-U2:CAPS">
+<ANCHOR id="ITDB-IPOD-MODEL-MINI:CAPS" href="libgpod/libgpod-Device.html#ITDB-IPOD-MODEL-MINI:CAPS">
+<ANCHOR id="ITDB-IPOD-MODEL-MINI-BLUE:CAPS" href="libgpod/libgpod-Device.html#ITDB-IPOD-MODEL-MINI-BLUE:CAPS">
+<ANCHOR id="ITDB-IPOD-MODEL-MINI-PINK:CAPS" href="libgpod/libgpod-Device.html#ITDB-IPOD-MODEL-MINI-PINK:CAPS">
+<ANCHOR id="ITDB-IPOD-MODEL-MINI-GREEN:CAPS" href="libgpod/libgpod-Device.html#ITDB-IPOD-MODEL-MINI-GREEN:CAPS">
+<ANCHOR id="ITDB-IPOD-MODEL-MINI-GOLD:CAPS" href="libgpod/libgpod-Device.html#ITDB-IPOD-MODEL-MINI-GOLD:CAPS">
+<ANCHOR id="ITDB-IPOD-MODEL-SHUFFLE:CAPS" href="libgpod/libgpod-Device.html#ITDB-IPOD-MODEL-SHUFFLE:CAPS">
+<ANCHOR id="ITDB-IPOD-MODEL-NANO-WHITE:CAPS" href="libgpod/libgpod-Device.html#ITDB-IPOD-MODEL-NANO-WHITE:CAPS">
+<ANCHOR id="ITDB-IPOD-MODEL-NANO-BLACK:CAPS" href="libgpod/libgpod-Device.html#ITDB-IPOD-MODEL-NANO-BLACK:CAPS">
+<ANCHOR id="ITDB-IPOD-MODEL-VIDEO-WHITE:CAPS" href="libgpod/libgpod-Device.html#ITDB-IPOD-MODEL-VIDEO-WHITE:CAPS">
+<ANCHOR id="ITDB-IPOD-MODEL-VIDEO-BLACK:CAPS" href="libgpod/libgpod-Device.html#ITDB-IPOD-MODEL-VIDEO-BLACK:CAPS">
+<ANCHOR id="ITDB-IPOD-MODEL-MOBILE-1:CAPS" href="libgpod/libgpod-Device.html#ITDB-IPOD-MODEL-MOBILE-1:CAPS">
+<ANCHOR id="ITDB-IPOD-MODEL-VIDEO-U2:CAPS" href="libgpod/libgpod-Device.html#ITDB-IPOD-MODEL-VIDEO-U2:CAPS">
+<ANCHOR id="ITDB-IPOD-MODEL-NANO-SILVER:CAPS" href="libgpod/libgpod-Device.html#ITDB-IPOD-MODEL-NANO-SILVER:CAPS">
+<ANCHOR id="ITDB-IPOD-MODEL-NANO-BLUE:CAPS" href="libgpod/libgpod-Device.html#ITDB-IPOD-MODEL-NANO-BLUE:CAPS">
+<ANCHOR id="ITDB-IPOD-MODEL-NANO-GREEN:CAPS" href="libgpod/libgpod-Device.html#ITDB-IPOD-MODEL-NANO-GREEN:CAPS">
+<ANCHOR id="ITDB-IPOD-MODEL-NANO-PINK:CAPS" href="libgpod/libgpod-Device.html#ITDB-IPOD-MODEL-NANO-PINK:CAPS">
+<ANCHOR id="ITDB-IPOD-MODEL-NANO-RED:CAPS" href="libgpod/libgpod-Device.html#ITDB-IPOD-MODEL-NANO-RED:CAPS">
+<ANCHOR id="ITDB-IPOD-MODEL-NANO-YELLOW:CAPS" href="libgpod/libgpod-Device.html#ITDB-IPOD-MODEL-NANO-YELLOW:CAPS">
+<ANCHOR id="ITDB-IPOD-MODEL-NANO-PURPLE:CAPS" href="libgpod/libgpod-Device.html#ITDB-IPOD-MODEL-NANO-PURPLE:CAPS">
+<ANCHOR id="ITDB-IPOD-MODEL-NANO-ORANGE:CAPS" href="libgpod/libgpod-Device.html#ITDB-IPOD-MODEL-NANO-ORANGE:CAPS">
+<ANCHOR id="ITDB-IPOD-MODEL-IPHONE-1:CAPS" href="libgpod/libgpod-Device.html#ITDB-IPOD-MODEL-IPHONE-1:CAPS">
+<ANCHOR id="ITDB-IPOD-MODEL-SHUFFLE-SILVER:CAPS" href="libgpod/libgpod-Device.html#ITDB-IPOD-MODEL-SHUFFLE-SILVER:CAPS">
+<ANCHOR id="ITDB-IPOD-MODEL-SHUFFLE-PINK:CAPS" href="libgpod/libgpod-Device.html#ITDB-IPOD-MODEL-SHUFFLE-PINK:CAPS">
+<ANCHOR id="ITDB-IPOD-MODEL-SHUFFLE-BLUE:CAPS" href="libgpod/libgpod-Device.html#ITDB-IPOD-MODEL-SHUFFLE-BLUE:CAPS">
+<ANCHOR id="ITDB-IPOD-MODEL-SHUFFLE-GREEN:CAPS" href="libgpod/libgpod-Device.html#ITDB-IPOD-MODEL-SHUFFLE-GREEN:CAPS">
+<ANCHOR id="ITDB-IPOD-MODEL-SHUFFLE-ORANGE:CAPS" href="libgpod/libgpod-Device.html#ITDB-IPOD-MODEL-SHUFFLE-ORANGE:CAPS">
+<ANCHOR id="ITDB-IPOD-MODEL-SHUFFLE-PURPLE:CAPS" href="libgpod/libgpod-Device.html#ITDB-IPOD-MODEL-SHUFFLE-PURPLE:CAPS">
+<ANCHOR id="ITDB-IPOD-MODEL-SHUFFLE-RED:CAPS" href="libgpod/libgpod-Device.html#ITDB-IPOD-MODEL-SHUFFLE-RED:CAPS">
+<ANCHOR id="ITDB-IPOD-MODEL-CLASSIC-SILVER:CAPS" href="libgpod/libgpod-Device.html#ITDB-IPOD-MODEL-CLASSIC-SILVER:CAPS">
+<ANCHOR id="ITDB-IPOD-MODEL-CLASSIC-BLACK:CAPS" href="libgpod/libgpod-Device.html#ITDB-IPOD-MODEL-CLASSIC-BLACK:CAPS">
+<ANCHOR id="ITDB-IPOD-MODEL-TOUCH-BLACK:CAPS" href="libgpod/libgpod-Device.html#ITDB-IPOD-MODEL-TOUCH-BLACK:CAPS">
<ANCHOR id="itdb-info-get-ipod-model-name-string" href="libgpod/libgpod-Device.html#itdb-info-get-ipod-model-name-string">
<ANCHOR id="itdb-init-ipod" href="libgpod/libgpod-Device.html#itdb-init-ipod">
-<ANCHOR id="Itdb-IpodGeneration" href="libgpod/libgpod-Device.html#Itdb-IpodGeneration">
-<ANCHOR id="Itdb-IpodInfo" href="libgpod/libgpod-Device.html#Itdb-IpodInfo">
-<ANCHOR id="Itdb-IpodModel" href="libgpod/libgpod-Device.html#Itdb-IpodModel">
<ANCHOR id="Itdb-ArtworkFormat" href="libgpod/libgpod-Device.html#Itdb-ArtworkFormat">
<ANCHOR id="libgpod-Photo-database" href="libgpod/libgpod-Photo-database.html">
-<ANCHOR id="Itdb-PhotoAlbum" href="libgpod/libgpod-Photo-database.html#Itdb-PhotoAlbum">
<ANCHOR id="Itdb-PhotoDB" href="libgpod/libgpod-Photo-database.html#Itdb-PhotoDB">
+<ANCHOR id="itdb-photodb-create" href="libgpod/libgpod-Photo-database.html#itdb-photodb-create">
+<ANCHOR id="itdb-photodb-free" href="libgpod/libgpod-Photo-database.html#itdb-photodb-free">
+<ANCHOR id="itdb-photodb-parse" href="libgpod/libgpod-Photo-database.html#itdb-photodb-parse">
+<ANCHOR id="itdb-photodb-write" href="libgpod/libgpod-Photo-database.html#itdb-photodb-write">
<ANCHOR id="itdb-photodb-add-photo" href="libgpod/libgpod-Photo-database.html#itdb-photodb-add-photo">
<ANCHOR id="itdb-photodb-add-photo-from-data" href="libgpod/libgpod-Photo-database.html#itdb-photodb-add-photo-from-data">
<ANCHOR id="itdb-photodb-add-photo-from-pixbuf" href="libgpod/libgpod-Photo-database.html#itdb-photodb-add-photo-from-pixbuf">
-<ANCHOR id="itdb-photodb-create" href="libgpod/libgpod-Photo-database.html#itdb-photodb-create">
-<ANCHOR id="itdb-photodb-free" href="libgpod/libgpod-Photo-database.html#itdb-photodb-free">
-<ANCHOR id="itdb-photodb-parse" href="libgpod/libgpod-Photo-database.html#itdb-photodb-parse">
+<ANCHOR id="itdb-photodb-remove-photo" href="libgpod/libgpod-Photo-database.html#itdb-photodb-remove-photo">
+<ANCHOR id="Itdb-PhotoAlbum" href="libgpod/libgpod-Photo-database.html#Itdb-PhotoAlbum">
+<ANCHOR id="itdb-photodb-photoalbum-create" href="libgpod/libgpod-Photo-database.html#itdb-photodb-photoalbum-create">
<ANCHOR id="itdb-photodb-photoalbum-add-photo" href="libgpod/libgpod-Photo-database.html#itdb-photodb-photoalbum-add-photo">
<ANCHOR id="itdb-photodb-photoalbum-by-name" href="libgpod/libgpod-Photo-database.html#itdb-photodb-photoalbum-by-name">
-<ANCHOR id="itdb-photodb-photoalbum-create" href="libgpod/libgpod-Photo-database.html#itdb-photodb-photoalbum-create">
<ANCHOR id="itdb-photodb-photoalbum-remove" href="libgpod/libgpod-Photo-database.html#itdb-photodb-photoalbum-remove">
-<ANCHOR id="itdb-photodb-remove-photo" href="libgpod/libgpod-Photo-database.html#itdb-photodb-remove-photo">
-<ANCHOR id="itdb-photodb-write" href="libgpod/libgpod-Photo-database.html#itdb-photodb-write">
Modified: libgpod/branches/upstream/current/docs/reference/html/itunesdb.html
===================================================================
--- libgpod/branches/upstream/current/docs/reference/html/itunesdb.html 2008-12-25 18:06:29 UTC (rev 338)
+++ libgpod/branches/upstream/current/docs/reference/html/itunesdb.html 2009-01-24 10:34:00 UTC (rev 339)
@@ -3,12 +3,12 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
<title>Part I. iPod database</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.72.0">
+<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
<link rel="start" href="index.html" title="libgpod Reference Manual">
<link rel="up" href="index.html" title="libgpod Reference Manual">
<link rel="prev" href="index.html" title="libgpod Reference Manual">
<link rel="next" href="libgpod-The-Itdb-iTunesDB-structure.html" title="iPod database reading/writing">
-<meta name="generator" content="GTK-Doc V1.8 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.9 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
<link rel="part" href="itunesdb.html" title="Part I. iPod database">
<link rel="chapter" href="ch01.html" title="iPod database components">
@@ -31,7 +31,46 @@
The iPod database functions are used for adding audio and video
to the iPod.
</p>
+<div class="toc">
+<p><b>Table of Contents</b></p>
+<dl>
+<dt>
+<span class="refentrytitle"><a href="libgpod-The-Itdb-iTunesDB-structure.html">iPod database reading/writing</a></span><span class="refpurpose"> — Functions to read, write, and create an iPod database</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="libgpod-File-handling-functions.html">File handling functions</a></span><span class="refpurpose"> — Managing files on the iPod</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="libgpod-Time-handling.html">Time handling</a></span><span class="refpurpose"> — [DEPRECATED] Helper functions to convert between Epoch time and Mac
+(iPod) time</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="libgpod-Low-level-functions.html">Low-level functions</a></span><span class="refpurpose"> — Low-level functions which shouldn't be needed in normal situations</span>
+</dt>
+<dt><span class="chapter"><a href="ch01.html">iPod database components</a></span></dt>
+<dd><dl>
+<dt>
+<span class="refentrytitle"><a href="libgpod-Tracks.html">Tracks</a></span><span class="refpurpose"> — Data structure to store metadata about an iPod track</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="libgpod-Playlists.html">Playlists</a></span><span class="refpurpose"> — Data structure to represent an iPod playlist</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="libgpod-Smart-Playlists.html">Smart Playlists</a></span><span class="refpurpose"> — Data structure to represent an iPod smart playlist</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="libgpod-Artwork.html">Artwork</a></span><span class="refpurpose"> — Data structure to store iPod artwork (album covers)</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="libgpod-Chapter-Data.html">Chapter Data</a></span><span class="refpurpose"> — Data structure to store chapter data for tracks</span>
+</dt>
+<dt>
+<span class="refentrytitle"><a href="libgpod-Device.html">Device</a></span><span class="refpurpose"> — Data structure holding information about the iPod (model, mount point, etc.)</span>
+</dt>
+</dl></dd>
+</dl>
</div>
</div>
+</div>
</body>
</html>
Modified: libgpod/branches/upstream/current/docs/reference/html/libgpod-Artwork.html
===================================================================
--- libgpod/branches/upstream/current/docs/reference/html/libgpod-Artwork.html 2008-12-25 18:06:29 UTC (rev 338)
+++ libgpod/branches/upstream/current/docs/reference/html/libgpod-Artwork.html 2009-01-24 10:34:00 UTC (rev 339)
@@ -3,12 +3,12 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
<title>Artwork</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.72.0">
+<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
<link rel="start" href="index.html" title="libgpod Reference Manual">
<link rel="up" href="ch01.html" title="iPod database components">
<link rel="prev" href="libgpod-Smart-Playlists.html" title="Smart Playlists">
-<link rel="next" href="libgpod-Device.html" title="Device">
-<meta name="generator" content="GTK-Doc V1.8 (XML mode)">
+<link rel="next" href="libgpod-Chapter-Data.html" title="Chapter Data">
+<meta name="generator" content="GTK-Doc V1.9 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
<link rel="part" href="itunesdb.html" title="Part I. iPod database">
<link rel="chapter" href="ch01.html" title="iPod database components">
@@ -21,18 +21,18 @@
<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
<th width="100%" align="center">libgpod Reference Manual</th>
-<td><a accesskey="n" href="libgpod-Device.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+<td><a accesskey="n" href="libgpod-Chapter-Data.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
</tr>
-<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2573451" class="shortcut">Top</a>
+<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2795129" class="shortcut">Top</a>
 | 
- <a href="#id2607850" class="shortcut">Description</a></nobr></td></tr>
+ <a href="#id2809475" class="shortcut">Description</a></nobr></td></tr>
</table>
<div class="refentry" lang="en">
<a name="libgpod-Artwork"></a><div class="titlepage"></div>
<div class="refnamediv"><table width="100%"><tr>
<td valign="top">
<h2>
-<a name="id2573451"></a><span class="refentrytitle">Artwork</span>
+<a name="id2795129"></a><span class="refentrytitle">Artwork</span>
</h2>
<p>Artwork — Data structure to store iPod artwork (album covers)</p>
</td>
@@ -44,71 +44,104 @@
- <a href="libgpod-Artwork.html#Itdb-Artwork">Itdb_Artwork</a>;
- <a href="libgpod-Artwork.html#Itdb-Thumb">Itdb_Thumb</a>;
-enum <a href="libgpod-Artwork.html#ItdbThumbType">ItdbThumbType</a>;
-<a href="libgpod-Artwork.html#Itdb-Artwork">Itdb_Artwork</a>* <a href="libgpod-Artwork.html#itdb-artwork-new">itdb_artwork_new</a> (void);
-<a href="libgpod-Artwork.html#Itdb-Artwork">Itdb_Artwork</a>* <a href="libgpod-Artwork.html#itdb-artwork-duplicate">itdb_artwork_duplicate</a> (<a href="libgpod-Artwork.html#Itdb-Artwork">Itdb_Artwork</a> *artwork);
-void <a href="libgpod-Artwork.html#itdb-artwork-free">itdb_artwork_free</a> (<a href="libgpod-Artwork.html#Itdb-Artwork">Itdb_Artwork</a> *artwork);
-gboolean <a href="libgpod-Artwork.html#itdb-artwork-add-thumbnail">itdb_artwork_add_thumbnail</a> (<a href="libgpod-Artwork.html#Itdb-Artwork">Itdb_Artwork</a> *artwork,
- <a href="libgpod-Artwork.html#ItdbThumbType">ItdbThumbType</a> type,
- const gchar *filename,
- gint rotation,
- GError **error);
-gboolean <a href="libgpod-Artwork.html#itdb-artwork-add-thumbnail-from-data">itdb_artwork_add_thumbnail_from_data</a>
- (<a href="libgpod-Artwork.html#Itdb-Artwork">Itdb_Artwork</a> *artwork,
- <a href="libgpod-Artwork.html#ItdbThumbType">ItdbThumbType</a> type,
- const guchar *image_data,
- gsize image_data_len,
- gint rotation,
- GError **error);
-gboolean <a href="libgpod-Artwork.html#itdb-artwork-add-thumbnail-from-pixbuf">itdb_artwork_add_thumbnail_from_pixbuf</a>
- (<a href="libgpod-Artwork.html#Itdb-Artwork">Itdb_Artwork</a> *artwork,
- <a href="libgpod-Artwork.html#ItdbThumbType">ItdbThumbType</a> type,
- gpointer pixbuf,
- gint rotation,
- GError **error);
-void <a href="libgpod-Artwork.html#itdb-artwork-remove-thumbnail">itdb_artwork_remove_thumbnail</a> (<a href="libgpod-Artwork.html#Itdb-Artwork">Itdb_Artwork</a> *artwork,
- <a href="libgpod-Artwork.html#Itdb-Thumb">Itdb_Thumb</a> *thumb);
-void <a href="libgpod-Artwork.html#itdb-artwork-remove-thumbnails">itdb_artwork_remove_thumbnails</a> (<a href="libgpod-Artwork.html#Itdb-Artwork">Itdb_Artwork</a> *artwork);
-<a href="libgpod-Artwork.html#Itdb-Thumb">Itdb_Thumb</a>* <a href="libgpod-Artwork.html#itdb-artwork-get-thumb-by-type">itdb_artwork_get_thumb_by_type</a> (<a href="libgpod-Artwork.html#Itdb-Artwork">Itdb_Artwork</a> *artwork,
- <a href="libgpod-Artwork.html#ItdbThumbType">ItdbThumbType</a> type);
-gpointer <a href="libgpod-Artwork.html#itdb-thumb-get-gdk-pixbuf">itdb_thumb_get_gdk_pixbuf</a> (<a href="libgpod-Device.html#Itdb-Device">Itdb_Device</a> *device,
- <a href="libgpod-Artwork.html#Itdb-Thumb">Itdb_Thumb</a> *thumb);
-<a href="libgpod-Artwork.html#Itdb-Thumb">Itdb_Thumb</a>* <a href="libgpod-Artwork.html#itdb-thumb-duplicate">itdb_thumb_duplicate</a> (<a href="libgpod-Artwork.html#Itdb-Thumb">Itdb_Thumb</a> *thumb);
-void <a href="libgpod-Artwork.html#itdb-thumb-free">itdb_thumb_free</a> (<a href="libgpod-Artwork.html#Itdb-Thumb">Itdb_Thumb</a> *thumb);
-<a href="libgpod-Artwork.html#Itdb-Thumb">Itdb_Thumb</a>* <a href="libgpod-Artwork.html#itdb-thumb-new">itdb_thumb_new</a> (void);
-gchar* <a href="libgpod-Artwork.html#itdb-thumb-get-filename">itdb_thumb_get_filename</a> (<a href="libgpod-Device.html#Itdb-Device">Itdb_Device</a> *device,
- <a href="libgpod-Artwork.html#Itdb-Thumb">Itdb_Thumb</a> *thumb);
+ <a class="link" href="libgpod-Artwork.html#Itdb-Artwork">Itdb_Artwork</a>;
+<a class="link" href="libgpod-Artwork.html#Itdb-Artwork">Itdb_Artwork</a>* <a class="link" href="libgpod-Artwork.html#itdb-artwork-new">itdb_artwork_new</a> (void);
+<a class="link" href="libgpod-Artwork.html#Itdb-Artwork">Itdb_Artwork</a>* <a class="link" href="libgpod-Artwork.html#itdb-artwork-duplicate">itdb_artwork_duplicate</a> (<a class="link" href="libgpod-Artwork.html#Itdb-Artwork">Itdb_Artwork</a> *artwork);
+void <a class="link" href="libgpod-Artwork.html#itdb-artwork-free">itdb_artwork_free</a> (<a class="link" href="libgpod-Artwork.html#Itdb-Artwork">Itdb_Artwork</a> *artwork);
+<a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"
+>gpointer</a> <a class="link" href="libgpod-Artwork.html#itdb-artwork-get-pixbuf">itdb_artwork_get_pixbuf</a> (<a class="link" href="libgpod-Device.html#Itdb-Device">Itdb_Device</a> *device,
+ <a class="link" href="libgpod-Artwork.html#Itdb-Artwork">Itdb_Artwork</a> *artwork,
+ <a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"
+>gint</a> width,
+ <a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"
+>gint</a> height);
+<a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"
+>gboolean</a> <a class="link" href="libgpod-Artwork.html#itdb-artwork-set-thumbnail">itdb_artwork_set_thumbnail</a> (<a class="link" href="libgpod-Artwork.html#Itdb-Artwork">Itdb_Artwork</a> *artwork,
+ const <a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"
+>gchar</a> *filename,
+ <a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"
+>gint</a> rotation,
+ <a
+href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"
+>GError</a> **error);
+<a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"
+>gboolean</a> <a class="link" href="libgpod-Artwork.html#itdb-artwork-set-thumbnail-from-data">itdb_artwork_set_thumbnail_from_data</a>
+ (<a class="link" href="libgpod-Artwork.html#Itdb-Artwork">Itdb_Artwork</a> *artwork,
+ const <a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guchar"
+>guchar</a> *image_data,
+ <a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gsize"
+>gsize</a> image_data_len,
+ <a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"
+>gint</a> rotation,
+ <a
+href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"
+>GError</a> **error);
+<a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"
+>gboolean</a> <a class="link" href="libgpod-Artwork.html#itdb-artwork-set-thumbnail-from-pixbuf">itdb_artwork_set_thumbnail_from_pixbuf</a>
+ (<a class="link" href="libgpod-Artwork.html#Itdb-Artwork">Itdb_Artwork</a> *artwork,
+ <a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"
+>gpointer</a> pixbuf,
+ <a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"
+>gint</a> rotation,
+ <a
+href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"
+>GError</a> **error);
+void <a class="link" href="libgpod-Artwork.html#itdb-artwork-remove-thumbnails">itdb_artwork_remove_thumbnails</a> (<a class="link" href="libgpod-Artwork.html#Itdb-Artwork">Itdb_Artwork</a> *artwork);
+ <a class="link" href="libgpod-Artwork.html#Itdb-Thumb">Itdb_Thumb</a>;
+<a class="link" href="libgpod-Artwork.html#Itdb-Thumb">Itdb_Thumb</a>* <a class="link" href="libgpod-Artwork.html#itdb-thumb-duplicate">itdb_thumb_duplicate</a> (<a class="link" href="libgpod-Artwork.html#Itdb-Thumb">Itdb_Thumb</a> *thumb);
+void <a class="link" href="libgpod-Artwork.html#itdb-thumb-free">itdb_thumb_free</a> (<a class="link" href="libgpod-Artwork.html#Itdb-Thumb">Itdb_Thumb</a> *thumb);
+<a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"
+>gpointer</a> <a class="link" href="libgpod-Artwork.html#itdb-thumb-to-pixbuf-at-size">itdb_thumb_to_pixbuf_at_size</a> (<a class="link" href="libgpod-Device.html#Itdb-Device">Itdb_Device</a> *device,
+ <a class="link" href="libgpod-Artwork.html#Itdb-Thumb">Itdb_Thumb</a> *thumb,
+ <a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"
+>gint</a> width,
+ <a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"
+>gint</a> height);
+<a
+href="/usr/share/gtk-doc/html/glib/glib-Doubly-Linked-Lists.html#GList"
+>GList</a>* <a class="link" href="libgpod-Artwork.html#itdb-thumb-to-pixbufs">itdb_thumb_to_pixbufs</a> (<a class="link" href="libgpod-Device.html#Itdb-Device">Itdb_Device</a> *device,
+ <a class="link" href="libgpod-Artwork.html#Itdb-Thumb">Itdb_Thumb</a> *thumb);
</pre>
</div>
<div class="refsect1" lang="en">
-<a name="id2607850"></a><h2>Description</h2>
+<a name="id2809475"></a><h2>Description</h2>
<p>
These functions and structures are for adding, changing, and removing
album/track artwork. For working with photos, see the
-<a href="photodb.html" title="Part II. Photo database">Photo database</a> section.
+<a class="link" href="photodb.html" title="Part II. Photo database">Photo database</a> section.
</p>
</div>
<div class="refsect1" lang="en">
-<a name="id2607874"></a><h2>Details</h2>
+<a name="id2839616"></a><h2>Details</h2>
<div class="refsect2" lang="en">
-<a name="id2607885"></a><h3>
+<a name="id2839627"></a><h3>
<a name="Itdb-Artwork"></a>Itdb_Artwork</h3>
-<a class="indexterm" name="id2607897"></a><pre class="programlisting">typedef struct {
- GList *thumbnails; /* list of Itdb_Thumbs */
- guint32 id; /* Artwork id used by photoalbums, starts at
- * 0x40... libgpod will set this on sync. */
+<a class="indexterm" name="id2839642"></a><pre class="programlisting">typedef struct {
+ Itdb_Thumb *thumbnail;
+ guint32 id;
+ guint64 dbid;
gint32 unk028;
- guint32 rating; /* Rating from iPhoto * 20 (PhotoDB only) */
+ guint32 rating;
gint32 unk036;
- time_t creation_date; /* Date the image file was created
- (creation date of image file (PhotoDB only) */
- time_t digitized_date;/* Date the image was taken (EXIF information,
- PhotoDB only) */
- guint32 artwork_size; /* Size in bytes of the original source
- image (PhotoDB only -- don't touch in
- case of ArtworkDB!) */
+ time_t creation_date;
+ time_t digitized_date;
+ guint32 artwork_size;
/* reserved for future use */
gint32 reserved_int1;
gint32 reserved_int2;
@@ -123,85 +156,160 @@
} Itdb_Artwork;
</pre>
<p>
-
-</p>
-</div>
-<hr>
-<div class="refsect2" lang="en">
-<a name="id2592895"></a><h3>
-<a name="Itdb-Thumb"></a>Itdb_Thumb</h3>
-<a class="indexterm" name="id2567564"></a><pre class="programlisting">typedef struct {
- ItdbThumbType type;
- gchar *filename;
- guchar *image_data; /* holds the thumbnail data of
- non-transfered thumbnails when
- filename == NULL */
- gsize image_data_len; /* length of data */
- gpointer pixbuf;
- gint rotation; /* angle (0, 90, 180, 270) to rotate the image */
- guint32 offset;
- guint32 size;
- gint16 width;
- gint16 height;
- gint16 horizontal_padding;
- gint16 vertical_padding;
- /* reserved for future use */
- gint32 reserved_int1;
- gint32 reserved_int2;
- gpointer reserved1;
- gpointer reserved2;
-} Itdb_Thumb;
-</pre>
+Structure representing artwork in an <a class="link" href="libgpod-The-Itdb-iTunesDB-structure.html#Itdb-iTunesDB"><span class="type">Itdb_iTunesDB</span></a> or <a class="link" href="libgpod-Photo-database.html#Itdb-PhotoDB"><span class="type">Itdb_PhotoDB</span></a></p>
<p>
</p>
-</div>
-<hr>
-<div class="refsect2" lang="en">
-<a name="id2577225"></a><h3>
-<a name="ItdbThumbType"></a>enum ItdbThumbType</h3>
-<a class="indexterm" name="id2599700"></a><pre class="programlisting">typedef enum {
- ITDB_THUMB_COVER_SMALL = 0,
- ITDB_THUMB_COVER_LARGE,
- ITDB_THUMB_PHOTO_SMALL,
- ITDB_THUMB_PHOTO_LARGE,
- ITDB_THUMB_PHOTO_FULL_SCREEN,
- ITDB_THUMB_PHOTO_TV_SCREEN,
- ITDB_THUMB_COVER_XLARGE, /* iPhone: cover flow */
- ITDB_THUMB_COVER_MEDIUM, /* iPhone: cover view */
- ITDB_THUMB_COVER_SMEDIUM, /* iPhone: ?? */
- ITDB_THUMB_COVER_XSMALL, /* iPhone: ?? */
-} ItdbThumbType;
-</pre>
-<p>
-
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><a class="link" href="libgpod-Artwork.html#Itdb-Thumb">Itdb_Thumb</a> *<em class="structfield"><code>thumbnail</code></em>;</span></p></td>
+<td> An <a class="link" href="libgpod-Artwork.html#Itdb-Thumb"><span class="type">Itdb_Thumb</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint32"
+>guint32</a> <em class="structfield"><code>id</code></em>;</span></p></td>
+<td> Artwork id used by photoalbums. This starts at 0x40 and
+ is set automatically when the ArtworkDB or PhotoDB is
+ written
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint64"
+>guint64</a> <em class="structfield"><code>dbid</code></em>;</span></p></td>
+<td> The dbid of associated track. Used internally by
+ libgpod.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint32"
+>gint32</a> <em class="structfield"><code>unk028</code></em>;</span></p></td>
+<td> Unknown
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint32"
+>guint32</a> <em class="structfield"><code>rating</code></em>;</span></p></td>
+<td> Rating from iPhoto * 20 (PhotoDB only)
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint32"
+>gint32</a> <em class="structfield"><code>unk036</code></em>;</span></p></td>
+<td> Unknown
+</td>
+</tr>
+<tr>
+<td><p><span class="term">time_t <em class="structfield"><code>creation_date</code></em>;</span></p></td>
+<td> Date the image file was created (PhotoDB only)
+</td>
+</tr>
+<tr>
+<td><p><span class="term">time_t <em class="structfield"><code>digitized_date</code></em>;</span></p></td>
+<td> Date the image was taken (EXIF information, PhotoDB
+ only)
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint32"
+>guint32</a> <em class="structfield"><code>artwork_size</code></em>;</span></p></td>
+<td> Size in bytes of the original source image (PhotoDB
+ only -- don't touch in case of ArtworkDB!)
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint32"
+>gint32</a> <em class="structfield"><code>reserved_int1</code></em>;</span></p></td>
+<td> Reserved for future use
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint32"
+>gint32</a> <em class="structfield"><code>reserved_int2</code></em>;</span></p></td>
+<td> Reserved for future use
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"
+>gpointer</a> <em class="structfield"><code>reserved1</code></em>;</span></p></td>
+<td> Reserved for future use
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"
+>gpointer</a> <em class="structfield"><code>reserved2</code></em>;</span></p></td>
+<td> Reserved for future use
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint64"
+>guint64</a> <em class="structfield"><code>usertype</code></em>;</span></p></td>
+<td> For use by application
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"
+>gpointer</a> <em class="structfield"><code>userdata</code></em>;</span></p></td>
+<td> For use by application
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><a class="link" href="libgpod-The-Itdb-iTunesDB-structure.html#ItdbUserDataDuplicateFunc">ItdbUserDataDuplicateFunc</a> <em class="structfield"><code>userdata_duplicate</code></em>;</span></p></td>
+<td> A function to duplicate <span class="type">userdata</span>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><a class="link" href="libgpod-The-Itdb-iTunesDB-structure.html#ItdbUserDataDestroyFunc">ItdbUserDataDestroyFunc</a> <em class="structfield"><code>userdata_destroy</code></em>;</span></p></td>
+<td> A function to free <span class="type">userdata</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+<p class="since">Since 0.3.0
</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2599724"></a><h3>
+<a name="id2839036"></a><h3>
<a name="itdb-artwork-new"></a>itdb_artwork_new ()</h3>
-<a class="indexterm" name="id2599736"></a><pre class="programlisting"><a href="libgpod-Artwork.html#Itdb-Artwork">Itdb_Artwork</a>* itdb_artwork_new (void);</pre>
+<a class="indexterm" name="id2839051"></a><pre class="programlisting"><a class="link" href="libgpod-Artwork.html#Itdb-Artwork">Itdb_Artwork</a>* itdb_artwork_new (void);</pre>
<p>
-Creates a new <a href="libgpod-Artwork.html#Itdb-Artwork"><span class="type">Itdb_Artwork</span></a></p>
+Creates a new <a class="link" href="libgpod-Artwork.html#Itdb-Artwork"><span class="type">Itdb_Artwork</span></a></p>
<p>
</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody><tr>
-<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td>
-<td> a new <a href="libgpod-Artwork.html#Itdb-Artwork"><span class="type">Itdb_Artwork</span></a> to be freed with <a href="libgpod-Artwork.html#itdb-artwork-free"><code class="function">itdb_artwork_free()</code></a> when
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> a new <a class="link" href="libgpod-Artwork.html#Itdb-Artwork"><span class="type">Itdb_Artwork</span></a> to be freed with <a class="link" href="libgpod-Artwork.html#itdb-artwork-free"><code class="function">itdb_artwork_free()</code></a> when
no longer needed
+
</td>
</tr></tbody>
</table></div>
+<p class="since">Since 0.3.0
+</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2599799"></a><h3>
+<a name="id2839121"></a><h3>
<a name="itdb-artwork-duplicate"></a>itdb_artwork_duplicate ()</h3>
-<a class="indexterm" name="id2599810"></a><pre class="programlisting"><a href="libgpod-Artwork.html#Itdb-Artwork">Itdb_Artwork</a>* itdb_artwork_duplicate (<a href="libgpod-Artwork.html#Itdb-Artwork">Itdb_Artwork</a> *artwork);</pre>
+<a class="indexterm" name="id2839135"></a><pre class="programlisting"><a class="link" href="libgpod-Artwork.html#Itdb-Artwork">Itdb_Artwork</a>* itdb_artwork_duplicate (<a class="link" href="libgpod-Artwork.html#Itdb-Artwork">Itdb_Artwork</a> *artwork);</pre>
<p>
Duplicates <em class="parameter"><code>artwork</code></em></p>
<p>
@@ -211,23 +319,26 @@
<col align="left" valign="top">
<tbody>
<tr>
-<td><span class="term"><em class="parameter"><code>artwork</code></em> :</span></td>
-<td> an <a href="libgpod-Artwork.html#Itdb-Artwork"><span class="type">Itdb_Artwork</span></a>
+<td><p><span class="term"><em class="parameter"><code>artwork</code></em> :</span></p></td>
+<td> an <a class="link" href="libgpod-Artwork.html#Itdb-Artwork"><span class="type">Itdb_Artwork</span></a>
</td>
</tr>
<tr>
-<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
<td> a new copy of <em class="parameter"><code>artwork</code></em>
+
</td>
</tr>
</tbody>
</table></div>
+<p class="since">Since 0.3.0
+</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2599889"></a><h3>
+<a name="id2839221"></a><h3>
<a name="itdb-artwork-free"></a>itdb_artwork_free ()</h3>
-<a class="indexterm" name="id2599902"></a><pre class="programlisting">void itdb_artwork_free (<a href="libgpod-Artwork.html#Itdb-Artwork">Itdb_Artwork</a> *artwork);</pre>
+<a class="indexterm" name="id2839235"></a><pre class="programlisting">void itdb_artwork_free (<a class="link" href="libgpod-Artwork.html#Itdb-Artwork">Itdb_Artwork</a> *artwork);</pre>
<p>
Frees memory used by <em class="parameter"><code>artwork</code></em></p>
<p>
@@ -236,91 +347,103 @@
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody><tr>
-<td><span class="term"><em class="parameter"><code>artwork</code></em> :</span></td>
-<td> an <a href="libgpod-Artwork.html#Itdb-Artwork"><span class="type">Itdb_Artwork</span></a>
+<td><p><span class="term"><em class="parameter"><code>artwork</code></em> :</span></p></td>
+<td> an <a class="link" href="libgpod-Artwork.html#Itdb-Artwork"><span class="type">Itdb_Artwork</span></a>
</td>
</tr></tbody>
</table></div>
+<p class="since">Since 0.3.0
+</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2610419"></a><h3>
-<a name="itdb-artwork-add-thumbnail"></a>itdb_artwork_add_thumbnail ()</h3>
-<a class="indexterm" name="id2610430"></a><pre class="programlisting">gboolean itdb_artwork_add_thumbnail (<a href="libgpod-Artwork.html#Itdb-Artwork">Itdb_Artwork</a> *artwork,
- <a href="libgpod-Artwork.html#ItdbThumbType">ItdbThumbType</a> type,
- const gchar *filename,
- gint rotation,
- GError **error);</pre>
+<a name="id2839304"></a><h3>
+<a name="itdb-artwork-get-pixbuf"></a>itdb_artwork_get_pixbuf ()</h3>
+<a class="indexterm" name="id2839317"></a><pre class="programlisting"><a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"
+>gpointer</a> itdb_artwork_get_pixbuf (<a class="link" href="libgpod-Device.html#Itdb-Device">Itdb_Device</a> *device,
+ <a class="link" href="libgpod-Artwork.html#Itdb-Artwork">Itdb_Artwork</a> *artwork,
+ <a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"
+>gint</a> width,
+ <a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"
+>gint</a> height);</pre>
<p>
-Appends a thumbnail of type <em class="parameter"><code>type</code></em> to existing thumbnails in <em class="parameter"><code>artwork</code></em>. No
-data is read from <em class="parameter"><code>filename</code></em> yet, the file will be when <em class="parameter"><code>artwork</code></em> is saved to
-disk. <em class="parameter"><code>filename</code></em> must still exist when that happens.
-</p>
+Returns a <a
+href="/usr/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf.html#GdkPixbuf"
+><span class="type">GdkPixbuf</span></a> representing the thumbnail stored in <em class="parameter"><code>artwork</code></em>
+scaling it if appropriate. If either height or width is -1, then the
+biggest unscaled thumbnail available will be returned</p>
<p>
-For the rotation angle you can also use the gdk constants
-GDK_PIXBUF_ROTATE_NONE, ..._COUNTERCLOCKWISE, ..._UPSIDEDOWN AND
-..._CLOCKWISE.</p>
-<p>
</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
<tr>
-<td><span class="term"><em class="parameter"><code>artwork</code></em> :</span></td>
-<td> an <span class="type">Itdb_Thumbnail</span>
+<td><p><span class="term"><em class="parameter"><code>device</code></em> :</span></p></td>
+<td> an <a class="link" href="libgpod-Device.html#Itdb-Device"><span class="type">Itdb_Device</span></a>
</td>
</tr>
<tr>
-<td><span class="term"><em class="parameter"><code>type</code></em> :</span></td>
-<td> thumbnail size
+<td><p><span class="term"><em class="parameter"><code>artwork</code></em> :</span></p></td>
+<td> an <a class="link" href="libgpod-Artwork.html#Itdb-Artwork"><span class="type">Itdb_Artwork</span></a>
</td>
</tr>
<tr>
-<td><span class="term"><em class="parameter"><code>filename</code></em> :</span></td>
-<td> image file to use to create the thumbnail
+<td><p><span class="term"><em class="parameter"><code>width</code></em> :</span></p></td>
+<td> width of the pixbuf to retrieve, -1 for the biggest
+ possible size and 0 for the smallest possible size (with no
+ scaling)
</td>
</tr>
<tr>
-<td><span class="term"><em class="parameter"><code>rotation</code></em> :</span></td>
-<td> angle by which the image should be rotated
-counterclockwise. Valid values are 0, 90, 180 and 270.
+<td><p><span class="term"><em class="parameter"><code>height</code></em> :</span></p></td>
+<td> height of the pixbuf to retrieve, -1 for the biggest possible
+ size and 0 for the smallest possible size (with no scaling)
</td>
</tr>
<tr>
-<td><span class="term"><em class="parameter"><code>error</code></em> :</span></td>
-<td> return location for a <span class="type">GError</span> or NULL
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> a <a
+href="/usr/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf.html#GdkPixbuf"
+><span class="type">GdkPixbuf</span></a> that must be unreffed when no longer used, NULL
+if no artwork could be found or if libgpod is compiled without GdkPixbuf
+support
+
</td>
</tr>
-<tr>
-<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td>
-<td> TRUE if the thumbnail could be successfully added, FALSE
-otherwise. <em class="parameter"><code>error</code></em> is set appropriately.
-</td>
-</tr>
</tbody>
</table></div>
+<p class="since">Since 0.7.0
+</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2610634"></a><h3>
-<a name="itdb-artwork-add-thumbnail-from-data"></a>itdb_artwork_add_thumbnail_from_data ()</h3>
-<a class="indexterm" name="id2610648"></a><pre class="programlisting">gboolean itdb_artwork_add_thumbnail_from_data
- (<a href="libgpod-Artwork.html#Itdb-Artwork">Itdb_Artwork</a> *artwork,
- <a href="libgpod-Artwork.html#ItdbThumbType">ItdbThumbType</a> type,
- const guchar *image_data,
- gsize image_data_len,
- gint rotation,
- GError **error);</pre>
+<a name="id2839491"></a><h3>
+<a name="itdb-artwork-set-thumbnail"></a>itdb_artwork_set_thumbnail ()</h3>
+<a class="indexterm" name="id2839505"></a><pre class="programlisting"><a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"
+>gboolean</a> itdb_artwork_set_thumbnail (<a class="link" href="libgpod-Artwork.html#Itdb-Artwork">Itdb_Artwork</a> *artwork,
+ const <a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"
+>gchar</a> *filename,
+ <a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"
+>gint</a> rotation,
+ <a
+href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"
+>GError</a> **error);</pre>
<p>
-Appends a thumbnail of type <em class="parameter"><code>type</code></em> to existing thumbnails in
-<em class="parameter"><code>artwork</code></em>. No data is processed yet. This will be done when <em class="parameter"><code>artwork</code></em>
-is saved to disk.
+Appends a thumbnail of type <em class="parameter"><code>type</code></em> to existing thumbnails in <em class="parameter"><code>artwork</code></em>. No
+data is read from <em class="parameter"><code>filename</code></em> yet, the file will be when <em class="parameter"><code>artwork</code></em> is saved to
+disk. <em class="parameter"><code>filename</code></em> must still exist when that happens.
</p>
<p>
For the rotation angle you can also use the gdk constants
-GDK_PIXBUF_ROTATE_NONE, ..._COUNTERCLOCKWISE, ..._UPSIDEDOWN AND
-..._CLOCKWISE.</p>
+<code class="literal">GDK_PIXBUF_ROTATE_NONE</code>, <code class="literal">GDK_PIXBUF_ROTATE_COUNTERCLOCKWISE</code>,
+<code class="literal">GDK_PIXBUF_ROTATE_UPSIDEDOWN</code>, AND <code class="literal">GDK_PIXBUF_ROTATE_CLOCKWISE</code>.</p>
<p>
</p>
@@ -328,66 +451,68 @@
<col align="left" valign="top">
<tbody>
<tr>
-<td><span class="term"><em class="parameter"><code>artwork</code></em> :</span></td>
-<td> an <span class="type">Itdb_Thumbnail</span>
+<td><p><span class="term"><em class="parameter"><code>artwork</code></em> :</span></p></td>
+<td> an <a class="link" href="libgpod-Artwork.html#Itdb-Artwork"><span class="type">Itdb_Artwork</span></a>
</td>
</tr>
<tr>
-<td><span class="term"><em class="parameter"><code>type</code></em> :</span></td>
-<td> thumbnail size
+<td><p><span class="term"><em class="parameter"><code>filename</code></em> :</span></p></td>
+<td> image file to use to create the thumbnail
</td>
</tr>
<tr>
-<td><span class="term"><em class="parameter"><code>image_data</code></em> :</span></td>
-<td> data used to create the thumbnail (the raw contents of
- an image file)
+<td><p><span class="term"><em class="parameter"><code>rotation</code></em> :</span></p></td>
+<td> angle by which the image should be rotated
+ counterclockwise. Valid values are 0, 90, 180 and 270.
</td>
</tr>
<tr>
-<td><span class="term"><em class="parameter"><code>image_data_len</code></em> :</span></td>
-<td> length of above data block
+<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
+<td> return location for a <a
+href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"
+><span class="type">GError</span></a> or NULL
</td>
</tr>
<tr>
-<td><span class="term"><em class="parameter"><code>rotation</code></em> :</span></td>
-<td> angle by which the image should be rotated
-counterclockwise. Valid values are 0, 90, 180 and 270.
-</td>
-</tr>
-<tr>
-<td><span class="term"><em class="parameter"><code>error</code></em> :</span></td>
-<td> return location for a <span class="type">GError</span> or NULL
-</td>
-</tr>
-<tr>
-<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
<td> TRUE if the thumbnail could be successfully added, FALSE
otherwise. <em class="parameter"><code>error</code></em> is set appropriately.
+
</td>
</tr>
</tbody>
</table></div>
+<p class="since">Since 0.7.0
+</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2613470"></a><h3>
-<a name="itdb-artwork-add-thumbnail-from-pixbuf"></a>itdb_artwork_add_thumbnail_from_pixbuf ()</h3>
-<a class="indexterm" name="id2613482"></a><pre class="programlisting">gboolean itdb_artwork_add_thumbnail_from_pixbuf
- (<a href="libgpod-Artwork.html#Itdb-Artwork">Itdb_Artwork</a> *artwork,
- <a href="libgpod-Artwork.html#ItdbThumbType">ItdbThumbType</a> type,
- gpointer pixbuf,
- gint rotation,
- GError **error);</pre>
+<a name="id2847934"></a><h3>
+<a name="itdb-artwork-set-thumbnail-from-data"></a>itdb_artwork_set_thumbnail_from_data ()</h3>
+<a class="indexterm" name="id2847947"></a><pre class="programlisting"><a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"
+>gboolean</a> itdb_artwork_set_thumbnail_from_data
+ (<a class="link" href="libgpod-Artwork.html#Itdb-Artwork">Itdb_Artwork</a> *artwork,
+ const <a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guchar"
+>guchar</a> *image_data,
+ <a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gsize"
+>gsize</a> image_data_len,
+ <a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"
+>gint</a> rotation,
+ <a
+href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"
+>GError</a> **error);</pre>
<p>
-Appends a thumbnail of type <em class="parameter"><code>type</code></em> to existing thumbnails in <em class="parameter"><code>artwork</code></em>. No
-data is generated from <em class="parameter"><code>pixbuf</code></em> yet, it will be done when <em class="parameter"><code>artwork</code></em> is saved
-to disk. <em class="parameter"><code>pixbuf</code></em> is ref'ed by this function, but is not copied, so it should
-not be modified before the database is saved.
+Set a thumbnail in <em class="parameter"><code>artwork</code></em>. No data is processed yet. This will be done when
+<em class="parameter"><code>artwork</code></em> is saved to disk.
</p>
<p>
For the rotation angle you can also use the gdk constants
-GDK_PIXBUF_ROTATE_NONE, ..._COUNTERCLOCKWISE, ..._UPSIDEDOWN AND
-..._CLOCKWISE.</p>
+<code class="literal">GDK_PIXBUF_ROTATE_NONE</code>, <code class="literal">GDK_PIXBUF_ROTATE_COUNTERCLOCKWISE</code>,
+<code class="literal">GDK_PIXBUF_ROTATE_UPSIDEDOWN</code>, AND <code class="literal">GDK_PIXBUF_ROTATE_CLOCKWISE</code>.</p>
<p>
</p>
@@ -395,72 +520,120 @@
<col align="left" valign="top">
<tbody>
<tr>
-<td><span class="term"><em class="parameter"><code>artwork</code></em> :</span></td>
-<td> an <span class="type">Itdb_Thumbnail</span>
+<td><p><span class="term"><em class="parameter"><code>artwork</code></em> :</span></p></td>
+<td> an <a class="link" href="libgpod-Artwork.html#Itdb-Artwork"><span class="type">Itdb_Artwork</span></a>
</td>
</tr>
<tr>
-<td><span class="term"><em class="parameter"><code>type</code></em> :</span></td>
-<td> thumbnail size
+<td><p><span class="term"><em class="parameter"><code>image_data</code></em> :</span></p></td>
+<td> data used to create the thumbnail (the raw contents of
+ an image file)
</td>
</tr>
<tr>
-<td><span class="term"><em class="parameter"><code>pixbuf</code></em> :</span></td>
-<td> <span class="type">GdkPixbuf</span> to use to create the thumbnail
+<td><p><span class="term"><em class="parameter"><code>image_data_len</code></em> :</span></p></td>
+<td> length of above data block
</td>
</tr>
<tr>
-<td><span class="term"><em class="parameter"><code>rotation</code></em> :</span></td>
-<td> angle by which the image should be rotated
-counterclockwise. Valid values are 0, 90, 180 and 270.
+<td><p><span class="term"><em class="parameter"><code>rotation</code></em> :</span></p></td>
+<td> angle by which the image should be rotated
+ counterclockwise. Valid values are 0, 90, 180 and 270.
</td>
</tr>
<tr>
-<td><span class="term"><em class="parameter"><code>error</code></em> :</span></td>
-<td> return location for a <span class="type">GError</span> or NULL
+<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
+<td> return location for a <a
+href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"
+><span class="type">GError</span></a> or NULL
</td>
</tr>
<tr>
-<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
<td> TRUE if the thumbnail could be successfully added, FALSE
otherwise. <em class="parameter"><code>error</code></em> is set appropriately.
+
</td>
</tr>
</tbody>
</table></div>
+<p class="since">Since 0.7.0
+</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2613675"></a><h3>
-<a name="itdb-artwork-remove-thumbnail"></a>itdb_artwork_remove_thumbnail ()</h3>
-<a class="indexterm" name="id2613687"></a><pre class="programlisting">void itdb_artwork_remove_thumbnail (<a href="libgpod-Artwork.html#Itdb-Artwork">Itdb_Artwork</a> *artwork,
- <a href="libgpod-Artwork.html#Itdb-Thumb">Itdb_Thumb</a> *thumb);</pre>
+<a name="id2848156"></a><h3>
+<a name="itdb-artwork-set-thumbnail-from-pixbuf"></a>itdb_artwork_set_thumbnail_from_pixbuf ()</h3>
+<a class="indexterm" name="id2848170"></a><pre class="programlisting"><a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"
+>gboolean</a> itdb_artwork_set_thumbnail_from_pixbuf
+ (<a class="link" href="libgpod-Artwork.html#Itdb-Artwork">Itdb_Artwork</a> *artwork,
+ <a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"
+>gpointer</a> pixbuf,
+ <a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"
+>gint</a> rotation,
+ <a
+href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"
+>GError</a> **error);</pre>
<p>
-Removes <em class="parameter"><code>thumb</code></em> from <em class="parameter"><code>artwork</code></em>. The memory used by <em class="parameter"><code>thumb</code></em> is freed.</p>
+Set a thumbnail in <em class="parameter"><code>artwork</code></em>. No data is generated from <em class="parameter"><code>pixbuf</code></em> yet, it will
+be done when <em class="parameter"><code>artwork</code></em> is saved to disk. <em class="parameter"><code>pixbuf</code></em> is ref'ed by this function,
+but is not copied, so it should not be modified before the database is saved.
+</p>
<p>
+For the rotation angle you can also use the gdk constants
+<code class="literal">GDK_PIXBUF_ROTATE_NONE</code>, <code class="literal">GDK_PIXBUF_ROTATE_COUNTERCLOCKWISE</code>,
+<code class="literal">GDK_PIXBUF_ROTATE_UPSIDEDOWN</code>, AND <code class="literal">GDK_PIXBUF_ROTATE_CLOCKWISE</code>.</p>
+<p>
</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
<tr>
-<td><span class="term"><em class="parameter"><code>artwork</code></em> :</span></td>
-<td> an <a href="libgpod-Artwork.html#Itdb-Artwork"><span class="type">Itdb_Artwork</span></a>
+<td><p><span class="term"><em class="parameter"><code>artwork</code></em> :</span></p></td>
+<td> an <a class="link" href="libgpod-Artwork.html#Itdb-Artwork"><span class="type">Itdb_Artwork</span></a>
</td>
</tr>
<tr>
-<td><span class="term"><em class="parameter"><code>thumb</code></em> :</span></td>
-<td> an <a href="libgpod-Artwork.html#Itdb-Thumb"><span class="type">Itdb_Thumb</span></a>
+<td><p><span class="term"><em class="parameter"><code>pixbuf</code></em> :</span></p></td>
+<td> <a
+href="/usr/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf.html#GdkPixbuf"
+><span class="type">GdkPixbuf</span></a> to use to create the thumbnail
</td>
</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>rotation</code></em> :</span></p></td>
+<td> angle by which the image should be rotated
+ counterclockwise. Valid values are 0, 90, 180 and 270.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
+<td> return location for a <a
+href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"
+><span class="type">GError</span></a> or NULL
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> TRUE if the thumbnail could be successfully added, FALSE
+otherwise. <em class="parameter"><code>error</code></em> is set appropriately.
+
+</td>
+</tr>
</tbody>
</table></div>
+<p class="since">Since 0.7.0
+</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2613779"></a><h3>
+<a name="id2848382"></a><h3>
<a name="itdb-artwork-remove-thumbnails"></a>itdb_artwork_remove_thumbnails ()</h3>
-<a class="indexterm" name="id2613791"></a><pre class="programlisting">void itdb_artwork_remove_thumbnails (<a href="libgpod-Artwork.html#Itdb-Artwork">Itdb_Artwork</a> *artwork);</pre>
+<a class="indexterm" name="id2848396"></a><pre class="programlisting">void itdb_artwork_remove_thumbnails (<a class="link" href="libgpod-Artwork.html#Itdb-Artwork">Itdb_Artwork</a> *artwork);</pre>
<p>
Removes all thumbnails from <em class="parameter"><code>artwork</code></em></p>
<p>
@@ -469,20 +642,26 @@
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody><tr>
-<td><span class="term"><em class="parameter"><code>artwork</code></em> :</span></td>
-<td> an <a href="libgpod-Artwork.html#Itdb-Artwork"><span class="type">Itdb_Artwork</span></a>
+<td><p><span class="term"><em class="parameter"><code>artwork</code></em> :</span></p></td>
+<td> an <a class="link" href="libgpod-Artwork.html#Itdb-Artwork"><span class="type">Itdb_Artwork</span></a>
</td>
</tr></tbody>
</table></div>
+<p class="since">Since 0.3.0
+</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2613847"></a><h3>
-<a name="itdb-artwork-get-thumb-by-type"></a>itdb_artwork_get_thumb_by_type ()</h3>
-<a class="indexterm" name="id2613859"></a><pre class="programlisting"><a href="libgpod-Artwork.html#Itdb-Thumb">Itdb_Thumb</a>* itdb_artwork_get_thumb_by_type (<a href="libgpod-Artwork.html#Itdb-Artwork">Itdb_Artwork</a> *artwork,
- <a href="libgpod-Artwork.html#ItdbThumbType">ItdbThumbType</a> type);</pre>
+<a name="id2848458"></a><h3>
+<a name="Itdb-Thumb"></a>Itdb_Thumb</h3>
+<a class="indexterm" name="id2848471"></a><pre class="programlisting">typedef struct {
+ ItdbThumbDataType data_type;
+ guint rotation;
+} Itdb_Thumb;
+</pre>
<p>
-Searches <em class="parameter"><code>artwork</code></em> for an <a href="libgpod-Artwork.html#Itdb-Thumb"><span class="type">Itdb_Thumb</span></a> of type <em class="parameter"><code>type</code></em>.</p>
+This is an opaque structure representing a thumbnail to be
+transferred to the ipod or read from the ipod.</p>
<p>
</p>
@@ -490,66 +669,27 @@
<col align="left" valign="top">
<tbody>
<tr>
-<td><span class="term"><em class="parameter"><code>artwork</code></em> :</span></td>
-<td> an <a href="libgpod-Artwork.html#Itdb-Artwork"><span class="type">Itdb_Artwork</span></a>
+<td><p><span class="term">ItdbThumbDataType <em class="structfield"><code>data_type</code></em>;</span></p></td>
+<td> The type of data (file, memory, pixbuf, ipod, etc.)
</td>
</tr>
<tr>
-<td><span class="term"><em class="parameter"><code>type</code></em> :</span></td>
-<td> type of the <a href="libgpod-Artwork.html#Itdb-Thumb"><span class="type">Itdb_Thumb</span></a> to retrieve
+<td><p><span class="term"><a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"
+>guint</a> <em class="structfield"><code>rotation</code></em>;</span></p></td>
+<td> Angle by which the image is rotated counterclockwise
</td>
</tr>
-<tr>
-<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td>
-<td> an <a href="libgpod-Artwork.html#Itdb-Thumb"><span class="type">Itdb_Thumb</span></a> of type <em class="parameter"><code>type</code></em>, or NULL if such a thumbnail couldn't
-be found
-</td>
-</tr>
</tbody>
</table></div>
-</div>
-<hr>
-<div class="refsect2" lang="en">
-<a name="id2613974"></a><h3>
-<a name="itdb-thumb-get-gdk-pixbuf"></a>itdb_thumb_get_gdk_pixbuf ()</h3>
-<a class="indexterm" name="id2613985"></a><pre class="programlisting">gpointer itdb_thumb_get_gdk_pixbuf (<a href="libgpod-Device.html#Itdb-Device">Itdb_Device</a> *device,
- <a href="libgpod-Artwork.html#Itdb-Thumb">Itdb_Thumb</a> *thumb);</pre>
-<p>
-Converts <em class="parameter"><code>thumb</code></em> to a <span class="type">GdkPixbuf</span>.
-Since we want to have gdk-pixbuf dependency optional, a generic
-gpointer is returned which you have to cast to a <span class="type">GdkPixbuf</span> using
-<code class="function">GDK_PIXBUF()</code> yourself.</p>
-<p>
-
+<p class="since">Since 0.3.0
</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><span class="term"><em class="parameter"><code>device</code></em> :</span></td>
-<td> an <a href="libgpod-Device.html#Itdb-Device"><span class="type">Itdb_Device</span></a>
-</td>
-</tr>
-<tr>
-<td><span class="term"><em class="parameter"><code>thumb</code></em> :</span></td>
-<td> an <a href="libgpod-Artwork.html#Itdb-Thumb"><span class="type">Itdb_Thumb</span></a>
-</td>
-</tr>
-<tr>
-<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td>
-<td> a <span class="type">GdkPixbuf</span> that must be unreffed with <code class="function">gdk_pixbuf_unref()</code>
-after use, or NULL if the creation of the gdk-pixbuf failed or if
-libgpod was compiled without gdk-pixbuf support.
-</td>
-</tr>
-</tbody>
-</table></div>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2614116"></a><h3>
+<a name="id2848539"></a><h3>
<a name="itdb-thumb-duplicate"></a>itdb_thumb_duplicate ()</h3>
-<a class="indexterm" name="id2614126"></a><pre class="programlisting"><a href="libgpod-Artwork.html#Itdb-Thumb">Itdb_Thumb</a>* itdb_thumb_duplicate (<a href="libgpod-Artwork.html#Itdb-Thumb">Itdb_Thumb</a> *thumb);</pre>
+<a class="indexterm" name="id2848552"></a><pre class="programlisting"><a class="link" href="libgpod-Artwork.html#Itdb-Thumb">Itdb_Thumb</a>* itdb_thumb_duplicate (<a class="link" href="libgpod-Artwork.html#Itdb-Thumb">Itdb_Thumb</a> *thumb);</pre>
<p>
Duplicates the data contained in <em class="parameter"><code>thumb</code></em></p>
<p>
@@ -559,24 +699,27 @@
<col align="left" valign="top">
<tbody>
<tr>
-<td><span class="term"><em class="parameter"><code>thumb</code></em> :</span></td>
-<td> an <a href="libgpod-Artwork.html#Itdb-Thumb"><span class="type">Itdb_Thumb</span></a>
+<td><p><span class="term"><em class="parameter"><code>thumb</code></em> :</span></p></td>
+<td> an <a class="link" href="libgpod-Artwork.html#Itdb-Thumb"><span class="type">Itdb_Thumb</span></a>
</td>
</tr>
<tr>
-<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td>
-<td> a newly allocated copy of <em class="parameter"><code>thumb</code></em> to be freed with
-<a href="libgpod-Artwork.html#itdb-thumb-free"><code class="function">itdb_thumb_free()</code></a> after use
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> a newly allocated copy of <em class="parameter"><code>thumb</code></em> to be freed with
+<a class="link" href="libgpod-Artwork.html#itdb-thumb-free"><code class="function">itdb_thumb_free()</code></a> after use
+
</td>
</tr>
</tbody>
</table></div>
+<p class="since">Since 0.3.0
+</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2614204"></a><h3>
+<a name="id2848636"></a><h3>
<a name="itdb-thumb-free"></a>itdb_thumb_free ()</h3>
-<a class="indexterm" name="id2614214"></a><pre class="programlisting">void itdb_thumb_free (<a href="libgpod-Artwork.html#Itdb-Thumb">Itdb_Thumb</a> *thumb);</pre>
+<a class="indexterm" name="id2848648"></a><pre class="programlisting">void itdb_thumb_free (<a class="link" href="libgpod-Artwork.html#Itdb-Thumb">Itdb_Thumb</a> *thumb);</pre>
<p>
Frees the memory used by <em class="parameter"><code>thumb</code></em></p>
<p>
@@ -585,42 +728,113 @@
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody><tr>
-<td><span class="term"><em class="parameter"><code>thumb</code></em> :</span></td>
-<td> an <a href="libgpod-Artwork.html#Itdb-Thumb"><span class="type">Itdb_Thumb</span></a>
+<td><p><span class="term"><em class="parameter"><code>thumb</code></em> :</span></p></td>
+<td> an <a class="link" href="libgpod-Artwork.html#Itdb-Thumb"><span class="type">Itdb_Thumb</span></a>
</td>
</tr></tbody>
</table></div>
+<p class="since">Since 0.3.0
+</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2614269"></a><h3>
-<a name="itdb-thumb-new"></a>itdb_thumb_new ()</h3>
-<a class="indexterm" name="id2614279"></a><pre class="programlisting"><a href="libgpod-Artwork.html#Itdb-Thumb">Itdb_Thumb</a>* itdb_thumb_new (void);</pre>
+<a name="id2848709"></a><h3>
+<a name="itdb-thumb-to-pixbuf-at-size"></a>itdb_thumb_to_pixbuf_at_size ()</h3>
+<a class="indexterm" name="id2848723"></a><pre class="programlisting"><a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"
+>gpointer</a> itdb_thumb_to_pixbuf_at_size (<a class="link" href="libgpod-Device.html#Itdb-Device">Itdb_Device</a> *device,
+ <a class="link" href="libgpod-Artwork.html#Itdb-Thumb">Itdb_Thumb</a> *thumb,
+ <a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"
+>gint</a> width,
+ <a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"
+>gint</a> height);</pre>
<p>
-Creates a new <a href="libgpod-Artwork.html#Itdb-Thumb"><span class="type">Itdb_Thumb</span></a></p>
+Converts <em class="parameter"><code>thumb</code></em> to a <a
+href="/usr/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf.html#GdkPixbuf"
+><span class="type">GdkPixbuf</span></a>.
+</p>
<p>
+</p>
+<div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
+<h3 class="title">Note</h3>
+Since we want to have gdk-pixbuf dependency optional, a generic
+gpointer is returned which you have to cast to a <a
+href="/usr/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf.html#GdkPixbuf"
+><span class="type">GdkPixbuf</span></a> using
+<code class="function">GDK_PIXBUF()</code> yourself.
+</div>
+<p>
</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
-<tbody><tr>
-<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td>
-<td> newly allocated <a href="libgpod-Artwork.html#Itdb-Thumb"><span class="type">Itdb_Thumb</span></a> to be freed with <a href="libgpod-Artwork.html#itdb-thumb-free"><code class="function">itdb_thumb_free()</code></a>
-after use
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>device</code></em> :</span></p></td>
+<td> an <a class="link" href="libgpod-Device.html#Itdb-Device"><span class="type">Itdb_Device</span></a>
</td>
-</tr></tbody>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>thumb</code></em> :</span></p></td>
+<td> an <a class="link" href="libgpod-Artwork.html#Itdb-Thumb"><span class="type">Itdb_Thumb</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>width</code></em> :</span></p></td>
+<td> width of the pixbuf to retrieve, -1 for the biggest
+ possible size and 0 for the smallest possible size (with no scaling)
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>height</code></em> :</span></p></td>
+<td> height of the pixbuf to retrieve, -1 for the biggest possible size
+ and 0 for the smallest possible size (with no scaling)
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> a <a
+href="/usr/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf.html#GdkPixbuf"
+><span class="type">GdkPixbuf</span></a> that must be unreffed with <a
+href="/usr/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-refcounting.html#gdk-pixbuf-unref"
+><code class="function">gdk_pixbuf_unref()</code></a>
+after use, or NULL if the creation of the gdk-pixbuf failed or if
+libgpod was compiled without gdk-pixbuf support.
+
+</td>
+</tr>
+</tbody>
</table></div>
+<p class="since">Since 0.7.0
+</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2614335"></a><h3>
-<a name="itdb-thumb-get-filename"></a>itdb_thumb_get_filename ()</h3>
-<a class="indexterm" name="id2614345"></a><pre class="programlisting">gchar* itdb_thumb_get_filename (<a href="libgpod-Device.html#Itdb-Device">Itdb_Device</a> *device,
- <a href="libgpod-Artwork.html#Itdb-Thumb">Itdb_Thumb</a> *thumb);</pre>
+<a name="id2848909"></a><h3>
+<a name="itdb-thumb-to-pixbufs"></a>itdb_thumb_to_pixbufs ()</h3>
+<a class="indexterm" name="id2848921"></a><pre class="programlisting"><a
+href="/usr/share/gtk-doc/html/glib/glib-Doubly-Linked-Lists.html#GList"
+>GList</a>* itdb_thumb_to_pixbufs (<a class="link" href="libgpod-Device.html#Itdb-Device">Itdb_Device</a> *device,
+ <a class="link" href="libgpod-Artwork.html#Itdb-Thumb">Itdb_Thumb</a> *thumb);</pre>
<p>
-Get filename of thumbnail. If it's a thumbnail on the iPod, return
-the full path to the ithmb file. Otherwise return the full path to
-the original file.</p>
+Converts <em class="parameter"><code>thumb</code></em> to a <a
+href="/usr/share/gtk-doc/html/glib/glib-Doubly-Linked-Lists.html#GList"
+><span class="type">GList</span></a> of <a
+href="/usr/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf.html#GdkPixbuf"
+><span class="type">GdkPixbuf</span></a>. The returned <a
+href="/usr/share/gtk-doc/html/glib/glib-Doubly-Linked-Lists.html#GList"
+><span class="type">GList</span></a> will
+generally contain only 1 element, the full-size pixbuf associated with
+<em class="parameter"><code>thumb</code></em>, but when the artwork has been read from the ipod and hasn't been
+modified from the library, then the returned <a
+href="/usr/share/gtk-doc/html/glib/glib-Doubly-Linked-Lists.html#GList"
+><span class="type">GList</span></a> will contain several
+<a
+href="/usr/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf.html#GdkPixbuf"
+><span class="type">GdkPixbuf</span></a> corresponding to the various thumbnail sizes that were
+written to the iPod database.</p>
<p>
</p>
@@ -628,31 +842,53 @@
<col align="left" valign="top">
<tbody>
<tr>
-<td><span class="term"><em class="parameter"><code>device</code></em> :</span></td>
-<td> an <a href="libgpod-Device.html#Itdb-Device"><span class="type">Itdb_Device</span></a>
+<td><p><span class="term"><em class="parameter"><code>device</code></em> :</span></p></td>
+<td> an <a class="link" href="libgpod-Device.html#Itdb-Device"><span class="type">Itdb_Device</span></a>
</td>
</tr>
<tr>
-<td><span class="term"><em class="parameter"><code>thumb</code></em> :</span></td>
-<td> an <a href="libgpod-Artwork.html#Itdb-Thumb"><span class="type">Itdb_Thumb</span></a>
+<td><p><span class="term"><em class="parameter"><code>thumb</code></em> :</span></p></td>
+<td> an <a class="link" href="libgpod-Artwork.html#Itdb-Thumb"><span class="type">Itdb_Thumb</span></a>
</td>
</tr>
<tr>
-<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td>
-<td> newly allocated string containing the absolute path to the
-thumbnail file.
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> a <a
+href="/usr/share/gtk-doc/html/glib/glib-Doubly-Linked-Lists.html#GList"
+><span class="type">GList</span></a> of <a
+href="/usr/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf.html#GdkPixbuf"
+><span class="type">GdkPixbuf</span></a> which are associated with <em class="parameter"><code>thumb</code></em>, NULL
+if the pixbuf was invalid or if libgpod is compiled without gdk-pixbuf
+support. The <a
+href="/usr/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf.html#GdkPixbuf"
+><span class="type">GdkPixbuf</span></a> must be unreffed with <a
+href="/usr/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-refcounting.html#gdk-pixbuf-unref"
+><code class="function">gdk_pixbuf_unref()</code></a> after use
+and the <a
+href="/usr/share/gtk-doc/html/glib/glib-Doubly-Linked-Lists.html#GList"
+><span class="type">GList</span></a> must be freed with <a
+href="/usr/share/gtk-doc/html/glib/glib-Doubly-Linked-Lists.html#g-list-free"
+><code class="function">g_list_free()</code></a>.
+
</td>
</tr>
</tbody>
</table></div>
+<p class="since">Since 0.7.0
+</p>
</div>
</div>
<div class="refsect1" lang="en">
-<a name="id2614435"></a><h2>See Also</h2>
+<a name="id2849109"></a><h2>See Also</h2>
<p>
-<a href="photodb.html" title="Part II. Photo database">Photo database</a>
+<a class="link" href="photodb.html" title="Part II. Photo database">Photo database</a>
</p>
</div>
+<div class="refsect1" lang="en">
+<a name="id2849124"></a><div class="refsect2" lang="en"><a name="id2849125"></a></div>
+<hr>
+<div class="refsect2" lang="en"><a name="id2849126"></a></div>
</div>
+</div>
</body>
</html>
Added: libgpod/branches/upstream/current/docs/reference/html/libgpod-Chapter-Data.html
===================================================================
--- libgpod/branches/upstream/current/docs/reference/html/libgpod-Chapter-Data.html (rev 0)
+++ libgpod/branches/upstream/current/docs/reference/html/libgpod-Chapter-Data.html 2009-01-24 10:34:00 UTC (rev 339)
@@ -0,0 +1,485 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
+<title>Chapter Data</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
+<link rel="start" href="index.html" title="libgpod Reference Manual">
+<link rel="up" href="ch01.html" title="iPod database components">
+<link rel="prev" href="libgpod-Artwork.html" title="Artwork">
+<link rel="next" href="libgpod-Device.html" title="Device">
+<meta name="generator" content="GTK-Doc V1.9 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+<link rel="part" href="itunesdb.html" title="Part I. iPod database">
+<link rel="chapter" href="ch01.html" title="iPod database components">
+<link rel="part" href="photodb.html" title="Part II. Photo database">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
+<tr valign="middle">
+<td><a accesskey="p" href="libgpod-Artwork.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
+<th width="100%" align="center">libgpod Reference Manual</th>
+<td><a accesskey="n" href="libgpod-Device.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+</tr>
+<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2802489" class="shortcut">Top</a>
+  | 
+ <a href="#id2788846" class="shortcut">Description</a></nobr></td></tr>
+</table>
+<div class="refentry" lang="en">
+<a name="libgpod-Chapter-Data"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2>
+<a name="id2802489"></a><span class="refentrytitle">Chapter Data</span>
+</h2>
+<p>Chapter Data — Data structure to store chapter data for tracks</p>
+</td>
+<td valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsynopsisdiv">
+<h2>Synopsis</h2>
+<pre class="synopsis">
+
+
+
+ <a class="link" href="libgpod-Chapter-Data.html#Itdb-Chapter">Itdb_Chapter</a>;
+ <a class="link" href="libgpod-Chapter-Data.html#Itdb-Chapterdata">Itdb_Chapterdata</a>;
+<a class="link" href="libgpod-Chapter-Data.html#Itdb-Chapter">Itdb_Chapter</a>* <a class="link" href="libgpod-Chapter-Data.html#itdb-chapter-new">itdb_chapter_new</a> (void);
+<a class="link" href="libgpod-Chapter-Data.html#Itdb-Chapter">Itdb_Chapter</a>* <a class="link" href="libgpod-Chapter-Data.html#itdb-chapter-duplicate">itdb_chapter_duplicate</a> (<a class="link" href="libgpod-Chapter-Data.html#Itdb-Chapter">Itdb_Chapter</a> *chapter);
+void <a class="link" href="libgpod-Chapter-Data.html#itdb-chapter-free">itdb_chapter_free</a> (<a class="link" href="libgpod-Chapter-Data.html#Itdb-Chapter">Itdb_Chapter</a> *chapter);
+<a class="link" href="libgpod-Chapter-Data.html#Itdb-Chapterdata">Itdb_Chapterdata</a>* <a class="link" href="libgpod-Chapter-Data.html#itdb-chapterdata-new">itdb_chapterdata_new</a> (void);
+<a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"
+>gboolean</a> <a class="link" href="libgpod-Chapter-Data.html#itdb-chapterdata-add-chapter">itdb_chapterdata_add_chapter</a> (<a class="link" href="libgpod-Chapter-Data.html#Itdb-Chapterdata">Itdb_Chapterdata</a> *chapterdata,
+ <a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint32"
+>gint32</a> startpos,
+ <a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"
+>gchar</a> *chaptertitle);
+<a class="link" href="libgpod-Chapter-Data.html#Itdb-Chapterdata">Itdb_Chapterdata</a>* <a class="link" href="libgpod-Chapter-Data.html#itdb-chapterdata-duplicate">itdb_chapterdata_duplicate</a> (<a class="link" href="libgpod-Chapter-Data.html#Itdb-Chapterdata">Itdb_Chapterdata</a> *chapterdata);
+void <a class="link" href="libgpod-Chapter-Data.html#itdb-chapterdata-remove-chapter">itdb_chapterdata_remove_chapter</a> (<a class="link" href="libgpod-Chapter-Data.html#Itdb-Chapterdata">Itdb_Chapterdata</a> *chapterdata,
+ <a class="link" href="libgpod-Chapter-Data.html#Itdb-Chapter">Itdb_Chapter</a> *chapter);
+void <a class="link" href="libgpod-Chapter-Data.html#itdb-chapterdata-remove-chapters">itdb_chapterdata_remove_chapters</a> (<a class="link" href="libgpod-Chapter-Data.html#Itdb-Chapterdata">Itdb_Chapterdata</a> *chapterdata);
+void <a class="link" href="libgpod-Chapter-Data.html#itdb-chapterdata-free">itdb_chapterdata_free</a> (<a class="link" href="libgpod-Chapter-Data.html#Itdb-Chapterdata">Itdb_Chapterdata</a> *chapterdata);
+</pre>
+</div>
+<div class="refsect1" lang="en">
+<a name="id2788846"></a><h2>Description</h2>
+<p>
+Chapters allow for a large file to be divided into sections. The start and stop
+points in the track are defined here, as well as the title for each chapter.
+</p>
+</div>
+<div class="refsect1" lang="en">
+<a name="id2788864"></a><h2>Details</h2>
+<div class="refsect2" lang="en">
+<a name="id2788875"></a><h3>
+<a name="Itdb-Chapter"></a>Itdb_Chapter</h3>
+<a class="indexterm" name="id2788889"></a><pre class="programlisting">typedef struct {
+ guint32 startpos;
+ gchar *chaptertitle;
+ /* reserved for future use */
+ gint32 reserved_int1;
+ gint32 reserved_int2;
+ gpointer reserved1;
+ gpointer reserved2;
+} Itdb_Chapter;
+</pre>
+<p>
+Structure representing an iTunesDB Chapter</p>
+<p>
+
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint32"
+>guint32</a> <em class="structfield"><code>startpos</code></em>;</span></p></td>
+<td> The start position of the chapter in ms. The first chapter
+ begins at 1.
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"
+>gchar</a> *<em class="structfield"><code>chaptertitle</code></em>;</span></p></td>
+<td> The chapter title in UTF8
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint32"
+>gint32</a> <em class="structfield"><code>reserved_int1</code></em>;</span></p></td>
+<td> Reserved for future use
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint32"
+>gint32</a> <em class="structfield"><code>reserved_int2</code></em>;</span></p></td>
+<td> Reserved for future use
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"
+>gpointer</a> <em class="structfield"><code>reserved1</code></em>;</span></p></td>
+<td> Reserved for future use
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"
+>gpointer</a> <em class="structfield"><code>reserved2</code></em>;</span></p></td>
+<td> Reserved for future use
+</td>
+</tr>
+</tbody>
+</table></div>
+<p class="since">Since 0.7.0
+</p>
+</div>
+<hr>
+<div class="refsect2" lang="en">
+<a name="id2838689"></a><h3>
+<a name="Itdb-Chapterdata"></a>Itdb_Chapterdata</h3>
+<a class="indexterm" name="id2838703"></a><pre class="programlisting">typedef struct {
+ GList *chapters;
+ guint32 unk024;
+ guint32 unk028;
+ guint32 unk032;
+ /* reserved for future use */
+ gint32 reserved_int1;
+ gint32 reserved_int2;
+ gpointer reserved1;
+ gpointer reserved2;
+} Itdb_Chapterdata;
+</pre>
+<p>
+Structure representing iTunesDB Chapter data</p>
+<p>
+
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><a
+href="/usr/share/gtk-doc/html/glib/glib-Doubly-Linked-Lists.html#GList"
+>GList</a> *<em class="structfield"><code>chapters</code></em>;</span></p></td>
+<td> A list of chapters (<a class="link" href="libgpod-Chapter-Data.html#Itdb-Chapter"><span class="type">Itdb_Chapter</span></a>)
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint32"
+>guint32</a> <em class="structfield"><code>unk024</code></em>;</span></p></td>
+<td> Unknown
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint32"
+>guint32</a> <em class="structfield"><code>unk028</code></em>;</span></p></td>
+<td> Unknown
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint32"
+>guint32</a> <em class="structfield"><code>unk032</code></em>;</span></p></td>
+<td> Unknown
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint32"
+>gint32</a> <em class="structfield"><code>reserved_int1</code></em>;</span></p></td>
+<td> Reserved for future use
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint32"
+>gint32</a> <em class="structfield"><code>reserved_int2</code></em>;</span></p></td>
+<td> Reserved for future use
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"
+>gpointer</a> <em class="structfield"><code>reserved1</code></em>;</span></p></td>
+<td> Reserved for future use
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"
+>gpointer</a> <em class="structfield"><code>reserved2</code></em>;</span></p></td>
+<td> Reserved for future use
+</td>
+</tr>
+</tbody>
+</table></div>
+<p class="since">Since 0.7.0
+</p>
+</div>
+<hr>
+<div class="refsect2" lang="en">
+<a name="id2838190"></a><h3>
+<a name="itdb-chapter-new"></a>itdb_chapter_new ()</h3>
+<a class="indexterm" name="id2838205"></a><pre class="programlisting"><a class="link" href="libgpod-Chapter-Data.html#Itdb-Chapter">Itdb_Chapter</a>* itdb_chapter_new (void);</pre>
+<p>
+Creates a new <a class="link" href="libgpod-Chapter-Data.html#Itdb-Chapter"><span class="type">Itdb_Chapter</span></a></p>
+<p>
+
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody><tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> newly allocated <a class="link" href="libgpod-Chapter-Data.html#Itdb-Chapter"><span class="type">Itdb_Chapter</span></a> to be freed with <a class="link" href="libgpod-Chapter-Data.html#itdb-chapter-free"><code class="function">itdb_chapter_free()</code></a>
+after use
+
+</td>
+</tr></tbody>
+</table></div>
+<p class="since">Since 0.7.0
+</p>
+</div>
+<hr>
+<div class="refsect2" lang="en">
+<a name="id2838276"></a><h3>
+<a name="itdb-chapter-duplicate"></a>itdb_chapter_duplicate ()</h3>
+<a class="indexterm" name="id2838289"></a><pre class="programlisting"><a class="link" href="libgpod-Chapter-Data.html#Itdb-Chapter">Itdb_Chapter</a>* itdb_chapter_duplicate (<a class="link" href="libgpod-Chapter-Data.html#Itdb-Chapter">Itdb_Chapter</a> *chapter);</pre>
+<p>
+Duplicates the data contained in <em class="parameter"><code>chapter</code></em></p>
+<p>
+
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>chapter</code></em> :</span></p></td>
+<td> an <a class="link" href="libgpod-Chapter-Data.html#Itdb-Chapter"><span class="type">Itdb_Chapter</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> a newly allocated copy of <em class="parameter"><code>chapter</code></em> to be freed with
+<a class="link" href="libgpod-Chapter-Data.html#itdb-chapter-free"><code class="function">itdb_chapter_free()</code></a> after use
+
+</td>
+</tr>
+</tbody>
+</table></div>
+<p class="since">Since 0.7.0
+</p>
+</div>
+<hr>
+<div class="refsect2" lang="en">
+<a name="id2838385"></a><h3>
+<a name="itdb-chapter-free"></a>itdb_chapter_free ()</h3>
+<a class="indexterm" name="id2838400"></a><pre class="programlisting">void itdb_chapter_free (<a class="link" href="libgpod-Chapter-Data.html#Itdb-Chapter">Itdb_Chapter</a> *chapter);</pre>
+<p>
+Frees the memory used by <em class="parameter"><code>chapter</code></em></p>
+<p>
+
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody><tr>
+<td><p><span class="term"><em class="parameter"><code>chapter</code></em> :</span></p></td>
+<td> an <a class="link" href="libgpod-Chapter-Data.html#Itdb-Chapter"><span class="type">Itdb_Chapter</span></a>
+</td>
+</tr></tbody>
+</table></div>
+<p class="since">Since 0.7.0
+</p>
+</div>
+<hr>
+<div class="refsect2" lang="en">
+<a name="id2843562"></a><h3>
+<a name="itdb-chapterdata-new"></a>itdb_chapterdata_new ()</h3>
+<a class="indexterm" name="id2843575"></a><pre class="programlisting"><a class="link" href="libgpod-Chapter-Data.html#Itdb-Chapterdata">Itdb_Chapterdata</a>* itdb_chapterdata_new (void);</pre>
+<p>
+Creates a new <a class="link" href="libgpod-Chapter-Data.html#Itdb-Chapterdata"><span class="type">Itdb_Chapterdata</span></a></p>
+<p>
+
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody><tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> a new <a class="link" href="libgpod-Chapter-Data.html#Itdb-Chapterdata"><span class="type">Itdb_Chapterdata</span></a> to be freed with
+ <a class="link" href="libgpod-Chapter-Data.html#itdb-chapterdata-free"><code class="function">itdb_chapterdata_free()</code></a> when no longer needed
+
+</td>
+</tr></tbody>
+</table></div>
+<p class="since">Since 0.7.0
+</p>
+</div>
+<hr>
+<div class="refsect2" lang="en">
+<a name="id2843645"></a><h3>
+<a name="itdb-chapterdata-add-chapter"></a>itdb_chapterdata_add_chapter ()</h3>
+<a class="indexterm" name="id2843660"></a><pre class="programlisting"><a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"
+>gboolean</a> itdb_chapterdata_add_chapter (<a class="link" href="libgpod-Chapter-Data.html#Itdb-Chapterdata">Itdb_Chapterdata</a> *chapterdata,
+ <a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint32"
+>gint32</a> startpos,
+ <a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"
+>gchar</a> *chaptertitle);</pre>
+<p>
+Appends a chapter to existing chapters in <em class="parameter"><code>chapterdata</code></em>.</p>
+<p>
+
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>chapterdata</code></em> :</span></p></td>
+<td> an <a class="link" href="libgpod-Chapter-Data.html#Itdb-Chapterdata"><span class="type">Itdb_Chapterdata</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>startpos</code></em> :</span></p></td>
+<td> chapter start time in milliseconds
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>chaptertitle</code></em> :</span></p></td>
+<td> chapter title
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> TRUE if the chapter could be successfully added, FALSE
+otherwise.
+
+</td>
+</tr>
+</tbody>
+</table></div>
+<p class="since">Since 0.7.0
+</p>
+</div>
+<hr>
+<div class="refsect2" lang="en">
+<a name="id2843785"></a><h3>
+<a name="itdb-chapterdata-duplicate"></a>itdb_chapterdata_duplicate ()</h3>
+<a class="indexterm" name="id2843799"></a><pre class="programlisting"><a class="link" href="libgpod-Chapter-Data.html#Itdb-Chapterdata">Itdb_Chapterdata</a>* itdb_chapterdata_duplicate (<a class="link" href="libgpod-Chapter-Data.html#Itdb-Chapterdata">Itdb_Chapterdata</a> *chapterdata);</pre>
+<p>
+Duplicates <em class="parameter"><code>chapterdata</code></em></p>
+<p>
+
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>chapterdata</code></em> :</span></p></td>
+<td> an <a class="link" href="libgpod-Chapter-Data.html#Itdb-Chapterdata"><span class="type">Itdb_Chapterdata</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> a new copy of <em class="parameter"><code>chapterdata</code></em>
+
+</td>
+</tr>
+</tbody>
+</table></div>
+<p class="since">Since 0.7.0
+</p>
+</div>
+<hr>
+<div class="refsect2" lang="en">
+<a name="id2843884"></a><h3>
+<a name="itdb-chapterdata-remove-chapter"></a>itdb_chapterdata_remove_chapter ()</h3>
+<a class="indexterm" name="id2843900"></a><pre class="programlisting">void itdb_chapterdata_remove_chapter (<a class="link" href="libgpod-Chapter-Data.html#Itdb-Chapterdata">Itdb_Chapterdata</a> *chapterdata,
+ <a class="link" href="libgpod-Chapter-Data.html#Itdb-Chapter">Itdb_Chapter</a> *chapter);</pre>
+<p>
+Removes <em class="parameter"><code>chapter</code></em> from <em class="parameter"><code>chapterdata</code></em>. The memory used by <em class="parameter"><code>chapter</code></em> is freed.</p>
+<p>
+
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>chapterdata</code></em> :</span></p></td>
+<td> an <a class="link" href="libgpod-Chapter-Data.html#Itdb-Chapterdata"><span class="type">Itdb_Chapterdata</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>chapter</code></em> :</span></p></td>
+<td> an <a class="link" href="libgpod-Chapter-Data.html#Itdb-Chapter"><span class="type">Itdb_Chapter</span></a>
+</td>
+</tr>
+</tbody>
+</table></div>
+<p class="since">Since 0.7.0
+</p>
+</div>
+<hr>
+<div class="refsect2" lang="en">
+<a name="id2844011"></a><h3>
+<a name="itdb-chapterdata-remove-chapters"></a>itdb_chapterdata_remove_chapters ()</h3>
+<a class="indexterm" name="id2844027"></a><pre class="programlisting">void itdb_chapterdata_remove_chapters (<a class="link" href="libgpod-Chapter-Data.html#Itdb-Chapterdata">Itdb_Chapterdata</a> *chapterdata);</pre>
+<p>
+Removes all chapters from <em class="parameter"><code>chapterdata</code></em></p>
+<p>
+
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody><tr>
+<td><p><span class="term"><em class="parameter"><code>chapterdata</code></em> :</span></p></td>
+<td> an <a class="link" href="libgpod-Chapter-Data.html#Itdb-Chapterdata"><span class="type">Itdb_Chapterdata</span></a>
+</td>
+</tr></tbody>
+</table></div>
+<p class="since">Since 0.7.0
+</p>
+</div>
+<hr>
+<div class="refsect2" lang="en">
+<a name="id2844096"></a><h3>
+<a name="itdb-chapterdata-free"></a>itdb_chapterdata_free ()</h3>
+<a class="indexterm" name="id2844110"></a><pre class="programlisting">void itdb_chapterdata_free (<a class="link" href="libgpod-Chapter-Data.html#Itdb-Chapterdata">Itdb_Chapterdata</a> *chapterdata);</pre>
+<p>
+Frees memory used by <em class="parameter"><code>chapterdata</code></em></p>
+<p>
+
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody><tr>
+<td><p><span class="term"><em class="parameter"><code>chapterdata</code></em> :</span></p></td>
+<td> an <a class="link" href="libgpod-Chapter-Data.html#Itdb-Chapterdata"><span class="type">Itdb_Chapterdata</span></a>
+</td>
+</tr></tbody>
+</table></div>
+<p class="since">Since 0.7.0
+</p>
+</div>
+</div>
+<div class="refsect1" lang="en">
+<a name="id2844180"></a><div class="refsect2" lang="en"><a name="id2844181"></a></div>
+<hr>
+<div class="refsect2" lang="en"><a name="id2844182"></a></div>
+</div>
+</div>
+</body>
+</html>
Modified: libgpod/branches/upstream/current/docs/reference/html/libgpod-Device.html
===================================================================
--- libgpod/branches/upstream/current/docs/reference/html/libgpod-Device.html 2008-12-25 18:06:29 UTC (rev 338)
+++ libgpod/branches/upstream/current/docs/reference/html/libgpod-Device.html 2009-01-24 10:34:00 UTC (rev 339)
@@ -3,12 +3,12 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
<title>Device</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.72.0">
+<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
<link rel="start" href="index.html" title="libgpod Reference Manual">
<link rel="up" href="ch01.html" title="iPod database components">
-<link rel="prev" href="libgpod-Artwork.html" title="Artwork">
+<link rel="prev" href="libgpod-Chapter-Data.html" title="Chapter Data">
<link rel="next" href="photodb.html" title="Part II. Photo database">
-<meta name="generator" content="GTK-Doc V1.8 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.9 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
<link rel="part" href="itunesdb.html" title="Part I. iPod database">
<link rel="chapter" href="ch01.html" title="iPod database components">
@@ -17,22 +17,22 @@
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
<tr valign="middle">
-<td><a accesskey="p" href="libgpod-Artwork.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td><a accesskey="p" href="libgpod-Chapter-Data.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
<th width="100%" align="center">libgpod Reference Manual</th>
<td><a accesskey="n" href="photodb.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
</tr>
-<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2562194" class="shortcut">Top</a>
+<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2803674" class="shortcut">Top</a>
 | 
- <a href="#id2576086" class="shortcut">Description</a></nobr></td></tr>
+ <a href="#id2844188" class="shortcut">Description</a></nobr></td></tr>
</table>
<div class="refentry" lang="en">
<a name="libgpod-Device"></a><div class="titlepage"></div>
<div class="refnamediv"><table width="100%"><tr>
<td valign="top">
<h2>
-<a name="id2562194"></a><span class="refentrytitle">Device</span>
+<a name="id2803674"></a><span class="refentrytitle">Device</span>
</h2>
<p>Device — Data structure holding information about the iPod (model, mount point, etc.)</p>
</td>
@@ -44,93 +44,187 @@
- <a href="libgpod-Device.html#Itdb-Device">Itdb_Device</a>;
-<a href="libgpod-Device.html#Itdb-Device">Itdb_Device</a>* <a href="libgpod-Device.html#itdb-device-new">itdb_device_new</a> (void);
-void <a href="libgpod-Device.html#itdb-device-free">itdb_device_free</a> (<a href="libgpod-Device.html#Itdb-Device">Itdb_Device</a> *device);
-void <a href="libgpod-Device.html#itdb-device-set-mountpoint">itdb_device_set_mountpoint</a> (<a href="libgpod-Device.html#Itdb-Device">Itdb_Device</a> *device,
- const gchar *mp);
-gboolean <a href="libgpod-Device.html#itdb-device-read-sysinfo">itdb_device_read_sysinfo</a> (<a href="libgpod-Device.html#Itdb-Device">Itdb_Device</a> *device);
-gchar* <a href="libgpod-Device.html#itdb-device-get-sysinfo">itdb_device_get_sysinfo</a> (<a href="libgpod-Device.html#Itdb-Device">Itdb_Device</a> *device,
- const gchar *field);
-void <a href="libgpod-Device.html#itdb-device-set-sysinfo">itdb_device_set_sysinfo</a> (<a href="libgpod-Device.html#Itdb-Device">Itdb_Device</a> *device,
- const gchar *field,
- const gchar *value);
-gboolean <a href="libgpod-Device.html#itdb-device-write-sysinfo">itdb_device_write_sysinfo</a> (<a href="libgpod-Device.html#Itdb-Device">Itdb_Device</a> *device,
- GError **error);
-const <a href="libgpod-Device.html#Itdb-IpodInfo">Itdb_IpodInfo</a>* <a href="libgpod-Device.html#itdb-device-get-ipod-info">itdb_device_get_ipod_info</a> (<a href="libgpod-Device.html#Itdb-Device">Itdb_Device</a> *device);
-gboolean <a href="libgpod-Device.html#itdb-device-supports-artwork">itdb_device_supports_artwork</a> (<a href="libgpod-Device.html#Itdb-Device">Itdb_Device</a> *device);
-gboolean <a href="libgpod-Device.html#itdb-device-supports-photo">itdb_device_supports_photo</a> (<a href="libgpod-Device.html#Itdb-Device">Itdb_Device</a> *device);
-const <a href="libgpod-Device.html#Itdb-IpodInfo">Itdb_IpodInfo</a>* <a href="libgpod-Device.html#itdb-info-get-ipod-info-table">itdb_info_get_ipod_info_table</a> (void);
-const gchar* <a href="libgpod-Device.html#itdb-info-get-ipod-generation-string">itdb_info_get_ipod_generation_string</a>
- (<a href="libgpod-Device.html#Itdb-IpodGeneration">Itdb_IpodGeneration</a> generation);
-const gchar* <a href="libgpod-Device.html#itdb-info-get-ipod-model-name-string">itdb_info_get_ipod_model_name_string</a>
- (<a href="libgpod-Device.html#Itdb-IpodModel">Itdb_IpodModel</a> model);
-gboolean <a href="libgpod-Device.html#itdb-init-ipod">itdb_init_ipod</a> (const gchar *mountpoint,
- const gchar *model_number,
- const gchar *ipod_name,
- GError **error);
-enum <a href="libgpod-Device.html#Itdb-IpodGeneration">Itdb_IpodGeneration</a>;
- <a href="libgpod-Device.html#Itdb-IpodInfo">Itdb_IpodInfo</a>;
-enum <a href="libgpod-Device.html#Itdb-IpodModel">Itdb_IpodModel</a>;
- <a href="libgpod-Device.html#Itdb-ArtworkFormat">Itdb_ArtworkFormat</a>;
+ <a class="link" href="libgpod-Device.html#Itdb-Device">Itdb_Device</a>;
+<a class="link" href="libgpod-Device.html#Itdb-Device">Itdb_Device</a>* <a class="link" href="libgpod-Device.html#itdb-device-new">itdb_device_new</a> (void);
+void <a class="link" href="libgpod-Device.html#itdb-device-free">itdb_device_free</a> (<a class="link" href="libgpod-Device.html#Itdb-Device">Itdb_Device</a> *device);
+void <a class="link" href="libgpod-Device.html#itdb-device-set-mountpoint">itdb_device_set_mountpoint</a> (<a class="link" href="libgpod-Device.html#Itdb-Device">Itdb_Device</a> *device,
+ const <a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"
+>gchar</a> *mp);
+<a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"
+>gboolean</a> <a class="link" href="libgpod-Device.html#itdb-device-read-sysinfo">itdb_device_read_sysinfo</a> (<a class="link" href="libgpod-Device.html#Itdb-Device">Itdb_Device</a> *device);
+<a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"
+>gchar</a>* <a class="link" href="libgpod-Device.html#itdb-device-get-sysinfo">itdb_device_get_sysinfo</a> (const <a class="link" href="libgpod-Device.html#Itdb-Device">Itdb_Device</a> *device,
+ const <a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"
+>gchar</a> *field);
+void <a class="link" href="libgpod-Device.html#itdb-device-set-sysinfo">itdb_device_set_sysinfo</a> (<a class="link" href="libgpod-Device.html#Itdb-Device">Itdb_Device</a> *device,
+ const <a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"
+>gchar</a> *field,
+ const <a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"
+>gchar</a> *value);
+<a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"
+>gboolean</a> <a class="link" href="libgpod-Device.html#itdb-device-write-sysinfo">itdb_device_write_sysinfo</a> (<a class="link" href="libgpod-Device.html#Itdb-Device">Itdb_Device</a> *device,
+ <a
+href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"
+>GError</a> **error);
+ <a class="link" href="libgpod-Device.html#Itdb-IpodInfo">Itdb_IpodInfo</a>;
+const <a class="link" href="libgpod-Device.html#Itdb-IpodInfo">Itdb_IpodInfo</a>* <a class="link" href="libgpod-Device.html#itdb-device-get-ipod-info">itdb_device_get_ipod_info</a> (const <a class="link" href="libgpod-Device.html#Itdb-Device">Itdb_Device</a> *device);
+<a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"
+>gboolean</a> <a class="link" href="libgpod-Device.html#itdb-device-supports-artwork">itdb_device_supports_artwork</a> (const <a class="link" href="libgpod-Device.html#Itdb-Device">Itdb_Device</a> *device);
+<a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"
+>gboolean</a> <a class="link" href="libgpod-Device.html#itdb-device-supports-photo">itdb_device_supports_photo</a> (const <a class="link" href="libgpod-Device.html#Itdb-Device">Itdb_Device</a> *device);
+<a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"
+>gboolean</a> <a class="link" href="libgpod-Device.html#itdb-device-supports-video">itdb_device_supports_video</a> (const <a class="link" href="libgpod-Device.html#Itdb-Device">Itdb_Device</a> *device);
+const <a class="link" href="libgpod-Device.html#Itdb-IpodInfo">Itdb_IpodInfo</a>* <a class="link" href="libgpod-Device.html#itdb-info-get-ipod-info-table">itdb_info_get_ipod_info_table</a> (void);
+enum <a class="link" href="libgpod-Device.html#Itdb-IpodGeneration">Itdb_IpodGeneration</a>;
+const <a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"
+>gchar</a>* <a class="link" href="libgpod-Device.html#itdb-info-get-ipod-generation-string">itdb_info_get_ipod_generation_string</a>
+ (<a class="link" href="libgpod-Device.html#Itdb-IpodGeneration">Itdb_IpodGeneration</a> generation);
+enum <a class="link" href="libgpod-Device.html#Itdb-IpodModel">Itdb_IpodModel</a>;
+const <a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"
+>gchar</a>* <a class="link" href="libgpod-Device.html#itdb-info-get-ipod-model-name-string">itdb_info_get_ipod_model_name_string</a>
+ (<a class="link" href="libgpod-Device.html#Itdb-IpodModel">Itdb_IpodModel</a> model);
+<a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"
+>gboolean</a> <a class="link" href="libgpod-Device.html#itdb-init-ipod">itdb_init_ipod</a> (const <a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"
+>gchar</a> *mountpoint,
+ const <a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"
+>gchar</a> *model_number,
+ const <a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"
+>gchar</a> *ipod_name,
+ <a
+href="/usr/share/gtk-doc/html/glib/glib-Error-Reporting.html#GError"
+>GError</a> **error);
+ <a class="link" href="libgpod-Device.html#Itdb-ArtworkFormat">Itdb_ArtworkFormat</a>;
</pre>
</div>
<div class="refsect1" lang="en">
-<a name="id2576086"></a><h2>Description</h2>
+<a name="id2844188"></a><h2>Description</h2>
<p>
These functions are for reading and setting information about the iPod.
</p>
</div>
<div class="refsect1" lang="en">
-<a name="id2576102"></a><h2>Details</h2>
+<a name="id2844204"></a><h2>Details</h2>
<div class="refsect2" lang="en">
-<a name="id2576113"></a><h3>
+<a name="id2844215"></a><h3>
<a name="Itdb-Device"></a>Itdb_Device</h3>
-<a class="indexterm" name="id2576125"></a><pre class="programlisting">typedef struct {
- gchar *mountpoint; /* mountpoint of the iPod */
- gint musicdirs; /* number of /iPod_Control/Music/F.. dirs */
- guint byte_order; /* G_LITTLE_ENDIAN "regular" endianness
- * G_BIG_ENDIAN "reversed" endianness (e.g. mobile
- * phone iTunesDBs)
- */
- GHashTable *sysinfo; /* hash with value/key pairs of all entries
- * in Device/SysInfo */
- gboolean sysinfo_changed; /* Has the sysinfo hash been changed by
- the user (itdb_set_sysinfo) */
- gint timezone_shift; /* difference in seconds between the current
- * timezone and UTC
- */
+<a class="indexterm" name="id2844230"></a><pre class="programlisting">typedef struct {
+ gchar *mountpoint;
+ gint musicdirs;
+ guint byte_order;
+ GHashTable *sysinfo;
+ SysInfoIpodProperties *sysinfo_extended;
+ gboolean sysinfo_changed;
+ gint timezone_shift;
} Itdb_Device;
</pre>
<p>
+Structure representing an iPod device</p>
+<p>
</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"
+>gchar</a> *<em class="structfield"><code>mountpoint</code></em>;</span></p></td>
+<td> The mountpoint of the iPod
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"
+>gint</a> <em class="structfield"><code>musicdirs</code></em>;</span></p></td>
+<td> The number of /iPod_Control/Music/F.. dirs
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#guint"
+>guint</a> <em class="structfield"><code>byte_order</code></em>;</span></p></td>
+<td> G_LITTLE_ENDIAN "regular" endianness G_BIG_ENDIAN
+ "reversed" endianness (e.g. mobile phone iTunesDBs)
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><a
+href="/usr/share/gtk-doc/html/glib/glib-Hash-Tables.html#GHashTable"
+>GHashTable</a> *<em class="structfield"><code>sysinfo</code></em>;</span></p></td>
+<td> A hash with key/value pairs of all entries in
+ Device/SysInfo
+</td>
+</tr>
+<tr>
+<td><p><span class="term">SysInfoIpodProperties *<em class="structfield"><code>sysinfo_extended</code></em>;</span></p></td>
+<td> The parsed content of SysInfoExtended, which can be NULL
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"
+>gboolean</a> <em class="structfield"><code>sysinfo_changed</code></em>;</span></p></td>
+<td> True if the sysinfo hash been changed by the user, false
+ otherwise. (see <code class="function">itdb_set_sysinfo()</code>)
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"
+>gint</a> <em class="structfield"><code>timezone_shift</code></em>;</span></p></td>
+<td> The difference in seconds between the current timezone
+ and UTC
+</td>
+</tr>
+</tbody>
+</table></div>
+<p class="since">Since 0.4.0
+</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2577660"></a><h3>
+<a name="id2844426"></a><h3>
<a name="itdb-device-new"></a>itdb_device_new ()</h3>
-<a class="indexterm" name="id2577781"></a><pre class="programlisting"><a href="libgpod-Device.html#Itdb-Device">Itdb_Device</a>* itdb_device_new (void);</pre>
+<a class="indexterm" name="id2844441"></a><pre class="programlisting"><a class="link" href="libgpod-Device.html#Itdb-Device">Itdb_Device</a>* itdb_device_new (void);</pre>
<p>
-Creates a new <a href="libgpod-Device.html#Itdb-Device"><span class="type">Itdb_Device</span></a> structure</p>
+Creates a new <a class="link" href="libgpod-Device.html#Itdb-Device"><span class="type">Itdb_Device</span></a> structure</p>
<p>
</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody><tr>
-<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td>
-<td> a newly allocated <a href="libgpod-Device.html#Itdb-Device"><span class="type">Itdb_Device</span></a> which must be freed with
-<a href="libgpod-Device.html#itdb-device-free"><code class="function">itdb_device_free()</code></a> when no longer needed
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td> a newly allocated <a class="link" href="libgpod-Device.html#Itdb-Device"><span class="type">Itdb_Device</span></a> which must be freed with
+<a class="link" href="libgpod-Device.html#itdb-device-free"><code class="function">itdb_device_free()</code></a> when no longer needed
+
</td>
</tr></tbody>
</table></div>
+<p class="since">Since 0.4.0
+</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2612646"></a><h3>
+<a name="id2844511"></a><h3>
<a name="itdb-device-free"></a>itdb_device_free ()</h3>
-<a class="indexterm" name="id2612658"></a><pre class="programlisting">void itdb_device_free (<a href="libgpod-Device.html#Itdb-Device">Itdb_Device</a> *device);</pre>
+<a class="indexterm" name="id2844526"></a><pre class="programlisting">void itdb_device_free (<a class="link" href="libgpod-Device.html#Itdb-Device">Itdb_Device</a> *device);</pre>
<p>
Frees memory used by <em class="parameter"><code>device</code></em></p>
<p>
@@ -139,18 +233,22 @@
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody><tr>
-<td><span class="term"><em class="parameter"><code>device</code></em> :</span></td>
-<td> an <a href="libgpod-Device.html#Itdb-Device"><span class="type">Itdb_Device</span></a>
+<td><p><span class="term"><em class="parameter"><code>device</code></em> :</span></p></td>
+<td> an <a class="link" href="libgpod-Device.html#Itdb-Device"><span class="type">Itdb_Device</span></a>
</td>
</tr></tbody>
</table></div>
+<p class="since">Since 0.4.0
+</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2612719"></a><h3>
+<a name="id2844594"></a><h3>
<a name="itdb-device-set-mountpoint"></a>itdb_device_set_mountpoint ()</h3>
-<a class="indexterm" name="id2612730"></a><pre class="programlisting">void itdb_device_set_mountpoint (<a href="libgpod-Device.html#Itdb-Device">Itdb_Device</a> *device,
- const gchar *mp);</pre>
+<a class="indexterm" name="id2844609"></a><pre class="programlisting">void itdb_device_set_mountpoint (<a class="link" href="libgpod-Device.html#Itdb-Device">Itdb_Device</a> *device,
+ const <a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"
+>gchar</a> *mp);</pre>
<p>
Sets the mountpoint of <em class="parameter"><code>device</code></em> to <em class="parameter"><code>mp</code></em> and update the cached device
information (in particular, re-read the SysInfo file)</p>
@@ -161,23 +259,27 @@
<col align="left" valign="top">
<tbody>
<tr>
-<td><span class="term"><em class="parameter"><code>device</code></em> :</span></td>
-<td> an <a href="libgpod-Device.html#Itdb-Device"><span class="type">Itdb_Device</span></a>
+<td><p><span class="term"><em class="parameter"><code>device</code></em> :</span></p></td>
+<td> an <a class="link" href="libgpod-Device.html#Itdb-Device"><span class="type">Itdb_Device</span></a>
</td>
</tr>
<tr>
-<td><span class="term"><em class="parameter"><code>mp</code></em> :</span></td>
-<td> the new mount point
+<td><p><span class="term"><em class="parameter"><code>mp</code></em> :</span></p></td>
+<td> the new mount point
</td>
</tr>
</tbody>
</table></div>
+<p class="since">Since 0.4.0
+</p>
</div>
<hr>
<div class="refsect2" lang="en">
-<a name="id2612821"></a><h3>
+<a name="id2850726"></a><h3>
<a name="itdb-device-read-sysinfo"></a>itdb_device_read_sysinfo ()</h3>
-<a class="indexterm" name="id2612832"></a><pre class="programlisting">gboolean itdb_device_read_sysinfo (<a href="libgpod-Device.html#Itdb-Device">Itdb_Device</a> *device);</pre>
+<a class="indexterm" name="id2850739"></a><pre class="programlisting"><a
+href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"
+>gboolean</a> itdb_device_read_sysinfo (<a class="link" href="libgpod-Device.html#Itdb-Device">Itdb_Device</a> *device);</pre>
<p>
Reads the SysInfo file and stores information in device->sysinfo for
later use.</p>
@@ -188,24 +290,31 @@
<col align="left" va