DISTRHO
/
Cardinal
mirror of https://github.com/DISTRHO/Cardinal.git
1
0
Fork 0
Code Issues 0 Releases 18 Wiki Activity
Browse Source

Add back ZZC, clear up some licenses a bit more

tags/22.02
falkTX 3 years ago
parent
ccb94fd000
commit
7722e5df35
5 changed files with 25 additions and 26 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      README.md
  2. +15
    -12
      doc/LICENSES.md
  3. +6
    -6
      plugins/Makefile
  4. +1
    -1
      plugins/ZZC
  5. +2
    -6
      plugins/plugins.cpp

+ 1
- 1
README.md View File

@@ -122,12 +122,12 @@ At the moment the following 3rd-party modules are provided:
- Sonus Modular
- Valley
- ZetaCarinae
- ZZC

Potentially coming soon, currently sorting out license situation:
- Atelier
- Befaco
- Fundamental
- ZZC

Additionally Cardinal provides its own modules for DAW/Host automation, time position and internal plugin hosting.



+ 15
- 12
doc/LICENSES.md View File

@@ -103,25 +103,25 @@ Below is a list of artwork licenses from plugins
| cf/DejaVuSansMono.ttf | Bitstream-Vera | |
| cf/Segment7Standard.ttf | OFL-1.1-RFN | |
| cf/VT323-Regular.ttf | OFL-1.1-no-RFN | |
| ChowDSP/* | GPL-3.0-or-later | |
| ChowDSP/* | GPL-3.0-or-later | Same license as source code |
| ChowDSP/fonts/RobotoCondensed-*.ttf | Apache-2.0 | |
| DrumKit/* | CC0-1.0 | |
| DrumKit/component/NovaMono.ttf | OFL-1.1-RFN | |
| E-Series/* | Custom | Copyright © Synthesis Technology, [used and distributed with permission](LICENSE-PERMISSIONS.md#eseries-paul-schreiber--synthtech) |
| ExpertSleepers-Encoders/* | MIT | |
| Extratone/* | GPL-3.0-or-later | |
| ExpertSleepers-Encoders/* | MIT | [Same license as source code](https://github.com/expertsleepersltd/vcvrack-encoders/issues/3) |
| Extratone/* | GPL-3.0-or-later | [Same license as source code](https://github.com/EaterOfSheep/Extratone/issues/7) |
| FehlerFabrik/* | GPL-3.0-or-later | No artwork specific license provided, see [FehlerFabrik#17](https://github.com/RCameron93/FehlerFabrik/issues/17) |
| GlueTheGiant/* | GPL-3.0-or-later | |
| GlueTheGiant/* | GPL-3.0-or-later | Same license as source code |
| GlueTheGiant/fonts/DSEG7-* | OFL-1.1-RFN | |
| GrandeModular/* | CC-BY-NC-ND-4.0 | |
| HetrickCV/* | CC0-1.0 | No artwork specific license provided |
| HetrickCV/* | CC0-1.0 | |
| ihtsyn/* | GPL-3.0-or-later | [Same license as source code](https://github.com/nysthi/nysthi/issues/379#issuecomment-1027873902) |
| ImpromptuModular/* | CC-BY-NC-ND-4.0 | |
| ImpromptuModular/res/comp/complib/* | CC-BY-NC-4.0 | |
| JW-Modules/* | BSD-3-Clause | No artwork specific license provided |
| JW-Modules/DejaVuSansMono.ttf | Bitstream-Vera | Unused in Cardinal |
| LifeFormModular/* | MIT | No artwork specific license provided |
| LittleUtils/* | EUPL-1.2 | |
| LittleUtils/* | EUPL-1.2 | Same license as source code |
| LittleUtils/fonts/CooperHewitt-*.ttf | OFL-1.1-RFN | |
| LittleUtils/fonts/Overpass-*.ttf | OFL-1.1-RFN | |
| LittleUtils/fonts/RobotoMono-*.ttf | Apache-2.0 | |
@@ -130,20 +130,24 @@ Below is a list of artwork licenses from plugins
| LyraeModules/* | CC-BY-NC-SA-4.0 | |
| MindMeld/* | CC-BY-NC-ND-4.0 | |
| MindMeld/fonts/RobotoCondensed-*.ttf | Apache-2.0 | |
| Mog/* | CC0-1.0 | No artwork specific license provided |
| Mog/* | CC0-1.0 | |
| Mog/components/* | CC-BY-NC-4.0 | |
| Mog/Exo2-BoldItalic.ttf | OFL-1.1-RFN | |
| mscHack/* | BSD-3-Clause | No artwork specific license provided, see [mschack#108](https://github.com/mschack/VCV-Rack-Plugins/issues/108) |
| Prism/* | CC-BY-SA-4.0 | |
| Prism/RobotoCondensed-Regular.ttf | Apache-2.0 | |
| Rackwindows/* | MIT | |
| Rackwindows/* | MIT | [Same license as source code](https://github.com/n0jo/rackwindows/issues/15) |
| repelzen/* | CC-BY-SA-4.0 | |
| sonusmodular/* | GPL-3.0-or-later | No artwork specific license provided, see [sonusmodular#14](https://gitlab.com/sonusdept/sonusmodular/-/issues/14) |
| ValleyAudio/* | GPL-3.0-or-later | |
| sonusmodular/* | GPL-3.0-or-later | [Same license as source code](https://gitlab.com/sonusdept/sonusmodular/-/issues/14) |
| ValleyAudio/* | GPL-3.0-or-later | [Same license as source code](https://github.com/ValleyAudio/ValleyRackFree/issues/73) |
| ValleyAudio/din1451alt.ttf | CC-BY-3.0-DE | |
| ValleyAudio/DSEG14Classic-*.ttf | OFL-1.1-RFN | |
| ValleyAudio/ShareTechMono-*.ttf | OFL-1.1-RFN | |
| ZetaCarinaeModules/* | GPL-3.0-or-later | |
| ZetaCarinaeModules/* | GPL-3.0-or-later | [Same license as source code](https://github.com/mhampton/ZetaCarinaeModules/issues/8) |
| ZZC/* | CC-BY-NC-SA-4.0 | |
| ZZC/panels/* | CC-BY-NC-SA-4.0 | NOTE: The ZZC Logo is Copyright (c) 2019 Sergey Ukolov and cannot be used in derivative works; Cardinal's use does not officially constitute derivative work. |
| ZZC/fonts/DSEG/* | OFL-1.1-RFN | |
| ZZC/fonts/Nunito/* | OFL-1.1-RFN | |

Bellow follows a list of artwork licenses from potentially coming plugins.

@@ -153,7 +157,6 @@ Bellow follows a list of artwork licenses from potentially coming plugins.
| Befaco/components/* | CC-BY-NC-4.0 | |
| Befaco/panels/* | Custom | Copyright © [Befaco](https://www.befaco.org/), used and distributed with permission (TODO ask for it) |
| Fundamental/* | CC-BY-NC-ND-4.0 | |
| ZZC/* | ??? | See [ZZC#89](https://github.com/zezic/ZZC/issues/89) and [ZZC#90](https://github.com/zezic/ZZC/issues/90) |

### Rack



+ 6
- 6
plugins/Makefile View File

@@ -705,12 +705,12 @@ PLUGIN_FILES += $(filter-out ZetaCarinaeModules/src/plugin.cpp,$(wildcard ZetaCa
# --------------------------------------------------------------
# ZZC

# PLUGIN_FILES += $(filter-out ZZC/src/ZZC.cpp,$(wildcard ZZC/src/*.cpp))
# PLUGIN_FILES += ZZC/src/dsp/Wavetable.cpp
# PLUGIN_FILES += ZZC/src/filetypes/WavSupport.cpp
#
# # modules/types which are present in other plugins
# ZZC_CUSTOM = Clock LowFrequencyOscillator
PLUGIN_FILES += $(filter-out ZZC/src/ZZC.cpp,$(wildcard ZZC/src/*.cpp))
PLUGIN_FILES += ZZC/src/dsp/Wavetable.cpp
PLUGIN_FILES += ZZC/src/filetypes/WavSupport.cpp
# modules/types which are present in other plugins
ZZC_CUSTOM = Clock LowFrequencyOscillator

# --------------------------------------------------------------



+ 1
- 1
plugins/ZZC

@@ -1 +1 @@
Subproject commit 268c15711a7fe184970b1525c98f17e72db64af5
Subproject commit 15364616da500d31f7545dcbfc01b4fda7f7c9d4

+ 2
- 6
plugins/plugins.cpp View File

@@ -511,14 +511,12 @@ extern Model* modelMaude_221;
#include "ZetaCarinaeModules/src/plugin.hpp"

// ZZC
/*
#define DISPLAYS_H
#define ZZC_SHARED_H
#define ZZC_WIDGETS_H
#define modelClock modelZZCClock
#include "ZZC/src/ZZC.hpp"
#undef modelClock
*/

#endif // NOPLUGINS

@@ -573,7 +571,7 @@ Plugin* pluginInstance__repelzen;
Plugin* pluginInstance__sonusmodular;
Plugin* pluginInstance__ValleyAudio;
Plugin* pluginInstance__ZetaCarinaeModules;
// Plugin* pluginInstance__ZZC;
Plugin* pluginInstance__ZZC;
#endif // NOPLUGINS

namespace rack {
@@ -1872,7 +1870,6 @@ static void initStatic__ZetaCarinaeModules()
}
}

/*
static void initStatic__ZZC()
{
Plugin* p = new Plugin;
@@ -1894,7 +1891,6 @@ static void initStatic__ZZC()
#undef modelClock
}
}
*/
#endif // NOPLUGINS

void initStaticPlugins()
@@ -1941,7 +1937,7 @@ void initStaticPlugins()
initStatic__sonusmodular();
initStatic__ValleyAudio();
initStatic__ZetaCarinaeModules();
// initStatic__ZZC();
initStatic__ZZC();
#endif // NOPLUGINS
}



Write Preview
Loading…
Cancel
Save