falkTX
/
Carla
mirror of https://github.com/falkTX/Carla
1
0
Fork 0
Code Releases 43 Activity
Audio plugin host https://kx.studio/carla
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
1725 Commits
17 Branches
263MB
Tree: d806410560
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from 'd806410560'
${ noResults }
Carla/source/modules/lilv/custom-patches.diff

424 lines
13KB
Raw Blame History 

  1. diff -U 3 -H -w -E -d -r -N -- lilv-0.18.0.orig/lilv/lilv.h lilv-0.18.0/lilv/lilv.h

  2. --- lilv-0.18.0.orig/lilv/lilv.h	2014-01-04 04:17:29.000000000 +0000

  3. +++ lilv-0.18.0/lilv/lilv.h	2014-04-14 20:49:45.340264688 +0000

  4. @@ -26,8 +26,9 @@

  5.  #include <stdint.h>

  6.  #include <stdio.h>

  7.  

  8. -#include "lv2/lv2plug.in/ns/lv2core/lv2.h"

  9. -#include "lv2/lv2plug.in/ns/ext/urid/urid.h"

  10. +#include "lv2/lv2.h"

  11. +#include "lv2/state.h"

  12. +#include "lv2/urid.h"

  13.  

  14.  #ifdef LILV_SHARED

  15.  #    ifdef _WIN32

  16. @@ -1228,7 +1229,7 @@

  17.  LILV_API

  18.  LilvState*

  19.  lilv_state_new_from_world(LilvWorld*      world,

  20. -                          LV2_URID_Map*   map,

  21. +                          const LV2_URID_Map* map,

  22.                            const LilvNode* subject);

  23.  

  24.  /**

  25. @@ -1247,7 +1248,7 @@

  26.  LILV_API

  27.  LilvState*

  28.  lilv_state_new_from_file(LilvWorld*      world,

  29. -                         LV2_URID_Map*   map,

  30. +                         const LV2_URID_Map* map,

  31.                           const LilvNode* subject,

  32.                           const char*     path);

  33.  

  34. @@ -1257,7 +1258,7 @@

  35.  LILV_API

  36.  LilvState*

  37.  lilv_state_new_from_string(LilvWorld*    world,

  38. -                           LV2_URID_Map* map,

  39. +                           const LV2_URID_Map* map,

  40.                             const char*   str);

  41.  

  42.  /**

  43. @@ -1428,7 +1429,8 @@

  44.  LILV_API

  45.  void

  46.  lilv_state_restore(const LilvState*           state,

  47. -                   LilvInstance*              instance,

  48. +                   const LV2_State_Interface* iface,

  49. +                   LV2_Handle                 handle,

  50.                     LilvSetPortValueFunc       set_value,

  51.                     void*                      user_data,

  52.                     uint32_t                   flags,

  53. @@ -1782,6 +1784,25 @@

  54.  lilv_ui_get_binary_uri(const LilvUI* ui);

  55.  

  56.  /**

  57. +  Custom calls

  58. +*/

  59. +LILV_API

  60. +const LilvNodes*

  61. +lilv_ui_get_supported_features(const LilvUI* ui);

  62. +

  63. +LILV_API

  64. +const LilvNodes*

  65. +lilv_ui_get_required_features(const LilvUI* ui);

  66. +

  67. +LILV_API

  68. +const LilvNodes*

  69. +lilv_ui_get_optional_features(const LilvUI* ui);

  70. +

  71. +LILV_API

  72. +const LilvNodes*

  73. +lilv_ui_get_extension_data(const LilvUI* ui);

  74. +

  75. +/**

  76.     @}

  77.     @}

  78.  */

  79. diff -U 3 -H -w -E -d -r -N -- lilv-0.18.0.orig/lilv/lilvmm.hpp lilv-0.18.0/lilv/lilvmm.hpp

  80. --- lilv-0.18.0.orig/lilv/lilvmm.hpp	2013-03-19 04:05:10.000000000 +0000

  81. +++ lilv-0.18.0/lilv/lilvmm.hpp	2014-04-14 20:55:29.312713841 +0000

  82. @@ -35,6 +35,9 @@

  83.  #define LILV_WRAP0(RT, prefix, name) \

  84.  	inline RT name() { return lilv_ ## prefix ## _ ## name (me); }

  85.  

  86. +#define LILV_WRAP0_CONST(RT, prefix, name) \

  87. +	inline RT name() const { return lilv_ ## prefix ## _ ## name (me); }

  88. +

  89.  #define LILV_WRAP0_VOID(prefix, name) \

  90.  	inline void name() { lilv_ ## prefix ## _ ## name(me); }

  91.  

  92. @@ -65,6 +68,7 @@

  93.  #endif

  94.  

  95.  struct Node {

  96. +	inline Node(LilvNode* node)       : me(node) {}

  97.  	inline Node(const LilvNode* node) : me(lilv_node_duplicate(node)) {}

  98.  	inline Node(const Node& copy)     : me(lilv_node_duplicate(copy.me)) {}

  99.  

  100. @@ -78,20 +82,20 @@

  101.  

  102.  	LILV_WRAP_CONVERSION(LilvNode);

  103.  

  104. -	LILV_WRAP0(char*,       node, get_turtle_token);

  105. -	LILV_WRAP0(bool,        node, is_uri);

  106. -	LILV_WRAP0(const char*, node, as_uri);

  107. -	LILV_WRAP0(bool,        node, is_blank);

  108. -	LILV_WRAP0(const char*, node, as_blank);

  109. -	LILV_WRAP0(bool,        node, is_literal);

  110. -	LILV_WRAP0(bool,        node, is_string);

  111. -	LILV_WRAP0(const char*, node, as_string);

  112. -	LILV_WRAP0(bool,        node, is_float);

  113. -	LILV_WRAP0(float,       node, as_float);

  114. -	LILV_WRAP0(bool,        node, is_int);

  115. -	LILV_WRAP0(int,         node, as_int);

  116. -	LILV_WRAP0(bool,        node, is_bool);

  117. -	LILV_WRAP0(bool,        node, as_bool);

  118. +	LILV_WRAP0_CONST(char*,       node, get_turtle_token);

  119. +	LILV_WRAP0_CONST(bool,        node, is_uri);

  120. +	LILV_WRAP0_CONST(const char*, node, as_uri);

  121. +	LILV_WRAP0_CONST(bool,        node, is_blank);

  122. +	LILV_WRAP0_CONST(const char*, node, as_blank);

  123. +	LILV_WRAP0_CONST(bool,        node, is_literal);

  124. +	LILV_WRAP0_CONST(bool,        node, is_string);

  125. +	LILV_WRAP0_CONST(const char*, node, as_string);

  126. +	LILV_WRAP0_CONST(bool,        node, is_float);

  127. +	LILV_WRAP0_CONST(float,       node, as_float);

  128. +	LILV_WRAP0_CONST(bool,        node, is_int);

  129. +	LILV_WRAP0_CONST(int,         node, as_int);

  130. +	LILV_WRAP0_CONST(bool,        node, is_bool);

  131. +	LILV_WRAP0_CONST(bool,        node, as_bool);

  132.  

  133.  	LilvNode* me;

  134.  };

  135. @@ -126,7 +130,7 @@

  136.  	LILV_WRAP0(LilvIter*, prefix, begin); \

  137.  	LILV_WRAP1(LilvIter*, prefix, next, LilvIter*, i); \

  138.  	LILV_WRAP1(bool, prefix, is_end, LilvIter*, i); \

  139. -	const Lilv ## CT* me; \

  140. +	const Lilv ## CT* me

  141.  

  142.  struct PluginClasses {

  143.  	LILV_WRAP_COLL(PluginClasses, PluginClass, plugin_classes);

  144. @@ -148,15 +152,14 @@

  145.  	inline UI(const LilvUI* c_obj) : me(c_obj) {}

  146.  	LILV_WRAP_CONVERSION(const LilvUI);

  147.  

  148. -	LILV_WRAP0(const LilvNode*, ui, get_uri);

  149. -	LILV_WRAP0(const LilvNode*, ui, get_bundle_uri);

  150. -	LILV_WRAP0(const LilvNode*, ui, get_binary_uri);

  151. -	LILV_WRAP0(const LilvNodes*, ui, get_classes);

  152. -	/*LILV_WRAP3(bool, ui, is_supported,

  153. -	           LilvUISupportedFunc, supported_func,

  154. -	           const LilvNode*,     container_type,

  155. -	           const LilvNode**,    ui_type);*/

  156. -	LILV_WRAP1(bool, ui, is_a, const LilvNode*, class_uri);

  157. +	LILV_WRAP0(Node,  ui, get_uri);

  158. +	LILV_WRAP1(bool,  ui, is_a, LilvNode*, ui_class);

  159. +	LILV_WRAP0(Node,  ui, get_bundle_uri);

  160. +	LILV_WRAP0(Node,  ui, get_binary_uri);

  161. +	LILV_WRAP0(Nodes, ui, get_supported_features);

  162. +	LILV_WRAP0(Nodes, ui, get_required_features);

  163. +	LILV_WRAP0(Nodes, ui, get_optional_features);

  164. +	LILV_WRAP0(Nodes, ui, get_extension_data);

  165.  

  166.  	const LilvUI* me;

  167.  };

  168. @@ -260,7 +263,7 @@

  169.  

  170.  	LILV_DEPRECATED

  171.  	inline Instance(Plugin plugin, double sample_rate) {

  172. -		me = lilv_plugin_instantiate(plugin, sample_rate, NULL);

  173. +		me = lilv_plugin_instantiate(plugin, sample_rate, nullptr);

  174.  	}

  175.  

  176.  	LILV_DEPRECATED inline Instance(Plugin              plugin,

  177. @@ -275,7 +278,7 @@

  178.  		LilvInstance* me = lilv_plugin_instantiate(

  179.  			plugin, sample_rate, features);

  180.  

  181. -		return me ? new Instance(me) : NULL;

  182. +		return me ? new Instance(me) : nullptr;

  183.  	}

  184.  

  185.  	LILV_WRAP_CONVERSION(LilvInstance);

  186. @@ -307,19 +310,19 @@

  187.  	inline World() : me(lilv_world_new()) {}

  188.  	inline ~World() { lilv_world_free(me); }

  189.  

  190. -	inline LilvNode* new_uri(const char* uri) {

  191. +	inline LilvNode* new_uri(const char* uri) const {

  192.  		return lilv_new_uri(me, uri);

  193.  	}

  194. -	inline LilvNode* new_string(const char* str) {

  195. +	inline LilvNode* new_string(const char* str) const {

  196.  		return lilv_new_string(me, str);

  197.  	}

  198. -	inline LilvNode* new_int(int val) {

  199. +	inline LilvNode* new_int(int val) const {

  200.  		return lilv_new_int(me, val);

  201.  	}

  202. -	inline LilvNode* new_float(float val) {

  203. +	inline LilvNode* new_float(float val) const {

  204.  		return lilv_new_float(me, val);

  205.  	}

  206. -	inline LilvNode* new_bool(bool val) {

  207. +	inline LilvNode* new_bool(bool val) const {

  208.  		return lilv_new_bool(me, val);

  209.  	}

  210.  	inline Nodes find_nodes(const LilvNode* subject,

  211. diff -U 3 -H -w -E -d -r -N -- lilv-0.18.0.orig/src/lilv_internal.h lilv-0.18.0/src/lilv_internal.h

  212. --- lilv-0.18.0.orig/src/lilv_internal.h	2014-01-04 04:02:22.000000000 +0000

  213. +++ lilv-0.18.0/src/lilv_internal.h	2014-04-14 20:31:23.028483446 +0000

  214. @@ -50,7 +50,7 @@

  215.  #include "lilv/lilv.h"

  216.  

  217.  #ifdef LILV_DYN_MANIFEST

  218. -#    include "lv2/lv2plug.in/ns/ext/dynmanifest/dynmanifest.h"

  219. +#    include "lv2/dynmanifest.h"

  220.  #endif

  221.  

  222.  /*

  223. diff -U 3 -H -w -E -d -r -N -- lilv-0.18.0.orig/src/plugin.c lilv-0.18.0/src/plugin.c

  224. --- lilv-0.18.0.orig/src/plugin.c	2014-01-04 21:23:47.000000000 +0000

  225. +++ lilv-0.18.0/src/plugin.c	2014-04-14 20:44:13.939913922 +0000

  226. @@ -27,7 +27,7 @@

  227.  #include "lilv_config.h"

  228.  #include "lilv_internal.h"

  229.  

  230. -#include "lv2/lv2plug.in/ns/extensions/ui/ui.h"

  231. +#include "lv2/ui.h"

  232.  

  233.  #define NS_DOAP (const uint8_t*)"http://usefulinc.com/ns/doap#"

  234.  #define NS_FOAF (const uint8_t*)"http://xmlns.com/foaf/0.1/"

  235. diff -U 3 -H -w -E -d -r -N -- lilv-0.18.0.orig/src/port.c lilv-0.18.0/src/port.c

  236. --- lilv-0.18.0.orig/src/port.c	2014-01-04 04:04:20.000000000 +0000

  237. +++ lilv-0.18.0/src/port.c	2014-04-14 20:33:03.708189391 +0000

  238. @@ -20,8 +20,8 @@

  239.  #include <stdlib.h>

  240.  #include <string.h>

  241.  

  242. -#include "lv2/lv2plug.in/ns/ext/atom/atom.h"

  243. -#include "lv2/lv2plug.in/ns/ext/event/event.h"

  244. +#include "lv2/atom.h"

  245. +#include "lv2/event.h"

  246.  

  247.  #include "lilv_internal.h"

  248.  

  249. diff -U 3 -H -w -E -d -r -N -- lilv-0.18.0.orig/src/state.c lilv-0.18.0/src/state.c

  250. --- lilv-0.18.0.orig/src/state.c	2013-12-16 03:17:00.000000000 +0000

  251. +++ lilv-0.18.0/src/state.c	2014-04-14 20:39:02.307711987 +0000

  252. @@ -18,10 +18,10 @@

  253.  #include <stdio.h>

  254.  #include <string.h>

  255.  

  256. -#include "lv2/lv2plug.in/ns/ext/atom/atom.h"

  257. -#include "lv2/lv2plug.in/ns/ext/atom/forge.h"

  258. -#include "lv2/lv2plug.in/ns/ext/presets/presets.h"

  259. -#include "lv2/lv2plug.in/ns/ext/state/state.h"

  260. +#include "lv2/atom.h"

  261. +#include "lv2/atom-forge.h"

  262. +#include "lv2/presets.h"

  263. +#include "lv2/state.h"

  264.  

  265.  #include "lilv_config.h"

  266.  #include "lilv_internal.h"

  267. @@ -399,30 +399,18 @@

  268.  LILV_API

  269.  void

  270.  lilv_state_restore(const LilvState*           state,

  271. -                   LilvInstance*              instance,

  272. +                   const LV2_State_Interface* iface,

  273. +                   LV2_Handle                 handle,

  274.                     LilvSetPortValueFunc       set_value,

  275.                     void*                      user_data,

  276.                     uint32_t                   flags,

  277.                     const LV2_Feature *const * features)

  278.  {

  279. -	LV2_State_Map_Path map_path = {

  280. -		(LilvState*)state, abstract_path, absolute_path };

  281. -	LV2_Feature map_feature = { LV2_STATE__mapPath, &map_path };

  282. -

  283. -	const LV2_Feature** sfeatures = add_features(features, &map_feature, NULL);

  284. -

  285. -	const LV2_Descriptor*      desc  = instance ? instance->lv2_descriptor : NULL;

  286. -	const LV2_State_Interface* iface = (desc && desc->extension_data)

  287. -		? (const LV2_State_Interface*)desc->extension_data(LV2_STATE__interface)

  288. -		: NULL;

  289. -

  290.  	if (iface) {

  291. -		iface->restore(instance->lv2_handle, retrieve_callback,

  292. -		               (LV2_State_Handle)state, flags, sfeatures);

  293. +		iface->restore(handle, retrieve_callback,

  294. +		               (LV2_State_Handle)state, flags, features);

  295.  	}

  296.  

  297. -	free(sfeatures);

  298. -

  299.  	if (set_value) {

  300.  		for (uint32_t i = 0; i < state->num_values; ++i) {

  301.  			const PortValue* val = &state->values[i];

  302. @@ -569,7 +557,7 @@

  303.  LILV_API

  304.  LilvState*

  305.  lilv_state_new_from_world(LilvWorld*      world,

  306. -                          LV2_URID_Map*   map,

  307. +                          const LV2_URID_Map* map,

  308.                            const LilvNode* node)

  309.  {

  310.  	if (!lilv_node_is_uri(node) && !lilv_node_is_blank(node)) {

  311. @@ -587,7 +575,7 @@

  312.  LILV_API

  313.  LilvState*

  314.  lilv_state_new_from_file(LilvWorld*      world,

  315. -                         LV2_URID_Map*   map,

  316. +                         const LV2_URID_Map* map,

  317.                           const LilvNode* subject,

  318.                           const char*     path)

  319.  {

  320. @@ -641,7 +629,7 @@

  321.  LILV_API

  322.  LilvState*

  323.  lilv_state_new_from_string(LilvWorld*    world,

  324. -                           LV2_URID_Map* map,

  325. +                           const LV2_URID_Map* map,

  326.                             const char*   str)

  327.  {

  328.  	if (!str) {

  329. diff -U 3 -H -w -E -d -r -N -- lilv-0.18.0.orig/src/ui.c lilv-0.18.0/src/ui.c

  330. --- lilv-0.18.0.orig/src/ui.c	2012-03-27 03:41:41.000000000 +0000

  331. +++ lilv-0.18.0/src/ui.c	2014-04-14 20:46:20.491810535 +0000

  332. @@ -128,3 +128,59 @@

  333.  	assert(ui->binary_uri);

  334.  	return ui->binary_uri;

  335.  }

  336. +

  337. +static LilvNodes*

  338. +lilv_ui_get_value_internal(const LilvUI* ui,

  339. +                           const SordNode* predicate)

  340. +{

  341. +	assert(ui);

  342. +	return lilv_world_find_nodes_internal(ui->world, ui->uri->node, predicate, NULL);

  343. +}

  344. +

  345. +LILV_API

  346. +const LilvNodes*

  347. +lilv_ui_get_supported_features(const LilvUI* ui)

  348. +{

  349. +	assert(ui);

  350. +	LilvNodes* optional = lilv_ui_get_optional_features(ui);

  351. +	LilvNodes* required = lilv_ui_get_required_features(ui);

  352. +	LilvNodes* result   = lilv_nodes_new();

  353. +

  354. +	LILV_FOREACH(nodes, i, optional)

  355. +		zix_tree_insert((ZixTree*)result, lilv_node_duplicate(lilv_nodes_get(optional, i)), NULL);

  356. +

  357. +	LILV_FOREACH(nodes, i, required)

  358. +		zix_tree_insert((ZixTree*)result, lilv_node_duplicate(lilv_nodes_get(required, i)), NULL);

  359. +

  360. +	lilv_nodes_free(optional);

  361. +	lilv_nodes_free(required);

  362. +

  363. +	return result;

  364. +}

  365. +

  366. +LILV_API

  367. +const LilvNodes*

  368. +lilv_ui_get_required_features(const LilvUI* ui)

  369. +{

  370. +	assert(ui);

  371. +	assert(ui->world);

  372. +	return lilv_ui_get_value_internal(ui, ui->world->uris.lv2_requiredFeature);

  373. +}

  374. +

  375. +LILV_API

  376. +const LilvNodes*

  377. +lilv_ui_get_optional_features(const LilvUI* ui)

  378. +{

  379. +	assert(ui);

  380. +	assert(ui->world);

  381. +	return lilv_ui_get_value_internal(ui, ui->world->uris.lv2_optionalFeature);

  382. +}

  383. +

  384. +LILV_API

  385. +const LilvNodes*

  386. +lilv_ui_get_extension_data(const LilvUI* ui)

  387. +{

  388. +	assert(ui);

  389. +	assert(ui->world);

  390. +	return lilv_ui_get_value_internal(ui, ui->world->uris.lv2_extensionData);

  391. +}

  392. diff -U 3 -H -w -E -d -r -N -- lilv-0.18.0.orig/src/util.c lilv-0.18.0/src/util.c

  393. --- lilv-0.18.0.orig/src/util.c	2012-08-09 20:51:00.000000000 +0000

  394. +++ lilv-0.18.0/src/util.c	2014-04-14 20:43:49.832743279 +0000

  395. @@ -29,7 +29,6 @@

  396.  #include <string.h>

  397.  

  398.  #ifdef _WIN32

  399. -#    define _WIN32_WINNT 0x0600  /* for CreateSymbolicLink */

  400.  #    include <windows.h>

  401.  #    include <direct.h>

  402.  #    include <io.h>

  403. @@ -426,7 +425,7 @@

  404.  	int ret = 0;

  405.  	if (strcmp(oldpath, newpath)) {

  406.  #ifdef _WIN32

  407. -		ret = !CreateSymbolicLink(newpath, oldpath, 0);

  408. +		ret = 0;

  409.  #else

  410.  		ret = symlink(oldpath, newpath);

  411.  #endif

  412. diff -U 3 -H -w -E -d -r -N -- lilv-0.18.0.orig/src/world.c lilv-0.18.0/src/world.c

  413. --- lilv-0.18.0.orig/src/world.c	2013-12-27 19:45:19.000000000 +0000

  414. +++ lilv-0.18.0/src/world.c	2014-04-14 20:45:37.828508116 +0000

  415. @@ -19,7 +19,7 @@

  416.  #include <stdlib.h>

  417.  #include <string.h>

  418.  

  419. -#include "lv2/lv2plug.in/ns/ext/presets/presets.h"

  420. +#include "lv2/presets.h"

  421.  

  422.  #include "lilv_internal.h"

  423.