Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
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-gpu
Commits
25ea83eb
Commit
25ea83eb
authored
Mar 17, 2008
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
VLM: use input_ItemAddOption
parent
2e7e2246
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
17 deletions
+12
-17
src/input/vlm.c
src/input/vlm.c
+12
-17
No files found.
src/input/vlm.c
View file @
25ea83eb
...
...
@@ -2266,17 +2266,13 @@ static int vlm_OnMediaUpdate( vlm_t *p_vlm, vlm_media_sys_t *p_media )
p_media
->
vod
.
item
.
psz_uri
=
strdup
(
p_cfg
->
ppsz_input
[
0
]
);
TAB_INIT
(
p_media
->
vod
.
item
.
i_options
,
p_media
->
vod
.
item
.
ppsz_options
);
asprintf
(
&
psz_dup
,
"sout=%s"
,
psz_output
);
TAB_APPEND
(
p_media
->
vod
.
item
.
i_options
,
p_media
->
vod
.
item
.
ppsz_options
,
psz_dup
);
input_ItemAddOption
(
&
p_media
->
vod
.
item
,
psz_dup
);
free
(
psz_dup
);
for
(
i
=
0
;
i
<
p_cfg
->
i_option
;
i
++
)
{
psz_dup
=
strdup
(
p_cfg
->
ppsz_option
[
i
]
);
TAB_APPEND
(
p_media
->
vod
.
item
.
i_options
,
p_media
->
vod
.
item
.
ppsz_options
,
psz_dup
);
}
psz_dup
=
strdup
(
"no-sout-keep"
);
TAB_APPEND
(
p_media
->
vod
.
item
.
i_options
,
p_media
->
vod
.
item
.
ppsz_options
,
psz_dup
);
input_ItemAddOption
(
&
p_media
->
vod
.
item
,
p_cfg
->
ppsz_option
[
i
]
);
input_ItemAddOption
(
&
p_media
->
vod
.
item
,
"no-sout-keep"
);
asprintf
(
&
psz_header
,
_
(
"Media: %s"
),
p_cfg
->
psz_name
);
...
...
@@ -2554,15 +2550,13 @@ static int vlm_ControlMediaInstanceStart( vlm_t *p_vlm, int64_t id, const char *
if
(
!
p_instance
)
{
vlm_media_t
*
p_cfg
=
&
p_media
->
cfg
;
char
*
psz_keep
;
c
onst
c
har
*
psz_keep
;
int
i
;
p_instance
=
vlm_MediaInstanceNew
(
p_vlm
,
psz_id
);
if
(
!
p_instance
)
return
VLC_ENOMEM
;
TAB_INIT
(
p_instance
->
item
.
i_options
,
p_instance
->
item
.
ppsz_options
);
if
(
p_cfg
->
psz_output
!=
NULL
||
psz_vod_output
!=
NULL
)
{
char
*
psz_buffer
;
...
...
@@ -2570,7 +2564,8 @@ static int vlm_ControlMediaInstanceStart( vlm_t *p_vlm, int64_t id, const char *
p_cfg
->
psz_output
?
p_cfg
->
psz_output
:
""
,
(
p_cfg
->
psz_output
&&
psz_vod_output
)
?
":"
:
psz_vod_output
?
"#"
:
""
,
psz_vod_output
?
psz_vod_output
:
""
);
TAB_APPEND
(
p_instance
->
item
.
i_options
,
p_instance
->
item
.
ppsz_options
,
psz_buffer
);
input_ItemAddOption
(
&
p_instance
->
item
,
psz_buffer
);
free
(
psz_buffer
);
}
for
(
i
=
0
;
i
<
p_cfg
->
i_option
;
i
++
)
...
...
@@ -2580,16 +2575,16 @@ static int vlm_ControlMediaInstanceStart( vlm_t *p_vlm, int64_t id, const char *
else
if
(
!
strcmp
(
p_cfg
->
ppsz_option
[
i
],
"nosout-keep"
)
||
!
strcmp
(
p_cfg
->
ppsz_option
[
i
],
"no-sout-keep"
)
)
p_instance
->
b_sout_keep
=
VLC_FALSE
;
else
TAB_APPEND
(
p_instance
->
item
.
i_options
,
p_instance
->
item
.
ppsz_options
,
strdup
(
p_cfg
->
ppsz_option
[
i
]
)
);
input_ItemAddOption
(
&
p_instance
->
item
,
p_cfg
->
ppsz_option
[
i
]
);
}
/* We force the right sout-keep value (avoid using the sout-keep from the global configuration)
* FIXME implement input list for VOD (need sout-keep)
* */
if
(
!
p_cfg
->
b_vod
&&
p_instance
->
b_sout_keep
)
psz_keep
=
strdup
(
"sout-keep"
)
;
psz_keep
=
"sout-keep"
;
else
psz_keep
=
strdup
(
"no-sout-keep"
)
;
TAB_APPEND
(
p_instance
->
item
.
i_options
,
p_instance
->
item
.
ppsz_options
,
psz_keep
);
psz_keep
=
"no-sout-keep"
;
input_ItemAddOption
(
&
p_instance
->
item
,
psz_keep
);
TAB_APPEND
(
p_media
->
i_instance
,
p_media
->
instance
,
p_instance
);
}
...
...
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