Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC
Manage
Activity
Members
Labels
Plan
Issues
4k
Issue boards
Milestones
Code
Merge requests
454
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VideoLAN
VLC
Commits
ca28eb21
Commit
ca28eb21
authored
22 years ago
by
Samuel Hocevar
Browse files
Options
Downloads
Patches
Plain Diff
* ./modules/audio_output/oss.c: compilation fix for BSD, courtesy of
Steven M. Schultz.
parent
1e4d2842
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
modules/audio_output/oss.c
+10
-5
10 additions, 5 deletions
modules/audio_output/oss.c
with
10 additions
and
5 deletions
modules/audio_output/oss.c
+
10
−
5
View file @
ca28eb21
...
...
@@ -2,7 +2,7 @@
* oss.c : OSS /dev/dsp module for vlc
*****************************************************************************
* Copyright (C) 2000-2002 VideoLAN
* $Id: oss.c,v 1.4
4
2003/01/1
3 14:51:25 massiot
Exp $
* $Id: oss.c,v 1.4
5
2003/01/1
4 22:44:29 sam
Exp $
*
* Authors: Michel Kaempf <maxx@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
...
...
@@ -12,7 +12,7 @@
* 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
...
...
@@ -53,6 +53,11 @@
# include <machine/soundcard.h>
#endif
/* AFMT_AC3 is really IEC61937 / IEC60958, mpeg/ac3/dts over spdif */
#ifndef AFMT_AC3
# define AFMT_AC3 0x00000400
/* Dolby Digital AC3 */
#endif
/*****************************************************************************
* aout_sys_t: OSS audio output method descriptor
*****************************************************************************
...
...
@@ -207,11 +212,11 @@ static void Probe( aout_instance_t * p_aout )
/* Test for mono. */
i_nb_channels
=
1
;
if
(
ioctl
(
p_sys
->
i_fd
,
SNDCTL_DSP_CHANNELS
,
&
i_nb_channels
)
>=
0
if
(
ioctl
(
p_sys
->
i_fd
,
SNDCTL_DSP_CHANNELS
,
&
i_nb_channels
)
>=
0
&&
i_nb_channels
==
1
)
{
val
.
psz_string
=
N_
(
"Mono"
);
var_Change
(
p_aout
,
"audio-device"
,
VLC_VAR_ADDCHOICE
,
&
val
);
var_Change
(
p_aout
,
"audio-device"
,
VLC_VAR_ADDCHOICE
,
&
val
);
}
...
...
@@ -595,7 +600,7 @@ static int OSSThread( aout_instance_t * p_aout )
msleep
(
delay
/
2
);
}
}
while
(
!
p_aout
->
b_die
&&
!
(
p_buffer
=
aout_OutputNextBuffer
(
p_aout
,
next_date
,
VLC_TRUE
)
)
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment