modules/services_discovery/freebox.c: Create a new service discovery for the french...

diff --git a/configure.ac b/configure.ac
index 3646cd23b60823eb7edd040e178bdf872778b0e1..c1a5ab733504be4b3cfa2f134406a742a2bd739e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1268,7 +1268,7 @@ AC_LANG_POP(C++)
 
 if test "${SYS}" != "mingwce"; then
   VLC_ADD_PLUGINS([access_fake access_filter_timeshift access_filter_record access_filter_dump])
-  VLC_ADD_PLUGINS([gestures rc telnet hotkeys showintf marq podcast shout sap fake folder])
+  VLC_ADD_PLUGINS([gestures rc telnet hotkeys showintf marq podcast shout sap freebox fake folder])
   VLC_ADD_PLUGINS([rss mosaic wall motiondetect clone crop erase bluescreen alphamask gaussianblur])
   VLC_ADD_PLUGINS([i420_yuy2 i422_yuy2 i420_ymga i422_i420])
   VLC_ADD_PLUGINS([aout_file linear_resampler bandlimited_resampler])

diff --git a/modules/services_discovery/Modules.am b/modules/services_discovery/Modules.am
index c489b913dae4448ae8254397092b2b8e3cd35aab..6dce79ea8d037a1e2184edd7bcc3c69a6559bdad 100644 (file)
--- a/modules/services_discovery/Modules.am
+++ b/modules/services_discovery/Modules.am
@@ -4,4 +4,5 @@ SOURCES_shout = shout.c
 SOURCES_upnp_cc = upnp_cc.cpp
 SOURCES_upnp_intel = upnp_intel.cpp
 SOURCES_bonjour = bonjour.c
+SOURCES_freebox = freebox.c
 SOURCES_podcast = podcast.c

diff --git a/modules/services_discovery/freebox.c b/modules/services_discovery/freebox.c
new file mode 100644 (file)
index 0000000..3d6d5b7
--- /dev/null
+++ b/modules/services_discovery/freebox.c
@@ -0,0 +1,104 @@
+/*****************************************************************************
+ * freebox.c :  Freebox interface module
+ *****************************************************************************
+ * Copyright (C) 2004-2007 the VideoLAN team
+ * $Id$
+ *
+ * Authors: Pierre d'Herbemont <pdherbemont # videolan.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.
+ *****************************************************************************/
+
+/*****************************************************************************
+ * Includes
+ *****************************************************************************/
+
+#include <vlc/vlc.h>
+#include <vlc_services_discovery.h>
+#include <vlc_interface.h>
+
+#include <vlc_network.h>
+
+/************************************************************************
+ * definitions
+ ************************************************************************/
+static const char kpsz_freebox_playlist_url[] = "http://mafreebox.freebox.fr/freeboxtv/playlist.m3u";
+
+/*****************************************************************************
+ * Module descriptor
+ *****************************************************************************/
+
+/* Callbacks */
+static int  Open ( vlc_object_t *, int );
+static void Close( vlc_object_t * );
+static void ItemAdded( const vlc_event_t * p_event, void * user_data );
+static void Run( services_discovery_t *p_sd );
+
+vlc_module_begin();
+    set_shortname( "Freebox");
+    set_description( _("Freebox TV listing (French ISP free.fr services)") );
+    add_shortcut( "freebox" );
+    set_category( CAT_PLAYLIST );
+    set_subcategory( SUBCAT_PLAYLIST_SD );
+
+    set_capability( "services_discovery", 0 );
+    set_callbacks( Open, Close );
+vlc_module_end();
+
+
+/*****************************************************************************
+ * Open: initialize
+ *****************************************************************************/
+static int Open( vlc_object_t *p_this, int i_type )
+{
+    services_discovery_t *p_sd = ( services_discovery_t* )p_this;
+    p_sd->pf_run = Run;
+    services_discovery_SetLocalizedName( p_sd, _("Freebox TV") );
+    return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * ItemAdded:
+ *****************************************************************************/
+static void ItemAdded( const vlc_event_t * p_event, void * user_data )
+{
+    services_discovery_t *p_sd = user_data;
+    services_discovery_AddItem( p_sd,
+            p_event->u.input_item_subitem_added.p_new_child,
+            NULL /* no category */ );
+}
+
+/*****************************************************************************
+ * Run:
+ *****************************************************************************/
+static void Run( services_discovery_t *p_sd )
+{
+    input_item_t * p_input = input_ItemNewExt( p_sd, kpsz_freebox_playlist_url,
+                                _("Freebox TV"), 0, NULL, -1 );
+    input_ItemAddOption( p_input, "no-playlist-autostart" );
+    vlc_gc_incref( p_input );
+
+    vlc_event_attach( &p_input->event_manager, vlc_InputItemSubItemAdded, ItemAdded, p_sd );
+    input_Read( p_sd, p_input, VLC_TRUE );
+    vlc_event_detach( &p_input->event_manager, vlc_InputItemSubItemAdded, ItemAdded, p_sd );
+    vlc_gc_decref( p_input );
+}
+
+/*****************************************************************************
+ * Close:
+ *****************************************************************************/
+static void Close( vlc_object_t *p_this )
+{
+}