1 files changed, 115 insertions, 115 deletions

diff --git a/utils/gen_adldata/progs_cache.cpp b/utils/gen_adldata/progs_cache.cpp
index fa67da3..73b05da 100644
--- a/utils/gen_adldata/progs_cache.cpp
+++ b/utils/gen_adldata/progs_cache.cpp
@@ -11,126 +11,126 @@
 #include "file_formats/load_wopl.h"
 #include "file_formats/load_ea.h"
 
-InstrumentDataTab insdatatab;
+//InstrumentDataTab insdatatab;
 
-InstrumentsData instab;
-InstProgsData   progs;
-BankSetupData   banksetup;
+//InstrumentsData instab;
+//InstProgsData   progs;
+//BankSetupData   banksetup;
 
-std::vector<std::string> banknames;
+//std::vector<std::string> banknames;
 
 //unsigned maxvalues[30] = { 0 };
 
-void SetBank(size_t bank, unsigned patch, size_t insno)
-{
-    progs[bank][patch] = insno + 1;
-}
-
-void SetBankSetup(size_t bank, const AdlBankSetup &setup)
-{
-    banksetup[bank] = setup;
-}
-
-size_t InsertIns(const insdata &id, ins &in, const std::string &name, const std::string &name2)
-{
-    return InsertIns(id, id, in, name, name2, true);
-}
-
-size_t InsertIns(
-    const insdata &id,
-    const insdata &id2,
-    ins &in,
-    const std::string &name,
-    const std::string &name2,
-    bool oneVoice)
-{
-    {
-        InstrumentDataTab::iterator i = insdatatab.lower_bound(id);
-
-        size_t insno = ~size_t(0);
-        if(i == insdatatab.end() || i->first != id)
-        {
-            std::pair<insdata, std::pair<size_t, std::set<std::string> > > res;
-            res.first = id;
-            res.second.first = insdatatab.size();
-            if(!name.empty()) res.second.second.insert(name);
-            if(!name2.empty()) res.second.second.insert(name2);
-            insdatatab.insert(i, res);
-            insno = res.second.first;
-        }
-        else
-        {
-            if(!name.empty()) i->second.second.insert(name);
-            if(!name2.empty()) i->second.second.insert(name2);
-            insno = i->second.first;
-        }
-
-        in.insno1 = insno;
-        in.instCache1 = id;
-    }
-
-    if(oneVoice || (id == id2))
-    {
-        in.insno2 = in.insno1;
-        in.instCache2 = in.instCache1;
-    }
-    else
-    {
-        InstrumentDataTab::iterator i = insdatatab.lower_bound(id2);
-
-        size_t insno2 = ~size_t(0);
-        if(i == insdatatab.end() || i->first != id2)
-        {
-            std::pair<insdata, std::pair<size_t, std::set<std::string> > > res;
-            res.first = id2;
-            res.second.first = insdatatab.size();
-            if(!name.empty()) res.second.second.insert(name);
-            if(!name2.empty()) res.second.second.insert(name2);
-            insdatatab.insert(i, res);
-            insno2 = res.second.first;
-        }
-        else
-        {
-            if(!name.empty()) i->second.second.insert(name);
-            if(!name2.empty()) i->second.second.insert(name2);
-            insno2 = i->second.first;
-        }
-        in.insno2 = insno2;
-        in.instCache2 = id2;
-    }
-
-    {
-        InstrumentsData::iterator i = instab.lower_bound(in);
-
-        size_t resno = ~size_t(0);
-        if(i == instab.end() || i->first != in)
-        {
-            std::pair<ins, std::pair<size_t, std::set<std::string> > > res;
-            res.first = in;
-            res.second.first = instab.size();
-            if(!name.empty()) res.second.second.insert(name);
-            if(!name2.empty()) res.second.second.insert(name2);
-            instab.insert(i, res);
-            resno = res.second.first;
-        }
-        else
-        {
-            if(!name.empty()) i->second.second.insert(name);
-            if(!name2.empty()) i->second.second.insert(name2);
-            resno = i->second.first;
-        }
-        return resno;
-    }
-}
-
-// Create silent 'nosound' instrument
-size_t InsertNoSoundIns()
-{
-    // { 0x0F70700,0x0F70710, 0xFF,0xFF, 0x0,+0 },
-    insdata tmp1 = MakeNoSoundIns();
-    struct ins tmp2;
-    return InsertIns(tmp1, tmp1, tmp2, "nosound", "");
-}
+//void SetBank(size_t bank, unsigned patch, size_t insno)
+//{
+//    progs[bank][patch] = insno + 1;
+//}
+
+//void SetBankSetup(size_t bank, const AdlBankSetup &setup)
+//{
+//    banksetup[bank] = setup;
+//}
+
+//size_t InsertIns(const insdata &id, ins &in, const std::string &name, const std::string &name2)
+//{
+//    return InsertIns(id, id, in, name, name2, true);
+//}
+
+//size_t InsertIns(
+//    const insdata &id,
+//    const insdata &id2,
+//    ins &in,
+//    const std::string &name,
+//    const std::string &name2,
+//    bool oneVoice)
+//{
+//    {
+//        InstrumentDataTab::iterator i = insdatatab.lower_bound(id);
+
+//        size_t insno = ~size_t(0);
+//        if(i == insdatatab.end() || i->first != id)
+//        {
+//            std::pair<insdata, std::pair<size_t, std::set<std::string> > > res;
+//            res.first = id;
+//            res.second.first = insdatatab.size();
+//            if(!name.empty()) res.second.second.insert(name);
+//            if(!name2.empty()) res.second.second.insert(name2);
+//            insdatatab.insert(i, res);
+//            insno = res.second.first;
+//        }
+//        else
+//        {
+//            if(!name.empty()) i->second.second.insert(name);
+//            if(!name2.empty()) i->second.second.insert(name2);
+//            insno = i->second.first;
+//        }
+
+//        in.insno1 = insno;
+//        in.instCache1 = id;
+//    }
+
+//    if(oneVoice || (id == id2))
+//    {
+//        in.insno2 = in.insno1;
+//        in.instCache2 = in.instCache1;
+//    }
+//    else
+//    {
+//        InstrumentDataTab::iterator i = insdatatab.lower_bound(id2);
+
+//        size_t insno2 = ~size_t(0);
+//        if(i == insdatatab.end() || i->first != id2)
+//        {
+//            std::pair<insdata, std::pair<size_t, std::set<std::string> > > res;
+//            res.first = id2;
+//            res.second.first = insdatatab.size();
+//            if(!name.empty()) res.second.second.insert(name);
+//            if(!name2.empty()) res.second.second.insert(name2);
+//            insdatatab.insert(i, res);
+//            insno2 = res.second.first;
+//        }
+//        else
+//        {
+//            if(!name.empty()) i->second.second.insert(name);
+//            if(!name2.empty()) i->second.second.insert(name2);
+//            insno2 = i->second.first;
+//        }
+//        in.insno2 = insno2;
+//        in.instCache2 = id2;
+//    }
+
+//    {
+//        InstrumentsData::iterator i = instab.lower_bound(in);
+
+//        size_t resno = ~size_t(0);
+//        if(i == instab.end() || i->first != in)
+//        {
+//            std::pair<ins, std::pair<size_t, std::set<std::string> > > res;
+//            res.first = in;
+//            res.second.first = instab.size();
+//            if(!name.empty()) res.second.second.insert(name);
+//            if(!name2.empty()) res.second.second.insert(name2);
+//            instab.insert(i, res);
+//            resno = res.second.first;
+//        }
+//        else
+//        {
+//            if(!name.empty()) i->second.second.insert(name);
+//            if(!name2.empty()) i->second.second.insert(name2);
+//            resno = i->second.first;
+//        }
+//        return resno;
+//    }
+//}
+
+//// Create silent 'nosound' instrument
+//size_t InsertNoSoundIns()
+//{
+//    // { 0x0F70700,0x0F70710, 0xFF,0xFF, 0x0,+0 },
+//    insdata tmp1 = MakeNoSoundIns();
+//    struct ins tmp2;
+//    return InsertIns(tmp1, tmp1, tmp2, "nosound", "");
+//}
 
 insdata MakeNoSoundIns()
 {