summaryrefslogtreecommitdiff
path: root/muse2/muse/exportmidi.cpp
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2012-05-28 14:15:52 +0000
committerFlorian Jung <flo@windfisch.org>2012-05-28 14:15:52 +0000
commitd2a88cfaad5ac385fc3c6212c09ad7fbc38e9454 (patch)
tree387da0b38255003e1a971629ea0de32273ac3d3c /muse2/muse/exportmidi.cpp
parent716f5a5b56a3b7ff59004ef0a1af5f98cb2a691c (diff)
merged with release_2_0
Diffstat (limited to 'muse2/muse/exportmidi.cpp')
-rw-r--r--muse2/muse/exportmidi.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/muse2/muse/exportmidi.cpp b/muse2/muse/exportmidi.cpp
index c5cb44c4..8f5af4c5 100644
--- a/muse2/muse/exportmidi.cpp
+++ b/muse2/muse/exportmidi.cpp
@@ -180,7 +180,7 @@ void MusE::exportMidi()
for (MusECore::ciMarker m = ml->begin(); m != ml->end(); ++m) {
QByteArray ba = m->second.name().toLatin1();
const char* name = ba.constData();
- int len = strlen(name);
+ int len = ba.length();
MusECore::MidiPlayEvent ev(m->first, port, MusECore::ME_META, (unsigned char*)name, len);
ev.setA(0x6);
l->add(ev);
@@ -192,7 +192,7 @@ void MusE::exportMidi()
QByteArray ba = MusEGlobal::config.copyright.toLatin1();
const char* copyright = ba.constData();
if (copyright && *copyright) {
- int len = strlen(copyright);
+ int len = ba.length();
MusECore::MidiPlayEvent ev(0, port, MusECore::ME_META, (unsigned char*)copyright, len);
ev.setA(0x2);
l->add(ev);
@@ -293,7 +293,7 @@ void MusE::exportMidi()
if (!track->name().isEmpty()) {
QByteArray ba = track->name().toLatin1();
const char* name = ba.constData();
- int len = strlen(name);
+ int len = ba.length();
MusECore::MidiPlayEvent ev(0, port, MusECore::ME_META, (unsigned char*)name, len+1);
ev.setA(0x3); // Meta Sequence/Track Name
l->add(ev);
@@ -309,7 +309,7 @@ void MusE::exportMidi()
if (!track->comment().isEmpty()) {
QByteArray ba = track->comment().toLatin1();
const char* comment = ba.constData();
- int len = strlen(comment);
+ int len = ba.length();
MusECore::MidiPlayEvent ev(0, port, MusECore::ME_META, (unsigned char*)comment, len+1);
ev.setA(0xf); // Meta Text
l->add(ev);