Mercurial > mplayer.hg
diff mplayer.c @ 10272:7b0bc557987b
renames: DATADIR->MPLAYER_DATADIR, CONFDIR->MPLAYER_CONFDIR, LIBDIR->MPLAYER_LIBDIR
author | arpi |
---|---|
date | Mon, 09 Jun 2003 12:15:48 +0000 |
parents | 3d4c520e71c2 |
children | eee7cab79089 |
line wrap: on
line diff
--- a/mplayer.c Mon Jun 09 12:12:04 2003 +0000 +++ b/mplayer.c Mon Jun 09 12:15:48 2003 +0000 @@ -525,7 +525,7 @@ { char *conffile; int conffile_fd; -if (m_config_parse_config_file(conf, CONFDIR"/mplayer.conf") < 0) +if (m_config_parse_config_file(conf, MPLAYER_CONFDIR "/mplayer.conf") < 0) exit(1); if ((conffile = get_path("")) == NULL) { mp_msg(MSGT_CPLAYER,MSGL_WARN,MSGTR_NoHomeDir); @@ -866,7 +866,7 @@ // check codec.conf if(!parse_codec_cfg(get_path("codecs.conf"))){ - if(!parse_codec_cfg(CONFDIR"/codecs.conf")){ + if(!parse_codec_cfg(MPLAYER_CONFDIR "/codecs.conf")){ if(!parse_codec_cfg(NULL)){ mp_msg(MSGT_CPLAYER,MSGL_HINT,MSGTR_CopyCodecsConf); exit(0); @@ -1038,7 +1038,7 @@ // try default: vo_font=read_font_desc(get_path("font/font.desc"),font_factor,verbose>1); if(!vo_font) - vo_font=read_font_desc(DATADIR"/font/font.desc",font_factor,verbose>1); + vo_font=read_font_desc(MPLAYER_DATADIR "/font/font.desc",font_factor,verbose>1); } #ifdef HAVE_FREETYPE if (!vo_font) @@ -1117,8 +1117,8 @@ if(menu_init(menu_cfg)) mp_msg(MSGT_CPLAYER,MSGL_INFO,"Menu inited: %s\n", menu_cfg); else { - if(menu_init(CONFDIR"/menu.conf")) - mp_msg(MSGT_CPLAYER,MSGL_INFO,"Menu inited: %s\n", CONFDIR"/menu.conf"); + if(menu_init(MPLAYER_CONFDIR "/menu.conf")) + mp_msg(MSGT_CPLAYER,MSGL_INFO,"Menu inited: %s\n", MPLAYER_CONFDIR"/menu.conf"); else { mp_msg(MSGT_CPLAYER,MSGL_INFO,"Menu init failed\n"); use_menu = 0;