diff options
author | František Dvořák <valtri@users.sourceforge.net> | 2005-08-29 15:28:16 +0000 |
---|---|---|
committer | František Dvořák <valtri@users.sourceforge.net> | 2005-08-29 15:28:16 +0000 |
commit | 0f8fd3b22893dd07db6506a1ba4d298e51a1c985 (patch) | |
tree | 291cf3594687cdaaa23f9527ba6d9f20f1a6283d /src/xine-engine/load_plugins.c | |
parent | 7cb89d83b0d845270e583c2848b0eaaa5e053217 (diff) | |
download | xine-lib-0f8fd3b22893dd07db6506a1ba4d298e51a1c985.tar.gz xine-lib-0f8fd3b22893dd07db6506a1ba4d298e51a1c985.tar.bz2 |
*BUGFIX*
Windows ports updates:
- finished M$VC port update
- moved xine plugins back to normal location for Windows ports,
added relative directories (used relative to ${prefix}),
make sure it's thread-safe (but it's still hacky)
- fixed ugly bug with loading plugins, when working drive was differrent from
plugins directory
directory
- directory and subdirectory separator called as platform specific
- fix crash with newer win32 pthread (missing mutex_init in vo plugin), yes!
- small doc update
CVS patchset: 7712
CVS date: 2005/08/29 15:28:16
Diffstat (limited to 'src/xine-engine/load_plugins.c')
-rw-r--r-- | src/xine-engine/load_plugins.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c index 6910f157b..dfec63876 100644 --- a/src/xine-engine/load_plugins.c +++ b/src/xine-engine/load_plugins.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: load_plugins.c,v 1.211 2005/08/25 15:36:30 valtri Exp $ + * $Id: load_plugins.c,v 1.212 2005/08/29 15:28:16 valtri Exp $ * * * Load input/demux/audio_out/video_out/codec plugins @@ -1088,21 +1088,21 @@ void _x_scan_plugins (xine_t *this) { if ((pluginpath = getenv("XINE_PLUGIN_PATH")) != NULL) { pluginpath = strdup(pluginpath); } else { - char *str1, *str2; + const char *str1, *str2; int len; str1 = "~/.xine/plugins"; str2 = XINE_PLUGINDIR; len = strlen(str1) + strlen(str2) + 2; pluginpath = xine_xmalloc(len); - snprintf(pluginpath, len, "%s:%s", str1, str2); + snprintf(pluginpath, len, "%s" XINE_DIRECTORY_SEPARATOR_STRING "%s", str1, str2); } plugindir = xine_xmalloc(strlen(pluginpath)+strlen(homedir)+2); j=0; lenpluginpath = strlen(pluginpath); for (i=0; i <= lenpluginpath; ++i){ switch (pluginpath[i]){ - case ':': + case XINE_DIRECTORY_SEPARATOR_CHAR: case '\0': plugindir[j] = '\0'; collect_plugins(this, plugindir); |