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
a398f405
Commit
a398f405
authored
May 25, 2008
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove audio output recycling support. It kept crashing.
parent
5a3ede13
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
29 deletions
+15
-29
src/audio_output/dec.c
src/audio_output/dec.c
+10
-19
src/input/decoder.c
src/input/decoder.c
+5
-1
src/libvlc-common.c
src/libvlc-common.c
+0
-9
No files found.
src/audio_output/dec.c
View file @
a398f405
...
@@ -173,30 +173,21 @@ aout_input_t * __aout_DecNew( vlc_object_t * p_this,
...
@@ -173,30 +173,21 @@ aout_input_t * __aout_DecNew( vlc_object_t * p_this,
audio_sample_format_t
*
p_format
,
audio_sample_format_t
*
p_format
,
audio_replay_gain_t
*
p_replay_gain
)
audio_replay_gain_t
*
p_replay_gain
)
{
{
if
(
*
pp_aout
==
NULL
)
aout_instance_t
*
p_aout
=
*
pp_aout
;
{
if
(
p_aout
==
NULL
)
/* Create an audio output if there is none. */
*
pp_aout
=
vlc_object_find
(
p_this
,
VLC_OBJECT_AOUT
,
FIND_ANYWHERE
);
if
(
*
pp_aout
==
NULL
)
{
{
msg_Dbg
(
p_this
,
"no aout present, spawning one"
);
msg_Dbg
(
p_this
,
"no aout present, spawning one"
);
p_aout
=
aout_New
(
p_this
);
*
pp_aout
=
aout_New
(
p_this
);
/* Everything failed, I'm a loser, I just wanna die */
/* Everything failed, I'm a loser, I just wanna die */
if
(
*
pp_aout
==
NULL
)
if
(
p_aout
==
NULL
)
{
return
NULL
;
return
NULL
;
}
vlc_object_attach
(
*
pp_aout
,
p_this
->
p_libvlc
);
vlc_object_attach
(
p_aout
,
p_this
);
}
*
pp_aout
=
p_aout
;
else
{
vlc_object_release
(
*
pp_aout
);
}
}
}
return
DecNew
(
p_this
,
*
p
p_aout
,
p_format
,
p_replay_gain
);
return
DecNew
(
p_this
,
p_aout
,
p_format
,
p_replay_gain
);
}
}
/*****************************************************************************
/*****************************************************************************
...
...
src/input/decoder.c
View file @
a398f405
...
@@ -986,7 +986,11 @@ static void DeleteDecoder( decoder_t * p_dec )
...
@@ -986,7 +986,11 @@ static void DeleteDecoder( decoder_t * p_dec )
/* Cleanup */
/* Cleanup */
if
(
p_dec
->
p_owner
->
p_aout_input
)
if
(
p_dec
->
p_owner
->
p_aout_input
)
aout_DecDelete
(
p_dec
->
p_owner
->
p_aout
,
p_dec
->
p_owner
->
p_aout_input
);
aout_DecDelete
(
p_dec
->
p_owner
->
p_aout
,
p_dec
->
p_owner
->
p_aout_input
);
if
(
p_dec
->
p_owner
->
p_aout
)
{
aout_Delete
(
p_dec
->
p_owner
->
p_aout
);
p_dec
->
p_owner
->
p_aout
=
NULL
;
}
if
(
p_dec
->
p_owner
->
p_vout
)
if
(
p_dec
->
p_owner
->
p_vout
)
{
{
int
i_pic
;
int
i_pic
;
...
...
src/libvlc-common.c
View file @
a398f405
...
@@ -945,15 +945,6 @@ int libvlc_InternalCleanup( libvlc_int_t *p_libvlc )
...
@@ -945,15 +945,6 @@ int libvlc_InternalCleanup( libvlc_int_t *p_libvlc )
vout_Destroy
(
p_vout
);
vout_Destroy
(
p_vout
);
}
}
/* Free audio outputs */
msg_Dbg
(
p_libvlc
,
"removing all audio outputs"
);
while
(
(
p_aout
=
vlc_object_find
(
p_libvlc
,
VLC_OBJECT_AOUT
,
FIND_CHILD
))
)
{
vlc_object_detach
(
(
vlc_object_t
*
)
p_aout
);
vlc_object_release
(
(
vlc_object_t
*
)
p_aout
);
aout_Delete
(
p_aout
);
}
#ifdef ENABLE_SOUT
#ifdef ENABLE_SOUT
playlist_t
*
p_playlist
;
playlist_t
*
p_playlist
;
sout_instance_t
*
p_sout
;
sout_instance_t
*
p_sout
;
...
...
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