[prev in list] [next in list] [prev in thread] [next in thread] 

List:       xine-cvslog
Subject:    [xine-cvs] HG: xine-lib: Fix xine_get_pluginroot (mingw32)
From:       Matthias Ringwald <mringwal () inf ! ethz ! ch>
Date:       2008-07-11 20:31:39
Message-ID: b4d1678a8b4bae0c0dde.1215806207 () hg ! debian ! org
[Download RAW message or body]

# HG changeset patch
# User Matthias Ringwald <mringwal@inf.ethz.ch>
# Date 1215806207 -7200
# Node ID b4d1678a8b4bae0c0dde73734d383d008d992a2e
# Parent  0630bdb5d4849355122e0d784adcce1ea00b7ab8
Fix xine_get_pluginroot (mingw32)
xine_get_pluginroot now makes use of the XINE_REL_PLUGINROOT define

diff -r b4d1678a8b4bae0c0dde73734d383d008d992a2e -r \
                0630bdb5d4849355122e0d784adcce1ea00b7ab8 configure.ac
--- a/configure.ac	Fri Jul 11 21:56:47 2008 +0200
+++ b/configure.ac	Thu Jul 10 11:38:44 2008 +0200
@@ -2458,7 +2458,8 @@ else
   AC_DEFINE_UNQUOTED(XINE_FONTDIR,"$XINE_FONTPATH",[Define this to osd fonts dir \
location])  AC_DEFINE_UNQUOTED(XINE_LOCALEDIR, "$XINE_LOCALEPATH",[Path where catalog \
files will be.])  fi
-AC_DEFINE_UNQUOTED(XINE_REL_PLUGINDIR,"$XINE_REL_PLUGINDIR",[Define this to plugin \
directory relative to execution prefix]) \
+AC_DEFINE_UNQUOTED(XINE_REL_PLUGINDIR,"$XINE_REL_PLUGINDIR",[Define this to specific \
plugin directory relative to execution prefix]) \
+AC_DEFINE_UNQUOTED(XINE_REL_PLUGINROOT,"$XINE_REL_PLUGINROOT",[Define this to \
general plugin directory relative to execution prefix])  \
AC_DEFINE_UNQUOTED(XINE_REL_FONTDIR,"$XINE_REL_FONTDIR",[Define this to font \
directory relative to prefix])  \
AC_DEFINE_UNQUOTED(XINE_REL_LOCALEDIR,"$XINE_REL_LOCALEDIR",[Define this to font \
directory relative to prefix])  AC_SUBST(XINE_CONFIG_PREFIX)
diff -r b4d1678a8b4bae0c0dde73734d383d008d992a2e -r \
                0630bdb5d4849355122e0d784adcce1ea00b7ab8 src/xine-utils/utils.c
--- a/src/xine-utils/utils.c	Fri Jul 11 21:56:47 2008 +0200
+++ b/src/xine-utils/utils.c	Thu Jul 10 11:38:44 2008 +0200
@@ -393,11 +393,8 @@ const char *xine_get_pluginroot(void) {
   static char pluginroot[1024] = {0, };
 
   if (!pluginroot[0]) {
-    char *sep, *sep2;
-    strcpy (pluginroot, xine_get_plugindir ());
-    sep = strrchr (pluginroot, '/');
-    sep2 = strrchr (pluginroot, '\\');
-    *(sep < sep2 ? sep : sep2) = 0;
+    xine_get_rootdir(pluginroot, sizeof(pluginroot) - strlen(XINE_REL_PLUGINROOT) - \
1); +    strcat(pluginroot, XINE_DIRECTORY_SEPARATOR_STRING XINE_REL_PLUGINROOT);
   }
 
   return pluginroot;

-------------------------------------------------------------------------
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08
_______________________________________________
Xine-cvslog mailing list
Xine-cvslog@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xine-cvslog


[prev in list] [next in list] [prev in thread] [next in thread]