Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
888aed94
Commit
888aed94
authored
Nov 12, 2010
by
Pierre Ynard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vlm: use make_URI()
parent
99fa5b44
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
2 deletions
+9
-2
src/input/vlm.c
src/input/vlm.c
+9
-2
No files found.
src/input/vlm.c
View file @
888aed94
...
...
@@ -58,6 +58,7 @@
#include "vlm_event.h"
#include <vlc_vod.h>
#include <vlc_sout.h>
#include <vlc_url.h>
#include "../stream_output/stream_output.h"
#include "../libvlc.h"
...
...
@@ -586,8 +587,11 @@ static int vlm_OnMediaUpdate( vlm_t *p_vlm, vlm_media_sys_t *p_media )
int
i
;
vlc_gc_decref
(
p_media
->
vod
.
p_item
);
p_media
->
vod
.
p_item
=
input_item_New
(
p_vlm
,
p_cfg
->
ppsz_input
[
0
],
char
*
psz_uri
=
make_URI
(
p_cfg
->
ppsz_input
[
0
],
NULL
);
p_media
->
vod
.
p_item
=
input_item_New
(
p_vlm
,
psz_uri
,
p_cfg
->
psz_name
);
free
(
psz_uri
);
if
(
p_cfg
->
psz_output
)
{
...
...
@@ -960,7 +964,10 @@ static int vlm_ControlMediaInstanceStart( vlm_t *p_vlm, int64_t id, const char *
/* Start new one */
p_instance
->
i_index
=
i_input_index
;
input_item_SetURI
(
p_instance
->
p_item
,
p_media
->
cfg
.
ppsz_input
[
p_instance
->
i_index
]
)
;
char
*
psz_uri
=
make_URI
(
p_media
->
cfg
.
ppsz_input
[
p_instance
->
i_index
],
NULL
);
input_item_SetURI
(
p_instance
->
p_item
,
psz_uri
)
;
free
(
psz_uri
);
if
(
asprintf
(
&
psz_log
,
_
(
"Media: %s"
),
p_media
->
cfg
.
psz_name
)
!=
-
1
)
{
...
...
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