Skip to content

Commit

Permalink
Event List Editor: Fixed cannot open multiple parts
Browse files Browse the repository at this point in the history
  • Loading branch information
Tim committed Oct 16, 2024
1 parent 74f6477 commit 27c5064
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 6 deletions.
4 changes: 4 additions & 0 deletions src/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
16.10.2024
- Event List Editor: Fixed cannot open multiple parts. (Tim)
Thanks to forum user 'enaiel' for spotting that.
- Fixed Roland INTEGRA-7.idf file XML errors (added 13.05.2024).
30.09.2024
- Track list context menu audio controller 'midi assign': Fixed cannot assign to song.
Oops, broken at 10.07.2022
Expand Down
24 changes: 21 additions & 3 deletions src/muse/app.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3367,7 +3367,8 @@ void MusE::startListEditor(bool newwin)

void MusE::startListEditor(MusECore::PartList* pl, bool newwin)
{
pl->erase(++pl->begin(), pl->end());
// REMOVE Tim. list. Removed.
// pl->erase(++pl->begin(), pl->end());

if (!newwin && findOpenListEditor(pl))
return;
Expand Down Expand Up @@ -3421,8 +3422,25 @@ MusEGui::ListEdit* MusE::findOpenListEditor(MusECore::PartList* pl) {
MusEGui::ListEdit* le = static_cast<MusEGui::ListEdit*>(d->widget());
const MusECore::PartList* pl_tmp = le->parts();

if (pl->begin()->second->uuid() != pl_tmp->begin()->second->uuid())
continue;
// REMOVE Tim. list. Changed.
// if (pl->begin()->second->uuid() != pl_tmp->begin()->second->uuid())
// continue;
bool found = false;
for(MusECore::ciPart ip_tmp = pl_tmp->cbegin(); ip_tmp != pl_tmp->cend(); ++ip_tmp)
{
for(MusECore::ciPart ip = pl->cbegin(); ip != pl->cend(); ++ip)
{
if(ip->second->uuid() == ip_tmp->second->uuid())
{
found = true;
break;
}
}
if(found)
break;
}
if(!found)
continue;

if (!d->isVisible())
toggleDocksAction->setChecked(true);
Expand Down
5 changes: 2 additions & 3 deletions src/share/instruments/Roland INTEGRA-7.idf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<muse version="2.1">
<!--Richie Cookston version 1.02-->
<MidiInstrument name="Roland INTEGRA-7">
</PatchGroup>
<PatchGroup name="Studio Sets">
<Patch name="Integra Preview" hbank="86" lbank="1" prog="0" />
<Patch name="Full Orch Set" hbank="86" lbank="1" prog="1" />
Expand Down Expand Up @@ -6077,5 +6076,5 @@
<Controller name="Program" type="Program" />
<Controller name="PolyAftertouch" type="PolyAftertouch" />
<Controller name="Aftertouch" type="Aftertouch" />
</MidiInstrument>
<muse>
</MidiInstrument>
</muse>

0 comments on commit 27c5064

Please sign in to comment.