[vlc-commits] projectM: cosmetic, fix syntax coloring
Rémi Denis-Courmont
git at videolan.org
Thu Oct 25 21:12:54 CEST 2012
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Oct 25 21:58:43 2012 +0300| [4c755f49aa4225e95bda123e7ce0a58a0740838d] | committer: Rémi Denis-Courmont
projectM: cosmetic, fix syntax coloring
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4c755f49aa4225e95bda123e7ce0a58a0740838d
---
modules/visualization/projectm.cpp | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/modules/visualization/projectm.cpp b/modules/visualization/projectm.cpp
index 9d76223..048e159 100644
--- a/modules/visualization/projectm.cpp
+++ b/modules/visualization/projectm.cpp
@@ -77,9 +77,11 @@ static void Close ( vlc_object_t * );
#ifdef WIN32
# define FONT_PATH "C:\\WINDOWS\\Fonts\\arial.ttf"
# define FONT_PATH_MENU "C:\\WINDOWS\\Fonts\\arial.ttf"
+# define PRESET_PATH NULL
#else
# define FONT_PATH "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf"
# define FONT_PATH_MENU "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf"
+# define PRESET_PATH "/usr/share/projectM/presets"
#endif
vlc_module_begin ()
@@ -92,11 +94,7 @@ vlc_module_begin ()
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
+ add_directory( "projectm-preset-path", PRESET_PATH,
PRESET_PATH_TXT, PRESET_PATH_LONGTXT, true )
add_loadfile( "projectm-title-font", FONT_PATH,
TITLE_FONT_TXT, TITLE_FONT_LONGTXT, true )
More information about the vlc-commits
mailing list