id3mux: minor code clean-up

Add helper function to write text frames with just one string.
This commit is contained in:
Tim-Philipp Müller 2010-08-04 23:50:53 +01:00
parent 24ab5a4708
commit 770194a8fc

View file

@ -157,6 +157,8 @@ static guint id3v2_frame_get_size (GstId3v2Tag * tag, GstId3v2Frame * frame);
static void id3v2_tag_add_text_frame (GstId3v2Tag * tag,
const gchar * frame_id, const gchar ** strings, int num_strings);
static void id3v2_tag_add_simple_text_frame (GstId3v2Tag * tag,
const gchar * frame_id, const gchar * string);
static gboolean
id3v2_tag_init (GstId3v2Tag * tag, guint major_version)
@ -434,6 +436,13 @@ id3v2_tag_add_text_frame (GstId3v2Tag * tag, const gchar * frame_id,
g_array_append_val (tag->frames, frame);
}
static void
id3v2_tag_add_simple_text_frame (GstId3v2Tag * tag, const gchar * frame_id,
const gchar * string)
{
id3v2_tag_add_text_frame (tag, frame_id, (const gchar **) &string, 1);
}
/* ====================================================================== */
static void
@ -567,8 +576,7 @@ add_count_or_num_tag (GstId3v2Tag * id3v2tag, const GstTagList * list,
GST_DEBUG ("Setting %s to %s (frame_id = %s)", tag, tag_str, frame_id);
id3v2_tag_add_text_frame (id3v2tag, frame_id, (const gchar **) &tag_str,
1);
id3v2_tag_add_simple_text_frame (id3v2tag, frame_id, tag_str);
g_free (tag_str);
}
} else if (corr[idx].corr_count == NULL) {
@ -581,8 +589,7 @@ add_count_or_num_tag (GstId3v2Tag * id3v2tag, const GstTagList * list,
gchar *tag_str = g_strdup_printf ("0/%u", count);
GST_DEBUG ("Setting %s to %s (frame_id = %s)", tag, tag_str, frame_id);
id3v2_tag_add_text_frame (id3v2tag, frame_id, (const gchar **) &tag_str,
1);
id3v2_tag_add_simple_text_frame (id3v2tag, frame_id, tag_str);
g_free (tag_str);
}
}
@ -608,7 +615,7 @@ add_bpm_tag (GstId3v2Tag * id3v2tag, const GstTagList * list,
*/
tag_str = g_strdup_printf ("%u", (guint) bpm);
GST_DEBUG ("Setting %s to %s", tag, tag_str);
id3v2_tag_add_text_frame (id3v2tag, "TBPM", (const gchar **) &tag_str, 1);
id3v2_tag_add_simple_text_frame (id3v2tag, "TBPM", tag_str);
g_free (tag_str);
}