From 97b083ac833ada3c18a5639ee782e575ca583acf Mon Sep 17 00:00:00 2001 From: methodus Date: Sat, 29 Sep 2012 22:48:30 +0200 Subject: Streamer almost completed. First tests successful. However, there are no plugins, yet. --- include/media/mediaManager.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'include/media') diff --git a/include/media/mediaManager.h b/include/media/mediaManager.h index 7e97799..09b3919 100644 --- a/include/media/mediaManager.h +++ b/include/media/mediaManager.h @@ -14,6 +14,7 @@ #include #include #include +#include "../../include/plugin.h" #include "../../include/tools.h" namespace upnp { @@ -32,12 +33,12 @@ private: cResourceStreamer(cMediaManager* manager, cUPnPResourceProvider* provider, cMetadata::Resource* resource); public: + virtual ~cResourceStreamer(); std::string GetContentFeatures() const; size_t GetContentLength() const; std::string GetContentType() const; std::string GetTransferMode(const std::string& requestedMode ) const; - std::string GetRange() const; - std::string GetAvailableSeekRange(const std::string& seekRequest) const; + bool Seekable() const; bool Open(string uri); size_t Read(char* buf, size_t bufLen); @@ -92,9 +93,9 @@ public: int Browse(BrowseRequest& request); int Search(SearchRequest& request); - static BrowseFlag ToBrowseFlag(std::string browseFlag); + static BrowseFlag ToBrowseFlag(const std::string& browseFlag); - cResourceStreamer* GetResourceStreamer(std::string objectID); + cResourceStreamer* GetResourceStreamer(const std::string& objectID, int resourceID = 0); private: @@ -105,6 +106,8 @@ private: void OnContainerUpdate(string uri, long updateID); + cUPnPResourceProvider* CreateResourceProvider(const std::string& uri); + uint32_t mSystemUpdateID; IdList mEventedContainerUpdateIDs; StringList mScanDirectories; -- cgit v1.2.3