A much nicer way to reset element data string

1 files changed, 2 insertions, 37 deletions

diff --git a/src/drumkitparser.cc b/src/drumkitparser.cc
index b2acf1b..e426852 100644
--- a/src/drumkitparser.cc
+++ b/src/drumkitparser.cc
@@ -65,6 +65,8 @@ void DrumKitParser::characterData(std::string &data)
 void DrumKitParser::startTag(std::string name,
                              std::map<std::string, std::string> attr)
 {
+  data = "";
+
   if(name == "drumkit") {
     if(attr.find("version") != attr.end()) {
       try {
@@ -81,27 +83,6 @@ void DrumKitParser::startTag(std::string name,
     }
   }
 
-  if(in_metadata) {
-    if(name == "name") {
-      data = "";
-    }
-    if(name == "description") {
-      data = "";
-    }
-    if(name == "notes") {
-      data = "";
-    }
-    if(name == "author") {
-      data = "";
-    }
-    if(name == "email") {
-      data = "";
-    }
-    if(name == "website") {
-      data = "";
-    }
-  }
-
   if(name == "metadata") {
     in_metadata = true;
   }
@@ -117,15 +98,6 @@ void DrumKitParser::startTag(std::string name,
     in_channel = true;
   }
 
-  if(in_channel) {
-    if(name == "name") {
-      data = "";
-    }
-    if(name == "microphone") {
-      data = "";
-    }
-  }
-
   if(name == "instruments") {}
 
   if(name == "instrument") {
@@ -147,13 +119,6 @@ void DrumKitParser::startTag(std::string name,
   }
 
   if(in_instrument) {
-    if(name == "name") {
-      data = "";
-    }
-    
-    if(name == "description") {
-      data = "";
-    }
     if(name == "channelmap") {
       if(attr.find("in") == attr.end()) {
         DEBUG(kitparser, "Missing 'in' in channelmap tag.\n");