From d536e2bb9e579e0fc912aadf3f91ded9e7798fbc Mon Sep 17 00:00:00 2001 From: Pierre d'Herbemont Date: Tue, 16 Feb 2010 01:51:17 +0100 Subject: [PATCH] Revert "freebox: Bring back freebox SD in C." This reverts commit c8a67b80e5af4c5bad8d1d3409570c024e7bc8c9. Conflicts: modules/services_discovery/freebox.c freebox luasd is doing a wonderful job now. --- modules/misc/lua/vlc.c | 2 +- modules/services_discovery/Modules.am | 2 - modules/services_discovery/freebox.c | 136 -------------------------- 3 files changed, 1 insertion(+), 139 deletions(-) delete mode 100644 modules/services_discovery/freebox.c diff --git a/modules/misc/lua/vlc.c b/modules/misc/lua/vlc.c index 7d9dae3bb0..9084739a37 100644 --- a/modules/misc/lua/vlc.c +++ b/modules/misc/lua/vlc.c @@ -126,7 +126,7 @@ vlc_module_begin () add_submodule () set_description( N_("Freebox TV") ) - add_shortcut( "luafreebox" ) + add_shortcut( "freebox" ) set_capability( "services_discovery", 0 ) set_callbacks( Open_LuaSD, Close_LuaSD ) diff --git a/modules/services_discovery/Modules.am b/modules/services_discovery/Modules.am index 33f186691a..bb603292f8 100644 --- a/modules/services_discovery/Modules.am +++ b/modules/services_discovery/Modules.am @@ -1,4 +1,3 @@ -SOURCES_freebox = freebox.c SOURCES_sap = sap.c SOURCES_upnp_cc = upnp_cc.cpp SOURCES_upnp_intel = upnp_intel.cpp upnp_intel.hpp @@ -20,6 +19,5 @@ EXTRA_LTLIBRARIES += \ libvlc_LTLIBRARIES += \ libmediadirs_plugin.la \ libpodcast_plugin.la \ - libfreebox_plugin.la \ libsap_plugin.la \ $(LTLIBxcb_apps) diff --git a/modules/services_discovery/freebox.c b/modules/services_discovery/freebox.c deleted file mode 100644 index be2aa389e9..0000000000 --- a/modules/services_discovery/freebox.c +++ /dev/null @@ -1,136 +0,0 @@ -/***************************************************************************** - * freebox.c: Shoutcast services discovery module - ***************************************************************************** - * Copyright (C) 2005-2007 the VideoLAN team - * $Id$ - * - * Authors: Sigmund Augdal Helberg - * Antoine Cellerier - * Pierre d'Herbemont - * - * 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. - *****************************************************************************/ - -/***************************************************************************** - * Includes - *****************************************************************************/ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#include -#include -#include - -/***************************************************************************** - * Module descriptor - *****************************************************************************/ - -static int Open( vlc_object_t * ); -static void Close( vlc_object_t * ); - -VLC_SD_PROBE_HELPER("freebox", "Freebox TV", SD_CAT_INTERNET) - -vlc_module_begin () - set_category( CAT_PLAYLIST ) - set_subcategory( SUBCAT_PLAYLIST_SD ) - - set_shortname( "Freebox") - set_description( N_("Freebox TV") ) - set_capability( "services_discovery", 0 ) - set_callbacks( Open, Close ) - add_shortcut( "freebox" ) - - VLC_SD_PROBE_SUBMODULE -vlc_module_end () - - -/***************************************************************************** - * Local prototypes - *****************************************************************************/ - -static void *Run( void * ); -struct services_discovery_sys_t -{ - vlc_thread_t thread; -}; - -/***************************************************************************** - * Open: initialize and create stuff - *****************************************************************************/ -static int Open(vlc_object_t *this) -{ - services_discovery_t *sd = (services_discovery_t *)this; - sd->p_sys = malloc(sizeof(*(sd->p_sys))); - if (sd->p_sys == NULL) - return VLC_ENOMEM; - - if (vlc_clone(&sd->p_sys->thread, Run, sd, VLC_THREAD_PRIORITY_LOW)) - { - free(sd->p_sys); - return VLC_EGENERIC; - } - return VLC_SUCCESS; -} - -/***************************************************************************** - * ItemAdded: - *****************************************************************************/ -static void ItemAdded(const vlc_event_t * event, void *user_data) -{ - services_discovery_t *sd = user_data; - input_item_t *child = event->u.input_item_subitem_added.p_new_child; - input_item_AddOption(child, "deinterlace=1", VLC_INPUT_OPTION_TRUSTED); - services_discovery_AddItem(sd, child, NULL); -} - - -/***************************************************************************** - * Run: - *****************************************************************************/ -static void *Run(void *data) -{ - services_discovery_t *sd = data; - int canc = vlc_savecancel(); - - const char * const name = "Freebox TV"; - const char * const url = "http://mafreebox.freebox.fr/freeboxtv/playlist.m3u"; - input_item_t *input = input_item_New(sd, url, vlc_gettext(name)); - input_item_AddOption(input, "no-playlist-autostart", VLC_INPUT_OPTION_TRUSTED); - - /* Read every subitems, and add them in ItemAdded */ - vlc_event_manager_t *em = &input->event_manager; - vlc_event_attach(em, vlc_InputItemSubItemAdded, ItemAdded, sd); - input_Read(sd, input); - vlc_event_detach(em, vlc_InputItemSubItemAdded, ItemAdded, sd); - - vlc_gc_decref(input); - - vlc_restorecancel(canc); - return NULL; -} - -/***************************************************************************** - * Close: - *****************************************************************************/ -static void Close(vlc_object_t *this) -{ - services_discovery_t *sd = (services_discovery_t *)this; - services_discovery_sys_t *sys = sd->p_sys; - vlc_join(sys->thread, NULL); - free(sys); -} - -- 2.39.2