Fix terminology. Use "content descriptor" (or condesc) throughout the code and docs.

1 files changed, 7 insertions, 7 deletions

diff --git a/src/idop.c b/src/idop.c
index 87c4f0a..f124986 100644
--- a/src/idop.c
+++ b/src/idop.c
@@ -27,7 +27,7 @@ set_frame_value(struct id3_frame *frame, const struct ed_item *item)
 		(latin1_option ? ID3_FIELD_TEXTENCODING_ISO_8859_1 
 		               : ID3_FIELD_TEXTENCODING_UTF_8);
 	id3_ucs4_t *ucs4;
-	const char *class;
+	const char *condesc;
 	
 	switch (frame_id(frame->id)) {
 	default:
@@ -55,13 +55,13 @@ set_frame_value(struct id3_frame *frame, const struct ed_item *item)
 		id3_field_setlanguage(field, item->lang ? item->lang : "eng");
 		/* Field 2: Short content descriptor */
 		field = id3_frame_field(frame, 2);
-		class = item->class ? item->class : "";
+		condesc = item->condesc ? item->condesc : "";
 		if (latin1_option)
 			ucs4 = id3_latin1_ucs4duplicate(
-				     (const id3_latin1_t *)class);
+				     (const id3_latin1_t *)condesc);
 		else
 			ucs4 = id3_utf8_ucs4duplicate(
-				     (const id3_utf8_t *)class);
+				     (const id3_utf8_t *)condesc);
 		id3_field_setstring(field, ucs4);
 		/* Field 3: Comment */
 		field = id3_frame_field(frame, 3);
@@ -101,7 +101,7 @@ update_frame(struct id3_tag *tag, const struct ed_item *item)
 		if (id3_tag_attachframe(tag, frame))
 			error(1, 0, "cannot attach new frame");
 	} else if (strcmp(item->id, ID3_FRAME_COMMENT) == 0
-		   && item->class) {
+		   && item->condesc) {
 		/* Special handling for comments */
 		int i = 0;
 		union id3_field *field;
@@ -111,7 +111,7 @@ update_frame(struct id3_tag *tag, const struct ed_item *item)
 			char *s;
 			
 			if (field && (s = field_to_string(field, 0))
-			    && strcmp(s, item->class) == 0)
+			    && strcmp(s, item->condesc) == 0)
 				break;
 		} while (frame = id3_tag_findframe(tag, item->id, ++i));
 		if (!frame) {
@@ -377,7 +377,7 @@ ed_item_set_comment_fields(struct ed_item *itm, struct id3_frame *frame)
 		field = id3_frame_field(frame, 2);
 		if (!field)
 			return;
-		itm->class = field_to_string(field, 0);
+		itm->condesc = field_to_string(field, 0);
 	}
 }