diff options
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | src/encoder/plugins/VorbisEncoderPlugin.cxx | 7 | ||||
| -rw-r--r-- | src/util/StringUtil.cxx | 20 | ||||
| -rw-r--r-- | src/util/StringUtil.hxx | 8 |
4 files changed, 33 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 1c4ad43f4..e198f1a41 100644 --- a/configure.ac +++ b/configure.ac @@ -1145,9 +1145,8 @@ MPD_ENABLE_AUTO_PKG(shine_encoder, SHINE, [shine >= 3.1], [shine encoder], [libshine not found]) dnl ---------------------------- Ogg Vorbis Encoder --------------------------- -MPD_ENABLE_AUTO_PKG_DEPENDS(vorbis_encoder, VORBISENC, [vorbisenc vorbis ogg], - [Ogg Vorbis encoder], [libvorbisenc not found], [], - [enable_glib], [Cannot use --enable-vorbis-encoder with --disable-glib]) +MPD_ENABLE_AUTO_PKG(vorbis_encoder, VORBISENC, [vorbisenc vorbis ogg], + [Ogg Vorbis encoder], [libvorbisenc not found]) dnl ------------------------------- LAME Encoder ------------------------------ diff --git a/src/encoder/plugins/VorbisEncoderPlugin.cxx b/src/encoder/plugins/VorbisEncoderPlugin.cxx index 3cc941220..01c9910a0 100644 --- a/src/encoder/plugins/VorbisEncoderPlugin.cxx +++ b/src/encoder/plugins/VorbisEncoderPlugin.cxx @@ -25,14 +25,13 @@ #include "tag/Tag.hxx" #include "AudioFormat.hxx" #include "config/ConfigError.hxx" +#include "util/StringUtil.hxx" #include "util/NumberParser.hxx" #include "util/Error.hxx" #include "util/Domain.hxx" #include <vorbis/vorbisenc.h> -#include <glib.h> - struct vorbis_encoder { /** the base class */ Encoder encoder; @@ -273,9 +272,9 @@ static void copy_tag_to_vorbis_comment(vorbis_comment *vc, const Tag &tag) { for (const auto &item : tag) { - char *name = g_ascii_strup(tag_item_names[item.type], -1); + char name[64]; + ToUpperASCII(name, tag_item_names[item.type], sizeof(name)); vorbis_comment_add_tag(vc, name, item.value); - g_free(name); } } diff --git a/src/util/StringUtil.cxx b/src/util/StringUtil.cxx index bcade2b3b..f5b4b7a8b 100644 --- a/src/util/StringUtil.cxx +++ b/src/util/StringUtil.cxx @@ -120,3 +120,23 @@ string_array_contains(const char *const* haystack, const char *needle) return false; } + +void +ToUpperASCII(char *dest, const char *src, size_t size) +{ + assert(dest != nullptr); + assert(src != nullptr); + assert(size > 1); + + char *const end = dest + size - 1; + + do { + char ch = *src++; + if (ch == 0) + break; + + *dest++ = ToUpperASCII(ch); + } while (dest < end); + + *dest = 0; +} diff --git a/src/util/StringUtil.hxx b/src/util/StringUtil.hxx index 9beda5441..77fe1be18 100644 --- a/src/util/StringUtil.hxx +++ b/src/util/StringUtil.hxx @@ -114,4 +114,12 @@ gcc_pure bool string_array_contains(const char *const* haystack, const char *needle); +/** + * Convert the specified ASCII string (0x00..0x7f) to upper case. + * + * @param size the destination buffer size + */ +void +ToUpperASCII(char *dest, const char *src, size_t size); + #endif |