decoder/flac: eliminate the obsolete "track number" code

This has been deprecated by the "embcue" playlist plugin.

4 files changed, 18 insertions, 41 deletions

diff --git a/src/decoder/FLACCommon.cxx b/src/decoder/FLACCommon.cxx
index 8e86b6ae4..46bcb357a 100644
--- a/src/decoder/FLACCommon.cxx
+++ b/src/decoder/FLACCommon.cxx
@@ -133,7 +133,7 @@ void flac_metadata_common_cb(const FLAC__StreamMetadata * block,
 					mixramp_start, mixramp_end);
 
 		if (data->tag != nullptr)
-			flac_vorbis_comments_to_tag(data->tag, nullptr,
+			flac_vorbis_comments_to_tag(data->tag,
 						    &block->data.vorbis_comment);
 
 	default:
diff --git a/src/decoder/FLACDecoderPlugin.cxx b/src/decoder/FLACDecoderPlugin.cxx
index 0b543ea65..d541e6990 100644
--- a/src/decoder/FLACDecoderPlugin.cxx
+++ b/src/decoder/FLACDecoderPlugin.cxx
@@ -176,7 +176,7 @@ static bool
 flac_scan_file(const char *file,
 	       const struct tag_handler *handler, void *handler_ctx)
 {
-	return flac_scan_file2(file, nullptr, handler, handler_ctx);
+	return flac_scan_file2(file, handler, handler_ctx);
 }
 
 /**
@@ -382,8 +382,7 @@ oggflac_scan_file(const char *file,
 		if (!(block = FLAC__metadata_iterator_get_block(it)))
 			break;
 
-		flac_scan_metadata(nullptr, block,
-				   handler, handler_ctx);
+		flac_scan_metadata(block, handler, handler_ctx);
 	} while (FLAC__metadata_iterator_next(it));
 	FLAC__metadata_iterator_delete(it);
 
diff --git a/src/decoder/FLACMetaData.cxx b/src/decoder/FLACMetaData.cxx
index b1d82a93d..6ec8deab9 100644
--- a/src/decoder/FLACMetaData.cxx
+++ b/src/decoder/FLACMetaData.cxx
@@ -133,30 +133,15 @@ flac_parse_mixramp(char **mixramp_start, char **mixramp_end,
  */
 static const char *
 flac_comment_value(const FLAC__StreamMetadata_VorbisComment_Entry *entry,
-		   const char *name, const char *char_tnum, size_t *length_r)
+		   const char *name, size_t *length_r)
 {
 	size_t name_length = strlen(name);
-	size_t char_tnum_length = 0;
 	const char *comment = (const char*)entry->entry;
 
 	if (entry->length <= name_length ||
 	    g_ascii_strncasecmp(comment, name, name_length) != 0)
 		return nullptr;
 
-	if (char_tnum != nullptr) {
-		char_tnum_length = strlen(char_tnum);
-		if (entry->length > name_length + char_tnum_length + 2 &&
-		    comment[name_length] == '[' &&
-		    g_ascii_strncasecmp(comment + name_length + 1,
-					char_tnum, char_tnum_length) == 0 &&
-		    comment[name_length + char_tnum_length + 1] == ']')
-			name_length = name_length + char_tnum_length + 2;
-		else if (entry->length > name_length + char_tnum_length &&
-			 g_ascii_strncasecmp(comment + name_length,
-					     char_tnum, char_tnum_length) == 0)
-			name_length = name_length + char_tnum_length;
-	}
-
 	if (comment[name_length] == '=') {
 		*length_r = entry->length - name_length - 1;
 		return comment + name_length + 1;
@@ -172,13 +157,12 @@ flac_comment_value(const FLAC__StreamMetadata_VorbisComment_Entry *entry,
 static bool
 flac_copy_comment(const FLAC__StreamMetadata_VorbisComment_Entry *entry,
 		  const char *name, enum tag_type tag_type,
-		  const char *char_tnum,
 		  const struct tag_handler *handler, void *handler_ctx)
 {
 	const char *value;
 	size_t value_length;
 
-	value = flac_comment_value(entry, name, char_tnum, &value_length);
+	value = flac_comment_value(entry, name, &value_length);
 	if (value != nullptr) {
 		char *p = g_strndup(value, value_length);
 		tag_handler_invoke_tag(handler, handler_ctx, tag_type, p);
@@ -190,8 +174,7 @@ flac_copy_comment(const FLAC__StreamMetadata_VorbisComment_Entry *entry,
 }
 
 static void
-flac_scan_comment(const char *char_tnum,
-		  const FLAC__StreamMetadata_VorbisComment_Entry *entry,
+flac_scan_comment(const FLAC__StreamMetadata_VorbisComment_Entry *entry,
 		  const struct tag_handler *handler, void *handler_ctx)
 {
 	if (handler->pair != nullptr) {
@@ -208,36 +191,33 @@ flac_scan_comment(const char *char_tnum,
 	}
 
 	for (const struct tag_table *i = xiph_tags; i->name != nullptr; ++i)
-		if (flac_copy_comment(entry, i->name, i->type, char_tnum,
+		if (flac_copy_comment(entry, i->name, i->type,
 				      handler, handler_ctx))
 			return;
 
 	for (unsigned i = 0; i < TAG_NUM_OF_ITEM_TYPES; ++i)
 		if (flac_copy_comment(entry,
 				      tag_item_names[i], (enum tag_type)i,
-				      char_tnum,
 				      handler, handler_ctx))
 			return;
 }
 
 static void
-flac_scan_comments(const char *char_tnum,
-		   const FLAC__StreamMetadata_VorbisComment *comment,
+flac_scan_comments(const FLAC__StreamMetadata_VorbisComment *comment,
 		   const struct tag_handler *handler, void *handler_ctx)
 {
 	for (unsigned i = 0; i < comment->num_comments; ++i)
-		flac_scan_comment(char_tnum, &comment->comments[i],
+		flac_scan_comment(&comment->comments[i],
 				  handler, handler_ctx);
 }
 
 void
-flac_scan_metadata(const char *track,
-		   const FLAC__StreamMetadata *block,
+flac_scan_metadata(const FLAC__StreamMetadata *block,
 		   const struct tag_handler *handler, void *handler_ctx)
 {
 	switch (block->type) {
 	case FLAC__METADATA_TYPE_VORBIS_COMMENT:
-		flac_scan_comments(track, &block->data.vorbis_comment,
+		flac_scan_comments(&block->data.vorbis_comment,
 				   handler, handler_ctx);
 		break;
 
@@ -253,15 +233,14 @@ flac_scan_metadata(const char *track,
 }
 
 void
-flac_vorbis_comments_to_tag(struct tag *tag, const char *char_tnum,
+flac_vorbis_comments_to_tag(struct tag *tag,
 			    const FLAC__StreamMetadata_VorbisComment *comment)
 {
-	flac_scan_comments(char_tnum, comment,
-			   &add_tag_handler, tag);
+	flac_scan_comments(comment, &add_tag_handler, tag);
 }
 
 bool
-flac_scan_file2(const char *file, const char *char_tnum,
+flac_scan_file2(const char *file,
 		const struct tag_handler *handler, void *handler_ctx)
 {
 	FLAC__Metadata_SimpleIterator *it;
@@ -298,7 +277,7 @@ flac_scan_file2(const char *file, const char *char_tnum,
 		if (!block)
 			break;
 
-		flac_scan_metadata(char_tnum, block, handler, handler_ctx);
+		flac_scan_metadata(block, handler, handler_ctx);
 		FLAC__metadata_object_delete(block);
 	} while (FLAC__metadata_simple_iterator_next(it));
 
diff --git a/src/decoder/FLACMetaData.hxx b/src/decoder/FLACMetaData.hxx
index 1dbdc9a88..6e8f0ef6e 100644
--- a/src/decoder/FLACMetaData.hxx
+++ b/src/decoder/FLACMetaData.hxx
@@ -46,16 +46,15 @@ flac_parse_mixramp(char **mixramp_start, char **mixramp_end,
 		   const FLAC__StreamMetadata *block);
 
 void
-flac_vorbis_comments_to_tag(struct tag *tag, const char *char_tnum,
+flac_vorbis_comments_to_tag(struct tag *tag,
 			    const FLAC__StreamMetadata_VorbisComment *comment);
 
 void
-flac_scan_metadata(const char *track,
-		   const FLAC__StreamMetadata *block,
+flac_scan_metadata(const FLAC__StreamMetadata *block,
 		   const struct tag_handler *handler, void *handler_ctx);
 
 bool
-flac_scan_file2(const char *file, const char *char_tnum,
+flac_scan_file2(const char *file,
 		const struct tag_handler *handler, void *handler_ctx);
 
 #endif