summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--muse/muse/importmidi.cpp8
-rw-r--r--muse/muse/midieventbase.cpp2
-rw-r--r--muse/muse/songfile.cpp14
3 files changed, 13 insertions, 11 deletions
diff --git a/muse/muse/importmidi.cpp b/muse/muse/importmidi.cpp
index 41a8dfd2..9a9dee8c 100644
--- a/muse/muse/importmidi.cpp
+++ b/muse/muse/importmidi.cpp
@@ -93,7 +93,7 @@ void ImportMidiDialog::selectProjectClicked()
void ImportMidiDialog::setProjectName(const QString& name)
{
- projectName->setText(name);
+ projectName->setText(name);
}
//---------------------------------------------------------
@@ -102,7 +102,7 @@ void ImportMidiDialog::setProjectName(const QString& name)
void ImportMidiDialog::setTemplateName(const QString& name)
{
- templateName->setText(name);
+ templateName->setText(name);
}
//---------------------------------------------------------
@@ -231,7 +231,7 @@ void MusE::importMidi(const QString &file)
showTransport(config.transportVisible);
song->blockSignals(false);
-
+
transport->setMasterFlag(song->masterFlag());
punchinAction->setChecked(song->punchin());
punchoutAction->setChecked(song->punchout());
@@ -575,6 +575,7 @@ void MusE::processTrack(MidiTrack* track)
if (i1 == i2) { // empty?
if (st != -1) {
Part* part = new Part(track);
+ part->ref();
part->setType(AL::TICKS);
part->setTick(st);
part->setLenTick(x1-st);
@@ -600,6 +601,7 @@ void MusE::processTrack(MidiTrack* track)
}
if (st != -1) {
Part* part = new Part(track);
+ part->ref();
part->setType(AL::TICKS);
part->setTick(st);
part->setLenTick(x2-st);
diff --git a/muse/muse/midieventbase.cpp b/muse/muse/midieventbase.cpp
index 04bec920..2e3f371c 100644
--- a/muse/muse/midieventbase.cpp
+++ b/muse/muse/midieventbase.cpp
@@ -137,7 +137,7 @@ void MidiEventBase::read(QDomNode node)
bool ok;
*d++ = l.at(i).toInt(&ok, numberBase);
if (!ok)
- printf("error converting init val <%s>\n", l.at(i).toLatin1().data());
+ printf("error converting data val <%s>\n", l.at(i).toLatin1().data());
}
}
}
diff --git a/muse/muse/songfile.cpp b/muse/muse/songfile.cpp
index 5aa19206..14c044a6 100644
--- a/muse/muse/songfile.cpp
+++ b/muse/muse/songfile.cpp
@@ -444,37 +444,37 @@ void Song::read20(QDomNode node)
;
else if (t == "AudioAux") {
AudioGroup* track = new AudioGroup();
- track->read(node.firstChild());
+ track->read(n1.firstChild());
insertTrack0(track,-1);
}
else if (t == "AudioInput") {
AudioInput* track = new AudioInput();
- track->read(node.firstChild());
+ track->read(n1.firstChild());
insertTrack0(track,-1);
}
else if (t == "AudioGroup") {
AudioGroup* track = new AudioGroup();
- track->read(node.firstChild());
+ track->read(n1.firstChild());
insertTrack0(track,-1);
}
else if (t == "AudioOutput") {
AudioOutput* track = new AudioOutput();
- track->read(node.firstChild());
+ track->read(n1.firstChild());
insertTrack0(track,-1);
}
else if (t == "wavetrack") {
MidiTrack* track = new MidiTrack();
- track->read(node.firstChild());
+ track->read(n1.firstChild());
insertTrack0(track, -1);
}
else if (t == "drumtrack") {
MidiTrack* track = new MidiTrack();
- track->read(node.firstChild());
+ track->read(n1.firstChild());
insertTrack0(track, -1);
}
else if (t == "miditrack") {
MidiTrack* track = new MidiTrack();
- track->read(node.firstChild());
+ track->read(n1.firstChild());
insertTrack0(track, -1);
}
else