From 472ce9f42cc835cc79e1ac70322801dd6ed8b1a8 Mon Sep 17 00:00:00 2001
From: Tsuda Kageyu <tsuda.kageyu@gmail.com>
Date: Tue, 23 Jun 2015 11:48:25 +0900
Subject: [PATCH] ASF: Use CodecType enum instead of a magic number.
---
taglib/asf/asffile.cpp | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/taglib/asf/asffile.cpp b/taglib/asf/asffile.cpp
index 179649fa..3743fff1 100644
--- a/taglib/asf/asffile.cpp
+++ b/taglib/asf/asffile.cpp
@@ -154,6 +154,14 @@ class ASF::File::CodecListObject : public ASF::File::BaseObject
public:
ByteVector guid();
void parse(ASF::File *file, uint size);
+
+private:
+ enum CodecType
+ {
+ Video = 0x0001,
+ Audio = 0x0002,
+ Unknown = 0xFFFF
+ };
};
ASF::File::HeaderExtensionObject::~HeaderExtensionObject()
@@ -409,7 +417,7 @@ void ASF::File::CodecListObject::parse(ASF::File *file, uint size)
if(pos >= data.size())
break;
- const int type = data.toUShort(pos, false);
+ const CodecType type = static_cast<CodecType>(data.toUShort(pos, false));
pos += 2;
int nameLength = data.toUShort(pos, false);
@@ -427,7 +435,7 @@ void ASF::File::CodecListObject::parse(ASF::File *file, uint size)
const int infoLength = data.toUShort(pos, false);
pos += 2 + infoLength * 2;
- if(type == 2) {
+ if(type == Audio) {
// First audio codec found.
const String name(data.mid(namePos, nameLength * 2), String::UTF16LE);
--
2.40.0