From e6abc21f9bde66d8f60078493354ba3713f9fcd8 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Thu, 25 Feb 2021 15:48:04 -0500
Subject: Simplify reader interface

---
 include/serd/serd.h | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

(limited to 'include/serd')

diff --git a/include/serd/serd.h b/include/serd/serd.h
index 9c205d26..d51adebe 100644
--- a/include/serd/serd.h
+++ b/include/serd/serd.h
@@ -954,11 +954,12 @@ void
 serd_reader_set_default_graph(SerdReader* SERD_NONNULL      reader,
                               const SerdNode* SERD_NULLABLE graph);
 
-/// Read a file at a given `uri`
+/// Prepare to read from the file at a local file `uri`
 SERD_API
 SerdStatus
-serd_reader_read_file(SerdReader* SERD_NONNULL reader,
-                      const char* SERD_NONNULL uri);
+serd_reader_start_file(SerdReader* SERD_NONNULL reader,
+                       const char* SERD_NONNULL uri,
+                       bool                     bulk);
 
 /**
    Prepare to read from a stream.
@@ -1004,18 +1005,20 @@ SERD_API
 SerdStatus
 serd_reader_read_document(SerdReader* SERD_NONNULL reader);
 
-/// Finish reading from the source
-SERD_API
-SerdStatus
-serd_reader_end_stream(SerdReader* SERD_NONNULL reader);
+/**
+   Finish reading from the source.
 
-/// Read `utf8`
+   This should be called before starting to read from another source.
+*/
 SERD_API
 SerdStatus
-serd_reader_read_string(SerdReader* SERD_NONNULL reader,
-                        const char* SERD_NONNULL utf8);
+serd_reader_finish(SerdReader* SERD_NONNULL reader);
 
-/// Free `reader`
+/**
+   Free `reader`.
+
+   The reader will be finished via `serd_reader_finish()` if necessary.
+*/
 SERD_API
 void
 serd_reader_free(SerdReader* SERD_NULLABLE reader);
-- 
cgit v1.2.1