vlc | branch: master | Hugo Beauzée-Luyssen <[email protected]> | Thu Dec 3 13:43:52 2015 +0100| [1095d828d764c4cbbb7c36282278e33635fb6d5a] | committer: Hugo Beauzée-Luyssen
upnp: Read the target url from p_access > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1095d828d764c4cbbb7c36282278e33635fb6d5a --- modules/services_discovery/upnp.cpp | 7 +++---- modules/services_discovery/upnp.hpp | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/modules/services_discovery/upnp.cpp b/modules/services_discovery/upnp.cpp index 8033eb4..860d428 100644 --- a/modules/services_discovery/upnp.cpp +++ b/modules/services_discovery/upnp.cpp @@ -621,8 +621,8 @@ int MediaServerList::Callback( Upnp_EventType event_type, void* p_event, void* p namespace Access { -MediaServer::MediaServer(const char *psz_url, access_t *p_access) - : url_( psz_url ) +MediaServer::MediaServer( access_t *p_access ) + : url_( p_access->psz_url ) , access_( p_access ) , xmlDocument_( NULL ) , containerNodeList_( NULL ) @@ -935,8 +935,7 @@ static int Open( vlc_object_t *p_this ) return VLC_ENOMEM; p_access->p_sys = p_sys; - p_sys->p_server = new(std::nothrow) MediaServer( p_access->psz_location, - p_access ); + p_sys->p_server = new(std::nothrow) MediaServer( p_access ); if ( !p_sys->p_server ) { delete p_sys; diff --git a/modules/services_discovery/upnp.hpp b/modules/services_discovery/upnp.hpp index 986cf9e..22449dd 100644 --- a/modules/services_discovery/upnp.hpp +++ b/modules/services_discovery/upnp.hpp @@ -120,7 +120,7 @@ namespace Access class MediaServer { public: - MediaServer( const char* psz_url, access_t* p_access ); + MediaServer( access_t* p_access ); ~MediaServer(); input_item_t* getNextItem(); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
