Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
24e5f5cd
Commit
24e5f5cd
authored
Apr 16, 2014
by
Lukasz Marek
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavd/pulse_audio_common: rename variables and enums
Signed-off-by:
Lukasz Marek
<
lukasz.m.luki2@gmail.com
>
parent
e48fb4e1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
10 deletions
+10
-10
pulse_audio_common.c
libavdevice/pulse_audio_common.c
+10
-10
No files found.
libavdevice/pulse_audio_common.c
View file @
24e5f5cd
...
@@ -43,10 +43,10 @@ pa_sample_format_t av_cold ff_codec_id_to_pulse_format(enum AVCodecID codec_id)
...
@@ -43,10 +43,10 @@ pa_sample_format_t av_cold ff_codec_id_to_pulse_format(enum AVCodecID codec_id)
}
}
}
}
enum
PulseAudio
Loop
State
{
enum
PulseAudio
Context
State
{
P
A_LOOP
_INITIALIZING
,
P
ULSE_CONTEXT
_INITIALIZING
,
P
A_LOOP
_READY
,
P
ULSE_CONTEXT
_READY
,
P
A_LOOP
_FINISHED
P
ULSE_CONTEXT
_FINISHED
};
};
typedef
struct
PulseAudioDeviceList
{
typedef
struct
PulseAudioDeviceList
{
...
@@ -58,15 +58,15 @@ typedef struct PulseAudioDeviceList {
...
@@ -58,15 +58,15 @@ typedef struct PulseAudioDeviceList {
static
void
pa_state_cb
(
pa_context
*
c
,
void
*
userdata
)
static
void
pa_state_cb
(
pa_context
*
c
,
void
*
userdata
)
{
{
enum
PulseAudio
LoopState
*
loop_status
=
userdata
;
enum
PulseAudio
ContextState
*
context_state
=
userdata
;
switch
(
pa_context_get_state
(
c
))
{
switch
(
pa_context_get_state
(
c
))
{
case
PA_CONTEXT_FAILED
:
case
PA_CONTEXT_FAILED
:
case
PA_CONTEXT_TERMINATED
:
case
PA_CONTEXT_TERMINATED
:
*
loop_status
=
PA_LOOP
_FINISHED
;
*
context_state
=
PULSE_CONTEXT
_FINISHED
;
break
;
break
;
case
PA_CONTEXT_READY
:
case
PA_CONTEXT_READY
:
*
loop_status
=
PA_LOOP
_READY
;
*
context_state
=
PULSE_CONTEXT
_READY
;
break
;
break
;
default:
default:
break
;
break
;
...
@@ -142,7 +142,7 @@ int ff_pulse_audio_get_devices(AVDeviceInfoList *devices, const char *server, in
...
@@ -142,7 +142,7 @@ int ff_pulse_audio_get_devices(AVDeviceInfoList *devices, const char *server, in
pa_operation
*
pa_op
=
NULL
;
pa_operation
*
pa_op
=
NULL
;
pa_context
*
pa_ctx
=
NULL
;
pa_context
*
pa_ctx
=
NULL
;
enum
pa_operation_state
op_state
;
enum
pa_operation_state
op_state
;
enum
PulseAudio
LoopState
loop_state
=
PA_LOOP
_INITIALIZING
;
enum
PulseAudio
ContextState
loop_state
=
PULSE_CONTEXT
_INITIALIZING
;
PulseAudioDeviceList
dev_list
=
{
0
};
PulseAudioDeviceList
dev_list
=
{
0
};
int
i
;
int
i
;
...
@@ -168,9 +168,9 @@ int ff_pulse_audio_get_devices(AVDeviceInfoList *devices, const char *server, in
...
@@ -168,9 +168,9 @@ int ff_pulse_audio_get_devices(AVDeviceInfoList *devices, const char *server, in
goto
fail
;
goto
fail
;
}
}
while
(
loop_state
==
P
A_LOOP
_INITIALIZING
)
while
(
loop_state
==
P
ULSE_CONTEXT
_INITIALIZING
)
pa_mainloop_iterate
(
pa_ml
,
1
,
NULL
);
pa_mainloop_iterate
(
pa_ml
,
1
,
NULL
);
if
(
loop_state
==
P
A_LOOP
_FINISHED
)
{
if
(
loop_state
==
P
ULSE_CONTEXT
_FINISHED
)
{
dev_list
.
error_code
=
AVERROR_EXTERNAL
;
dev_list
.
error_code
=
AVERROR_EXTERNAL
;
goto
fail
;
goto
fail
;
}
}
...
...
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