Cast descriptor pointer to LV2 struct

falkTX · falkTX · commit fb4fdb3395f5 · 2017-06-26T12:40:43.000+02:00
Reported in #10 Need to test if if fixes the issue or not
diff --git a/interface.cc b/interface.cc
@@ -67,7 +67,7 @@ ladspa_descriptor (unsigned long i) { return i < N ? descriptors[i] : 0; }
 
 LV2_SYMBOL_EXPORT
 const LV2_Descriptor *
-lv2_descriptor(uint32_t i) { return i < N ? lv2_descriptors[i] : 0; }
+lv2_descriptor(uint32_t i) { return i < N ? static_cast<LV2_Descriptor*>(lv2_descriptors[i]) : 0; }
 
 __attribute__ ((constructor)) 
 void caps_so_init()
diff --git a/make_single_plugins.py b/make_single_plugins.py
@@ -62,7 +62,7 @@
 lv2_descriptor(uint32_t i)
 {
     static const Descriptor<__EFFECT__> lv2_descriptor(CAPS_URI "__EFFECT__");
-    return i == 0 ? &lv2_descriptor : 0;
+    return i == 0 ? static_cast<const LV2_Descriptor*>(&lv2_descriptor) : 0;
 }
 """
 
diff --git a/plugins/mod-caps-AmpVTS.lv2/interface.cc b/plugins/mod-caps-AmpVTS.lv2/interface.cc
@@ -27,5 +27,5 @@ const LV2_Descriptor *
 lv2_descriptor(uint32_t i)
 {
     static const Descriptor<AmpVTS> lv2_descriptor(CAPS_URI "AmpVTS");
-    return i == 0 ? &lv2_descriptor : 0;
+    return i == 0 ? static_cast<const LV2_Descriptor*>(&lv2_descriptor) : 0;
 }
diff --git a/plugins/mod-caps-AutoFilter.lv2/interface.cc b/plugins/mod-caps-AutoFilter.lv2/interface.cc
@@ -27,5 +27,5 @@ const LV2_Descriptor *
 lv2_descriptor(uint32_t i)
 {
     static const Descriptor<AutoFilter> lv2_descriptor(CAPS_URI "AutoFilter");
-    return i == 0 ? &lv2_descriptor : 0;
+    return i == 0 ? static_cast<const LV2_Descriptor*>(&lv2_descriptor) : 0;
 }
diff --git a/plugins/mod-caps-CEO.lv2/interface.cc b/plugins/mod-caps-CEO.lv2/interface.cc
@@ -27,5 +27,5 @@ const LV2_Descriptor *
 lv2_descriptor(uint32_t i)
 {
     static const Descriptor<CEO> lv2_descriptor(CAPS_URI "CEO");
-    return i == 0 ? &lv2_descriptor : 0;
+    return i == 0 ? static_cast<const LV2_Descriptor*>(&lv2_descriptor) : 0;
 }
diff --git a/plugins/mod-caps-CabinetIII.lv2/interface.cc b/plugins/mod-caps-CabinetIII.lv2/interface.cc
@@ -27,5 +27,5 @@ const LV2_Descriptor *
 lv2_descriptor(uint32_t i)
 {
     static const Descriptor<CabinetIII> lv2_descriptor(CAPS_URI "CabinetIII");
-    return i == 0 ? &lv2_descriptor : 0;
+    return i == 0 ? static_cast<const LV2_Descriptor*>(&lv2_descriptor) : 0;
 }
diff --git a/plugins/mod-caps-CabinetIV.lv2/interface.cc b/plugins/mod-caps-CabinetIV.lv2/interface.cc
@@ -27,5 +27,5 @@ const LV2_Descriptor *
 lv2_descriptor(uint32_t i)
 {
     static const Descriptor<CabinetIV> lv2_descriptor(CAPS_URI "CabinetIV");
-    return i == 0 ? &lv2_descriptor : 0;
+    return i == 0 ? static_cast<const LV2_Descriptor*>(&lv2_descriptor) : 0;
 }
diff --git a/plugins/mod-caps-ChorusI.lv2/interface.cc b/plugins/mod-caps-ChorusI.lv2/interface.cc
@@ -27,5 +27,5 @@ const LV2_Descriptor *
 lv2_descriptor(uint32_t i)
 {
     static const Descriptor<ChorusI> lv2_descriptor(CAPS_URI "ChorusI");
-    return i == 0 ? &lv2_descriptor : 0;
+    return i == 0 ? static_cast<const LV2_Descriptor*>(&lv2_descriptor) : 0;
 }
diff --git a/plugins/mod-caps-Click.lv2/interface.cc b/plugins/mod-caps-Click.lv2/interface.cc
@@ -27,5 +27,5 @@ const LV2_Descriptor *
 lv2_descriptor(uint32_t i)
 {
     static const Descriptor<Click> lv2_descriptor(CAPS_URI "Click");
-    return i == 0 ? &lv2_descriptor : 0;
+    return i == 0 ? static_cast<const LV2_Descriptor*>(&lv2_descriptor) : 0;
 }
diff --git a/plugins/mod-caps-Compress.lv2/interface.cc b/plugins/mod-caps-Compress.lv2/interface.cc
@@ -27,5 +27,5 @@ const LV2_Descriptor *
 lv2_descriptor(uint32_t i)
 {
     static const Descriptor<Compress> lv2_descriptor(CAPS_URI "Compress");
-    return i == 0 ? &lv2_descriptor : 0;
+    return i == 0 ? static_cast<const LV2_Descriptor*>(&lv2_descriptor) : 0;
 }
diff --git a/plugins/mod-caps-CompressX2.lv2/interface.cc b/plugins/mod-caps-CompressX2.lv2/interface.cc
@@ -27,5 +27,5 @@ const LV2_Descriptor *
 lv2_descriptor(uint32_t i)
 {
     static const Descriptor<CompressX2> lv2_descriptor(CAPS_URI "CompressX2");
-    return i == 0 ? &lv2_descriptor : 0;
+    return i == 0 ? static_cast<const LV2_Descriptor*>(&lv2_descriptor) : 0;
 }
diff --git a/plugins/mod-caps-Eq10.lv2/interface.cc b/plugins/mod-caps-Eq10.lv2/interface.cc
@@ -27,5 +27,5 @@ const LV2_Descriptor *
 lv2_descriptor(uint32_t i)
 {
     static const Descriptor<Eq10> lv2_descriptor(CAPS_URI "Eq10");
-    return i == 0 ? &lv2_descriptor : 0;
+    return i == 0 ? static_cast<const LV2_Descriptor*>(&lv2_descriptor) : 0;
 }
diff --git a/plugins/mod-caps-Eq10X2.lv2/interface.cc b/plugins/mod-caps-Eq10X2.lv2/interface.cc
@@ -27,5 +27,5 @@ const LV2_Descriptor *
 lv2_descriptor(uint32_t i)
 {
     static const Descriptor<Eq10X2> lv2_descriptor(CAPS_URI "Eq10X2");
-    return i == 0 ? &lv2_descriptor : 0;
+    return i == 0 ? static_cast<const LV2_Descriptor*>(&lv2_descriptor) : 0;
 }
diff --git a/plugins/mod-caps-Eq4p.lv2/interface.cc b/plugins/mod-caps-Eq4p.lv2/interface.cc
@@ -27,5 +27,5 @@ const LV2_Descriptor *
 lv2_descriptor(uint32_t i)
 {
     static const Descriptor<Eq4p> lv2_descriptor(CAPS_URI "Eq4p");
-    return i == 0 ? &lv2_descriptor : 0;
+    return i == 0 ? static_cast<const LV2_Descriptor*>(&lv2_descriptor) : 0;
 }
diff --git a/plugins/mod-caps-EqFA4p.lv2/interface.cc b/plugins/mod-caps-EqFA4p.lv2/interface.cc
@@ -27,5 +27,5 @@ const LV2_Descriptor *
 lv2_descriptor(uint32_t i)
 {
     static const Descriptor<EqFA4p> lv2_descriptor(CAPS_URI "EqFA4p");
-    return i == 0 ? &lv2_descriptor : 0;
+    return i == 0 ? static_cast<const LV2_Descriptor*>(&lv2_descriptor) : 0;
 }
diff --git a/plugins/mod-caps-Fractal.lv2/interface.cc b/plugins/mod-caps-Fractal.lv2/interface.cc
@@ -27,5 +27,5 @@ const LV2_Descriptor *
 lv2_descriptor(uint32_t i)
 {
     static const Descriptor<Fractal> lv2_descriptor(CAPS_URI "Fractal");
-    return i == 0 ? &lv2_descriptor : 0;
+    return i == 0 ? static_cast<const LV2_Descriptor*>(&lv2_descriptor) : 0;
 }
diff --git a/plugins/mod-caps-Narrower.lv2/interface.cc b/plugins/mod-caps-Narrower.lv2/interface.cc
@@ -27,5 +27,5 @@ const LV2_Descriptor *
 lv2_descriptor(uint32_t i)
 {
     static const Descriptor<Narrower> lv2_descriptor(CAPS_URI "Narrower");
-    return i == 0 ? &lv2_descriptor : 0;
+    return i == 0 ? static_cast<const LV2_Descriptor*>(&lv2_descriptor) : 0;
 }
diff --git a/plugins/mod-caps-Noisegate.lv2/interface.cc b/plugins/mod-caps-Noisegate.lv2/interface.cc
@@ -27,5 +27,5 @@ const LV2_Descriptor *
 lv2_descriptor(uint32_t i)
 {
     static const Descriptor<Noisegate> lv2_descriptor(CAPS_URI "Noisegate");
-    return i == 0 ? &lv2_descriptor : 0;
+    return i == 0 ? static_cast<const LV2_Descriptor*>(&lv2_descriptor) : 0;
 }
diff --git a/plugins/mod-caps-PhaserII.lv2/interface.cc b/plugins/mod-caps-PhaserII.lv2/interface.cc
@@ -27,5 +27,5 @@ const LV2_Descriptor *
 lv2_descriptor(uint32_t i)
 {
     static const Descriptor<PhaserII> lv2_descriptor(CAPS_URI "PhaserII");
-    return i == 0 ? &lv2_descriptor : 0;
+    return i == 0 ? static_cast<const LV2_Descriptor*>(&lv2_descriptor) : 0;
 }
diff --git a/plugins/mod-caps-Plate.lv2/interface.cc b/plugins/mod-caps-Plate.lv2/interface.cc
@@ -27,5 +27,5 @@ const LV2_Descriptor *
 lv2_descriptor(uint32_t i)
 {
     static const Descriptor<Plate> lv2_descriptor(CAPS_URI "Plate");
-    return i == 0 ? &lv2_descriptor : 0;
+    return i == 0 ? static_cast<const LV2_Descriptor*>(&lv2_descriptor) : 0;
 }
diff --git a/plugins/mod-caps-PlateX2.lv2/interface.cc b/plugins/mod-caps-PlateX2.lv2/interface.cc
@@ -27,5 +27,5 @@ const LV2_Descriptor *
 lv2_descriptor(uint32_t i)
 {
     static const Descriptor<PlateX2> lv2_descriptor(CAPS_URI "PlateX2");
-    return i == 0 ? &lv2_descriptor : 0;
+    return i == 0 ? static_cast<const LV2_Descriptor*>(&lv2_descriptor) : 0;
 }
diff --git a/plugins/mod-caps-Saturate.lv2/interface.cc b/plugins/mod-caps-Saturate.lv2/interface.cc
@@ -27,5 +27,5 @@ const LV2_Descriptor *
 lv2_descriptor(uint32_t i)
 {
     static const Descriptor<Saturate> lv2_descriptor(CAPS_URI "Saturate");
-    return i == 0 ? &lv2_descriptor : 0;
+    return i == 0 ? static_cast<const LV2_Descriptor*>(&lv2_descriptor) : 0;
 }
diff --git a/plugins/mod-caps-Scape.lv2/interface.cc b/plugins/mod-caps-Scape.lv2/interface.cc
@@ -27,5 +27,5 @@ const LV2_Descriptor *
 lv2_descriptor(uint32_t i)
 {
     static const Descriptor<Scape> lv2_descriptor(CAPS_URI "Scape");
-    return i == 0 ? &lv2_descriptor : 0;
+    return i == 0 ? static_cast<const LV2_Descriptor*>(&lv2_descriptor) : 0;
 }
diff --git a/plugins/mod-caps-Sin.lv2/interface.cc b/plugins/mod-caps-Sin.lv2/interface.cc
@@ -27,5 +27,5 @@ const LV2_Descriptor *
 lv2_descriptor(uint32_t i)
 {
     static const Descriptor<Sin> lv2_descriptor(CAPS_URI "Sin");
-    return i == 0 ? &lv2_descriptor : 0;
+    return i == 0 ? static_cast<const LV2_Descriptor*>(&lv2_descriptor) : 0;
 }
diff --git a/plugins/mod-caps-Spice.lv2/interface.cc b/plugins/mod-caps-Spice.lv2/interface.cc
@@ -27,5 +27,5 @@ const LV2_Descriptor *
 lv2_descriptor(uint32_t i)
 {
     static const Descriptor<Spice> lv2_descriptor(CAPS_URI "Spice");
-    return i == 0 ? &lv2_descriptor : 0;
+    return i == 0 ? static_cast<const LV2_Descriptor*>(&lv2_descriptor) : 0;
 }
diff --git a/plugins/mod-caps-SpiceX2.lv2/interface.cc b/plugins/mod-caps-SpiceX2.lv2/interface.cc
@@ -27,5 +27,5 @@ const LV2_Descriptor *
 lv2_descriptor(uint32_t i)
 {
     static const Descriptor<SpiceX2> lv2_descriptor(CAPS_URI "SpiceX2");
-    return i == 0 ? &lv2_descriptor : 0;
+    return i == 0 ? static_cast<const LV2_Descriptor*>(&lv2_descriptor) : 0;
 }
diff --git a/plugins/mod-caps-ToneStack.lv2/interface.cc b/plugins/mod-caps-ToneStack.lv2/interface.cc
@@ -27,5 +27,5 @@ const LV2_Descriptor *
 lv2_descriptor(uint32_t i)
 {
     static const Descriptor<ToneStack> lv2_descriptor(CAPS_URI "ToneStack");
-    return i == 0 ? &lv2_descriptor : 0;
+    return i == 0 ? static_cast<const LV2_Descriptor*>(&lv2_descriptor) : 0;
 }
diff --git a/plugins/mod-caps-White.lv2/interface.cc b/plugins/mod-caps-White.lv2/interface.cc
@@ -27,5 +27,5 @@ const LV2_Descriptor *
 lv2_descriptor(uint32_t i)
 {
     static const Descriptor<White> lv2_descriptor(CAPS_URI "White");
-    return i == 0 ? &lv2_descriptor : 0;
+    return i == 0 ? static_cast<const LV2_Descriptor*>(&lv2_descriptor) : 0;
 }
diff --git a/plugins/mod-caps-Wider.lv2/interface.cc b/plugins/mod-caps-Wider.lv2/interface.cc
@@ -27,5 +27,5 @@ const LV2_Descriptor *
 lv2_descriptor(uint32_t i)
 {
     static const Descriptor<Wider> lv2_descriptor(CAPS_URI "Wider");
-    return i == 0 ? &lv2_descriptor : 0;
+    return i == 0 ? static_cast<const LV2_Descriptor*>(&lv2_descriptor) : 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@`
`62`	`62`	`lv2_descriptor(uint32_t i)`
`63`	`63`	`{`
`64`	`64`	`static const Descriptor<__EFFECT__> lv2_descriptor(CAPS_URI "__EFFECT__");`
`65`		`- return i == 0 ? &lv2_descriptor : 0;`
	`65`	`+ return i == 0 ? static_cast<const LV2_Descriptor*>(&lv2_descriptor) : 0;`
`66`	`66`	`}`
`67`	`67`	`"""`
`68`	`68`
Original file line number	Diff line number	Diff line change
`@@ -27,5 +27,5 @@ const LV2_Descriptor *`
`27`	`27`	`lv2_descriptor(uint32_t i)`
`28`	`28`	`{`
`29`	`29`	`static const Descriptor<AmpVTS> lv2_descriptor(CAPS_URI "AmpVTS");`
`30`		`- return i == 0 ? &lv2_descriptor : 0;`
	`30`	`+ return i == 0 ? static_cast<const LV2_Descriptor*>(&lv2_descriptor) : 0;`
`31`	`31`	`}`