Reduce usage of api_config header

Author: tstenner

src/data_receiver.cpp

@@ -1,4 +1,5 @@
 #include "data_receiver.h"
+#include "api_config.h"
 #include "cancellable_streambuf.h"
 #include "sample.h"
 #include "socket_utils.h"

src/socket_utils.cpp

@@ -1,4 +1,5 @@
 #include "socket_utils.h"
+#include "api_config.h"
 #include "common.h"
 #include <boost/endian/conversion.hpp>
 #include <boost/system/system_error.hpp>

src/socket_utils.h

@@ -1,7 +1,6 @@
 #ifndef SOCKET_UTILS_H
 #define SOCKET_UTILS_H
 
-#include "api_config.h"
 #include <boost/asio/detail/chrono.hpp>
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/asio/ip/udp.hpp>

src/stream_outlet_impl.cpp

@@ -1,12 +1,14 @@
 #include "stream_outlet_impl.h"
+#include "api_config.h"
 #include "tcp_server.h"
 #include "udp_server.h"
 #include <memory>
 #include <sstream>
 
-using namespace lsl;
 using namespace lslboost::asio;
 
+namespace lsl {
+
 stream_outlet_impl::stream_outlet_impl(
 	const stream_info_impl &info, int chunk_size, int max_capacity)
 	: sample_factory_(std::make_shared<factory>(info.channel_format(), info.channel_count(),
@@ -135,8 +137,35 @@ stream_outlet_impl::~stream_outlet_impl() {
 	} catch (...) { LOG_F(ERROR, "Severe error during stream outlet shutdown."); }
 }
 
+void stream_outlet_impl::push_numeric_raw(const void *data, double timestamp, bool pushthrough) {
+	if (lsl::api_config::get_instance()->force_default_timestamps()) timestamp = 0.0;
+	sample_p smp(
+		sample_factory_->new_sample(timestamp == 0.0 ? lsl_clock() : timestamp, pushthrough));
+	smp->assign_untyped(data);
+	send_buffer_->push_sample(smp);
+}
+
 bool stream_outlet_impl::have_consumers() { return send_buffer_->have_consumers(); }
 
 bool stream_outlet_impl::wait_for_consumers(double timeout) {
 	return send_buffer_->wait_for_consumers(timeout);
 }
+
+template <class T>
+void stream_outlet_impl::enqueue(const T *data, double timestamp, bool pushthrough) {
+	if (lsl::api_config::get_instance()->force_default_timestamps()) timestamp = 0.0;
+	sample_p smp(
+		sample_factory_->new_sample(timestamp == 0.0 ? lsl_clock() : timestamp, pushthrough));
+	smp->assign_typed(data);
+	send_buffer_->push_sample(smp);
+}
+
+template void stream_outlet_impl::enqueue<char>(const char *data, double, bool);
+template void stream_outlet_impl::enqueue<int16_t>(const int16_t *data, double, bool);
+template void stream_outlet_impl::enqueue<int32_t>(const int32_t *data, double, bool);
+template void stream_outlet_impl::enqueue<int64_t>(const int64_t *data, double, bool);
+template void stream_outlet_impl::enqueue<float>(const float *data, double, bool);
+template void stream_outlet_impl::enqueue<double>(const double *data, double, bool);
+template void stream_outlet_impl::enqueue<std::string>(const std::string *data, double, bool);
+
+} // namespace lsl

src/stream_outlet_impl.h

@@ -1,7 +1,6 @@
 #ifndef STREAM_OUTLET_IMPL_H
 #define STREAM_OUTLET_IMPL_H
 
-#include "api_config.h"
 #include "common.h"
 #include "forward.h"
 #include "sample.h"
@@ -162,13 +161,7 @@ class stream_outlet_impl {
 	 * @param pushthrough Whether to push the sample through to the receivers instead of buffering
 	 * it into a chunk according to network speeds.
 	 */
-	void push_numeric_raw(const void *data, double timestamp = 0.0, bool pushthrough = true) {
-		if (lsl::api_config::get_instance()->force_default_timestamps()) timestamp = 0.0;
-		sample_p smp(
-			sample_factory_->new_sample(timestamp == 0.0 ? lsl_clock() : timestamp, pushthrough));
-		smp->assign_untyped(data);
-		send_buffer_->push_sample(smp);
-	}
+	void push_numeric_raw(const void *data, double timestamp = 0.0, bool pushthrough = true);
 
 	//
 	// === Pushing an chunk of samples into the outlet ===
@@ -300,17 +293,8 @@ class stream_outlet_impl {
 	/// Instantiate a new server stack.
 	void instantiate_stack(tcp tcp_protocol, udp udp_protocol);
 
-	/// Run the given io_context
-	void run_io(io_context_p &ios);
-
 	/// Allocate and enqueue a new sample into the send buffer.
-	template <class T> void enqueue(T *data, double timestamp, bool pushthrough) {
-		if (lsl::api_config::get_instance()->force_default_timestamps()) timestamp = 0.0;
-		sample_p smp(
-			sample_factory_->new_sample(timestamp == 0.0 ? lsl_clock() : timestamp, pushthrough));
-		smp->assign_typed(data);
-		send_buffer_->push_sample(smp);
-	}
+	template <class T> void enqueue(const T *data, double timestamp, bool pushthrough);
 
 	/**
 	 * Check whether some given number of channels matches the stream's channel_count.

src/tcp_server.cpp

@@ -1,4 +1,5 @@
 #include "tcp_server.h"
+#include "api_config.h"
 #include "cast.h"
 #include "consumer_queue.h"
 #include "sample.h"