From cdcfa7300eef25106e9db471b414b2e7ffd92ec7 Mon Sep 17 00:00:00 2001 From: Qball Cow Date: Sun, 26 Feb 2012 18:31:49 +0100 Subject: [PATCH] Remove some debug, improve some loading. --- src/MetaData/metadata.c | 15 ++------------- src/Tools/pixbuf-cache.c | 15 --------------- src/Widgets/gmpc-image-async.vala | 11 +++++++++++ src/gmpc-metaimage.gob | 1 - 4 files changed, 13 insertions(+), 29 deletions(-) diff --git a/src/MetaData/metadata.c b/src/MetaData/metadata.c index a105210b..e2cb9fa7 100644 --- a/src/MetaData/metadata.c +++ b/src/MetaData/metadata.c @@ -176,7 +176,7 @@ mpd_Song *rewrite_mpd_song(mpd_Song *tsong, MetaDataType type) } } - if(type&(META_ARTIST_ART|META_ARTIST_TXT) && tsong->artist) + else if(type&(META_ARTIST_ART|META_ARTIST_TXT) && tsong->artist) { MpdData *data2 = NULL; mpd_database_search_start(connection, TRUE); @@ -302,6 +302,7 @@ mpd_Song *rewrite_mpd_song(mpd_Song *tsong, MetaDataType type) } + // return edited; } /** @@ -1126,7 +1127,6 @@ void meta_data_clear_entry(mpd_Song *song, MetaDataType type) MetaDataResult meta_data_get_path(mpd_Song *tsong, MetaDataType type, MetaData **met,MetaDataCallback callback, gpointer data) { meta_thread_data *mtd = NULL; - INIT_TIC_TAC() if(!meta_data_validate_query(tsong, type)) { @@ -1160,14 +1160,12 @@ MetaDataResult meta_data_get_path(mpd_Song *tsong, MetaDataType type, MetaData * */ if((type&META_QUERY_NO_CACHE) == 0) { - GTimer *t = g_timer_new(); const char *md = connection_get_music_directory(); GLYR_ERROR err = GLYRE_OK; MetaDataResult mrd; MetaDataContentType content_type = META_DATA_CONTENT_RAW; GlyrQuery query; GlyrMemCache * cache = NULL; - TOC("try querying cache"); glyr_query_init(&query); /* Set some random settings */ @@ -1180,12 +1178,8 @@ MetaDataResult meta_data_get_path(mpd_Song *tsong, MetaDataType type, MetaData * g_free(path); } -TOC("start glyr setup"); content_type = setup_glyr_query(&query, mtd); -TOC("setup glyr done, start db lookup"); cache = glyr_db_lookup(db, &query); -TOC("end db lookup"); - printf("cache: %p\n", cache); if(process_glyr_result(cache,content_type, mtd)) { // Cleanup @@ -1196,16 +1190,12 @@ TOC("end db lookup"); *met = mtd->met; mtd->met = NULL; // Free mtd - printf("Got from cache: %f\n", g_timer_elapsed(t, NULL)); meta_thread_data_free(mtd); - TOC("Got from cache"); - g_timer_destroy(t); return mrd; } if(cache)glyr_free_list(cache); glyr_query_destroy(&query); - g_timer_destroy(t); } else { @@ -1217,7 +1207,6 @@ TOC("end db lookup"); } printf("start query\n"); - TEC("Pushing actual query"); g_async_queue_push(gaq, mtd); mtd = NULL; diff --git a/src/Tools/pixbuf-cache.c b/src/Tools/pixbuf-cache.c index 6745065d..5eecfd22 100644 --- a/src/Tools/pixbuf-cache.c +++ b/src/Tools/pixbuf-cache.c @@ -150,7 +150,6 @@ void pixbuf_cache_destroy(void) void pixbuf_cache_add_icon(int size, const gchar * url, GdkPixbuf * pb) { int *mdd= (int *)url; - GTimer *t = g_timer_new(); gchar *key; g_assert(pb_cache != NULL); if(size > MAX_SIZE) return; @@ -161,7 +160,6 @@ void pixbuf_cache_add_icon(int size, const gchar * url, GdkPixbuf * pb) mdd[2], mdd[3] ); - printf("key: %s\n", key); if (g_hash_table_lookup(pb_cache, key) == NULL) { @@ -171,41 +169,28 @@ void pixbuf_cache_add_icon(int size, const gchar * url, GdkPixbuf * pb) e->in_use = TRUE; g_object_add_toggle_ref(G_OBJECT(pb), (GToggleNotify) pixbuf_cache_entry_toggle_ref, (gpointer) key); g_hash_table_insert(pb_cache, key, e); - g_log(LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "%i Add entry: %s", g_hash_table_size(pb_cache), key); } else g_free(key); - g_timer_stop(t); - g_log(LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "Add icon took %.6f", g_timer_elapsed(t, NULL)); - g_timer_destroy(t); } GdkPixbuf *pixbuf_cache_lookup_icon(int size, const gchar * url) { int *mdd= (int *)url; - GTimer *t = g_timer_new(); gchar *key = g_strdup_printf("%i:%X%X%X%X", size, mdd[0], mdd[1], mdd[2], mdd[3] ); - printf("key: %s\n", key); DCE *retv = NULL; retv = g_hash_table_lookup(pb_cache, key); - g_log(LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "Found entry: %p", key); g_free(key); if (retv) { retv->in_use = TRUE; - g_timer_stop(t); - g_log(LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "Lookup icon took %.6f", g_timer_elapsed(t, NULL)); - g_timer_destroy(t); return g_object_ref(retv->pb); } - g_timer_stop(t); - g_log(LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "Lookup icon took %.6f", g_timer_elapsed(t, NULL)); - g_timer_destroy(t); return NULL; } diff --git a/src/Widgets/gmpc-image-async.vala b/src/Widgets/gmpc-image-async.vala index bf9f2968..efbdd6cf 100644 --- a/src/Widgets/gmpc-image-async.vala +++ b/src/Widgets/gmpc-image-async.vala @@ -142,6 +142,11 @@ namespace Gmpc loader_data = null; loader_md5sum = null; loader_timeout = 0; + try{ + loader.close(); + }catch (Error e) { + // Ignore this. + } loader = null; } } @@ -160,6 +165,11 @@ namespace Gmpc loader_data = null; loader_md5sum = null; loader_timeout = 0; + try{ + loader.close(); + }catch (Error e) { + // Ignore this. + } loader = null; } @@ -183,6 +193,7 @@ namespace Gmpc loader_timeout = GLib.Idle.add(loader_idle_callback); +// loader_timeout = GLib.Timeout.add(200, loader_idle_callback); return; } diff --git a/src/gmpc-metaimage.gob b/src/gmpc-metaimage.gob index ca1bea56..03b17ac1 100644 --- a/src/gmpc-metaimage.gob +++ b/src/gmpc-metaimage.gob @@ -449,7 +449,6 @@ class Gmpc:MetaImage from Gtk:Event:Box{ { meta_data_free(met); } - return FALSE; } public -- 2.11.4.GIT