i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

http_streamer: switch to libnetservices.a

Browse Source 
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 <[email protected]>
This commit is contained in:
Niels Sascha Reedijk
2021-01-27 19:53:11 +00:00
parent ce64ffdb90
commit ac4b837328
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/media/plugins/http_streamer/HTTPMediaIO.cpp
+2
View File
@@ -16,6 +16,8 @@
// 10 seconds timeout // 10 seconds timeout
#define HTTP_TIMEOUT 10000000 #define HTTP_TIMEOUT 10000000
using namespace BPrivate::Network;
class FileListener : public BUrlProtocolListener { class FileListener : public BUrlProtocolListener {
public: public:
src/add-ons/media/plugins/http_streamer/HTTPMediaIO.h
+1 -2
View File
@@ -9,7 +9,6 @@
#include <AdapterIO.h> #include <AdapterIO.h>
#include <FileRequest.h> #include <FileRequest.h>
#include <Url.h> #include <Url.h>
#include <UrlContext.h>
#include <UrlProtocolAsynchronousListener.h> #include <UrlProtocolAsynchronousListener.h>
@@ -40,7 +39,7 @@ protected:
friend class FileListener; friend class FileListener;
private: private:
BUrlRequest* fReq; BPrivate::Network::BUrlRequest* fReq;
FileListener* fListener; FileListener* fListener;
thread_id fReqThread; thread_id fReqThread;
src/add-ons/media/plugins/http_streamer/Jamfile
+2 -4
View File
@@ -3,16 +3,14 @@ SubDir HAIKU_TOP src add-ons media plugins http_streamer ;
UsePrivateHeaders media netservices shared ; UsePrivateHeaders media netservices shared ;
UsePrivateHeaders [ FDirName media experimental ] ; UsePrivateHeaders [ FDirName media experimental ] ;
# Use the deprecated libnetapi.so classes
SubDirC++Flags [ FDefines LIBNETAPI_DEPRECATED ] ;
local architectureObject ; local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] { for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) { on $(architectureObject) {
Addon [ MultiArchDefaultGristFiles http_streamer ] : Addon [ MultiArchDefaultGristFiles http_streamer ] :
HTTPStreamerPlugin.cpp HTTPStreamerPlugin.cpp
HTTPMediaIO.cpp HTTPMediaIO.cpp
: be media bnetapi shared : [ MultiArchDefaultGristFiles libnetservices.a ]
be media bnetapi shared
[ TargetLibsupc++ ] [ TargetLibsupc++ ]
; ;
} }