From ea00856f9480abca0aa4510e09770d843176ef07 Mon Sep 17 00:00:00 2001
From: "Claudius \"keldu\" Holeksa" <mail@keldu.de>
Date: Sat, 20 Jul 2024 19:08:13 +0200
Subject: wip

---
 default.nix                           |  3 ---
 modules/io_codec/c++/io_peer.hpp      | 14 +++++++-------
 modules/io_codec/c++/io_peer.tmpl.hpp |  2 +-
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/default.nix b/default.nix
index 3e6017e..f6d5818 100644
--- a/default.nix
+++ b/default.nix
@@ -146,12 +146,9 @@ in rec {
 		name = "forstio-unstable-${version}";
 		paths = [
 			forstio.remote-sycl
-			forstio.io_codec
 			forstio.thread
 			forstio.crypto
 			# forstio.codec-minecraft
 		];
 	};
-
-
 }
diff --git a/modules/io_codec/c++/io_peer.hpp b/modules/io_codec/c++/io_peer.hpp
index 91c6488..f576cbe 100644
--- a/modules/io_codec/c++/io_peer.hpp
+++ b/modules/io_codec/c++/io_peer.hpp
@@ -8,7 +8,7 @@
 namespace saw {
 
 template <typename Incoming, typename Outgoing,
-		  typename Encoding,
+		  typename TransportEncoding, typename ContentEncoding,
 		  typename BufferT = ring_buffer>
 class streaming_io_peer {
 public:
@@ -50,7 +50,7 @@ private:
 		: public conveyor_feeder<data<Outgoing, Encoding>> {
 	public:
 		peer_conveyor_feeder(
-			streaming_io_peer<Incoming, Outgoing, Encoding, BufferT> &peer_)
+			streaming_io_peer<Incoming, Outgoing, TransportEncoding, ContentEncoding, BufferT> &peer_)
 			: peer_{peer_} {}
 
 		void feed(data<Outgoing, Encoding> &&data_) override {
@@ -65,7 +65,7 @@ private:
 	
 		error_or<void> swap(conveyor<data<Outgoing, Encoding>> &&conveyor) noexcept override { return make_error<err::not_implemented>();}
 	private:
-		streaming_io_peer<Incoming, Outgoing, Encoding,
+		streaming_io_peer<Incoming, Outgoing, TransportEncoding, ContentEncoding,
 						  BufferT> &peer_;
 	};
 
@@ -75,8 +75,8 @@ private:
 
 	own<async_io_stream> io_stream_;
 
-	codec<Incoming, Encoding> in_codec_;
-	codec<Outgoing, Encoding> out_codec_;
+	codec<Incoming, TransportEncoding> in_codec_;
+	codec<Outgoing, TransportEncoding> out_codec_;
 
 	BufferT in_buffer_;
 	BufferT out_buffer_;
@@ -92,9 +92,9 @@ private:
  * This is a convenience wrapper intended for a faster setup of this class
  */
 template <typename Incoming, typename Outgoing,
-		  typename Encoding,
+		  typename TransportEncoding, typename ContentEncoding,
 		  typename BufferT = ring_buffer>
-std::pair<own<streaming_io_peer<Incoming, Outgoing, Encoding, BufferT>>,
+std::pair<own<streaming_io_peer<Incoming, Outgoing, TransportEncoding, ContentEncoding, BufferT>>,
 		  conveyor<data<Incoming, Encoding>>>
 new_streaming_io_peer(own<async_io_stream> stream);
 
diff --git a/modules/io_codec/c++/io_peer.tmpl.hpp b/modules/io_codec/c++/io_peer.tmpl.hpp
index a3ef9b6..2babb1c 100644
--- a/modules/io_codec/c++/io_peer.tmpl.hpp
+++ b/modules/io_codec/c++/io_peer.tmpl.hpp
@@ -9,7 +9,7 @@ streaming_io_peer<Incoming, Outgoing, Encoding,
 		own<async_io_stream> str)
 	: streaming_io_peer{std::move(feed), std::move(str), {}, {}, {}, {}} {}
 
-template <typename Incoming, typename Outgoing, typename Encoding, typename BufferT>
+template <typename Incoming, typename Outgoing, typename TransportEncoding, ContentEncoding, typename BufferT>
 streaming_io_peer<Incoming, Outgoing, Encoding,
 				  BufferT>::
 	streaming_io_peer(
-- 
cgit v1.2.3