From ac4b83732861796ceade108bed3e96e337c8c10a Mon Sep 17 00:00:00 2001
From: Niels Sascha Reedijk <niels.reedijk@gmail.com>
Date: Fri, 22 Jan 2021 20:30:38 +0000
Subject: [PATCH] http_streamer: switch to libnetservices.a

Switch to the experimental services API as the copy in libbnetapi.so is
deprecated.

Change-Id: I57d76b1d1be5c957221cc2d77d148fadbac2a642
Reviewed-on: https://review.haiku-os.org/c/haiku/+/3668
Reviewed-by: Adrien Destugues <pulkomandy@gmail.com>
---
 src/add-ons/media/plugins/http_streamer/HTTPMediaIO.cpp | 2 ++
 src/add-ons/media/plugins/http_streamer/HTTPMediaIO.h   | 3 +--
 src/add-ons/media/plugins/http_streamer/Jamfile         | 6 ++----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/add-ons/media/plugins/http_streamer/HTTPMediaIO.cpp b/src/add-ons/media/plugins/http_streamer/HTTPMediaIO.cpp
index 1cabcd2211..fd42b94013 100644
--- a/src/add-ons/media/plugins/http_streamer/HTTPMediaIO.cpp
+++ b/src/add-ons/media/plugins/http_streamer/HTTPMediaIO.cpp
@@ -16,6 +16,8 @@
 // 10 seconds timeout
 #define HTTP_TIMEOUT 10000000
 
+using namespace BPrivate::Network;
+
 
 class FileListener : public BUrlProtocolListener {
 public:
diff --git a/src/add-ons/media/plugins/http_streamer/HTTPMediaIO.h b/src/add-ons/media/plugins/http_streamer/HTTPMediaIO.h
index e917391d24..4fe8c75e35 100644
--- a/src/add-ons/media/plugins/http_streamer/HTTPMediaIO.h
+++ b/src/add-ons/media/plugins/http_streamer/HTTPMediaIO.h
@@ -9,7 +9,6 @@
 #include <AdapterIO.h>
 #include <FileRequest.h>
 #include <Url.h>
-#include <UrlContext.h>
 #include <UrlProtocolAsynchronousListener.h>
 
 
@@ -40,7 +39,7 @@ protected:
 
 	friend class FileListener;
 private:
-	BUrlRequest*						fReq;
+	BPrivate::Network::BUrlRequest*		fReq;
 	FileListener*						fListener;
 	thread_id							fReqThread;
 
diff --git a/src/add-ons/media/plugins/http_streamer/Jamfile b/src/add-ons/media/plugins/http_streamer/Jamfile
index bc9031dbde..6af42df175 100644
--- a/src/add-ons/media/plugins/http_streamer/Jamfile
+++ b/src/add-ons/media/plugins/http_streamer/Jamfile
@@ -3,16 +3,14 @@ SubDir HAIKU_TOP src add-ons media plugins http_streamer ;
 UsePrivateHeaders media netservices shared ;
 UsePrivateHeaders [ FDirName media experimental ] ;
 
-# Use the deprecated libnetapi.so classes
-SubDirC++Flags [ FDefines LIBNETAPI_DEPRECATED ] ;
-
 local architectureObject ;
 for architectureObject in [ MultiArchSubDirSetup ] {
 	on $(architectureObject) {
 		Addon [ MultiArchDefaultGristFiles http_streamer ] :
 			HTTPStreamerPlugin.cpp
 			HTTPMediaIO.cpp
-			: be media bnetapi shared
+			: [ MultiArchDefaultGristFiles libnetservices.a ]
+			be media bnetapi shared
 			[ TargetLibsupc++ ]
 		;
 	}