summaryrefslogtreecommitdiffstats
path: root/src/SocketWriter.cpp
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2016-09-18 01:51:47 -0400
committerDavid Robillard <d@drobilla.net>2016-09-18 01:51:47 -0400
commit758543f6dbb56755d3239c0ed68f1083384f0e96 (patch)
tree082133b95e44d32a84427d028aeca6498b79348d /src/SocketWriter.cpp
parent5fdc95a70e03e41777f4a023f222f537110a70b1 (diff)
downloadingen-758543f6dbb56755d3239c0ed68f1083384f0e96.tar.gz
ingen-758543f6dbb56755d3239c0ed68f1083384f0e96.tar.bz2
ingen-758543f6dbb56755d3239c0ed68f1083384f0e96.zip
Factor out text writing from socket writing
Diffstat (limited to 'src/SocketWriter.cpp')
-rw-r--r--src/SocketWriter.cpp90
1 files changed, 11 insertions, 79 deletions
diff --git a/src/SocketWriter.cpp b/src/SocketWriter.cpp
index f58207de..1a628ac0 100644
--- a/src/SocketWriter.cpp
+++ b/src/SocketWriter.cpp
@@ -19,107 +19,39 @@
#include <sys/socket.h>
#include "ingen/SocketWriter.hpp"
-#include "ingen/URIMap.hpp"
#ifndef MSG_NOSIGNAL
# define MSG_NOSIGNAL 0
#endif
-#define USTR(s) ((const uint8_t*)(s))
-
namespace Ingen {
-static size_t
-socket_sink(const void* buf, size_t len, void* stream)
-{
- SocketWriter* writer = (SocketWriter*)stream;
- ssize_t ret = send(writer->fd(), buf, len, MSG_NOSIGNAL);
- if (ret < 0) {
- return 0;
- }
- return ret;
-}
-
-static SerdStatus
-write_prefix(void* handle, const SerdNode* name, const SerdNode* uri)
-{
- SocketWriter* writer = (SocketWriter*)handle;
- serd_writer_set_prefix(writer->writer(), name, uri);
- return SERD_SUCCESS;
-}
-
SocketWriter::SocketWriter(URIMap& map,
URIs& uris,
const Raul::URI& uri,
SPtr<Raul::Socket> sock)
- : AtomWriter(map, uris, *this)
- , _map(map)
- , _sratom(sratom_new(&map.urid_map_feature()->urid_map))
- , _uri(uri)
+ : TurtleWriter(map, uris, uri)
, _socket(sock)
-{
- // Use <ingen:/> as base URI, so relative URIs are like bundle paths
- _base = serd_node_from_string(SERD_URI, (const uint8_t*)"ingen:/");
-
- serd_uri_parse(_base.buf, &_base_uri);
+{}
- // Set up serialisation environment
- _env = serd_env_new(&_base);
- serd_env_set_prefix_from_strings(_env, USTR("atom"), USTR("http://lv2plug.in/ns/ext/atom#"));
- serd_env_set_prefix_from_strings(_env, USTR("doap"), USTR("http://usefulinc.com/ns/doap#"));
- serd_env_set_prefix_from_strings(_env, USTR("ingen"), USTR(INGEN_NS));
- serd_env_set_prefix_from_strings(_env, USTR("lv2"), USTR("http://lv2plug.in/ns/lv2core#"));
- serd_env_set_prefix_from_strings(_env, USTR("midi"), USTR("http://lv2plug.in/ns/ext/midi#"));
- serd_env_set_prefix_from_strings(_env, USTR("owl"), USTR("http://www.w3.org/2002/07/owl#"));
- serd_env_set_prefix_from_strings(_env, USTR("patch"), USTR("http://lv2plug.in/ns/ext/patch#"));
- serd_env_set_prefix_from_strings(_env, USTR("rdf"), USTR("http://www.w3.org/1999/02/22-rdf-syntax-ns#"));
- serd_env_set_prefix_from_strings(_env, USTR("rdfs"), USTR("http://www.w3.org/2000/01/rdf-schema#"));
- serd_env_set_prefix_from_strings(_env, USTR("xsd"), USTR("http://www.w3.org/2001/XMLSchema#"));
-
- // Make a Turtle writer that writes directly to the socket
- _writer = serd_writer_new(
- SERD_TURTLE,
- (SerdStyle)(SERD_STYLE_RESOLVED|SERD_STYLE_ABBREVIATED|SERD_STYLE_CURIED),
- _env,
- &_base_uri,
- socket_sink,
- this);
-
- // Write namespace prefixes to reduce traffic
- serd_env_foreach(_env, write_prefix, this);
-
- // Configure sratom to write directly to the writer (and thus the socket)
- sratom_set_sink(_sratom,
- (const char*)_base.buf,
- (SerdStatementSink)serd_writer_write_statement,
- (SerdEndSink)serd_writer_end_anon,
- _writer);
-}
-
-SocketWriter::~SocketWriter()
-{
- sratom_free(_sratom);
- serd_writer_free(_writer);
- serd_env_free(_env);
-}
-
-bool
-SocketWriter::write(const LV2_Atom* msg)
+size_t
+SocketWriter::text_sink(const void* buf, size_t len)
{
- sratom_write(_sratom, &_map.urid_unmap_feature()->urid_unmap, 0,
- NULL, NULL, msg->type, msg->size, LV2_ATOM_BODY_CONST(msg));
- serd_writer_finish(_writer);
- return true;
+ ssize_t ret = send(_socket->fd(), buf, len, MSG_NOSIGNAL);
+ if (ret < 0) {
+ return 0;
+ }
+ return ret;
}
void
SocketWriter::bundle_end()
{
- AtomWriter::bundle_end();
+ TurtleWriter::bundle_end();
// Send a NULL byte to indicate end of bundle
const char end[] = { 0 };
- send(fd(), end, 1, MSG_NOSIGNAL);
+ send(_socket->fd(), end, 1, MSG_NOSIGNAL);
}
} // namespace Ingen