summaryrefslogtreecommitdiff
path: root/src/channel.cc
diff options
context:
space:
mode:
authorLars Bisballe Jensen <larsbisballe@gmail.com>2014-10-21 11:04:49 +0200
committerLars Bisballe Jensen <larsbisballe@gmail.com>2014-10-21 11:04:49 +0200
commit98a89a73d7834e83f09f1619d16a58f3ecf2d850 (patch)
tree2d1a78c1163219af8f53c9f8d0a181b372303951 /src/channel.cc
parentc7af1c332447e5fb25f37d4738458a5d7106a6fc (diff)
Added metadata strings to classes and began work on xml parser for drumkits
Diffstat (limited to 'src/channel.cc')
-rw-r--r--src/channel.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/channel.cc b/src/channel.cc
index 941847a..f3490b7 100644
--- a/src/channel.cc
+++ b/src/channel.cc
@@ -26,9 +26,9 @@
*/
#include "channel.h"
-Channel::Channel(std::string name)
+Channel::Channel(std::string id)
{
- this->name = name;
+ this->id = id;
num = NO_CHANNEL;
}
@@ -41,11 +41,11 @@ Channel::Channel(std::string name)
TEST_BEGIN;
Channel c1;
-TEST_EQUAL_STR(c1.name, "", "Empty name?");
+TEST_EQUAL_STR(c1.id, "", "Empty id?");
TEST_EQUAL_INT(c1.num, NO_CHANNEL, "No physical channel assigned?");
Channel c2("ch2");
-TEST_EQUAL_STR(c2.name, "ch2", "Nonempty name?");
+TEST_EQUAL_STR(c2.id, "ch2", "Nonempty id?");
TEST_EQUAL_INT(c2.num, NO_CHANNEL, "No physical channel assigned?");
Channels channels;