From 770194a8fcc638924b29e78e9f24c4c7e7ef4b83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Wed, 4 Aug 2010 23:50:53 +0100 Subject: id3mux: minor code clean-up Add helper function to write text frames with just one string. --- gst/id3tag/id3tag.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'gst/id3tag') diff --git a/gst/id3tag/id3tag.c b/gst/id3tag/id3tag.c index 48f3a0818..a46c1a06b 100644 --- a/gst/id3tag/id3tag.c +++ b/gst/id3tag/id3tag.c @@ -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); } -- cgit v1.2.1