reorder search paths for chugin probe

ccrma · Oct 31, 2024 · ae645e2 · ae645e2
1 parent 3762aac
commit ae645e2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/core/chuck.cpp b/src/core/chuck.cpp
@@ -96,8 +96,8 @@
 #define CHUCK_PARAM_USER_CHUGINS_DEFAULT           std::list<std::string>()
 // import search paths defaults
 #define CHUCK_PARAM_IMPORT_PATH_SYSTEM_DEFAULT     std::list<std::string>()
-#define CHUCK_PARAM_IMPORT_PATH_USER_DEFAULT       std::list<std::string>()
 #define CHUCK_PARAM_IMPORT_PATH_PACKAGES_DEFAULT   std::list<std::string>()
+#define CHUCK_PARAM_IMPORT_PATH_USER_DEFAULT       std::list<std::string>()
 
 
 
@@ -210,10 +210,10 @@ void ChucK::initDefaultParams()
     // import search paths
     m_listParams[tolower(CHUCK_PARAM_IMPORT_PATH_SYSTEM)]    = CHUCK_PARAM_IMPORT_PATH_SYSTEM_DEFAULT;
     m_param_types[tolower(CHUCK_PARAM_IMPORT_PATH_SYSTEM)]     = ck_param_string_list;
-    m_listParams[tolower(CHUCK_PARAM_IMPORT_PATH_USER)]    = CHUCK_PARAM_IMPORT_PATH_USER_DEFAULT;
-    m_param_types[tolower(CHUCK_PARAM_IMPORT_PATH_USER)]     = ck_param_string_list;
     m_listParams[tolower(CHUCK_PARAM_IMPORT_PATH_PACKAGES)]    = CHUCK_PARAM_IMPORT_PATH_PACKAGES_DEFAULT;
     m_param_types[tolower(CHUCK_PARAM_IMPORT_PATH_PACKAGES)]     = ck_param_string_list;
+    m_listParams[tolower(CHUCK_PARAM_IMPORT_PATH_USER)]    = CHUCK_PARAM_IMPORT_PATH_USER_DEFAULT;
+    m_param_types[tolower(CHUCK_PARAM_IMPORT_PATH_USER)]     = ck_param_string_list;
 }
 
 
@@ -837,8 +837,8 @@ void ChucK::probeChugins()
 
     // list of search pathes (added 1.3.0.0)
     std::list<std::string> dl_search_path = getParamStringList( CHUCK_PARAM_IMPORT_PATH_SYSTEM );
-    append_path_list( dl_search_path, getParamStringList( CHUCK_PARAM_IMPORT_PATH_USER) );
     append_path_list( dl_search_path, getParamStringList( CHUCK_PARAM_IMPORT_PATH_PACKAGES) );
+    append_path_list( dl_search_path, getParamStringList( CHUCK_PARAM_IMPORT_PATH_USER) );
 
     // list of individually named chug-ins (added 1.3.0.0)
     std::list<std::string> named_dls = getParamStringList( CHUCK_PARAM_USER_CHUGINS );

diff --git a/src/core/chuck.h b/src/core/chuck.h
@@ -104,8 +104,8 @@
 #define CHUCK_PARAM_USER_CHUGINS                "USER_CHUGINS"
 // import paths
 #define CHUCK_PARAM_IMPORT_PATH_SYSTEM          "IMPORT_PATH_SYSTEM"
-#define CHUCK_PARAM_IMPORT_PATH_USER            "IMPORT_PATH_USER"
 #define CHUCK_PARAM_IMPORT_PATH_PACKAGES        "IMPORT_PATH_PACKAGES"
+#define CHUCK_PARAM_IMPORT_PATH_USER            "IMPORT_PATH_USER"
 
 // code literal signifier
 #define CHUCK_CODE_LITERAL_SIGNIFIER            "<compiled.code>"