[libdmapsharing/LIBDMAPSHARING_2_2] Change warnings about missing metadata to debug statements
- From: W. Michael Petullo <wmpetullo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libdmapsharing/LIBDMAPSHARING_2_2] Change warnings about missing metadata to debug statements
- Date: Sat, 19 Mar 2011 22:36:00 +0000 (UTC)
commit f8b588ea49c3cbce67bc9c3b697dcc88a78fea54
Author: W. Michael Petullo <mike flyn org>
Date: Sat Mar 19 17:35:21 2011 -0500
Change warnings about missing metadata to debug statements
See also https://bugzilla.gnome.org/show_bug.cgi?id=645210.
Signed-off-by: W. Michael Petullo <mike flyn org>
libdmapsharing/daap-share.c | 26 +++++++++++++++-----------
libdmapsharing/dpap-share.c | 11 ++++++-----
2 files changed, 21 insertions(+), 16 deletions(-)
---
diff --git a/libdmapsharing/daap-share.c b/libdmapsharing/daap-share.c
index 903f587..7e2cc12 100644
--- a/libdmapsharing/daap-share.c
+++ b/libdmapsharing/daap-share.c
@@ -562,7 +562,7 @@ add_entry_to_mlcl (gpointer id,
dmap_structure_add (mlit, DMAP_CC_MINM, title);
g_free (title);
} else
- g_warning ("Title requested but not available");
+ g_debug ("Title requested but not available");
}
if (_dmap_share_client_requested (mb->bits, PERSISTENT_ID))
dmap_structure_add (mlit, DMAP_CC_MPER, GPOINTER_TO_UINT (id));
@@ -581,7 +581,7 @@ add_entry_to_mlcl (gpointer id,
dmap_structure_add (mlit, DMAP_CC_ASAL, album);
g_free (album);
} else
- g_warning ("Album requested but not available");
+ g_debug ("Album requested but not available");
}
if (_dmap_share_client_requested (mb->bits, SONG_GROUPING))
dmap_structure_add (mlit, DMAP_CC_AGRP, "");
@@ -592,7 +592,7 @@ add_entry_to_mlcl (gpointer id,
dmap_structure_add (mlit, DMAP_CC_ASAR, artist);
g_free (artist);
} else
- g_warning ("Artist requested but not available");
+ g_debug ("Artist requested but not available");
}
if (_dmap_share_client_requested (mb->bits, SONG_BITRATE)) {
gint32 bitrate = 0;
@@ -639,7 +639,7 @@ add_entry_to_mlcl (gpointer id,
dmap_structure_add (mlit, DMAP_CC_ASFM, format);
g_free (format);
} else
- g_warning ("Format requested but not available");
+ g_debug ("Format requested but not available");
}
if (_dmap_share_client_requested (mb->bits, SONG_GENRE)) {
gchar *genre = NULL;
@@ -648,7 +648,7 @@ add_entry_to_mlcl (gpointer id,
dmap_structure_add (mlit, DMAP_CC_ASGN, genre);
g_free (genre);
} else
- g_warning ("Genre requested but not available");
+ g_debug ("Genre requested but not available");
}
if (_dmap_share_client_requested (mb->bits, SONG_DESCRIPTION))
dmap_structure_add (mlit, DMAP_CC_ASDT, ""); /* FIXME: e.g., wav audio file */
@@ -695,18 +695,22 @@ add_entry_to_mlcl (gpointer id,
if (_dmap_share_client_requested (mb->bits, SONG_SORT_ARTIST)) {
gchar *sort_artist = NULL;
g_object_get (record, "sort-artist", &sort_artist, NULL);
- if (sort_artist)
+ if (sort_artist) {
dmap_structure_add (mlit, DMAP_CC_ASSA, sort_artist);
- else
- g_warning ("Sort artist requested but not available");
+ g_free (sort_artist);
+ } else {
+ g_debug ("Sort artist requested but not available");
+ }
}
if (_dmap_share_client_requested (mb->bits, SONG_SORT_ALBUM)) {
gchar *sort_album = NULL;
g_object_get (record, "sort-album", &sort_album, NULL);
- if (sort_album)
+ if (sort_album) {
dmap_structure_add (mlit, DMAP_CC_ASSU, sort_album);
- else
- g_warning ("Sort album requested but not available");
+ g_free (sort_album);
+ } else {
+ g_debug ("Sort album requested but not available");
+ }
}
if (_dmap_share_client_requested (mb->bits, SONG_MEDIAKIND)) {
gint mediakind = 0;
diff --git a/libdmapsharing/dpap-share.c b/libdmapsharing/dpap-share.c
index 4fc3135..3233205 100644
--- a/libdmapsharing/dpap-share.c
+++ b/libdmapsharing/dpap-share.c
@@ -371,7 +371,7 @@ add_entry_to_mlcl (gpointer id,
dmap_structure_add (mlit, DMAP_CC_MINM, filename);
g_free (filename);
} else
- g_warning ("Filename requested but not available");
+ g_debug ("Filename requested but not available");
}
if (_dmap_share_client_requested (mb->bits, PERSISTENT_ID))
dmap_structure_add (mlit, DMAP_CC_MPER, GPOINTER_TO_UINT (id));
@@ -384,7 +384,8 @@ add_entry_to_mlcl (gpointer id,
dmap_structure_add (mlit, DMAP_CC_PASP, aspect_ratio);
g_free (aspect_ratio);
} else
- g_warning ("Aspect ratio requested but not available");
+ g_debug
+ ("Aspect ratio requested but not available");
}
if (_dmap_share_client_requested (mb->bits, PHOTO_CREATIONDATE)) {
gint creation_date = 0;
@@ -398,7 +399,7 @@ add_entry_to_mlcl (gpointer id,
dmap_structure_add (mlit, DMAP_CC_PIMF, filename);
g_free (filename);
} else
- g_warning ("Filename requested but not available");
+ g_debug ("Filename requested but not available");
}
if (_dmap_share_client_requested (mb->bits, PHOTO_IMAGEFORMAT)) {
gchar *format = NULL;
@@ -407,7 +408,7 @@ add_entry_to_mlcl (gpointer id,
dmap_structure_add (mlit, DMAP_CC_PFMT, format);
g_free (format);
} else
- g_warning ("Format requested but not available");
+ g_debug ("Format requested but not available");
}
if (_dmap_share_client_requested (mb->bits, PHOTO_IMAGEFILESIZE)) {
gint filesize = 0;
@@ -441,7 +442,7 @@ add_entry_to_mlcl (gpointer id,
dmap_structure_add (mlit, DMAP_CC_PCMT, comments);
g_free (comments);
} else
- g_warning ("Comments requested but not available");
+ g_debug ("Comments requested but not available");
}
if (_dmap_share_client_requested (mb->bits, PHOTO_FILEDATA)) {
size_t size = 0;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]