From Niels Sascha Reedijk <niels.reedijk@xxxxxxxxx>:
Niels Sascha Reedijk has uploaded this change for review. (
https://review.haiku-os.org/c/haiku/+/3668 ;)
Change subject: http_streamer: switch to libnetservices.a
......................................................................
http_streamer: switch to libnetservices.a
Switch to the experimental services API as the copy in libbnetapi.so is
deprecated.
---
M src/add-ons/media/plugins/http_streamer/HTTPMediaIO.cpp
M src/add-ons/media/plugins/http_streamer/HTTPMediaIO.h
M src/add-ons/media/plugins/http_streamer/Jamfile
3 files changed, 5 insertions(+), 6 deletions(-)
git pull ssh://git.haiku-os.org:22/haiku refs/changes/68/3668/1
diff --git a/src/add-ons/media/plugins/http_streamer/HTTPMediaIO.cpp
b/src/add-ons/media/plugins/http_streamer/HTTPMediaIO.cpp
index 1cabcd2..58d19ab 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 HaikuExt;
+
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 e917391..da9e74c 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 @@
friend class FileListener;
private:
- BUrlRequest* fReq;
+ HaikuExt::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 bc9031d..6af42df 100644
--- a/src/add-ons/media/plugins/http_streamer/Jamfile
+++ b/src/add-ons/media/plugins/http_streamer/Jamfile
@@ -3,16 +3,14 @@
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++ ]
;
}
--
To view, visit https://review.haiku-os.org/c/haiku/+/3668
To unsubscribe, or for help writing mail filters, visit
https://review.haiku-os.org/settings
Gerrit-Project: haiku
Gerrit-Branch: master
Gerrit-Change-Id: I57d76b1d1be5c957221cc2d77d148fadbac2a642
Gerrit-Change-Number: 3668
Gerrit-PatchSet: 1
Gerrit-Owner: Niels Sascha Reedijk <niels.reedijk@xxxxxxxxx>
Gerrit-MessageType: newchange
