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
68d10077
Commit
68d10077
authored
Jan 27, 2011
by
Pierre Ynard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't pass relative file paths when using --one-instance
Fixes Debian bug #600269
parent
98c9762c
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
2 deletions
+9
-2
src/libvlc.c
src/libvlc.c
+9
-2
No files found.
src/libvlc.c
View file @
68d10077
...
@@ -604,8 +604,12 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
...
@@ -604,8 +604,12 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
for
(
i_input
=
vlc_optind
;
i_input
<
i_argc
;
i_input
++
)
for
(
i_input
=
vlc_optind
;
i_input
<
i_argc
;
i_input
++
)
{
{
/* We need to resolve relative paths in this instance */
char
*
psz_mrl
=
make_URI
(
ppsz_argv
[
i_input
]
);
if
(
psz_mrl
==
NULL
)
continue
;
msg_Dbg
(
p_libvlc
,
"Adds %s to the running Media Player"
,
msg_Dbg
(
p_libvlc
,
"Adds %s to the running Media Player"
,
ppsz_argv
[
i_input
]
);
psz_mrl
);
p_dbus_msg
=
dbus_message_new_method_call
(
p_dbus_msg
=
dbus_message_new_method_call
(
"org.mpris.vlc"
,
"/TrackList"
,
"org.mpris.vlc"
,
"/TrackList"
,
...
@@ -614,6 +618,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
...
@@ -614,6 +618,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
if
(
NULL
==
p_dbus_msg
)
if
(
NULL
==
p_dbus_msg
)
{
{
msg_Err
(
p_libvlc
,
"D-Bus problem"
);
msg_Err
(
p_libvlc
,
"D-Bus problem"
);
free
(
psz_mrl
);
system_End
(
p_libvlc
);
system_End
(
p_libvlc
);
exit
(
1
);
exit
(
1
);
}
}
...
@@ -621,12 +626,14 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
...
@@ -621,12 +626,14 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
/* append MRLs */
/* append MRLs */
dbus_message_iter_init_append
(
p_dbus_msg
,
&
dbus_args
);
dbus_message_iter_init_append
(
p_dbus_msg
,
&
dbus_args
);
if
(
!
dbus_message_iter_append_basic
(
&
dbus_args
,
if
(
!
dbus_message_iter_append_basic
(
&
dbus_args
,
DBUS_TYPE_STRING
,
&
p
psz_argv
[
i_input
]
)
)
DBUS_TYPE_STRING
,
&
p
sz_mrl
)
)
{
{
dbus_message_unref
(
p_dbus_msg
);
dbus_message_unref
(
p_dbus_msg
);
free
(
psz_mrl
);
system_End
(
p_libvlc
);
system_End
(
p_libvlc
);
exit
(
1
);
exit
(
1
);
}
}
free
(
psz_mrl
);
b_play
=
TRUE
;
b_play
=
TRUE
;
if
(
var_InheritBool
(
p_libvlc
,
"playlist-enqueue"
)
)
if
(
var_InheritBool
(
p_libvlc
,
"playlist-enqueue"
)
)
b_play
=
FALSE
;
b_play
=
FALSE
;
...
...
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