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
acd2a608
Commit
acd2a608
authored
Apr 28, 2005
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* es_out: oops, make EsOutProgramDel returning an error code.
parent
92ee1ca0
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
5 deletions
+7
-5
src/input/es_out.c
src/input/es_out.c
+7
-5
No files found.
src/input/es_out.c
View file @
acd2a608
...
@@ -499,7 +499,7 @@ static es_out_pgrm_t *EsOutProgramAdd( es_out_t *out, int i_group )
...
@@ -499,7 +499,7 @@ static es_out_pgrm_t *EsOutProgramAdd( es_out_t *out, int i_group )
/* EsOutDelProgram:
/* EsOutDelProgram:
* Delete a program
* Delete a program
*/
*/
static
void
EsOutProgramDel
(
es_out_t
*
out
,
int
i_group
)
static
int
EsOutProgramDel
(
es_out_t
*
out
,
int
i_group
)
{
{
es_out_sys_t
*
p_sys
=
out
->
p_sys
;
es_out_sys_t
*
p_sys
=
out
->
p_sys
;
input_thread_t
*
p_input
=
p_sys
->
p_input
;
input_thread_t
*
p_input
=
p_sys
->
p_input
;
...
@@ -516,13 +516,14 @@ static void EsOutProgramDel( es_out_t *out, int i_group )
...
@@ -516,13 +516,14 @@ static void EsOutProgramDel( es_out_t *out, int i_group )
}
}
}
}
if
(
p_pgrm
==
NULL
)
return
;
if
(
p_pgrm
==
NULL
)
return
VLC_EGENERIC
;
if
(
p_pgrm
->
i_es
)
if
(
p_pgrm
->
i_es
)
{
{
msg_Dbg
(
p_input
,
"can't delete program %d which still has %i ES"
,
msg_Dbg
(
p_input
,
"can't delete program %d which still has %i ES"
,
i_group
,
p_pgrm
->
i_es
);
i_group
,
p_pgrm
->
i_es
);
return
;
return
VLC_EGENERIC
;
}
}
TAB_REMOVE
(
p_sys
->
i_pgrm
,
p_sys
->
pgrm
,
p_pgrm
);
TAB_REMOVE
(
p_sys
->
i_pgrm
,
p_sys
->
pgrm
,
p_pgrm
);
...
@@ -538,6 +539,8 @@ static void EsOutProgramDel( es_out_t *out, int i_group )
...
@@ -538,6 +539,8 @@ static void EsOutProgramDel( es_out_t *out, int i_group )
var_Change
(
p_input
,
"program"
,
VLC_VAR_DELCHOICE
,
&
val
,
NULL
);
var_Change
(
p_input
,
"program"
,
VLC_VAR_DELCHOICE
,
&
val
,
NULL
);
var_SetBool
(
p_sys
->
p_input
,
"intf-change"
,
VLC_TRUE
);
var_SetBool
(
p_sys
->
p_input
,
"intf-change"
,
VLC_TRUE
);
return
VLC_SUCCESS
;
}
}
/* EsOutProgramMeta:
/* EsOutProgramMeta:
...
@@ -1057,8 +1060,7 @@ static void EsOutDel( es_out_t *out, es_out_id_t *es )
...
@@ -1057,8 +1060,7 @@ static void EsOutDel( es_out_t *out, es_out_id_t *es )
es
->
p_pgrm
->
i_es
--
;
es
->
p_pgrm
->
i_es
--
;
if
(
es
->
p_pgrm
->
i_es
==
0
)
if
(
es
->
p_pgrm
->
i_es
==
0
)
{
{
msg_Warn
(
p_sys
->
p_input
,
"Program doesn't contain anymore ES, "
msg_Dbg
(
p_sys
->
p_input
,
"Program doesn't contain anymore ES"
);
"TODO cleaning ?"
);
}
}
if
(
p_sys
->
p_es_audio
==
es
)
p_sys
->
p_es_audio
=
NULL
;
if
(
p_sys
->
p_es_audio
==
es
)
p_sys
->
p_es_audio
=
NULL
;
...
...
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