Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
70c09c2e
Commit
70c09c2e
authored
Jan 03, 2009
by
Antoine Cellerier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Split OSS access from v4l2.
parent
b5615ec0
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
424 additions
and
17 deletions
+424
-17
configure.ac
configure.ac
+1
-17
modules/access/Modules.am
modules/access/Modules.am
+1
-0
modules/access/oss.c
modules/access/oss.c
+422
-0
No files found.
configure.ac
View file @
70c09c2e
...
@@ -2343,23 +2343,6 @@ then
...
@@ -2343,23 +2343,6 @@ then
VLC_ADD_CPPFLAGS([v4l2],[-I${with_v4l2}/include])
VLC_ADD_CPPFLAGS([v4l2],[-I${with_v4l2}/include])
fi
fi
if test "${enable_alsa}" != "no"
then
AC_CHECK_HEADER(alsa/asoundlib.h, AC_CHECK_LIB(asound, main, have_v4l2_alsa="true", have_v4l2_alsa="false"),have_v4l2_alsa="false")
fi
if test "${have_v4l2_alsa}" = "true"
then
CFLAGS="${CFLAGS_save}"
AC_TRY_COMPILE([#define ALSA_PCM_NEW_HW_PARAMS_API
#define ALSA_PCM_NEW_SW_PARAMS_API
#include <alsa/asoundlib.h>],
[snd_pcm_hw_params_get_period_time(0,0,0);],
AC_DEFINE(HAVE_ALSA_NEW_API, 1, Define if ALSA is at least rc4))
VLC_ADD_LDFLAGS([v4l2],[-lasound -lm -ldl])
AC_DEFINE(HAVE_ALSA, 1, Define if ALSA is present.)
fi
CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_v4l2}"
CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_v4l2}"
AC_CHECK_HEADERS(linux/videodev2.h, [
AC_CHECK_HEADERS(linux/videodev2.h, [
VLC_ADD_PLUGIN([v4l2])
VLC_ADD_PLUGIN([v4l2])
...
@@ -4590,6 +4573,7 @@ if test "${enable_oss}" != "no" &&
...
@@ -4590,6 +4573,7 @@ if test "${enable_oss}" != "no" &&
then
then
AC_CHECK_HEADERS(soundcard.h sys/soundcard.h machine/soundcard.h, [
AC_CHECK_HEADERS(soundcard.h sys/soundcard.h machine/soundcard.h, [
VLC_ADD_PLUGIN([oss])
VLC_ADD_PLUGIN([oss])
VLC_ADD_PLUGIN([access_oss])
AC_CHECK_LIB(ossaudio,main,VLC_ADD_LIBS([oss],[-lossaudio]))
AC_CHECK_LIB(ossaudio,main,VLC_ADD_LIBS([oss],[-lossaudio]))
])
])
fi
fi
...
...
modules/access/Modules.am
View file @
70c09c2e
...
@@ -38,6 +38,7 @@ SOURCES_cdda = \
...
@@ -38,6 +38,7 @@ SOURCES_cdda = \
$(NULL)
$(NULL)
SOURCES_access_jack = jack.c
SOURCES_access_jack = jack.c
SOURCES_access_alsa = alsa.c
SOURCES_access_alsa = alsa.c
SOURCES_access_oss = oss.c
libvlc_LTLIBRARIES += \
libvlc_LTLIBRARIES += \
libaccess_file_plugin.la \
libaccess_file_plugin.la \
...
...
modules/access/oss.c
0 → 100644
View file @
70c09c2e
This diff is collapsed.
Click to expand it.
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