vlc | branch: master | Jean-Baptiste Kempf <[email protected]> | Mon Jul 25 22:28:13 2016 +0200| [b0763eaca83a52477b48b30989250e7d7647037e] | committer: Jean-Baptiste Kempf
lua: remove remanents of metachannels > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b0763eaca83a52477b48b30989250e7d7647037e --- modules/gui/qt/Makefile.am | 1 - .../playlist/sidebar-icons/sd/metachannels.svgz | Bin 2942 -> 0 bytes modules/gui/qt/vlc.qrc | 1 - share/Makefile.am | 5 +- share/lua/playlist/metachannels.lua | 60 --------------------- 5 files changed, 1 insertion(+), 66 deletions(-) diff --git a/modules/gui/qt/Makefile.am b/modules/gui/qt/Makefile.am index 5db060e..fce1ce9 100644 --- a/modules/gui/qt/Makefile.am +++ b/modules/gui/qt/Makefile.am @@ -327,7 +327,6 @@ DEPS_res = \ pixmaps/playlist/sidebar-icons/network.png \ pixmaps/playlist/sidebar-icons/sd/appletrailers.png \ pixmaps/playlist/sidebar-icons/sd/icecast.png \ - pixmaps/playlist/sidebar-icons/sd/metachannels.png \ pixmaps/playlist/sidebar-icons/sd/katsomo.png \ pixmaps/playlist/sidebar-icons/sd/fmc.png \ pixmaps/playlist/sidebar-icons/sd/frenchtv.png \ diff --git a/modules/gui/qt/pixmaps/playlist/sidebar-icons/sd/metachannels.svgz b/modules/gui/qt/pixmaps/playlist/sidebar-icons/sd/metachannels.svgz deleted file mode 100644 index e593d4c..0000000 Binary files a/modules/gui/qt/pixmaps/playlist/sidebar-icons/sd/metachannels.svgz and /dev/null differ diff --git a/modules/gui/qt/vlc.qrc b/modules/gui/qt/vlc.qrc index 7ff3485..fbf5bfd 100644 --- a/modules/gui/qt/vlc.qrc +++ b/modules/gui/qt/vlc.qrc @@ -151,7 +151,6 @@ <file alias="frenchtv">pixmaps/playlist/sidebar-icons/sd/frenchtv.png</file> <file alias="jamendo">pixmaps/playlist/sidebar-icons/sd/jamendo.png</file> <file alias="katsomo">pixmaps/playlist/sidebar-icons/sd/katsomo.png</file> - <file alias="metachannels">pixmaps/playlist/sidebar-icons/sd/metachannels.png</file> </qresource> <qresource prefix="/addons"> <file alias="default">pixmaps/addons/addon.png</file> diff --git a/share/Makefile.am b/share/Makefile.am index 4a5458e..fbfa447 100644 --- a/share/Makefile.am +++ b/share/Makefile.am @@ -144,7 +144,6 @@ nobase_vlclib_DATA = \ lua/playlist/lelombrik.luac \ lua/playlist/liveleak.luac \ lua/playlist/metacafe.luac \ - lua/playlist/metachannels.luac \ lua/playlist/mpora.luac \ lua/playlist/pinkbike.luac \ lua/playlist/pluzz.luac \ @@ -238,7 +237,6 @@ EXTRA_DIST += \ lua/playlist/lelombrik.lua \ lua/playlist/liveleak.lua \ lua/playlist/metacafe.lua \ - lua/playlist/metachannels.lua \ lua/playlist/mpora.lua \ lua/playlist/pinkbike.lua \ lua/playlist/pluzz.lua \ @@ -253,8 +251,7 @@ EXTRA_DIST += \ lua/sd/fmc.lua \ lua/sd/icecast.lua \ lua/sd/icast.lua \ - lua/sd/jamendo.lua \ - lua/sd/metachannels.lua + lua/sd/jamendo.lua DIST_http_lua = \ lua/http/view.html \ diff --git a/share/lua/playlist/metachannels.lua b/share/lua/playlist/metachannels.lua deleted file mode 100644 index fc0fd46..0000000 --- a/share/lua/playlist/metachannels.lua +++ /dev/null @@ -1,60 +0,0 @@ ---[[ - $Id$ - - Copyright © 2010 VideoLAN and AUTHORS - - Authors: Rémi Duraffort <ivoire at videolan dot org> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. ---]] - -require "simplexml" - -function probe() - return vlc.access == 'http' and string.match( vlc.path, 'metachannels.com' ) -end - -function parse() - local webpage = '' - while true do - local line = vlc.readline() - if line == nil then break end - webpage = webpage .. line - end - - local feed = simplexml.parse_string( webpage ) - local channel = feed.children[1] - - -- list all children that are items - local tracks = {} - for _,item in ipairs( channel.children ) do - if( item.name == 'item' ) then - simplexml.add_name_maps( item ) - local url = vlc.strings.resolve_xml_special_chars( item.children_map['link'][1].children[1] ) - local title = vlc.strings.resolve_xml_special_chars( item.children_map['title'][1].children[1] ) - local arturl = nil - if item.children_map['media:thumbnail'] then - arturl = vlc.strings.resolve_xml_special_chars( item.children_map['media:thumbnail'][1].attributes['url'] ) - end - table.insert( tracks, { path = url, - title = title, - arturl = arturl, - options = {':play-and-pause'} } ) - end - end - - return tracks -end - _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
