summaryrefslogtreecommitdiffstats
path: root/ingen
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2012-03-16 16:55:33 +0000
committerDavid Robillard <d@drobilla.net>2012-03-16 16:55:33 +0000
commit7126f005be3e49818dafe0d2666b6745e09f8aff (patch)
tree0347d8408335429dde623cdfa5bb1a3a3c9f8620 /ingen
parent9da093217352daa1fb61a6f2daf5195640e286a7 (diff)
downloadingen-7126f005be3e49818dafe0d2666b6745e09f8aff.tar.gz
ingen-7126f005be3e49818dafe0d2666b6745e09f8aff.tar.bz2
ingen-7126f005be3e49818dafe0d2666b6745e09f8aff.zip
Remove ping() from interface, just use a get instead.
Add preliminary AtomWriter Interface. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4068 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'ingen')
-rw-r--r--ingen/Interface.hpp1
-rw-r--r--ingen/client/ClientStore.hpp1
-rw-r--r--ingen/client/SigClientInterface.hpp1
-rw-r--r--ingen/shared/ClashAvoider.hpp1
-rw-r--r--ingen/shared/LV2URIMap.hpp23
-rw-r--r--ingen/shared/URIs.hpp14
6 files changed, 20 insertions, 21 deletions
diff --git a/ingen/Interface.hpp b/ingen/Interface.hpp
index cdc37949..3f79e2de 100644
--- a/ingen/Interface.hpp
+++ b/ingen/Interface.hpp
@@ -75,7 +75,6 @@ public:
virtual void set_response_id(int32_t id) = 0;
// Requests
- virtual void ping() = 0;
virtual void get(const Raul::URI& uri) = 0;
// Response
diff --git a/ingen/client/ClientStore.hpp b/ingen/client/ClientStore.hpp
index dbba8e90..d26573ea 100644
--- a/ingen/client/ClientStore.hpp
+++ b/ingen/client/ClientStore.hpp
@@ -104,7 +104,6 @@ public:
void del(const Raul::URI& uri);
void set_response_id(int32_t id) {}
- void ping() {}
void get(const Raul::URI& uri) {}
void response(int32_t id, Status status) {}
void error(const std::string& msg) {}
diff --git a/ingen/client/SigClientInterface.hpp b/ingen/client/SigClientInterface.hpp
index afc4d66b..7a53a7f7 100644
--- a/ingen/client/SigClientInterface.hpp
+++ b/ingen/client/SigClientInterface.hpp
@@ -111,7 +111,6 @@ protected:
{ EMIT(property_change, subject, key, value); }
void set_response_id(int32_t id) {}
- void ping() {}
void get(const Raul::URI& uri) {}
};
diff --git a/ingen/shared/ClashAvoider.hpp b/ingen/shared/ClashAvoider.hpp
index 5c33d412..41c6c86c 100644
--- a/ingen/shared/ClashAvoider.hpp
+++ b/ingen/shared/ClashAvoider.hpp
@@ -77,7 +77,6 @@ public:
virtual void del(const Raul::URI& uri);
virtual void set_response_id(int32_t id) {}
- virtual void ping() {}
virtual void get(const Raul::URI& uri) {}
virtual void response(int32_t id, Status status) {}
virtual void error(const std::string& msg) {}
diff --git a/ingen/shared/LV2URIMap.hpp b/ingen/shared/LV2URIMap.hpp
index 70c47a12..01bbfb7d 100644
--- a/ingen/shared/LV2URIMap.hpp
+++ b/ingen/shared/LV2URIMap.hpp
@@ -55,30 +55,23 @@ public:
LV2_Feature _feature;
};
- class URIMapFeature : public Feature {
- public:
+ struct URIMapFeature : public Feature {
URIMapFeature(LV2URIMap* map);
-
- private:
- LV2_URI_Map_Feature _feature_data;
+ LV2_URI_Map_Feature uri_map;
};
- class URIDMapFeature : public Feature {
- public:
+ struct URIDMapFeature : public Feature {
URIDMapFeature(LV2URIMap* map, LV2_URID_Map* urid_map);
- LV2_URID map(const char* uri);
- private:
+ LV2_URID map(const char* uri);
static LV2_URID default_map(LV2_URID_Map_Handle h, const char* uri);
- LV2_URID_Map _feature_data;
+ LV2_URID_Map urid_map;
};
- class URIDUnmapFeature : public Feature {
- public:
+ struct URIDUnmapFeature : public Feature {
URIDUnmapFeature(LV2URIMap* map, LV2_URID_Unmap* urid_unmap);
- const char* unmap(const LV2_URID urid);
- private:
+ const char* unmap(const LV2_URID urid);
static const char* default_unmap(LV2_URID_Map_Handle h, LV2_URID uri);
- LV2_URID_Unmap _feature_data;
+ LV2_URID_Unmap urid_unmap;
};
SharedPtr<URIMapFeature> uri_map_feature() { return _uri_map_feature; }
diff --git a/ingen/shared/URIs.hpp b/ingen/shared/URIs.hpp
index a99e45d0..22c46f15 100644
--- a/ingen/shared/URIs.hpp
+++ b/ingen/shared/URIs.hpp
@@ -36,6 +36,7 @@ public:
struct Quark : public Raul::URI {
Quark(LV2URIMap* map, const char* str);
+ operator LV2_URID() const { return id; }
uint32_t id;
};
@@ -56,13 +57,17 @@ public:
const Quark cv_CVPort;
const Quark doap_name;
const Quark ev_EventPort;
+ const Quark ingen_Connection;
const Quark ingen_Internal;
const Quark ingen_Node;
const Quark ingen_Patch;
const Quark ingen_Port;
const Quark ingen_activity;
const Quark ingen_broadcast;
+ const Quark ingen_canvasX;
+ const Quark ingen_canvasY;
const Quark ingen_controlBinding;
+ const Quark ingen_destination;
const Quark ingen_document;
const Quark ingen_enabled;
const Quark ingen_engine;
@@ -72,9 +77,8 @@ public:
const Quark ingen_polyphony;
const Quark ingen_sampleRate;
const Quark ingen_selected;
+ const Quark ingen_source;
const Quark ingen_value;
- const Quark ingen_canvasX;
- const Quark ingen_canvasY;
const Quark lv2_AudioPort;
const Quark lv2_ControlPort;
const Quark lv2_InputPort;
@@ -98,6 +102,12 @@ public:
const Quark midi_NoteOn;
const Quark midi_controllerNumber;
const Quark midi_noteNumber;
+ const Quark patch_Get;
+ const Quark patch_Put;
+ const Quark patch_Response;
+ const Quark patch_body;
+ const Quark patch_request;
+ const Quark patch_subject;
const Quark rdf_instanceOf;
const Quark rdf_type;
const Quark rdfs_seeAlso;