diff options
| author | Jorg Schuler <jcsjcs@users.sourceforge.net> | 2006-03-16 15:34:34 +0000 |
|---|---|---|
| committer | Jorg Schuler <jcsjcs@users.sourceforge.net> | 2006-03-16 15:34:34 +0000 |
| commit | d3bab54a791fbc5b7835e069dcada96fb6c82efe (patch) | |
| tree | c5a18421b35013c3fcd1ac5dbe72daa649a30b2b /src/db-artwork-writer.c | |
| parent | 435acf166a4aeda13d14ce7818fa33f2b7855b4f (diff) | |
| download | libgpod-tmz-d3bab54a791fbc5b7835e069dcada96fb6c82efe.tar.gz libgpod-tmz-d3bab54a791fbc5b7835e069dcada96fb6c82efe.tar.xz libgpod-tmz-d3bab54a791fbc5b7835e069dcada96fb6c82efe.zip | |
* itdb_device.[ch]: rewrote ipod-device.c, removed all hal-code,
removed all code irrelevant to writing the iTunesDB and
ArtworkDB.
* autodetect iControl directory now also works for ArtworkDB.
* db-artwork-parser.c (ipod_db_get_artwork_db_path): create
Artwork directory if not already present.
* itdb.h: Itdb_iTunesDB: moved mountpoint and musicdirs into
private Itdb_Device. Use itdb_set_mountpoint() and
itdb_get_mountpoint() to access the mountpoint.
git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1220 f01d2545-417e-4e96-918e-98f8d0dbbcb6
Diffstat (limited to 'src/db-artwork-writer.c')
| -rw-r--r-- | src/db-artwork-writer.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/db-artwork-writer.c b/src/db-artwork-writer.c index 65fc089..b890495 100644 --- a/src/db-artwork-writer.c +++ b/src/db-artwork-writer.c @@ -444,7 +444,7 @@ write_mhii (Itdb_Track *song, iPodBuffer *buffer) for (it = song->artwork->thumbnails; it != NULL; it = it->next) { iPodBuffer *sub_buffer; Itdb_Thumb *thumb; - const IpodArtworkFormat *img_info; + const Itdb_ArtworkFormat *img_info; mhii->num_children = GINT_TO_LE (num_children); mhii->total_len = GINT_TO_LE (total_bytes); @@ -453,7 +453,7 @@ write_mhii (Itdb_Track *song, iPodBuffer *buffer) return -1; } thumb = (Itdb_Thumb *)it->data; - img_info = ipod_get_artwork_info_from_type ( + img_info = itdb_get_artwork_info_from_type ( song->itdb->device, thumb->type); if (img_info == NULL) { return -1; @@ -543,7 +543,7 @@ static int write_mhif (Itdb_iTunesDB *db, iPodBuffer *buffer, enum iPodThumbnailType type) { MhifHeader *mhif; - const IpodArtworkFormat *img_info; + const Itdb_ArtworkFormat *img_info; mhif = (MhifHeader *)init_header (buffer, "mhif", sizeof (MhifHeader)); if (mhif == NULL) { @@ -551,7 +551,7 @@ write_mhif (Itdb_iTunesDB *db, iPodBuffer *buffer, enum iPodThumbnailType type) } mhif->total_len = mhif->header_len; - img_info = ipod_get_artwork_info_from_type (db->device, type); + img_info = itdb_get_artwork_info_from_type (db->device, type); if (img_info == NULL) { return -1; } @@ -748,7 +748,7 @@ ipod_write_artwork_db (Itdb_iTunesDB *db) /* Now we can update the ArtworkDB file */ id_max = ipod_artwork_db_set_ids (db); - filename = ipod_db_get_artwork_db_path (db->mountpoint); + filename = ipod_db_get_artwork_db_path (itdb_get_mountpoint (db)); if (filename == NULL) { /* FIXME: the iTunesDB will be inconsistent wrt artwork_count * it might be better to 0 out this field in all tracks |