Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
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
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
21223154
Commit
21223154
authored
Nov 04, 2010
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
output_control: lock object in audio_output_close()
Protect the attributes "open" and "fail_timer".
parent
a549d871
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
28 additions
and
2 deletions
+28
-2
output_control.c
src/output_control.c
+28
-2
No files found.
src/output_control.c
View file @
21223154
...
...
@@ -50,6 +50,20 @@ static void ao_command(struct audio_output *ao, enum audio_output_command cmd)
ao_command_wait
(
ao
);
}
/**
* Like ao_command(), but assumes the object is locked by the caller.
*/
static
void
ao_command_locked
(
struct
audio_output
*
ao
,
enum
audio_output_command
cmd
)
{
assert
(
ao
->
command
==
AO_COMMAND_NONE
);
ao
->
command
=
cmd
;
g_mutex_unlock
(
ao
->
mutex
);
ao_command_wait
(
ao
);
g_mutex_lock
(
ao
->
mutex
);
}
static
void
ao_command_async
(
struct
audio_output
*
ao
,
enum
audio_output_command
cmd
)
{
...
...
@@ -162,21 +176,33 @@ void audio_output_cancel(struct audio_output *ao)
ao_command_async
(
ao
,
AO_COMMAND_CANCEL
);
}
void
audio_output_close
(
struct
audio_output
*
ao
)
static
void
audio_output_close_locked
(
struct
audio_output
*
ao
)
{
assert
(
ao
!=
NULL
);
assert
(
!
ao
->
open
||
ao
->
fail_timer
==
NULL
);
if
(
ao
->
mixer
!=
NULL
)
mixer_auto_close
(
ao
->
mixer
);
if
(
ao
->
open
)
ao_command
(
ao
,
AO_COMMAND_CLOSE
);
ao_command
_locked
(
ao
,
AO_COMMAND_CLOSE
);
else
if
(
ao
->
fail_timer
!=
NULL
)
{
g_timer_destroy
(
ao
->
fail_timer
);
ao
->
fail_timer
=
NULL
;
}
}
void
audio_output_close
(
struct
audio_output
*
ao
)
{
assert
(
ao
!=
NULL
);
assert
(
!
ao
->
open
||
ao
->
fail_timer
==
NULL
);
g_mutex_lock
(
ao
->
mutex
);
audio_output_close_locked
(
ao
);
g_mutex_unlock
(
ao
->
mutex
);
}
void
audio_output_finish
(
struct
audio_output
*
ao
)
{
audio_output_close
(
ao
);
...
...
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