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
b4c31357
Commit
b4c31357
authored
Feb 10, 2008
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use config_GetDataDir() instead of DATA_PATH.
parent
49bcf08a
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
6 deletions
+16
-6
modules/control/http/http.c
modules/control/http/http.c
+6
-2
modules/gui/skins2/x11/x11_factory.cpp
modules/gui/skins2/x11/x11_factory.cpp
+1
-1
modules/misc/lua/vlc.c
modules/misc/lua/vlc.c
+2
-2
modules/misc/notify/notify.c
modules/misc/notify/notify.c
+7
-1
No files found.
modules/control/http/http.c
View file @
b4c31357
...
...
@@ -263,10 +263,14 @@ static int Open( vlc_object_t *p_this )
if
(
(
psz_src
==
NULL
)
||
(
*
psz_src
==
'\0'
)
)
{
static
char
const
*
ppsz_paths
[]
=
{
const
char
*
data_path
=
config_GetDataDir
();
char
buf
[
strlen
(
data_path
)
+
sizeof
(
"/http"
)];
snprintf
(
buf
,
sizeof
(
buf
),
"%s/http"
,
data_path
);
const
char
const
*
ppsz_paths
[]
=
{
"share/http"
,
"../share/http"
,
DATA_PATH
"/http"
,
buf
,
NULL
};
unsigned
i
;
...
...
modules/gui/skins2/x11/x11_factory.cpp
View file @
b4c31357
...
...
@@ -74,7 +74,7 @@ bool X11Factory::init()
m_resourcePath
.
push_back
(
(
string
)
getIntf
()
->
p_libvlc
->
psz_datadir
+
+
"/skins2"
);
m_resourcePath
.
push_back
(
(
string
)
"share/skins2"
);
m_resourcePath
.
push_back
(
(
string
)
DATA_PATH
+
"/skins2"
);
m_resourcePath
.
push_back
(
(
string
)
config_GetDataDir
()
+
"/skins2"
);
return
true
;
}
...
...
modules/misc/lua/vlc.c
View file @
b4c31357
...
...
@@ -432,8 +432,8 @@ int vlclua_dir_list( vlc_object_t *p_this, const char *luadirname,
||
!
S_ISDIR
(
stat_info
.
st_mode
)
)
{
free
(
ppsz_dir_list
[
1
]);
if
(
asprintf
(
&
ppsz_dir_list
[
1
],
DATA_PATH
DIR_SEP
"%s"
,
luadirname
)
<
0
)
if
(
asprintf
(
&
ppsz_dir_list
[
1
],
"%s"
DIR_SEP
"%s"
,
config_GetDataDir
()
,
luadirname
)
<
0
)
return
VLC_ENOMEM
;
}
}
...
...
modules/misc/notify/notify.c
View file @
b4c31357
...
...
@@ -219,7 +219,13 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var,
free
(
psz_arturl
);
}
else
/* else we show state-of-the art logo */
pix
=
gdk_pixbuf_new_from_file
(
DATA_PATH
"/vlc48x48.png"
,
&
p_error
);
{
const
char
*
data_path
=
config_GetDataDir
();
char
buf
[
strlen
(
data_path
)
+
sizeof
(
"/vlc48x48.png"
)];
snprintf
(
buf
,
sizeof
(
buf
),
"%s/vlc48x48.png"
,
data_path
);
pix
=
gdk_pixbuf_new_from_file
(
buf
,
&
p_error
);
}
/* we need to replace '&' with '&' because '&' is a keyword of
* notification-daemon parser */
...
...
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