From 7c6e44bf251073515b7a621ddb47ef5ee80ca7c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kjetil=20=C3=98rbekk?= Date: Sun, 5 Oct 2008 14:49:40 +0200 Subject: - Don't (re-)scan the collection initially (Scanning is really annoying with huge collections. Touch /.config to re-scan) --- src/mfs_subr.c | 14 +++++++++----- src/mfs_vnops.c | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/mfs_subr.c b/src/mfs_subr.c index 2db7f1b..d92e85a 100644 --- a/src/mfs_subr.c +++ b/src/mfs_subr.c @@ -231,11 +231,14 @@ mfs_init() /* error = mfs_insert_path(musicpath, handle); */ /* if (error != 0) */ /* return (error); */ - - error = mfs_reload_config(); - if (error != 0) { - return (error); - } + + /* Scan the music initially. (Disabled, since it's really + annoying with huge collections) */ +/* error = mfs_reload_config(); */ +/* if (error != 0) { */ +/* return (error); */ +/* } */ + return (0); } @@ -393,6 +396,7 @@ mfs_scan(const char *filepath) } } while (0); + /* Finally, insert song. */ do { title = taglib_tag_title(tag); diff --git a/src/mfs_vnops.c b/src/mfs_vnops.c index a144576..306b8fa 100755 --- a/src/mfs_vnops.c +++ b/src/mfs_vnops.c @@ -383,7 +383,7 @@ mfs_run(int argc, char **argv) /* Make a copy of the arguments */ char **argv_ = malloc(sizeof(char*) * (argc+1)); for (int i = 0; i < argc; i++) - asprintf(argv_+i, argv[i]); + asprintf(argv_+i, argv[i]); argv_[argc] = NULL; struct fuse_args args = { argc, argv_, 1 }; -- cgit v1.2.3