From 992e55bf0d8da446c5fdad3e642e848efebcb433 Mon Sep 17 00:00:00 2001
From: Jonathan Moore Liles <j.liles@unix.net>
Date: Sun, 20 Sep 2020 13:13:50 -0700
Subject: [PATCH] Sequencer: Fix configuration bug causing error message
 "Couldn't open instrument directory".

---
 sequencer/src/const.h      | 1 -
 sequencer/src/instrument.C | 6 +++---
 sequencer/wscript          | 1 +
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sequencer/src/const.h b/sequencer/src/const.h
index 0eeb0d6..b1d6970 100644
--- a/sequencer/src/const.h
+++ b/sequencer/src/const.h
@@ -38,4 +38,3 @@ const char COPYRIGHT[]  = "Copyright (c) 2007-2013 Jonathan Moore Liles";
 /* directories */
 
 #define USER_CONFIG_DIR ".non/"
-#define INSTRUMENT_DIR "instruments/"
diff --git a/sequencer/src/instrument.C b/sequencer/src/instrument.C
index ef14f24..3a8f69d 100644
--- a/sequencer/src/instrument.C
+++ b/sequencer/src/instrument.C
@@ -160,7 +160,7 @@ Instrument::read ( const char *s )
     if ( ! ( fp = fopen( pat, "r" ) ) )
     {
 
-        sprintf( pat, "%s/%s/%s.inst", SYSTEM_PATH, INSTRUMENT_DIR, s );
+        sprintf( pat, "%s/%s.inst", INSTRUMENTS_PATH, s );
 
         if ( ! ( fp = fopen( pat, "r" ) ) )
             return false;
@@ -261,7 +261,7 @@ get_listing( const char *dir )
 
     if ( 0 > ( n = scandir( dir, &names, instrument_filter, alphasort ) ) )
     {
-        WARNING( "couldn't open instrument directory" );
+        WARNING( "couldn't open instrument directory: %s", dir );
         return NULL;
     }
     else
@@ -291,7 +291,7 @@ get_listing( const char *dir )
 char **
 Instrument::listing ( void )
 {
-    list <string> *sys = get_listing( SYSTEM_PATH "/" INSTRUMENT_DIR );
+    list <string> *sys = get_listing( INSTRUMENTS_PATH );
     list <string> *usr = get_listing( config.user_config_dir );
 
     if ( ! ( usr || sys ) )
diff --git a/sequencer/wscript b/sequencer/wscript
index 0b7a28d..2ac5ad3 100644
--- a/sequencer/wscript
+++ b/sequencer/wscript
@@ -32,6 +32,7 @@ def configure(conf):
     conf.define('SYSTEM_PATH', '/'.join( [ conf.env.DATADIR, APPNAME ] ) )
     conf.define('DOCUMENT_PATH', '/'.join( [ conf.env.DATADIR, 'doc' ] ) )
     conf.define('PIXMAP_PATH', '/'.join( [ conf.env.DATADIR, 'pixmaps' ] ) )
+    conf.define('INSTRUMENTS_PATH', '/'.join( [ conf.env.DATADIR, APPNAME, 'instruments' ] ) )
 
     conf.write_config_header('config.h', remove=False)