vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Fri Oct 12 17:42:29 2012 +0300| [6656584f494fc78947842c574ff36d7168980396] | committer: Rémi Denis-Courmont
DVB scan: re-enable the old plugin I do not understand why it was disabled in the first place. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6656584f494fc78947842c574ff36d7168980396 --- modules/access/Modules.am | 15 +++++++++++++++ modules/access/dvb/access.c | 13 ++++++------- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/modules/access/Modules.am b/modules/access/Modules.am index 5665477..5040b39 100644 --- a/modules/access/Modules.am +++ b/modules/access/Modules.am @@ -239,6 +239,21 @@ libdtv_plugin_la_LIBADD += libbda.la -lstdc++ libvlc_LTLIBRARIES += libdtv_plugin.la endif +# Old Linux DVB scanner +libdvb_plugin_la_SOURCES = \ + dvb/access.c \ + dvb/linux_dvb.c \ + dvb/scan.c dvb/scan.h \ + dvb/dvb.h +libdvb_plugin_la_CFLAGS = $(AM_CFLAGS) +libdvb_plugin_la_LIBADD = $(AM_LIBADD) +if HAVE_LINUX_DVB +libvlc_LTLIBRARIES += libdvb_plugin.la +if HAVE_DVBPSI +libdvb_plugin_la_CFLAGS += $(DVBPSI_CFLAGS) +libdvb_plugin_la_LIBADD += $(DVBPSI_LIBS) +endif +endif ### Network streams ### diff --git a/modules/access/dvb/access.c b/modules/access/dvb/access.c index d49ccd4..8bda64e 100644 --- a/modules/access/dvb/access.c +++ b/modules/access/dvb/access.c @@ -124,13 +124,6 @@ static int Open( vlc_object_t *p_this ) if( *p_access->psz_access == '\0' ) return VLC_EGENERIC; - /* Set up access */ - p_access->pf_read = NULL; - p_access->pf_control = Control; - p_access->pf_seek = NULL; - - access_InitFields( p_access ); - p_access->p_sys = p_sys = calloc( 1, sizeof( access_sys_t ) ); if( !p_sys ) return VLC_ENOMEM; @@ -193,8 +186,14 @@ static int Open( vlc_object_t *p_this ) p_sys->i_read_once = DVB_READ_ONCE_SCAN; } + /* Set up access */ free( p_access->psz_demux ); p_access->psz_demux = strdup( "m3u8" ); + p_access->pf_read = NULL; + p_access->pf_control = Control; + p_access->pf_seek = NULL; + access_InitFields( p_access ); + return VLC_SUCCESS; } _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
