[rhythmbox] metadata: remove the NOT_AUDIO and NOT_AUDIO_IGNORE errors

[Jonathan Matthew <jmatthew src gnome org>]

commit f90922daa8bd7abb6d04afdedc4bbee08a0918ac
Author: Jonathan Matthew <jonathan d14n org>
Date:   Tue Jun 9 15:11:48 2009 +1000

    metadata: remove the NOT_AUDIO and NOT_AUDIO_IGNORE errors
    
    The metadata backend no longer makes these distinctions itself, so it
    shouldn't have error codes for them.
---
 metadata/rb-metadata-dbus-service.c |    8 +-------
 metadata/rb-metadata.h              |    2 --
 metadata/test-metadata.c            |   25 +++++++++++--------------
 3 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/metadata/rb-metadata-dbus-service.c b/metadata/rb-metadata-dbus-service.c
index 310f196..12c080b 100644
--- a/metadata/rb-metadata-dbus-service.c
+++ b/metadata/rb-metadata-dbus-service.c
@@ -420,13 +420,7 @@ test_load (const char *uri)
 	md = rb_metadata_new ();
 	rb_metadata_load (md, uri, &error);
 	if (error) {
-		if (error->code == RB_METADATA_ERROR_NOT_AUDIO_IGNORE) {
-			g_print ("%s is not an audio stream (ignored)\n", uri);
-		} else if (error->code == RB_METADATA_ERROR_NOT_AUDIO) {
-			g_print ("%s is not an audio stream\n", uri);
-		} else {
-			g_print ("Error loading metadata from %s: %s\n", uri, error->message);
-		}
+		g_print ("Error loading metadata from %s: %s\n", uri, error->message);
 		g_clear_error (&error);
 		rv = -1;
 	} else {
diff --git a/metadata/rb-metadata.h b/metadata/rb-metadata.h
index f70a20f..8c746c0 100644
--- a/metadata/rb-metadata.h
+++ b/metadata/rb-metadata.h
@@ -80,8 +80,6 @@ typedef enum
 	RB_METADATA_ERROR_UNSUPPORTED,
 	RB_METADATA_ERROR_GENERAL,
 	RB_METADATA_ERROR_INTERNAL,
-	RB_METADATA_ERROR_NOT_AUDIO,
-	RB_METADATA_ERROR_NOT_AUDIO_IGNORE,
 	RB_METADATA_ERROR_EMPTY_FILE
 } RBMetaDataError;
 
diff --git a/metadata/test-metadata.c b/metadata/test-metadata.c
index 1c17a30..23a0528 100644
--- a/metadata/test-metadata.c
+++ b/metadata/test-metadata.c
@@ -86,6 +86,7 @@ load_metadata_cb (gpointer file)
 	char **missing_plugins;
 	char **plugin_descriptions;
 	GError *error = NULL;
+	RBMetaDataField f;
 
 	if (strncmp (uri, "file://", 7)) {
 		if (uri[0] == '/') {
@@ -106,22 +107,18 @@ load_metadata_cb (gpointer file)
 	rb_metadata_load (md, (const char *)uri, &error);
 
 	if (error) {
-		switch (error->code) {
-		case RB_METADATA_ERROR_NOT_AUDIO_IGNORE:
-			printf ("file ignored: %s\n", error->message);
-			break;
-		default:
-			printf ("error: %s\n", error->message);
-			break;
-		}
+		printf ("error: %s\n", error->message);
 		g_clear_error (&error);
-	} else {
-		RBMetaDataField f;
-
-		printf ("type: %s\n", rb_metadata_get_mime (md));
-		for (f =(RBMetaDataField)0; f < RB_METADATA_FIELD_LAST; f++)
-			print_metadata_string (md, f, rb_metadata_get_field_name (f));
 	}
+
+	printf ("type: %s\n", rb_metadata_get_mime (md));
+	for (f =(RBMetaDataField)0; f < RB_METADATA_FIELD_LAST; f++)
+		print_metadata_string (md, f, rb_metadata_get_field_name (f));
+
+	printf ("has audio: %d\n", rb_metadata_has_audio (md));
+	printf ("has video: %d\n", rb_metadata_has_video (md));
+	printf ("has other data: %d\n", rb_metadata_has_other_data (md));
+
 	if (rb_metadata_get_missing_plugins (md, &missing_plugins, &plugin_descriptions)) {
 		int i = 0;
 		g_print ("missing plugins:\n");