Commit f8d955ad authored by Hanspeter Portner's avatar Hanspeter Portner

fixed for updated osc.lv2.

parent 75efcc95
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include <sherlock.h> #include <sherlock.h>
#include <lv2_osc.h> #include <osc.lv2/util.h>
typedef struct _handle_t handle_t; typedef struct _handle_t handle_t;
...@@ -34,7 +34,7 @@ struct _handle_t { ...@@ -34,7 +34,7 @@ struct _handle_t {
LV2_URID time_position; LV2_URID time_position;
LV2_URID time_frame; LV2_URID time_frame;
osc_forge_t oforge; LV2_OSC_URID osc_urid;
int64_t frame; int64_t frame;
}; };
...@@ -62,7 +62,7 @@ instantiate(const LV2_Descriptor* descriptor, double rate, ...@@ -62,7 +62,7 @@ instantiate(const LV2_Descriptor* descriptor, double rate,
handle->time_position = handle->map->map(handle->map->handle, LV2_TIME__Position); handle->time_position = handle->map->map(handle->map->handle, LV2_TIME__Position);
handle->time_frame = handle->map->map(handle->map->handle, LV2_TIME__frame); handle->time_frame = handle->map->map(handle->map->handle, LV2_TIME__frame);
osc_forge_init(&handle->oforge, handle->map); lv2_osc_urid_init(&handle->osc_urid, handle->map);
lv2_atom_forge_init(&handle->forge, handle->map); lv2_atom_forge_init(&handle->forge, handle->map);
return handle; return handle;
...@@ -147,8 +147,7 @@ run(LV2_Handle instance, uint32_t nsamples) ...@@ -147,8 +147,7 @@ run(LV2_Handle instance, uint32_t nsamples)
{ {
const LV2_Atom_Object *obj = (const LV2_Atom_Object *)&ev->body; const LV2_Atom_Object *obj = (const LV2_Atom_Object *)&ev->body;
if( osc_atom_is_bundle(&handle->oforge, obj) if(lv2_osc_is_message_or_bundle_type(&handle->osc_urid, obj->body.otype))
|| osc_atom_is_message(&handle->oforge, obj) )
{ {
has_osc = true; has_osc = true;
if(ref) if(ref)
......
This diff is collapsed.
...@@ -111,7 +111,7 @@ sherlock:osc_inspector_1_ui ...@@ -111,7 +111,7 @@ sherlock:osc_inspector_1_ui
ui:notifyType osc:Event ; ui:notifyType osc:Event ;
ui:protocol atom:eventTransfer ui:protocol atom:eventTransfer
] ; ] ;
lv2:requiredFeature ui:idleInterface, urid:map ; lv2:requiredFeature ui:idleInterface, urid:map, urid:unmap ;
lv2:extensionData ui:idleInterface, ui:showInterface . lv2:extensionData ui:idleInterface, ui:showInterface .
sherlock:osc_inspector_2_kx sherlock:osc_inspector_2_kx
...@@ -122,7 +122,7 @@ sherlock:osc_inspector_2_kx ...@@ -122,7 +122,7 @@ sherlock:osc_inspector_2_kx
ui:notifyType osc:Event ; ui:notifyType osc:Event ;
ui:protocol atom:eventTransfer ui:protocol atom:eventTransfer
] ; ] ;
lv2:requiredFeature kx:Host, urid:map . lv2:requiredFeature kx:Host, urid:map, urid:unmap .
sherlock:osc_inspector_3_eo sherlock:osc_inspector_3_eo
a ui:EoUI ; a ui:EoUI ;
...@@ -132,4 +132,4 @@ sherlock:osc_inspector_3_eo ...@@ -132,4 +132,4 @@ sherlock:osc_inspector_3_eo
ui:notifyType osc:Event ; ui:notifyType osc:Event ;
ui:protocol atom:eventTransfer ui:protocol atom:eventTransfer
] ; ] ;
lv2:requiredFeature urid:map . lv2:requiredFeature urid:map, urid:unmap .
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment