diff --git a/otherarch/sdcpp/sdtype_adapter.cpp b/otherarch/sdcpp/sdtype_adapter.cpp index 950790c9d..cc005c367 100644 --- a/otherarch/sdcpp/sdtype_adapter.cpp +++ b/otherarch/sdcpp/sdtype_adapter.cpp @@ -179,7 +179,7 @@ bool sdtype_load_model(const sd_load_model_inputs inputs) { sddebugmode = inputs.debugmode; - set_log_message(sddebugmode==1); + set_sd_log_level(sddebugmode); bool vae_decode_only = false; bool free_param = false; diff --git a/otherarch/sdcpp/util.cpp b/otherarch/sdcpp/util.cpp index dceec229e..d69dc7438 100644 --- a/otherarch/sdcpp/util.cpp +++ b/otherarch/sdcpp/util.cpp @@ -207,12 +207,12 @@ std::string path_join(const std::string& p1, const std::string& p2) { return p1 + "/" + p2; } -static bool do_log = true; +static int sdloglevel = 0; //-1 = hide all, 0 = normal, 1 = showall void pretty_progress(int step, int steps, float time) { if (step == 0) { return; } - if(!do_log) + if(sdloglevel<0) { return; } @@ -262,7 +262,7 @@ void* sd_log_cb_data = NULL; #define LOG_BUFFER_SIZE 1024 void log_message(const char* format, ...) { - if (do_log) { + if (sdloglevel>0) { printf("\n"); va_list args; va_start(args, format); @@ -271,13 +271,13 @@ void log_message(const char* format, ...) { fflush(stdout); } } -void set_log_message(bool log) +void set_sd_log_level(int log) { - do_log = log; + sdloglevel = log; } -bool get_log_message() +bool get_sd_log_level() { - return do_log; + return sdloglevel; } void log_printf(sd_log_level_t level, const char* file, int line, const char* format, ...) { diff --git a/otherarch/sdcpp/util.h b/otherarch/sdcpp/util.h index e5f070b5a..9fee1b5a3 100644 --- a/otherarch/sdcpp/util.h +++ b/otherarch/sdcpp/util.h @@ -45,8 +45,8 @@ void log_printf(sd_log_level_t level, const char* file, int line, const char* fo std::string trim(const std::string& s); void log_message(const char* format, ...); -void set_log_message(bool log); -bool get_log_message(); +void set_sd_log_level(int log); +bool get_sd_log_level(); #define LOG_DEBUG(...) log_message(__VA_ARGS__) #define LOG_INFO(...) log_message(__VA_ARGS__) #define LOG_WARN(...) log_message(__VA_ARGS__)