Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
6656584f
Commit
6656584f
authored
Oct 12, 2012
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
DVB scan: re-enable the old plugin
I do not understand why it was disabled in the first place.
parent
31434d07
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
7 deletions
+21
-7
modules/access/Modules.am
modules/access/Modules.am
+15
-0
modules/access/dvb/access.c
modules/access/dvb/access.c
+6
-7
No files found.
modules/access/Modules.am
View file @
6656584f
...
@@ -239,6 +239,21 @@ libdtv_plugin_la_LIBADD += libbda.la -lstdc++
...
@@ -239,6 +239,21 @@ libdtv_plugin_la_LIBADD += libbda.la -lstdc++
libvlc_LTLIBRARIES += libdtv_plugin.la
libvlc_LTLIBRARIES += libdtv_plugin.la
endif
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 ###
### Network streams ###
...
...
modules/access/dvb/access.c
View file @
6656584f
...
@@ -124,13 +124,6 @@ static int Open( vlc_object_t *p_this )
...
@@ -124,13 +124,6 @@ static int Open( vlc_object_t *p_this )
if
(
*
p_access
->
psz_access
==
'\0'
)
if
(
*
p_access
->
psz_access
==
'\0'
)
return
VLC_EGENERIC
;
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
)
);
p_access
->
p_sys
=
p_sys
=
calloc
(
1
,
sizeof
(
access_sys_t
)
);
if
(
!
p_sys
)
if
(
!
p_sys
)
return
VLC_ENOMEM
;
return
VLC_ENOMEM
;
...
@@ -193,8 +186,14 @@ static int Open( vlc_object_t *p_this )
...
@@ -193,8 +186,14 @@ static int Open( vlc_object_t *p_this )
p_sys
->
i_read_once
=
DVB_READ_ONCE_SCAN
;
p_sys
->
i_read_once
=
DVB_READ_ONCE_SCAN
;
}
}
/* Set up access */
free
(
p_access
->
psz_demux
);
free
(
p_access
->
psz_demux
);
p_access
->
psz_demux
=
strdup
(
"m3u8"
);
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
;
return
VLC_SUCCESS
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment