From 112a20132b40e19993fe85a181966f76470ab7a8 Mon Sep 17 00:00:00 2001 From: Christopher Snowhill Date: Thu, 30 Dec 2021 00:07:32 -0800 Subject: [PATCH] OpenMPT: Add format info as codec string --- Plugins/OpenMPT.old/OpenMPT/OMPTMetadataReader.mm | 7 ++++++- Plugins/OpenMPT/OpenMPT/OMPTMetadataReader.mm | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/Plugins/OpenMPT.old/OpenMPT/OMPTMetadataReader.mm b/Plugins/OpenMPT.old/OpenMPT/OMPTMetadataReader.mm index 5e97c9c2e..394e108ce 100644 --- a/Plugins/OpenMPT.old/OpenMPT/OMPTMetadataReader.mm +++ b/Plugins/OpenMPT.old/OpenMPT/OMPTMetadataReader.mm @@ -63,6 +63,7 @@ NSString * artist = nil; //NSString * comment = nil; NSString * date = nil; + NSString * type = nil; std::vector keys = mod->get_metadata_keys(); @@ -75,6 +76,8 @@ comment = [NSString stringWithUTF8String: mod->get_metadata( *key ).c_str()];*/ else if ( *key == "date" ) date = [NSString stringWithUTF8String: mod->get_metadata( *key ).c_str()]; + else if ( *key == "type_long" ) + type = [NSString stringWithUTF8String: mod->get_metadata( *key ).c_str()]; } delete mod; @@ -87,8 +90,10 @@ comment = @"";*/ if (date == nil) date = @""; + if (type == nil) + type = @""; - return [NSDictionary dictionaryWithObjectsAndKeys:title, @"title", artist, @"artist", /*comment, @"comment",*/ date, @"year", nil]; + return [NSDictionary dictionaryWithObjectsAndKeys:title, @"title", artist, @"artist", /*comment, @"comment",*/ date, @"year", type, @"codec", nil]; } catch (std::exception & /*e*/) { return 0; } diff --git a/Plugins/OpenMPT/OpenMPT/OMPTMetadataReader.mm b/Plugins/OpenMPT/OpenMPT/OMPTMetadataReader.mm index 3bc47765f..985e34671 100644 --- a/Plugins/OpenMPT/OpenMPT/OMPTMetadataReader.mm +++ b/Plugins/OpenMPT/OpenMPT/OMPTMetadataReader.mm @@ -63,6 +63,7 @@ NSString * artist = nil; //NSString * comment = nil; NSString * date = nil; + NSString * type = nil; std::vector keys = mod->get_metadata_keys(); @@ -75,6 +76,8 @@ comment = [NSString stringWithUTF8String: mod->get_metadata( *key ).c_str()];*/ else if ( *key == "date" ) date = [NSString stringWithUTF8String: mod->get_metadata( *key ).c_str()]; + else if ( *key == "type_long" ) + type = [NSString stringWithUTF8String: mod->get_metadata( *key ).c_str()]; } delete mod; @@ -87,8 +90,10 @@ comment = @"";*/ if (date == nil) date = @""; + if (type == nil) + type = @""; - return [NSDictionary dictionaryWithObjectsAndKeys:title, @"title", artist, @"artist", /*comment, @"comment",*/ date, @"year", nil]; + return [NSDictionary dictionaryWithObjectsAndKeys:title, @"title", artist, @"artist", /*comment, @"comment",*/ date, @"year", type, @"codec", nil]; } catch (std::exception & /*e*/) { return 0; }