commit 98f85779354179d0e7f81788201e114e1d8b880a
Author: phantomjinx <[email protected]>
Date: Sun Feb 27 23:07:30 2011 +0000
Reverse commit that loaded embedded artwork
* This function is far too slow for importing artwork from ipods and
actually
completely pointless since ipods get their artwork from the artwork db
rather than reading it from the tracks.
* The bug for not reloading embedded artwork for local itdbs will become an
issue again but requires greater work for resolution.
* gp_itdb.c
* autodetection of ipods should only occur after all itdbs have been loaded
and all plugins initialised.
libgtkpod/file_itunesdb.c | 8 --------
libgtkpod/gp_itdb.c | 6 +++---
2 files changed, 3 insertions(+), 11 deletions(-)
---
diff --git a/libgtkpod/file_itunesdb.c b/libgtkpod/file_itunesdb.c
index 151e9a4..47ac03c 100644
--- a/libgtkpod/file_itunesdb.c
+++ b/libgtkpod/file_itunesdb.c
@@ -107,7 +107,6 @@ void fill_in_extended_info(Track *track, gint32 total,
gint32 num) {
gint ipod_id = 0;
ExtraTrackData *etr;
struct track_extended_info *sei = NULL;
- gchar *trackpath;
g_return_if_fail (track);
etr = track->userdata;
@@ -161,13 +160,6 @@ void fill_in_extended_info(Track *track, gint32 total,
gint32 num) {
if (extendedinfohash)
g_hash_table_remove(extendedinfohash, &ipod_id);
}
-
- /* Try reading artwork data using the filetype of the track */
- trackpath = get_file_name_from_source(track, SOURCE_PREFER_LOCAL);
- if (trackpath) {
- get_track_info_from_file(trackpath, track);
- g_free(trackpath);
- }
}
/* Used to free the memory of hash data */
diff --git a/libgtkpod/gp_itdb.c b/libgtkpod/gp_itdb.c
index 9188fab..b95847e 100644
--- a/libgtkpod/gp_itdb.c
+++ b/libgtkpod/gp_itdb.c
@@ -817,9 +817,6 @@ void gp_init(int argc, char *argv[]) {
g_free(filename);
}
- /* Initiate autodetection */
- autodetection_init();
-
/* initiate client server */
server_setup();
@@ -853,6 +850,9 @@ void gp_init_itdbs() {
itdb_spl_update_live(itdb);
}
}
+
+ /* Itdbs now ready. Initiate autodetection */
+ autodetection_init();
}
/* Create an repository according to the settings in the preferences
------------------------------------------------------------------------------
Free Software Download: Index, Search & Analyze Logs and other IT data in
Real-Time with Splunk. Collect, index and harness all the fast moving IT data
generated by your applications, servers and devices whether physical, virtual
or in the cloud. Deliver compliance at lower cost and gain new business
insights. http://p.sf.net/sfu/splunk-dev2dev
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
