diff options
| -rw-r--r-- | plugins/ao/eng_ssf/eng_ssf.c | 14 | ||||
| -rw-r--r-- | plugins/ao/plugin.c | 4 |
2 files changed, 16 insertions, 2 deletions
diff --git a/plugins/ao/eng_ssf/eng_ssf.c b/plugins/ao/eng_ssf/eng_ssf.c index 0d81a665..18ba0e42 100644 --- a/plugins/ao/eng_ssf/eng_ssf.c +++ b/plugins/ao/eng_ssf/eng_ssf.c @@ -120,6 +120,20 @@ void *ssf_start(const char *path, uint8 *buffer, uint32 length) { uint64 tmp_length; + char libpath[PATH_MAX]; + const char *e = path + strlen(path); + while (e > path && *e != '/') { + e--; + } + if (*e == '/') { + e++; + memcpy (libpath, path, e-path); + libpath[e-path] = 0; + strcat (libpath, libfile); + } + else { + strcpy (libpath, libfile); + } #if DEBUG_LOADER printf("Loading library: %s\n", c->lib); #endif diff --git a/plugins/ao/plugin.c b/plugins/ao/plugin.c index badc73ef..0668d1e7 100644 --- a/plugins/ao/plugin.c +++ b/plugins/ao/plugin.c @@ -31,7 +31,7 @@ DB_functions_t *deadbeef; static DB_decoder_t plugin; -static const char * exts[] = { "psf", "psf2", "spu", "ssf", "qsf", "dsf", "minipsf", "minipsf2", "minispu", "minissf", "miniqsf", "minidsf", NULL }; +static const char * exts[] = { "psf", "psf2", "spu", "ssf", "qsf", "dsf", "minipsf", "minipsf2", "minissf", "miniqsf", "minidsf", NULL }; static const char *filetypes[] = { "PSF", "PSF2", "SPU", "SSF", "QSF", "DSF", NULL }; typedef struct { @@ -238,7 +238,7 @@ aoplug_insert (DB_playItem_t *after, const char *fname) { else if (!strcasecmp (ext, "psf2") || !strcasecmp (ext, "minipsf2")) { it->filetype = filetypes[1]; } - else if (!strcasecmp (ext, "spu") || !strcasecmp (ext, "minispu")) { + else if (!strcasecmp (ext, "spu")) { it->filetype = filetypes[2]; } else if (!strcasecmp (ext, "ssf") || !strcasecmp (ext, "minissf")) { |