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
4e3be6eb
Commit
4e3be6eb
authored
Aug 22, 2007
by
Christophe Mutricy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Check for the good directory.
Fix some warnings
parent
6d872fb4
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
11 deletions
+13
-11
modules/misc/lua/vlclua.c
modules/misc/lua/vlclua.c
+11
-10
modules/misc/lua/vlclua.h
modules/misc/lua/vlclua.h
+2
-1
No files found.
modules/misc/lua/vlclua.c
View file @
4e3be6eb
...
@@ -259,24 +259,23 @@ int vlclua_scripts_batch_execute( vlc_object_t *p_this,
...
@@ -259,24 +259,23 @@ int vlclua_scripts_batch_execute( vlc_object_t *p_this,
return
VLC_ENOMEM
;
return
VLC_ENOMEM
;
}
}
# else
# else
{
if
(
asprintf
(
&
ppsz_dir_list
[
1
],
"share"
DIR_SEP
"%s"
,
luadirname
)
<
0
)
return
VLC_ENOMEM
;
# ifdef HAVE_SYS_STAT_H
# ifdef HAVE_SYS_STAT_H
{
struct
stat
stat_info
;
struct
stat
stat_info
;
if
(
(
utf8_stat
(
"share/luaplaylist"
,
&
stat_info
)
==
-
1
)
if
(
(
utf8_stat
(
ppsz_dir_list
[
1
]
,
&
stat_info
)
==
-
1
)
||
!
S_ISDIR
(
stat_info
.
st_mode
)
)
||
!
S_ISDIR
(
stat_info
.
st_mode
)
)
{
{
free
(
ppsz_dir_list
[
1
]);
if
(
asprintf
(
&
ppsz_dir_list
[
1
],
if
(
asprintf
(
&
ppsz_dir_list
[
1
],
DATA_PATH
DIR_SEP
"%s"
,
luadirname
)
<
0
)
DATA_PATH
DIR_SEP
"%s"
,
luadirname
)
<
0
)
return
VLC_ENOMEM
;
return
VLC_ENOMEM
;
}
}
else
# endif
{
if
(
asprintf
(
&
ppsz_dir_list
[
1
],
"share"
DIR_SEP
"%s"
,
luadirname
)
<
0
)
return
VLC_ENOMEM
;
}
}
}
# endif
# endif
# endif
for
(
ppsz_dir
=
ppsz_dir_list
;
*
ppsz_dir
;
ppsz_dir
++
)
for
(
ppsz_dir
=
ppsz_dir_list
;
*
ppsz_dir
;
ppsz_dir
++
)
...
@@ -308,7 +307,9 @@ int vlclua_scripts_batch_execute( vlc_object_t *p_this,
...
@@ -308,7 +307,9 @@ int vlclua_scripts_batch_execute( vlc_object_t *p_this,
for
(
ppsz_file
=
ppsz_filelist
;
ppsz_file
<
ppsz_fileend
;
ppsz_file
++
)
for
(
ppsz_file
=
ppsz_filelist
;
ppsz_file
<
ppsz_fileend
;
ppsz_file
++
)
{
{
char
*
psz_filename
;
char
*
psz_filename
;
asprintf
(
&
psz_filename
,
"%s"
DIR_SEP
"%s"
,
*
ppsz_dir
,
*
ppsz_file
);
if
(
asprintf
(
&
psz_filename
,
"%s"
DIR_SEP
"%s"
,
*
ppsz_dir
,
*
ppsz_file
)
<
0
)
return
VLC_ENOMEM
;
msg_Dbg
(
p_this
,
"Trying Lua playlist script %s"
,
psz_filename
);
msg_Dbg
(
p_this
,
"Trying Lua playlist script %s"
,
psz_filename
);
i_ret
=
func
(
p_this
,
psz_filename
,
p_state
,
user_data
);
i_ret
=
func
(
p_this
,
psz_filename
,
p_state
,
user_data
);
...
...
modules/misc/lua/vlclua.h
View file @
4e3be6eb
...
@@ -94,3 +94,4 @@ void vlclua_read_custom_meta_data( vlc_object_t *p_this,
...
@@ -94,3 +94,4 @@ void vlclua_read_custom_meta_data( vlc_object_t *p_this,
lua_State
*
p_state
,
int
o
,
int
t
,
input_item_t
*
p_input
);
lua_State
*
p_state
,
int
o
,
int
t
,
input_item_t
*
p_input
);
#endif
/* VLC_LUA_H */
#endif
/* VLC_LUA_H */
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