[vlc-commits] gui/skins2: ThemeLoader::unarchive: use vlc_stream_NewMRL

[Filip Roséen]

vlc | branch: master | Filip Roséen <filip at atch.se> | Fri Mar 17 03:22:34 2017 +0100| [c66a72f77c969317a3843b5d617074d2ffb0eb06] | committer: Hugo Beauzée-Luyssen

gui/skins2: ThemeLoader::unarchive: use vlc_stream_NewMRL

Signed-off-by: Hugo Beauzée-Luyssen <hugo at beauzee.fr>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c66a72f77c969317a3843b5d617074d2ffb0eb06
---

 modules/gui/skins2/src/theme_loader.cpp | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/modules/gui/skins2/src/theme_loader.cpp b/modules/gui/skins2/src/theme_loader.cpp
index a7aa5138cb..ee69776ac9 100644
--- a/modules/gui/skins2/src/theme_loader.cpp
+++ b/modules/gui/skins2/src/theme_loader.cpp
@@ -240,24 +240,12 @@ bool ThemeLoader::unarchive( const std::string& fileName, const std::string &tem
         for( int i = 0; i < node->i_children; ++i )
         {
             auto child = node->pp_children[i]->p_item;
-            auto child_stream = make_stream_ptr( vlc_stream_NewURL( getIntf(), uri.get() ) );
+            auto child_stream = make_stream_ptr( vlc_stream_NewMRL( getIntf(), child->psz_uri ) );
             if( !child_stream )
             {
                 msg_Err( getIntf(), "unable to open %s for reading", child->psz_name );
             }
 
-            stream_t* stream = child_stream.get();
-            if( vlc_stream_extractor_Attach( &stream, child->psz_name, NULL ) )
-            {
-                msg_Err( getIntf(), "unable to locate %s within %s",
-                         child->psz_name, fileName.c_str() );
-
-                return false;
-            }
-
-            child_stream.release();
-            child_stream.reset( stream );
-
             auto out_path = tempPath + "/" + child->psz_name;
 
             { /* create directory tree */