diff --git a/MEMLNaut-PAF-NISPS.ino b/MEMLNaut-PAF-NISPS.ino index 3c603d1..8d99dec 100644 --- a/MEMLNaut-PAF-NISPS.ino +++ b/MEMLNaut-PAF-NISPS.ino @@ -165,7 +165,8 @@ void setup() { std::shared_ptr voiceSpaceSelectView; voiceSpaceSelectView = std::make_shared("Voice Spaces"); - MEMLNaut::Instance()->disp->AddView(voiceSpaceSelectView); + + MEMLNaut::Instance()->disp->InsertViewAfter(interface->rlStatsView, voiceSpaceSelectView); voiceSpaceSelectView->setOptions(voiceSpaceList); //set by core 1 on startup voiceSpaceSelectView->setNewVoiceCallback( [](size_t idx) { diff --git a/PAFSynthAudioApp.hpp b/PAFSynthAudioApp.hpp index 7573e4b..789764c 100644 --- a/PAFSynthAudioApp.hpp +++ b/PAFSynthAudioApp.hpp @@ -273,7 +273,7 @@ protected: maxiPAFOperator paf2; maxiPAFOperator paf3; - maxiDelayline<10000> dl1; + maxiDelayline<11000> dl1; // maxiDelayline<15100> dl2; maxiOsc pulse; diff --git a/data/tree_cosmos_names_2.csv b/data/tree_cosmos_names_2.csv new file mode 100644 index 0000000..26f6434 --- /dev/null +++ b/data/tree_cosmos_names_2.csv @@ -0,0 +1,420 @@ +Name,Component_1,Component_2 +Pleiadeiba,Pleiades,Ceiba +Pau Brasilica,Pau Brasil,Crab Nebula +Araucarina,Araucaria,Carina Nebula +Quebracho X-1,Quebracho,Cygnus X-1 +Lapachomeda,Lapacho,Andromeda +Guanacastellum,Guanacaste,Magellanic Cloud +Trianguanum,Triangulum,Guanacaste +Jacarandromeda,Jacaranda,Andromeda +Ceibalaxy,Ceiba,Galaxy +Horsehead Brasil,Horsehead,Pau Brasil +Monkeypuzzle Void,Monkey Puzzle,Cosmic Void +Quebrachion,Quebracho,Orion +Lapachosar,Lapacho,Quasar +Rubber Rosette,Rubber Tree,Rosette Nebula +Cashewmeda,Cashew,Andromeda +Brazil Nutnova,Brazil Nut,Supernova +Cecropiades,Cecropia,Pleiades +Balsombrero,Balsa,Sombrero Galaxy +Rosewoodway,Rosewood,Milky Way +Ipe Helix,Ipe,Helix Nebula +Kapoksagittarius,Kapok,Sagittarius +Cedrella Cluster,Cedrella,Star Cluster +Alerce Lyra,Alerce,Lyra +Mahogalactica,Mahogany,Galactic Center +Pinwheelnut,Pinwheel,Brazil Nut +Tarantularch,Tarantula Nebula,Larch +Ceibomeda,Ceiba,Andromeda +Pau Brassiopeia,Pau Brasil,Cassiopeia +Araucarion,Araucaria,Orion +Quebrachole,Quebracho,Black Hole +Lapachoway,Lapacho,Milky Way +Guanasar,Guanacaste,Quasar +Jacaranebula,Jacaranda,Nebula +Ceiba Centauri,Ceiba,Alpha Centauri +Brazilbeehive,Brazil Nut,Beehive Cluster +Monkeypuzzar,Monkey Puzzle,Quasar +Quebrachomeda,Quebracho,Andromeda +Lapachydes,Lapacho,Hyades +Rubberway,Rubber Tree,Milky Way +Cashewsar,Cashew,Quasar +Nutmeda,Brazil Nut,Andromeda +Cecropiagalaxy,Cecropia,Galaxy +Balsanova,Balsa,Supernova +Rosettewood,Rosette,Rosewood +Ipegalaxy,Ipe,Galaxy +Kapoknebula,Kapok,Nebula +Cedrellaxy,Cedrella,Galaxy +Alercentauri,Alerce,Centaurus +Mahogacrab,Mahogany,Crab Nebula +Eaglebrasil,Eagle Nebula,Pau Brasil +Tarantuleia,Tarantula Nebula,Ceiba +Whirlpoolnut,Whirlpool,Brazil Nut +Araucagalaxy,Araucaria,Galaxy +Quebrachiades,Quebracho,Pleiades +Lapachomeda,Lapacho,Andromeda +Guanacasteroid,Guanacaste,Asteroid +Jacarandromeda,Jacaranda,Andromeda +Ceibulsar,Ceiba,Pulsar +Tadpolebrasil,Tadpole,Pau Brasil +Monkeynova,Monkey Puzzle,Supernova +Quebrachygnus,Quebracho,Cygnus +Lapachoacentauri,Lapacho,Alpha Centauri +Rubberhole,Rubber Tree,Black Hole +Cashewnova,Cashew,Supernova +Brazilbutterfly,Brazil Nut,Butterfly Cluster +Cecropiomeda,Cecropia,Andromeda +Balsagittarius,Balsa,Sagittarius +Rosewoodrion,Rosewood,Orion +Ipeleiades,Ipe,Pleiades +Kapoksombrero,Kapok,Sombrero Galaxy +Cedrellipse,Cedrella,Elliptical Galaxy +Alercegalaxy,Alerce,Galaxy +Mahogaring,Mahogany,Ring Nebula +Cartwheeiba,Cartwheel,Ceiba +Pau Brasilian,Pau Brasil,Cassiopeian +Araucarionebula,Araucaria,Orion Nebula +Quebrasar,Quebracho,Quasar +Lapachomega,Lapacho,Omega Centauri +Guanacastway,Guanacaste,Milky Way +Jacaranovae,Jacaranda,Supernova +Ceibachomeda,Ceiba,Andromeda +Sunflowerbrasil,Sunflower Galaxy,Pau Brasil +Monkeypuzzalaxy,Monkey Puzzle,Galaxy +Quebrachoxima,Quebracho,Proxima +Lapachosar,Lapacho,Quasar +Rubberbula,Rubber Tree,Nebula +Cashewcluster,Cashew,Star Cluster +Nutway,Brazil Nut,Milky Way +Cecropianebula,Cecropia,Nebula +Balsagara,Balsa,Sagittarius A* +Rosewoodraco,Rosewood,Draco +Ipelipse,Ipe,Ellipse +Kapokagoon,Kapok,Lagoon Nebula +Cedrellaneta,Cedrella,Planetary Nebula +Alercerion,Alerce,Orion +Mahogacarina,Mahogany,Carina +Trifidnut,Trifid Nebula,Brazil Nut +Tarantulacho,Tarantula,Lapacho +Ceibanova,Ceiba,Supernova +Pau Brasilion,Pau Brasil,Orion +Araucariades,Araucaria,Pleiades +Quebrachoelix,Quebracho,Helix +Lapacholia,Lapacho,Magnolia +Guanacasar,Guanacaste,Quasar +Jacarandromeda,Jacaranda,Andromeda +Ceibulsar,Ceiba,Pulsar +Titan Brasil,Titan,Pau Brasil +Monkeynebula,Monkey Puzzle,Nebula +Quebrachomeda,Quebracho,Andromeda +Lapachogalaxy,Lapacho,Galaxy +Rubbersar,Rubber Tree,Quasar +Cashewmeda,Cashew,Andromeda +Nutcluster,Brazil Nut,Cluster +Cecropioway,Cecropia,Milky Way +Balsanebula,Balsa,Nebula +Rosewoodway,Rosewood,Milky Way +Ipegalaxy,Ipe,Galaxy +Kapoksar,Kapok,Quasar +Cedrellaxy,Cedrella,Galaxy +Alercenova,Alerce,Supernova +Mahogalactic,Mahogany,Galactic +Sculptorbrasil,Sculptor Galaxy,Pau Brasil +Ceibomeda,Ceiba,Andromeda +Araucarionway,Araucaria,Milky Way +Quebrachion,Quebracho,Orion +Lapachohole,Lapacho,Black Hole +Guanacastromeda,Guanacaste,Andromeda +Jacaranebula,Jacaranda,Nebula +Ceibagalaxy,Ceiba,Galaxy +Europa Brasil,Europa,Pau Brasil +Monkeypuzzar,Monkey Puzzle,Quasar +Quebrachnova,Quebracho,Supernova +Lapachoides,Lapacho,Hyades +Rubbermeda,Rubber Tree,Andromeda +Cashewnova,Cashew,Supernova +Nutway,Brazil Nut,Milky Way +Cecropiagalaxy,Cecropia,Galaxy +Balsaquila,Balsa,Aquila +Rosewoodsar,Rosewood,Quasar +Ipecentauri,Ipe,Alpha Centauri +Kapokgalaxy,Kapok,Galaxy +Cedrellaneta,Cedrella,Planetary Nebula +Alercemeda,Alerce,Andromeda +Mahoganova,Mahogany,Supernova +Boomerangbrasil,Boomerang Nebula,Pau Brasil +Ceibulsar,Ceiba,Pulsar +Pau Brasilades,Pau Brasil,Pleiades +Araucagalaxy,Araucaria,Galaxy +Quebrachomeda,Quebracho,Andromeda +Lapachosar,Lapacho,Quasar +Guanacastellum,Guanacaste,Magellanic +Jacaranovae,Jacaranda,Supernova +Ceibaway,Ceiba,Milky Way +Enceladnut,Enceladus,Brazil Nut +Monkeynebula,Monkey Puzzle,Nebula +Quebrachogalaxy,Quebracho,Galaxy +Lapachonova,Lapacho,Supernova +Rubberion,Rubber Tree,Orion +Cashewgalaxy,Cashew,Galaxy +Nutsagittarius,Brazil Nut,Sagittarius +Cecropia A*,Cecropia,Sagittarius A* +Balsanova,Balsa,Supernova +Rosewoodmeda,Rosewood,Andromeda +Ipesar,Ipe,Quasar +Kapokway,Kapok,Milky Way +Cedrellipse,Cedrella,Ellipse +Alercenebula,Alerce,Nebula +Mahogaring,Mahogany,Ring Nebula +Cat's Eye Brasil,Cat's Eye,Pau Brasil +Ceibomeda,Ceiba,Andromeda +Araucarionebula,Araucaria,Orion Nebula +Quebrachoides,Quebracho,Hyades +Lapachogalaxy,Lapacho,Galaxy +Guanacastar,Guanacaste,Quasar +Jacarandromeda,Jacaranda,Andromeda +Ceibaneta,Ceiba,Planetary Nebula +Ganymede Brasil,Ganymede,Pau Brasil +Monkeypuzzalaxy,Monkey Puzzle,Galaxy +Quebrachonova,Quebracho,Supernova +Lapachomeda,Lapacho,Andromeda +Rubbersar,Rubber Tree,Quasar +Cashewnebula,Cashew,Nebula +Nutgalaxy,Brazil Nut,Galaxy +Cecropiomeda,Cecropia,Andromeda +Balsagittarius,Balsa,Sagittarius +Rosewoodion,Rosewood,Orion +Ipeleiades,Ipe,Pleiades +Kapoknova,Kapok,Supernova +Cedrellaxy,Cedrella,Galaxy +Alercegalaxy,Alerce,Galaxy +Mahogacrab,Mahogany,Crab +Dumbbell Brasil,Dumbbell Nebula,Pau Brasil +Ceibulsar,Ceiba,Pulsar +Pau Brasilway,Pau Brasil,Milky Way +Araucarina,Araucaria,Carina +Quebrachogalaxy,Quebracho,Galaxy +Lapachosar,Lapacho,Quasar +Guanacastromeda,Guanacaste,Andromeda +Jacaranebula,Jacaranda,Nebula +Ceibanova,Ceiba,Supernova +Io Brasil,Io,Pau Brasil +Monkeypuzzar,Monkey Puzzle,Quasar +Quebrachomeda,Quebracho,Andromeda +Lapachogalaxy,Lapacho,Galaxy +Rubbernova,Rubber Tree,Supernova +Cashewmeda,Cashew,Andromeda +Nutnebula,Brazil Nut,Nebula +Cecropiagalaxy,Cecropia,Galaxy +Balsasar,Balsa,Quasar +Rosewoodway,Rosewood,Milky Way +Ipegalaxy,Ipe,Galaxy +Kapokmeda,Kapok,Andromeda +Cedrellaneta,Cedrella,Planetary Nebula +Alercenova,Alerce,Supernova +Mahogalagoon,Mahogany,Lagoon +Crescent Brasil,Crescent Nebula,Pau Brasil +Ceibagalaxy,Ceiba,Galaxy +Araucarionway,Araucaria,Milky Way +Quebrachion,Quebracho,Orion +Lapachohole,Lapacho,Black Hole +Guanacastar,Guanacaste,Quasar +Jacaranovo,Jacaranda,Supernova +Ceibomeda,Ceiba,Andromeda +Callisto Brasil,Callisto,Pau Brasil +Monkeynebula,Monkey Puzzle,Nebula +Quebrachogalaxy,Quebracho,Galaxy +Lapachonova,Lapacho,Supernova +Rubbermeda,Rubber Tree,Andromeda +Cashewgalaxy,Cashew,Galaxy +Nutway,Brazil Nut,Milky Way +Cecropiomeda,Cecropia,Andromeda +Balsanebula,Balsa,Nebula +Rosewoodsar,Rosewood,Quasar +Ipecentauri,Ipe,Centauri +Kapokgalaxy,Kapok,Galaxy +Cedrellaxy,Cedrella,Galaxy +Alercemeda,Alerce,Andromeda +Mahoganova,Mahogany,Supernova +Flame Brasil,Flame Nebula,Pau Brasil +Ceibulsar,Ceiba,Pulsar +Pau Brasilion,Pau Brasil,Orion +Araucagalaxy,Araucaria,Galaxy +Quebrachomeda,Quebracho,Andromeda +Lapachosar,Lapacho,Quasar +Guanacastway,Guanacaste,Milky Way +Jacarandromeda,Jacaranda,Andromeda +Ceibanova,Ceiba,Supernova +Veil Brasil,Veil Nebula,Pau Brasil +Monkeypuzzalaxy,Monkey Puzzle,Galaxy +Quebrachonova,Quebracho,Supernova +Lapachogalaxy,Lapacho,Galaxy +Rubberion,Rubber Tree,Orion +Cashewnova,Cashew,Supernova +Nutgalaxy,Brazil Nut,Galaxy +Cecropiagalaxy,Cecropia,Galaxy +Balsomeda,Balsa,Andromeda +Rosewoodway,Rosewood,Milky Way +Ipesar,Ipe,Quasar +Kapoknebula,Kapok,Nebula +Cedrellaneta,Cedrella,Planetary Nebula +Alercenebula,Alerce,Nebula +Mahogaring,Mahogany,Ring +Pelican Brasil,Pelican Nebula,Pau Brasil +Ceibagalaxy,Ceiba,Galaxy +Araucarionebula,Araucaria,Orion Nebula +Quebrachoides,Quebracho,Hyades +Lapachomeda,Lapacho,Andromeda +Guanacastar,Guanacaste,Quasar +Jacaranovo,Jacaranda,Supernova +Ceibulsar,Ceiba,Pulsar +Cone Brasil,Cone Nebula,Pau Brasil +Monkeypuzzar,Monkey Puzzle,Quasar +Quebrachogalaxy,Quebracho,Galaxy +Lapachosar,Lapacho,Quasar +Rubbernova,Rubber Tree,Supernova +Cashewmeda,Cashew,Andromeda +Nutway,Brazil Nut,Milky Way +Cecropiomeda,Cecropia,Andromeda +Balsagalaxy,Balsa,Galaxy +Rosewoodion,Rosewood,Orion +Ipeleiades,Ipe,Pleiades +Kapokgalaxy,Kapok,Galaxy +Cedrellaxy,Cedrella,Galaxy +Alercegalaxy,Alerce,Galaxy +Mahoganova,Mahogany,Supernova +Witch Head Brasil,Witch Head,Pau Brasil +Ceiboway,Ceiba,Milky Way +Pau Brasilmeda,Pau Brasil,Andromeda +Araucarina,Araucaria,Carina +Quebrachonebula,Quebracho,Nebula +Lapachogalaxy,Lapacho,Galaxy +Guanacastromeda,Guanacaste,Andromeda +Jacaranebula,Jacaranda,Nebula +Ceibanova,Ceiba,Supernova +Iris Brasil,Iris Nebula,Pau Brasil +Monkeynova,Monkey Puzzle,Supernova +Quebrachomeda,Quebracho,Andromeda +Lapachosar,Lapacho,Quasar +Rubbermeda,Rubber Tree,Andromeda +Cashewgalaxy,Cashew,Galaxy +Nutnebula,Brazil Nut,Nebula +Cecropiagalaxy,Cecropia,Galaxy +Balsanovo,Balsa,Supernova +Rosewoodway,Rosewood,Milky Way +Ipegalaxy,Ipe,Galaxy +Kapokmeda,Kapok,Andromeda +Cedrellaneta,Cedrella,Planetary Nebula +Alercenova,Alerce,Supernova +Mahogagalaxy,Mahogany,Galaxy +Bubble Brasil,Bubble Nebula,Pau Brasil +Ceibomeda,Ceiba,Andromeda +Araucarionway,Araucaria,Milky Way +Quebrachion,Quebracho,Orion +Lapachohole,Lapacho,Black Hole +Guanacastar,Guanacaste,Quasar +Jacaranovo,Jacaranda,Supernova +Ceibagalaxy,Ceiba,Galaxy +North America Brasil,North America,Pau Brasil +Monkeypuzzar,Monkey Puzzle,Quasar +Quebrachogalaxy,Quebracho,Galaxy +Lapachonova,Lapacho,Supernova +Rubbersar,Rubber Tree,Quasar +Cashewnebula,Cashew,Nebula +Nutgalaxy,Brazil Nut,Galaxy +Cecropiomeda,Cecropia,Andromeda +Balsoway,Balsa,Milky Way +Rosewoodsar,Rosewood,Quasar +Ipecentauri,Ipe,Centauri +Kapokgalaxy,Kapok,Galaxy +Cedrellaxy,Cedrella,Galaxy +Alercemeda,Alerce,Andromeda +Mahoganova,Mahogany,Supernova +Pacman Brasil,Pacman Nebula,Pau Brasil +Ceibulsar,Ceiba,Pulsar +Pau Brasilades,Pau Brasil,Pleiades +Araucagalaxy,Araucaria,Galaxy +Quebrachomeda,Quebracho,Andromeda +Lapachosar,Lapacho,Quasar +Guanacastway,Guanacaste,Milky Way +Jacarandromeda,Jacaranda,Andromeda +Ceibanova,Ceiba,Supernova +Soul Brasil,Soul Nebula,Pau Brasil +Monkeynebula,Monkey Puzzle,Nebula +Quebrachonova,Quebracho,Supernova +Lapachogalaxy,Lapacho,Galaxy +Rubberion,Rubber Tree,Orion +Cashewnova,Cashew,Supernova +Nutway,Brazil Nut,Milky Way +Cecropiagalaxy,Cecropia,Galaxy +Balsameda,Balsa,Andromeda +Rosewoodway,Rosewood,Milky Way +Ipesar,Ipe,Quasar +Kapoknebula,Kapok,Nebula +Cedrellaneta,Cedrella,Planetary Nebula +Alercenebula,Alerce,Nebula +Mahogaring,Mahogany,Ring +Heart Brasil,Heart Nebula,Pau Brasil +Ceibagalaxy,Ceiba,Galaxy +Araucarionebula,Araucaria,Orion Nebula +Quebrachoides,Quebracho,Hyades +Lapachomeda,Lapacho,Andromeda +Guanacastar,Guanacaste,Quasar +Jacaranovo,Jacaranda,Supernova +Ceiboway,Ceiba,Milky Way +Elephant Trunk Brasil,Elephant Trunk,Pau Brasil +Monkeypuzzalaxy,Monkey Puzzle,Galaxy +Quebrachogalaxy,Quebracho,Galaxy +Lapachosar,Lapacho,Quasar +Rubbernova,Rubber Tree,Supernova +Cashewmeda,Cashew,Andromeda +Nutgalaxy,Brazil Nut,Galaxy +Cecropiomeda,Cecropia,Andromeda +Balsagalaxy,Balsa,Galaxy +Rosewoodion,Rosewood,Orion +Ipeleiades,Ipe,Pleiades +Kapokgalaxy,Kapok,Galaxy +Cedrellaxy,Cedrella,Galaxy +Alercegalaxy,Alerce,Galaxy +Mahoganova,Mahogany,Supernova +Omega Brasil,Omega Nebula,Pau Brasil +Ceibulsar,Ceiba,Pulsar +Pau Brasilion,Pau Brasil,Orion +Araucarina,Araucaria,Carina +Quebrachonebula,Quebracho,Nebula +Lapachogalaxy,Lapacho,Galaxy +Guanacastromeda,Guanacaste,Andromeda +Jacaranebula,Jacaranda,Nebula +Ceibanova,Ceiba,Supernova +Blinking Brasil,Blinking Nebula,Pau Brasil +Monkeypuzzar,Monkey Puzzle,Quasar +Quebrachomeda,Quebracho,Andromeda +Lapachosar,Lapacho,Quasar +Rubbermeda,Rubber Tree,Andromeda +Cashewgalaxy,Cashew,Galaxy +Nutnebula,Brazil Nut,Nebula +Cecropiagalaxy,Cecropia,Galaxy +Balsanovo,Balsa,Supernova +Rosewoodway,Rosewood,Milky Way +Ipegalaxy,Ipe,Galaxy +Kapokmeda,Kapok,Andromeda +Cedrellaneta,Cedrella,Planetary Nebula +Alercenova,Alerce,Supernova +Mahogagalaxy,Mahogany,Galaxy +Ghost Brasil,Ghost Nebula,Pau Brasil +Ceibomeda,Ceiba,Andromeda +Araucarionway,Araucaria,Milky Way +Quebrachion,Quebracho,Orion +Lapachohole,Lapacho,Black Hole +Guanacastar,Guanacaste,Quasar +Jacaranovo,Jacaranda,Supernova +Ceibagalaxy,Ceiba,Galaxy +Eskimo Brasil,Eskimo Nebula,Pau Brasil +Monkeynebula,Monkey Puzzle,Nebula +Quebrachogalaxy,Quebracho,Galaxy +Lapachonova,Lapacho,Supernova +Rubbersar,Rubber Tree,Quasar +Cashewnebula,Cashew,Nebula +Nutgalaxy,Brazil Nut,Galaxy +Cecropioway,Cecropia,Milky Way \ No newline at end of file diff --git a/src/memllib b/src/memllib index c26b482..4177b1f 160000 --- a/src/memllib +++ b/src/memllib @@ -1 +1 @@ -Subproject commit c26b4828a534eef2db11730c67711b4b740ed09c +Subproject commit 4177b1f52394cf35124b4adbf0f76e7faf162932