lv2_ui.h   lv2_ui.h 
skipping to change at line 163 skipping to change at line 163
useless unless it has been configured using the UI in a previous sessio n). useless unless it has been configured using the UI in a previous sessio n).
A UI does not have to be a graphical widget, it could just as well be a A UI does not have to be a graphical widget, it could just as well be a
server listening for OSC input or an interface to some sort of hardware server listening for OSC input or an interface to some sort of hardware
device, depending on the RDF class of the UI. device, depending on the RDF class of the UI.
*/ */
#ifndef LV2_UI_H #ifndef LV2_UI_H
#define LV2_UI_H #define LV2_UI_H
#include <lv2.h> #include "lv2.h"
#define LV2_UI_URI "http://lv2plug.in/ns/extensions/ui" #define LV2_UI_URI "http://lv2plug.in/ns/extensions/ui"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/** A pointer to some widget or other type of UI handle. /** A pointer to some widget or other type of UI handle.
The actual type is defined by the type URI of the UI. The actual type is defined by the type URI of the UI.
All the functionality provided by this extension is toolkit All the functionality provided by this extension is toolkit
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 pluginclass.h   pluginclass.h 
skipping to change at line 26 skipping to change at line 26
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#ifndef __SLV2_PLUGIN_CLASS_H__ #ifndef __SLV2_PLUGIN_CLASS_H__
#define __SLV2_PLUGIN_CLASS_H__ #define __SLV2_PLUGIN_CLASS_H__
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include <slv2/types.h> #include "slv2/types.h"
/** \addtogroup slv2_data /** \addtogroup slv2_data
* @{ * @{
*/ */
/** Get the URI of this class' superclass. /** Get the URI of this class' superclass.
* *
* Returned value is owned by \a plugin_class and must not be freed by call er. * Returned value is owned by \a plugin_class and must not be freed by call er.
* Returned value may be NULL, if class has no parent. * Returned value may be NULL, if class has no parent.
* *
skipping to change at line 69 skipping to change at line 69
* Returned value must be freed by caller with slv2_plugin_classes_free. * Returned value must be freed by caller with slv2_plugin_classes_free.
* *
* Time = O(nclasses) * Time = O(nclasses)
*/ */
SLV2PluginClasses SLV2PluginClasses
slv2_plugin_class_get_children(SLV2PluginClass plugin_class); slv2_plugin_class_get_children(SLV2PluginClass plugin_class);
/** @} */ /** @} */
#ifdef __cplusplus #ifdef __cplusplus
} } /* extern "C" */
#endif #endif
#endif /* __SLV2_PLUGIN_CLASS_H__ */ #endif /* __SLV2_PLUGIN_CLASS_H__ */
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 pluginclasses.h   pluginclasses.h 
skipping to change at line 26 skipping to change at line 26
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#ifndef __SLV2_PLUGIN_CLASSES_H__ #ifndef __SLV2_PLUGIN_CLASSES_H__
#define __SLV2_PLUGIN_CLASSES_H__ #define __SLV2_PLUGIN_CLASSES_H__
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include <slv2/pluginclass.h> #include "slv2/pluginclass.h"
/** \addtogroup slv2_collections /** \addtogroup slv2_collections
* @{ * @{
*/ */
/** Get the number of plugins in the collection. /** Get the number of plugins in the collection.
*/ */
unsigned unsigned
slv2_plugin_classes_size(SLV2PluginClasses classes); slv2_plugin_classes_size(SLV2PluginClasses classes);
skipping to change at line 68 skipping to change at line 68
* *
* \return NULL if \a index out of range. * \return NULL if \a index out of range.
*/ */
SLV2PluginClass SLV2PluginClass
slv2_plugin_classes_get_at(SLV2PluginClasses classes, slv2_plugin_classes_get_at(SLV2PluginClasses classes,
unsigned index); unsigned index);
/** @} */ /** @} */
#ifdef __cplusplus #ifdef __cplusplus
} } /* extern "C" */
#endif #endif
#endif /* __SLV2_PLUGIN_CLASSES_H__ */ #endif /* __SLV2_PLUGIN_CLASSES_H__ */
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 plugininstance.h   plugininstance.h 
skipping to change at line 27 skipping to change at line 27
*/ */
#ifndef __SLV2_PLUGININSTANCE_H__ #ifndef __SLV2_PLUGININSTANCE_H__
#define __SLV2_PLUGININSTANCE_H__ #define __SLV2_PLUGININSTANCE_H__
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include <assert.h> #include <assert.h>
#include <lv2.h> #include "lv2.h"
#include <slv2/plugin.h> #include "slv2/plugin.h"
#include <slv2/port.h> #include "slv2/port.h"
typedef struct _InstanceImpl* SLV2InstanceImpl; typedef struct _InstanceImpl* SLV2InstanceImpl;
/** \cond IGNORE */ /** \cond IGNORE */
/* Instance of a plugin. /* Instance of a plugin.
* *
* The LV2 descriptor and handle of this are exposed to allow inlining of * The LV2 descriptor and handle of this are exposed to allow inlining of
* performance critical functions like slv2_instance_run (which are exposed * performance critical functions like slv2_instance_run (which are exposed
* in lv2.h anyway). This is for performance only, this struct is not * in lv2.h anyway). This is for performance only, this struct is not
skipping to change at line 169 skipping to change at line 169
slv2_instance_deactivate(SLV2Instance instance) slv2_instance_deactivate(SLV2Instance instance)
{ {
assert(instance); assert(instance);
assert(instance->lv2_descriptor); assert(instance->lv2_descriptor);
assert(instance->lv2_handle); assert(instance->lv2_handle);
if (instance->lv2_descriptor->deactivate) if (instance->lv2_descriptor->deactivate)
instance->lv2_descriptor->deactivate(instance->lv2_handle); instance->lv2_descriptor->deactivate(instance->lv2_handle);
} }
/** Get extension data from the plugin instance.
*
* The type and semantics of the data returned is specific to the particula
r
* extension, though in all cases it is shared and must not be deleted.
*/
static inline const void*
slv2_instance_get_extension_data(SLV2Instance instance,
const char* uri)
{
assert(instance);
assert(instance->lv2_descriptor);
if (instance->lv2_descriptor->extension_data)
return instance->lv2_descriptor->extension_data(uri);
else
return NULL;
}
/** Get the LV2_Descriptor of the plugin instance. /** Get the LV2_Descriptor of the plugin instance.
* *
* Normally hosts should not need to access the LV2_Descriptor directly, * Normally hosts should not need to access the LV2_Descriptor directly,
* use the slv2_instance_* functions. * use the slv2_instance_* functions.
* *
* The returned descriptor is shared and must not be deleted. * The returned descriptor is shared and must not be deleted.
*/ */
static inline const LV2_Descriptor* static inline const LV2_Descriptor*
slv2_instance_get_descriptor(SLV2Instance instance) slv2_instance_get_descriptor(SLV2Instance instance)
{ {
skipping to change at line 206 skipping to change at line 224
assert(instance->lv2_descriptor); assert(instance->lv2_descriptor);
return instance->lv2_handle; return instance->lv2_handle;
} }
#endif /* LIBSLV2_SOURCE */ #endif /* LIBSLV2_SOURCE */
/** @} */ /** @} */
#ifdef __cplusplus #ifdef __cplusplus
} } /* extern "C" */
#endif #endif
#endif /* __SLV2_PLUGININSTANCE_H__ */ #endif /* __SLV2_PLUGININSTANCE_H__ */
 End of changes. 3 change blocks. 
4 lines changed or deleted 23 lines changed or added


 plugins.h   plugins.h 
skipping to change at line 26 skipping to change at line 26
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#ifndef __SLV2_PLUGINS_H__ #ifndef __SLV2_PLUGINS_H__
#define __SLV2_PLUGINS_H__ #define __SLV2_PLUGINS_H__
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include <slv2/types.h> #include "slv2/types.h"
#include <slv2/plugin.h> #include "slv2/plugin.h"
/** \addtogroup slv2_collections /** \addtogroup slv2_collections
* @{ * @{
*/ */
/** Free a plugin plugins. /** Free a plugin plugins.
* *
* Freeing a plugin collection does not destroy the plugins it contains * Freeing a plugin collection does not destroy the plugins it contains
* (plugins are owned by the world). \a plugins is invalid after this call. * (plugins are owned by the world). \a plugins is invalid after this call.
*/ */
skipping to change at line 78 skipping to change at line 78
* *
* \return NULL if \a index out of range. * \return NULL if \a index out of range.
*/ */
SLV2Plugin SLV2Plugin
slv2_plugins_get_at(SLV2Plugins plugins, slv2_plugins_get_at(SLV2Plugins plugins,
unsigned index); unsigned index);
/** @} */ /** @} */
#ifdef __cplusplus #ifdef __cplusplus
} } /* extern "C" */
#endif #endif
#endif /* __SLV2_PLUGINS_H__ */ #endif /* __SLV2_PLUGINS_H__ */
 End of changes. 2 change blocks. 
3 lines changed or deleted 3 lines changed or added


 pluginui.h   pluginui.h 
skipping to change at line 33 skipping to change at line 33
extern "C" { extern "C" {
#endif #endif
/** \addtogroup slv2_data /** \addtogroup slv2_data
* @{ * @{
*/ */
/** Get the URI of a Plugin UI. /** Get the URI of a Plugin UI.
* *
* \param ui The Plugin UI * \param ui The Plugin UI
* \return a shared value which must not be modified or freed.
* *
* Time = O(1) * Time = O(1)
*/ */
SLV2Value SLV2Value
slv2_ui_get_uri(SLV2UI ui); slv2_ui_get_uri(SLV2UI ui);
/** Get the types (URIs of RDF classes) of a Plugin UI. /** Get the types (URIs of RDF classes) of a Plugin UI.
* *
* \param ui The Plugin UI * \param ui The Plugin UI
* \return a shared value which must not be modified or freed.
* *
* Time = O(1) * Time = O(1)
*/ */
SLV2Values SLV2Values
slv2_ui_get_classes(SLV2UI ui); slv2_ui_get_classes(SLV2UI ui);
/** Check whether a plugin UI is a given type. /** Check whether a plugin UI is a given type.
* *
* \param ui The Plugin UI * \param ui The Plugin UI
* \param class_uri The URI of the LV2 UI type to check this UI against * \param class_uri The URI of the LV2 UI type to check this UI against
* *
* Time = O(1) * Time = O(1)
*/ */
bool bool
slv2_ui_is_a(SLV2UI ui, SLV2Value class_uri); slv2_ui_is_a(SLV2UI ui, SLV2Value class_uri);
/** Get the URI for a Plugin UI's bundle. /** Get the URI for a Plugin UI's bundle.
* *
* \param ui The Plugin UI * \param ui The Plugin UI
* \return a shared value which must not be modified or freed.
* *
* Time = O(1) * Time = O(1)
*/ */
SLV2Value SLV2Value
slv2_ui_get_bundle_uri(SLV2UI ui); slv2_ui_get_bundle_uri(SLV2UI ui);
/** Get the URI for a Plugin UI's shared library. /** Get the URI for a Plugin UI's shared library.
* *
* \param ui The Plugin UI * \param ui The Plugin UI
* \return a shared value which must not be modified or freed.
* *
* Time = O(1) * Time = O(1)
*/ */
SLV2Value SLV2Value
slv2_ui_get_binary_uri(SLV2UI ui); slv2_ui_get_binary_uri(SLV2UI ui);
/** @} */ /** @} */
#ifdef __cplusplus #ifdef __cplusplus
} } /* extern "C" */
#endif #endif
#endif /* __SLV2_PLUGIN_UI_H__ */ #endif /* __SLV2_PLUGIN_UI_H__ */
 End of changes. 5 change blocks. 
1 lines changed or deleted 5 lines changed or added


 pluginuiinstance.h   pluginuiinstance.h 
skipping to change at line 27 skipping to change at line 27
*/ */
#ifndef __SLV2_PLUGINUIINSTANCE_H__ #ifndef __SLV2_PLUGINUIINSTANCE_H__
#define __SLV2_PLUGINUIINSTANCE_H__ #define __SLV2_PLUGINUIINSTANCE_H__
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include <assert.h> #include <assert.h>
#include <slv2/lv2_ui.h> #include "slv2/lv2_ui.h"
#include <slv2/plugin.h> #include "slv2/plugin.h"
typedef struct _SLV2UIInstanceImpl* SLV2UIInstanceImpl; typedef struct _SLV2UIInstanceImpl* SLV2UIInstanceImpl;
/* Instance of a plugin UI. /* Instance of a plugin UI.
* *
* All details are in hidden in the pimpl member to avoid making the * All details are in hidden in the pimpl member to avoid making the
* implementation a part of the ABI. * implementation a part of the ABI.
*/ */
typedef struct _SLV2UIInstance { typedef struct _SLV2UIInstance {
SLV2UIInstanceImpl pimpl; ///< Private implementation SLV2UIInstanceImpl pimpl; ///< Private implementation
skipping to change at line 106 skipping to change at line 106
* use the slv2_ui_instance_* functions. * use the slv2_ui_instance_* functions.
* *
* The returned handle is shared and must not be deleted. * The returned handle is shared and must not be deleted.
*/ */
LV2UI_Handle LV2UI_Handle
slv2_ui_instance_get_handle(SLV2UIInstance instance); slv2_ui_instance_get_handle(SLV2UIInstance instance);
/** @} */ /** @} */
#ifdef __cplusplus #ifdef __cplusplus
} } /* extern "C" */
#endif #endif
#endif /* __SLV2_PLUGINUIINSTANCE_H__ */ #endif /* __SLV2_PLUGINUIINSTANCE_H__ */
 End of changes. 2 change blocks. 
3 lines changed or deleted 3 lines changed or added


 pluginuis.h   pluginuis.h 
skipping to change at line 26 skipping to change at line 26
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#ifndef __SLV2_PLUGIN_UIS_H__ #ifndef __SLV2_PLUGIN_UIS_H__
#define __SLV2_PLUGIN_UIS_H__ #define __SLV2_PLUGIN_UIS_H__
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include <slv2/types.h> #include "slv2/types.h"
#include <slv2/plugin.h> #include "slv2/plugin.h"
/** \addtogroup slv2_collections /** \addtogroup slv2_collections
* *
* @{ * @{
*/ */
/** Free a plugin list. /** Free a plugin list.
* *
* Freeing a plugin list does not destroy the plugins it contains (plugins * Freeing a plugin list does not destroy the plugins it contains (plugins
* are owned by the world). \a list is invalid after this call. * are owned by the world). \a list is invalid after this call.
skipping to change at line 78 skipping to change at line 78
* *
* \return NULL if \a index out of range. * \return NULL if \a index out of range.
*/ */
SLV2UI SLV2UI
slv2_uis_get_at(SLV2UIs list, slv2_uis_get_at(SLV2UIs list,
unsigned index); unsigned index);
/** @} */ /** @} */
#ifdef __cplusplus #ifdef __cplusplus
} } /* extern "C" */
#endif #endif
#endif /* __SLV2_PLUGIN_UIS_H__ */ #endif /* __SLV2_PLUGIN_UIS_H__ */
 End of changes. 2 change blocks. 
3 lines changed or deleted 3 lines changed or added


 port.h   port.h 
skipping to change at line 26 skipping to change at line 26
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#ifndef __SLV2_PORT_H__ #ifndef __SLV2_PORT_H__
#define __SLV2_PORT_H__ #define __SLV2_PORT_H__
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include <slv2/types.h> #include "slv2/types.h"
#include <slv2/plugin.h> #include "slv2/plugin.h"
#include <slv2/port.h> #include "slv2/port.h"
#include <slv2/values.h> #include "slv2/values.h"
/** \addtogroup slv2_data /** \addtogroup slv2_data
* @{ * @{
*/ */
/** Port analog of slv2_plugin_get_value. /** Port analog of slv2_plugin_get_value.
* *
* Time = Query * Time = Query
*/ */
SLV2Values SLV2Values
slv2_port_get_value(SLV2Plugin plugin,
SLV2Port port,
SLV2Value predicate);
/** Port analog of slv2_plugin_get_value_by_qname.
*
* Time = Query
*/
SLV2Values
slv2_port_get_value_by_qname(SLV2Plugin plugin, slv2_port_get_value_by_qname(SLV2Plugin plugin,
SLV2Port port, SLV2Port port,
const char* property_uri); const char* property_uri);
/** Port analog of slv2_plugin_get_value_by_qname_i18n.
*
* Time = Query
*/
SLV2Values
slv2_port_get_value_by_qname_i18n(SLV2Plugin plugin,
SLV2Port port,
const char* property_uri);
/** Return the LV2 port properties of a port. /** Return the LV2 port properties of a port.
* *
* Time = Query * Time = Query
*/ */
SLV2Values SLV2Values
slv2_port_get_properties(SLV2Plugin plugin, slv2_port_get_properties(SLV2Plugin plugin,
SLV2Port port); SLV2Port port);
/** Return whether a port has a certain property. /** Return whether a port has a certain property.
* *
skipping to change at line 154 skipping to change at line 172
* Returned value may be NULL if @a port has no scale points, otherwise it * Returned value may be NULL if @a port has no scale points, otherwise it
* must be freed by caller with slv2_scale_points_free. * must be freed by caller with slv2_scale_points_free.
*/ */
SLV2ScalePoints SLV2ScalePoints
slv2_port_get_scale_points(SLV2Plugin plugin, slv2_port_get_scale_points(SLV2Plugin plugin,
SLV2Port port); SLV2Port port);
/** @} */ /** @} */
#ifdef __cplusplus #ifdef __cplusplus
} } /* extern "C" */
#endif #endif
#endif /* __SLV2_PORT_H__ */ #endif /* __SLV2_PORT_H__ */
 End of changes. 4 change blocks. 
5 lines changed or deleted 23 lines changed or added


 scalepoint.h   scalepoint.h 
skipping to change at line 26 skipping to change at line 26
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#ifndef __SLV2_SCALE_POINT_H__ #ifndef __SLV2_SCALE_POINT_H__
#define __SLV2_SCALE_POINT_H__ #define __SLV2_SCALE_POINT_H__
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include <slv2/types.h> #include "slv2/types.h"
/** \addtogroup slv2_data /** \addtogroup slv2_data
* @{ * @{
*/ */
/** Get the label of this scale point (enumeration value) /** Get the label of this scale point (enumeration value)
* *
* Returned value is owned by \a point and must not be freed. * Returned value is owned by \a point and must not be freed.
*/ */
SLV2Value SLV2Value
skipping to change at line 49 skipping to change at line 49
/** Get the value of this scale point (enumeration value) /** Get the value of this scale point (enumeration value)
* *
* Returned value is owned by \a point and must not be freed. * Returned value is owned by \a point and must not be freed.
*/ */
SLV2Value SLV2Value
slv2_scale_point_get_value(SLV2ScalePoint point); slv2_scale_point_get_value(SLV2ScalePoint point);
/** @} */ /** @} */
#ifdef __cplusplus #ifdef __cplusplus
} } /* extern "C" */
#endif #endif
#endif /* __SLV2_SCALE_POINT_H__ */ #endif /* __SLV2_SCALE_POINT_H__ */
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 scalepoints.h   scalepoints.h 
skipping to change at line 27 skipping to change at line 27
*/ */
#ifndef __SLV2_SCALE_POINTS_H__ #ifndef __SLV2_SCALE_POINTS_H__
#define __SLV2_SCALE_POINTS_H__ #define __SLV2_SCALE_POINTS_H__
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include <stdbool.h> #include <stdbool.h>
#include <slv2/value.h> #include "slv2/value.h"
/** \defgroup slv2_collections Collections of scale_points/objects /** \defgroup slv2_collections Collections of scale_points/objects
* *
* Ordered collections of typed scale_points which are fast for random * Ordered collections of typed scale_points which are fast for random
* access by index (i.e. a fancy array). * access by index (i.e. a fancy array).
* *
* @{ * @{
*/ */
/** Allocate a new, empty SLV2Values /** Allocate a new, empty SLV2ScalePoints
*/ */
SLV2Values SLV2ScalePoints
slv2_scale_points_new(); slv2_scale_points_new();
/** Free an SLV2Values. /** Free an SLV2ScalePoints.
*/ */
void void
slv2_scale_points_free(SLV2Values); slv2_scale_points_free(SLV2ScalePoints points);
/** Get the number of scale points in a collection. /** Get the number of scale points in a collection.
*/ */
unsigned unsigned
slv2_scale_points_size(SLV2Values points); slv2_scale_points_size(SLV2ScalePoints points);
/** Get the scale point at the given index in a collection. /** Get the scale point at the given index in a collection.
* *
* @return the element at \a index, or NULL if index is out of range. * @return the element at \a index, or NULL if index is out of range.
* *
* Time = O(1) * Time = O(1)
*/ */
SLV2ScalePoint SLV2ScalePoint
slv2_scale_points_get_at(SLV2ScalePoints points, unsigned index); slv2_scale_points_get_at(SLV2ScalePoints points, unsigned index);
/** @} */ /** @} */
#ifdef __cplusplus #ifdef __cplusplus
} } /* extern "C" */
#endif #endif
#endif /* __SLV2_SCALE_POINTS_H__ */ #endif /* __SLV2_SCALE_POINTS_H__ */
 End of changes. 7 change blocks. 
7 lines changed or deleted 7 lines changed or added


 slv2.h   slv2.h 
skipping to change at line 26 skipping to change at line 26
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#ifndef __SLV2_H__ #ifndef __SLV2_H__
#define __SLV2_H__ #define __SLV2_H__
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include <slv2/plugin.h> #include "slv2/plugin.h"
#include <slv2/pluginclass.h> #include "slv2/pluginclass.h"
#include <slv2/plugininstance.h> #include "slv2/plugininstance.h"
#include <slv2/plugins.h> #include "slv2/plugins.h"
#include <slv2/pluginui.h> #include "slv2/pluginui.h"
#include <slv2/pluginuiinstance.h> #include "slv2/pluginuiinstance.h"
#include <slv2/pluginuis.h> #include "slv2/pluginuis.h"
#include <slv2/port.h> #include "slv2/port.h"
#include <slv2/types.h> #include "slv2/types.h"
#include <slv2/util.h> #include "slv2/util.h"
#include <slv2/value.h> #include "slv2/value.h"
#include <slv2/values.h> #include "slv2/values.h"
#include <slv2/scalepoint.h> #include "slv2/scalepoint.h"
#include <slv2/scalepoints.h> #include "slv2/scalepoints.h"
#include <slv2/world.h> #include "slv2/world.h"
#ifdef __cplusplus #ifdef __cplusplus
} } /* extern "C" */
#endif #endif
#endif /* __SLV2_H__ */ #endif /* __SLV2_H__ */
 End of changes. 2 change blocks. 
16 lines changed or deleted 16 lines changed or added


 types.h   types.h 
skipping to change at line 74 skipping to change at line 74
/** A collection of scale points. */ /** A collection of scale points. */
typedef void* SLV2ScalePoints; typedef void* SLV2ScalePoints;
/** A plugin UI */ /** A plugin UI */
typedef struct _SLV2UI* SLV2UI; typedef struct _SLV2UI* SLV2UI;
/** A collection of plugin UIs. */ /** A collection of plugin UIs. */
typedef void* SLV2UIs; typedef void* SLV2UIs;
#ifdef __cplusplus #ifdef __cplusplus
} } /* extern "C" */
#endif #endif
#endif /* __SLV2_TYPES_H__ */ #endif /* __SLV2_TYPES_H__ */
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 util.h   util.h 
skipping to change at line 43 skipping to change at line 43
/** Convert a full URI (eg file://foo/bar/baz.ttl) to a local path (e.g. /f oo/bar/baz.ttl). /** Convert a full URI (eg file://foo/bar/baz.ttl) to a local path (e.g. /f oo/bar/baz.ttl).
* *
* Return value is shared and must not be deleted by caller. * Return value is shared and must not be deleted by caller.
* \return \a uri converted to a path, or NULL on failure (URI is not local ). * \return \a uri converted to a path, or NULL on failure (URI is not local ).
*/ */
const char* slv2_uri_to_path(const char* uri); const char* slv2_uri_to_path(const char* uri);
/** @} */ /** @} */
#ifdef __cplusplus #ifdef __cplusplus
} } /* extern "C" */
#endif #endif
#endif /* __SLV2_UTIL_H__ */ #endif /* __SLV2_UTIL_H__ */
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 value.h   value.h 
skipping to change at line 27 skipping to change at line 27
*/ */
#ifndef __SLV2_VALUE_H__ #ifndef __SLV2_VALUE_H__
#define __SLV2_VALUE_H__ #define __SLV2_VALUE_H__
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include <stdbool.h> #include <stdbool.h>
#include <slv2/types.h> #include "slv2/types.h"
/** \addtogroup slv2_data /** \addtogroup slv2_data
* @{ * @{
*/ */
/** Create a new URI value. /** Create a new URI value.
* *
* Returned value must be freed by called with slv2_value_free. * Returned value must be freed by called with slv2_value_free.
*/ */
SLV2Value SLV2Value
skipping to change at line 168 skipping to change at line 168
* Valid to call only if slv2_value_is_int(\a value) returns true. * Valid to call only if slv2_value_is_int(\a value) returns true.
* *
* Time = O(1) * Time = O(1)
*/ */
int int
slv2_value_as_int(SLV2Value value); slv2_value_as_int(SLV2Value value);
/** @} */ /** @} */
#ifdef __cplusplus #ifdef __cplusplus
} } /* extern "C" */
#endif #endif
#endif /* __SLV2_VALUE_H__ */ #endif /* __SLV2_VALUE_H__ */
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 values.h   values.h 
skipping to change at line 27 skipping to change at line 27
*/ */
#ifndef __SLV2_VALUES_H__ #ifndef __SLV2_VALUES_H__
#define __SLV2_VALUES_H__ #define __SLV2_VALUES_H__
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include <stdbool.h> #include <stdbool.h>
#include <slv2/value.h> #include "slv2/value.h"
/** \defgroup slv2_collections Collections of values/objects /** \defgroup slv2_collections Collections of values/objects
* *
* Ordered collections of typed values which are fast for random * Ordered collections of typed values which are fast for random
* access by index (i.e. a fancy array). * access by index (i.e. a fancy array).
* *
* @{ * @{
*/ */
/** Allocate a new, empty SLV2Values /** Allocate a new, empty SLV2Values
*/ */
SLV2Values SLV2Values
slv2_values_new(); slv2_values_new();
/** Free an SLV2Values. /** Free an SLV2Values.
*/ */
void void
slv2_values_free(SLV2Values); slv2_values_free(SLV2Values values);
/** Get the number of elements in a value collection. /** Get the number of elements in a value collection.
*/ */
unsigned unsigned
slv2_values_size(SLV2Values values); slv2_values_size(SLV2Values values);
/** Get the value at a given index in the collection. /** Get the value at a given index in the collection.
* *
* @return the element at \a index, or NULL if index is out of range. * @return the element at \a index, or NULL if index is out of range.
* *
skipping to change at line 71 skipping to change at line 71
/** Return whether \a values contains \a value. /** Return whether \a values contains \a value.
* *
* Time = O(n) * Time = O(n)
*/ */
bool bool
slv2_values_contains(SLV2Values values, SLV2Value value); slv2_values_contains(SLV2Values values, SLV2Value value);
/** @} */ /** @} */
#ifdef __cplusplus #ifdef __cplusplus
} } /* extern "C" */
#endif #endif
#endif /* __SLV2_VALUES_H__ */ #endif /* __SLV2_VALUES_H__ */
 End of changes. 3 change blocks. 
3 lines changed or deleted 3 lines changed or added


 world.h   world.h 
skipping to change at line 26 skipping to change at line 26
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#ifndef __SLV2_WORLD_H__ #ifndef __SLV2_WORLD_H__
#define __SLV2_WORLD_H__ #define __SLV2_WORLD_H__
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include <slv2/plugins.h>
#include <slv2/pluginclasses.h>
#include <librdf.h> #include <librdf.h>
#include "slv2/plugins.h"
#include "slv2/pluginclasses.h"
/** \defgroup slv2_world Global library state /** \defgroup slv2_world Global library state
* *
* The "world" represents all library state, and the data found in bundles' * The "world" represents all library state, and the data found in bundles'
* manifest.ttl (ie it is an in-memory index of all things LV2 found). * manifest.ttl (ie it is an in-memory index of all things LV2 found).
* Plugins (and plugin extensions) and the LV2 specification (and LV2 * Plugins (and plugin extensions) and the LV2 specification (and LV2
* extensions) itself can be queried from the world for use. * extensions) itself can be queried from the world for use.
* *
* Normal hosts which just want to easily load plugins by URI are strongly * Normal hosts which just want to easily load plugins by URI are strongly
* recommended to simply call \ref slv2_world_load_all to find all installe d * recommended to simply call \ref slv2_world_load_all to find all installe d
skipping to change at line 197 skipping to change at line 197
* destroyed until plugins are finished with. * destroyed until plugins are finished with.
*/ */
SLV2Plugins SLV2Plugins
slv2_world_get_plugins_by_query(SLV2World world, slv2_world_get_plugins_by_query(SLV2World world,
const char* query); const char* query);
#endif #endif
/** @} */ /** @} */
#ifdef __cplusplus #ifdef __cplusplus
} } /* extern "C" */
#endif #endif
#endif /* __SLV2_WORLD_H__ */ #endif /* __SLV2_WORLD_H__ */
 End of changes. 3 change blocks. 
3 lines changed or deleted 3 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/