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
fe03fdee
Commit
fe03fdee
authored
Jan 09, 2011
by
Sébastien Toque
Committed by
Jean-Baptiste Kempf
Jan 09, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ProjectM/Milkdrop default presets path on windows using datadir
Signed-off-by:
Jean-Baptiste Kempf
<
jb@videolan.org
>
parent
fd9eb658
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
0 deletions
+12
-0
modules/visualization/projectm.cpp
modules/visualization/projectm.cpp
+12
-0
No files found.
modules/visualization/projectm.cpp
View file @
fe03fdee
...
...
@@ -82,8 +82,12 @@ vlc_module_begin ()
#ifndef HAVE_PROJECTM2
add_loadfile
(
"projectm-config"
,
"/usr/share/projectM/config.inp"
,
CONFIG_TEXT
,
CONFIG_LONGTEXT
,
true
)
#else
#ifdef WIN32
add_directory
(
"projectm-preset-path"
,
NULL
,
#else
add_directory
(
"projectm-preset-path"
,
"/usr/share/projectM/presets"
,
#endif
PRESET_PATH_TXT
,
PRESET_PATH_LONGTXT
,
true
)
add_font
(
"projectm-title-font"
,
"/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf"
,
TITLE_FONT_TXT
,
TITLE_FONT_LONGTXT
,
true
)
...
...
@@ -349,6 +353,14 @@ static void *Thread( void *p_data )
free
(
psz_config
);
#else
psz_preset_path
=
var_InheritString
(
p_filter
,
"projectm-preset-path"
);
#ifdef WIN32
if
(
psz_preset_path
==
NULL
)
{
char
*
psz_data_path
=
config_GetDataDir
(
p_filter
);
asprintf
(
&
psz_preset_path
,
"%s"
DIR_SEP
"visualisation"
,
psz_data_path
);
free
(
psz_data_path
);
}
#endif
psz_title_font
=
var_InheritString
(
p_filter
,
"projectm-title-font"
);
psz_menu_font
=
var_InheritString
(
p_filter
,
"projectm-menu-font"
);
...
...
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