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
f6263939
Commit
f6263939
authored
Oct 31, 2012
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
aout: remove pf_ prefix where left (cosmetic)
parent
6c048d6c
Changes
19
Hide whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
61 additions
and
61 deletions
+61
-61
include/vlc_aout.h
include/vlc_aout.h
+3
-3
modules/audio_output/adummy.c
modules/audio_output/adummy.c
+3
-3
modules/audio_output/alsa.c
modules/audio_output/alsa.c
+4
-4
modules/audio_output/amem.c
modules/audio_output/amem.c
+3
-3
modules/audio_output/audioqueue.c
modules/audio_output/audioqueue.c
+3
-3
modules/audio_output/audiotrack.c
modules/audio_output/audiotrack.c
+2
-2
modules/audio_output/auhal.c
modules/audio_output/auhal.c
+4
-4
modules/audio_output/directx.c
modules/audio_output/directx.c
+5
-5
modules/audio_output/file.c
modules/audio_output/file.c
+3
-3
modules/audio_output/jack.c
modules/audio_output/jack.c
+3
-3
modules/audio_output/kai.c
modules/audio_output/kai.c
+3
-3
modules/audio_output/opensles_android.c
modules/audio_output/opensles_android.c
+3
-3
modules/audio_output/oss.c
modules/audio_output/oss.c
+3
-3
modules/audio_output/packet.c
modules/audio_output/packet.c
+1
-1
modules/audio_output/pulse.c
modules/audio_output/pulse.c
+3
-3
modules/audio_output/sndio.c
modules/audio_output/sndio.c
+3
-3
modules/audio_output/wasapi.c
modules/audio_output/wasapi.c
+3
-3
modules/audio_output/waveout.c
modules/audio_output/waveout.c
+3
-3
src/audio_output/output.c
src/audio_output/output.c
+6
-6
No files found.
include/vlc_aout.h
View file @
f6263939
...
...
@@ -144,11 +144,11 @@ struct audio_output
only when succesfully probed and not afterward) */
struct
aout_sys_t
*
sys
;
/**< Output plugin private data */
void
(
*
p
f_p
lay
)(
audio_output_t
*
,
block_t
*
,
mtime_t
*
);
/**< Play callback
void
(
*
play
)(
audio_output_t
*
,
block_t
*
,
mtime_t
*
);
/**< Play callback
- queue a block for playback */
void
(
*
pf_
pause
)(
audio_output_t
*
,
bool
,
mtime_t
);
/**< Pause/resume
void
(
*
pause
)(
audio_output_t
*
,
bool
,
mtime_t
);
/**< Pause/resume
callback (optional, may be NULL) */
void
(
*
pf_
flush
)(
audio_output_t
*
,
bool
);
/**< Flush/drain callback
void
(
*
flush
)(
audio_output_t
*
,
bool
);
/**< Flush/drain callback
(optional, may be NULL) */
int
(
*
volume_set
)(
audio_output_t
*
,
float
);
/**< Volume setter (or NULL) */
int
(
*
mute_set
)(
audio_output_t
*
,
bool
);
/**< Mute setter (or NULL) */
...
...
modules/audio_output/adummy.c
View file @
f6263939
...
...
@@ -53,9 +53,9 @@ static int Open( vlc_object_t * p_this )
{
audio_output_t
*
p_aout
=
(
audio_output_t
*
)
p_this
;
p_aout
->
p
f_p
lay
=
Play
;
p_aout
->
p
f_p
ause
=
NULL
;
p_aout
->
pf_
flush
=
NULL
;
p_aout
->
play
=
Play
;
p_aout
->
pause
=
NULL
;
p_aout
->
flush
=
NULL
;
p_aout
->
volume_set
=
NULL
;
p_aout
->
mute_set
=
NULL
;
...
...
modules/audio_output/alsa.c
View file @
f6263939
...
...
@@ -521,15 +521,15 @@ static int Open (vlc_object_t *obj)
aout_SoftVolumeInit
(
aout
);
}
aout
->
p
f_p
lay
=
Play
;
aout
->
play
=
Play
;
if
(
snd_pcm_hw_params_can_pause
(
hw
))
aout
->
p
f_p
ause
=
Pause
;
aout
->
pause
=
Pause
;
else
{
aout
->
p
f_p
ause
=
PauseDummy
;
aout
->
pause
=
PauseDummy
;
msg_Warn
(
aout
,
"device cannot be paused"
);
}
aout
->
pf_
flush
=
Flush
;
aout
->
flush
=
Flush
;
/* Setup audio-device choices */
{
...
...
modules/audio_output/amem.c
View file @
f6263939
...
...
@@ -235,9 +235,9 @@ static int Open (vlc_object_t *obj)
aout
->
format
.
i_rate
=
rate
;
aout
->
format
.
i_original_channels
=
aout
->
format
.
i_physical_channels
;
aout
->
p
f_p
lay
=
Play
;
aout
->
p
f_p
ause
=
Pause
;
aout
->
pf_
flush
=
Flush
;
aout
->
play
=
Play
;
aout
->
pause
=
Pause
;
aout
->
flush
=
Flush
;
if
(
sys
->
set_volume
!=
NULL
)
{
aout
->
volume_set
=
VolumeSet
;
...
...
modules/audio_output/audioqueue.c
View file @
f6263939
...
...
@@ -127,9 +127,9 @@ static int Open ( vlc_object_t *p_this )
p_aout
->
format
.
i_physical_channels
=
AOUT_CHAN_LEFT
|
AOUT_CHAN_RIGHT
;
p_aout
->
format
.
i_rate
=
44100
;
aout_PacketInit
(
p_aout
,
&
p_sys
->
packet
,
FRAME_SIZE
);
p_aout
->
p
f_p
lay
=
aout_PacketPlay
;
p_aout
->
p
f_p
ause
=
aout_PacketPause
;
p_aout
->
pf_
flush
=
aout_PacketFlush
;
p_aout
->
play
=
aout_PacketPlay
;
p_aout
->
pause
=
aout_PacketPause
;
p_aout
->
flush
=
aout_PacketFlush
;
msg_Dbg
(
p_aout
,
"Starting AudioQueue (status = %i)"
,
status
);
status
=
AudioQueueStart
(
p_sys
->
audioQueue
,
NULL
);
...
...
modules/audio_output/audiotrack.c
View file @
f6263939
...
...
@@ -287,8 +287,8 @@ static int Open(vlc_object_t *p_this)
}
p_aout
->
sys
=
p_sys
;
p_aout
->
p
f_p
lay
=
Play
;
p_aout
->
p
f_p
ause
=
Pause
;
p_aout
->
play
=
Play
;
p_aout
->
pause
=
Pause
;
p_sys
->
at_start
(
p_sys
->
AudioTrack
);
...
...
modules/audio_output/auhal.c
View file @
f6263939
...
...
@@ -179,9 +179,9 @@ static int Open(vlc_object_t * p_this)
p_sys
->
b_changed_mixing
=
false
;
memset
(
p_sys
->
p_remainder_buffer
,
0
,
sizeof
(
uint8_t
)
*
BUFSIZE
);
p_aout
->
p
f_p
lay
=
aout_PacketPlay
;
p_aout
->
p
f_p
ause
=
aout_PacketPause
;
p_aout
->
pf_
flush
=
aout_PacketFlush
;
p_aout
->
play
=
aout_PacketPlay
;
p_aout
->
pause
=
aout_PacketPause
;
p_aout
->
flush
=
aout_PacketFlush
;
aout_FormatPrint
(
p_aout
,
"VLC is looking for:"
,
&
p_aout
->
format
);
...
...
@@ -1370,7 +1370,7 @@ static int AudioDeviceCallback(vlc_object_t *p_this, const char *psz_variable,
/*****************************************************************************
* VolumeSet: Implements
pf_
volume_set(). Update the CoreAudio AU volume immediately.
* VolumeSet: Implements volume_set(). Update the CoreAudio AU volume immediately.
*****************************************************************************/
static
int
VolumeSet
(
audio_output_t
*
p_aout
,
float
volume
)
{
...
...
modules/audio_output/directx.c
View file @
f6263939
...
...
@@ -292,9 +292,9 @@ static int OpenAudio( vlc_object_t *p_this )
goto
error
;
}
p_aout
->
p
f_p
lay
=
Play
;
p_aout
->
p
f_p
ause
=
aout_PacketPause
;
p_aout
->
pf_
flush
=
aout_PacketFlush
;
p_aout
->
play
=
Play
;
p_aout
->
pause
=
aout_PacketPause
;
p_aout
->
flush
=
aout_PacketFlush
;
/* Volume */
if
(
val
.
i_int
==
AOUT_VAR_SPDIF
)
...
...
@@ -551,7 +551,7 @@ static void Play( audio_output_t *p_aout, block_t *p_buffer,
SetEvent
(
p_aout
->
sys
->
notif
.
event
);
aout_PacketPlay
(
p_aout
,
p_buffer
,
drift
);
p_aout
->
p
f_p
lay
=
aout_PacketPlay
;
p_aout
->
play
=
aout_PacketPlay
;
}
static
int
VolumeSet
(
audio_output_t
*
p_aout
,
float
vol
)
...
...
@@ -615,7 +615,7 @@ static void CloseAudio( vlc_object_t *p_this )
{
vlc_atomic_set
(
&
p_aout
->
sys
->
notif
.
abort
,
1
);
/* wake up the audio thread if needed */
if
(
p_aout
->
p
f_p
lay
==
Play
)
if
(
p_aout
->
play
==
Play
)
SetEvent
(
p_sys
->
notif
.
event
);
vlc_join
(
p_sys
->
notif
.
thread
,
NULL
);
...
...
modules/audio_output/file.c
View file @
f6263939
...
...
@@ -159,9 +159,9 @@ static int Open( vlc_object_t * p_this )
return
VLC_EGENERIC
;
}
p_aout
->
p
f_p
lay
=
Play
;
p_aout
->
p
f_p
ause
=
NULL
;
p_aout
->
pf_
flush
=
NULL
;
p_aout
->
play
=
Play
;
p_aout
->
pause
=
NULL
;
p_aout
->
flush
=
NULL
;
/* Audio format */
psz_format
=
var_CreateGetString
(
p_this
,
"audiofile-format"
);
...
...
modules/audio_output/jack.c
View file @
f6263939
...
...
@@ -143,9 +143,9 @@ static int Open( vlc_object_t *p_this )
// TODO add buffer size callback
p_aout
->
format
.
i_rate
=
jack_get_sample_rate
(
p_sys
->
p_jack_client
);
p_aout
->
p
f_p
lay
=
aout_PacketPlay
;
p_aout
->
p
f_p
ause
=
aout_PacketPause
;
p_aout
->
pf_
flush
=
aout_PacketFlush
;
p_aout
->
play
=
aout_PacketPlay
;
p_aout
->
pause
=
aout_PacketPause
;
p_aout
->
flush
=
aout_PacketFlush
;
aout_PacketInit
(
p_aout
,
&
p_sys
->
packet
,
jack_get_buffer_size
(
p_sys
->
p_jack_client
)
);
aout_SoftVolumeInit
(
p_aout
);
...
...
modules/audio_output/kai.c
View file @
f6263939
...
...
@@ -203,9 +203,9 @@ static int Open ( vlc_object_t *p_this )
p_aout
->
format
=
format
;
p_aout
->
p
f_p
lay
=
Play
;
p_aout
->
p
f_p
ause
=
aout_PacketPause
;
p_aout
->
pf_
flush
=
aout_PacketFlush
;
p_aout
->
play
=
Play
;
p_aout
->
pause
=
aout_PacketPause
;
p_aout
->
flush
=
aout_PacketFlush
;
aout_PacketInit
(
p_aout
,
&
p_sys
->
packet
,
ks_obtained
.
ulBufferSize
/
i_bytes_per_frame
);
...
...
modules/audio_output/opensles_android.c
View file @
f6263939
...
...
@@ -370,9 +370,9 @@ static int Open( vlc_object_t *p_this )
// we want 16bit signed data little endian.
p_aout
->
format
.
i_format
=
VLC_CODEC_S16L
;
p_aout
->
format
.
i_physical_channels
=
AOUT_CHAN_LEFT
|
AOUT_CHAN_RIGHT
;
p_aout
->
p
f_play
=
Play
;
p_aout
->
p
f_pause
=
Pause
;
p_aout
->
pf_flush
=
Flush
;
p_aout
->
p
lay
=
Play
;
p_aout
->
p
ause
=
Pause
;
p_aout
->
flush
=
Flush
;
aout_FormatPrepare
(
&
p_aout
->
format
);
...
...
modules/audio_output/oss.c
View file @
f6263939
...
...
@@ -226,9 +226,9 @@ static int Open (vlc_object_t *obj)
/* Setup audio_output_t */
aout
->
format
.
i_format
=
fourcc
;
aout
->
p
f_p
lay
=
Play
;
aout
->
p
f_p
ause
=
Pause
;
aout
->
pf_
flush
=
Flush
;
aout
->
play
=
Play
;
aout
->
pause
=
Pause
;
aout
->
flush
=
Flush
;
aout
->
volume_set
=
NULL
;
aout
->
mute_set
=
NULL
;
...
...
modules/audio_output/packet.c
View file @
f6263939
...
...
@@ -310,7 +310,7 @@ static block_t *aout_OutputSlice (audio_output_t *p_aout)
/**
* Dequeues the next audio packet (a.k.a. audio fragment).
* The audio output plugin must first call aout_PacketPlay() to queue the
* decoded audio samples. Typically, audio_output_t.p
f_p
lay is set to, or calls
* decoded audio samples. Typically, audio_output_t.play is set to, or calls
* aout_PacketPlay().
* @note This function is considered legacy. Please do not use this function in
* new audio output plugins.
...
...
modules/audio_output/pulse.c
View file @
f6263939
...
...
@@ -984,9 +984,9 @@ static int Open(vlc_object_t *obj)
pa_threaded_mainloop_unlock
(
sys
->
mainloop
);
aout
->
format
.
i_format
=
format
;
aout
->
p
f_p
lay
=
Play
;
aout
->
p
f_p
ause
=
Pause
;
aout
->
pf_
flush
=
Flush
;
aout
->
play
=
Play
;
aout
->
pause
=
Pause
;
aout
->
flush
=
Flush
;
aout
->
volume_set
=
VolumeSet
;
aout
->
mute_set
=
MuteSet
;
return
VLC_SUCCESS
;
...
...
modules/audio_output/sndio.c
View file @
f6263939
...
...
@@ -152,9 +152,9 @@ static int Open (vlc_object_t *obj)
aout
->
format
=
f
;
aout
->
sys
=
sys
;
aout
->
p
f_p
lay
=
Play
;
aout
->
p
f_p
ause
=
Pause
;
aout
->
pf_
flush
=
NULL
;
/* sndio sucks! */
aout
->
play
=
Play
;
aout
->
pause
=
Pause
;
aout
->
flush
=
NULL
;
/* sndio sucks! */
if
(
sio_onvol
(
sys
->
hdl
,
VolumeChanged
,
aout
))
{
aout
->
volume_set
=
VolumeSet
;
...
...
modules/audio_output/wasapi.c
View file @
f6263939
...
...
@@ -800,9 +800,9 @@ retry:
Leave
();
aout
->
format
=
format
;
aout
->
p
f_p
lay
=
Play
;
aout
->
p
f_p
ause
=
Pause
;
aout
->
pf_
flush
=
Flush
;
aout
->
play
=
Play
;
aout
->
pause
=
Pause
;
aout
->
flush
=
Flush
;
/*if (AOUT_FMT_LINEAR(&format) && !exclusive)*/
{
aout
->
volume_set
=
SimpleVolumeSet
;
...
...
modules/audio_output/waveout.c
View file @
f6263939
...
...
@@ -168,9 +168,9 @@ static int Open( vlc_object_t *p_this )
if
(
p_aout
->
sys
==
NULL
)
return
VLC_ENOMEM
;
p_aout
->
p
f_p
lay
=
Play
;
p_aout
->
p
f_p
ause
=
aout_PacketPause
;
p_aout
->
pf_
flush
=
aout_PacketFlush
;
p_aout
->
play
=
Play
;
p_aout
->
pause
=
aout_PacketPause
;
p_aout
->
flush
=
aout_PacketFlush
;
/*
check for configured audio device!
...
...
src/audio_output/output.c
View file @
f6263939
...
...
@@ -43,7 +43,7 @@
*
* @warning The caller (i.e. the audio output plug-in) is responsible for
* interlocking and synchronizing call to this function and to the
* audio_output_t.
pf_
volume_set callback. This ensures that VLC gets correct
* audio_output_t.volume_set callback. This ensures that VLC gets correct
* volume information (possibly with a latency).
*/
static
void
aout_OutputVolumeReport
(
audio_output_t
*
aout
,
float
volume
)
...
...
@@ -237,7 +237,7 @@ void aout_OutputPlay (audio_output_t *aout, block_t *block)
}
if
(
likely
(
owner
->
module
!=
NULL
))
aout
->
p
f_p
lay
(
aout
,
block
,
&
drift
);
aout
->
play
(
aout
,
block
,
&
drift
);
else
block_Release
(
block
);
/**
...
...
@@ -274,8 +274,8 @@ void aout_OutputPlay (audio_output_t *aout, block_t *block)
void
aout_OutputPause
(
audio_output_t
*
aout
,
bool
pause
,
mtime_t
date
)
{
aout_assert_locked
(
aout
);
if
(
aout
->
p
f_p
ause
!=
NULL
)
aout
->
p
f_p
ause
(
aout
,
pause
,
date
);
if
(
aout
->
pause
!=
NULL
)
aout
->
pause
(
aout
,
pause
,
date
);
}
/**
...
...
@@ -288,6 +288,6 @@ void aout_OutputFlush( audio_output_t *aout, bool wait )
{
aout_assert_locked
(
aout
);
if
(
aout
->
pf_
flush
!=
NULL
)
aout
->
pf_
flush
(
aout
,
wait
);
if
(
aout
->
flush
!=
NULL
)
aout
->
flush
(
aout
,
wait
);
}
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