From f080f9da70c8c25aa104f248704d3c7b0c2974ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Mangano-Tarumi?= <fmang@mg0.fr>
Date: Sat, 8 Dec 2018 10:59:07 -0500
Subject: [PATCH] =?UTF-8?q?ogg=5Fstream=20=E2=86=92=20ogg=5Flogical=5Fstre?=
 =?UTF-8?q?am?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/ogg.cc     |  4 ++--
 src/opustags.h | 11 +++++------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/ogg.cc b/src/ogg.cc
index d144f92..a8fd51f 100644
--- a/src/ogg.cc
+++ b/src/ogg.cc
@@ -37,7 +37,7 @@ ot::status ot::ogg_reader::read_header_packet(const std::function<status(ogg_pac
 {
 	if (ogg_page_continued(&page))
 		return {ot::st::error, "Unexpected continued header page."};
-	ogg_stream stream(ogg_page_serialno(&page));
+	ogg_logical_stream stream(ogg_page_serialno(&page));
 	stream.pageno = ogg_page_pageno(&page);
 	if (ogg_stream_pagein(&stream, &page) != 0)
 		return {st::libogg_error, "ogg_stream_pagein failed."};
@@ -75,7 +75,7 @@ ot::status ot::ogg_writer::write_page(const ogg_page& page)
 
 ot::status ot::ogg_writer::write_header_packet(int serialno, int pageno, ogg_packet& packet)
 {
-	ogg_stream stream(serialno);
+	ogg_logical_stream stream(serialno);
 	stream.b_o_s = (pageno != 0);
 	stream.pageno = pageno;
 	if (ogg_stream_packetin(&stream, &packet) != 0)
diff --git a/src/opustags.h b/src/opustags.h
index e66c3e5..26c0b96 100644
--- a/src/opustags.h
+++ b/src/opustags.h
@@ -136,22 +136,21 @@ private:
  */
 
 /** RAII-aware wrapper around libogg's ogg_stream_state. */
-struct ogg_stream : ogg_stream_state {
-	ogg_stream(int serialno) {
+struct ogg_logical_stream : ogg_stream_state {
+	ogg_logical_stream(int serialno) {
 		if (ogg_stream_init(this, serialno) != 0)
 			throw std::bad_alloc();
 	}
-	~ogg_stream() {
+	~ogg_logical_stream() {
 		ogg_stream_clear(this);
 	}
 };
 
 /**
- * Ogg reader, combining a FILE input, an ogg_sync_state reading the pages, and an ogg_stream_state
- * extracting the packets from the page.
+ * Ogg reader, combining a FILE input, an ogg_sync_state reading the pages.
  *
  * Call #read_page repeatedly until #status::end_of_stream to consume the stream, and use #page to
- * check its content. To extract its packets, call #read_packet until #status::end_of_packet.
+ * check its content.
  */
 struct ogg_reader {
 	/**