Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix #27921 #1047

Merged
merged 1 commit into from
Jul 23, 2014
Merged

fix #27921 #1047

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libmscore/rendermidi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ void Score::updateChannel()
if (an.isEmpty())
continue;
Staff* staff = _staves[st->staffIdx()];
int a = staff->part()->instr()->channelIdx(an);
int a = staff->part()->instr(s->tick())->channelIdx(an);
if (a != -1)
staff->channelList(voice)->insert(s->tick(), a);
}
Expand Down
2 changes: 1 addition & 1 deletion mscore/seq.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,7 @@ void Seq::playEvent(const NPlayEvent& event)
const Note* note = event.note();

if (note) {
Instrument* instr = note->staff()->part()->instr();
Instrument* instr = note->staff()->part()->instr(note->chord()->tick());
const Channel& a = instr->channel(note->subchannel());
mute = a.mute || a.soloMute;
}
Expand Down
20 changes: 12 additions & 8 deletions mscore/stafftextproperties.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ namespace Ms {
static void initChannelCombo(QComboBox* cb, StaffText* st)
{
Part* part = st->staff()->part();
foreach(const Channel& a, part->instr()->channel()) {
int tick = static_cast<Segment*>(st->parent())->tick();
foreach(const Channel& a, part->instr(tick)->channel()) {
if (a.name.isEmpty() || a.name == "normal")
cb->addItem(QT_TR_NOOP("normal"));
else
Expand Down Expand Up @@ -89,13 +90,14 @@ StaffTextProperties::StaffTextProperties(StaffText* st, QWidget* parent)
initChannelCombo(channelCombo[i], st);

Part* part = st->staff()->part();
int n = part->instr()->channel().size();
int tick = static_cast<Segment*>(st->parent())->tick();
int n = part->instr(tick)->channel().size();
int rows = 0;
for (int voice = 0; voice < VOICES; ++voice) {
if (st->channelName(voice).isEmpty())
continue;
for (int i = 0; i < n; ++i) {
const Channel& a = part->instr()->channel(i);
const Channel& a = part->instr(tick)->channel(i);
if (a.name != st->channelName(voice))
continue;
int row = 0;
Expand Down Expand Up @@ -128,7 +130,7 @@ StaffTextProperties::StaffTextProperties(StaffText* st, QWidget* parent)

QTreeWidgetItem* selectedItem = 0;
for (int i = 0; i < n; ++i) {
const Channel& a = part->instr()->channel(i);
const Channel& a = part->instr(tick)->channel(i);
QTreeWidgetItem* item = new QTreeWidgetItem(channelList);
item->setData(0, Qt::UserRole, i);
if (a.name.isEmpty() || a.name == "normal")
Expand Down Expand Up @@ -303,10 +305,11 @@ void StaffTextProperties::channelItemChanged(QTreeWidgetItem* item, QTreeWidgetI
Part* part = staffText->staff()->part();

int channelIdx = item->data(0, Qt::UserRole).toInt();
Channel& channel = part->instr()->channel(channelIdx);
int tick = static_cast<Segment*>(staffText->parent())->tick();
Channel& channel = part->instr(tick)->channel(channelIdx);
QString channelName = channel.name;

foreach(const NamedEventList& e, part->instr()->midiActions()) {
foreach(const NamedEventList& e, part->instr(tick)->midiActions()) {
QTreeWidgetItem* item = new QTreeWidgetItem(actionList);
if (e.name.isEmpty() || e.name == "normal")
item->setText(0, tr("normal"));
Expand Down Expand Up @@ -347,8 +350,9 @@ void StaffTextProperties::saveValues()
staffText->setChannelName(voice, QString());
for (int row = 0; row < VOICES; ++row) {
if (vb[voice][row]->isChecked()) {
int idx = channelCombo[row]->currentIndex();
staffText->setChannelName(voice, part->instr()->channel()[idx].name);
int idx = channelCombo[row]->currentIndex();
int instrId = static_cast<Segment*>(staffText->parent())->tick();
staffText->setChannelName(voice, part->instr(instrId)->channel()[idx].name);
break;
}
}
Expand Down