From a9c64e1609f119b93efccb5bc67dbcfcc2b12513 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Wed, 29 Sep 2021 17:03:26 +0200 Subject: [PATCH] fix versions of the log interface --- spa/include/spa/support/log-impl.h | 2 +- spa/plugins/support/journal.c | 2 +- spa/plugins/support/logger.c | 2 +- test/test-spa-log.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/spa/include/spa/support/log-impl.h b/spa/include/spa/support/log-impl.h index be5080bc9..124153d07 100644 --- a/spa/include/spa/support/log-impl.h +++ b/spa/include/spa/support/log-impl.h @@ -123,7 +123,7 @@ struct { \ { { { SPA_TYPE_INTERFACE_Log, SPA_VERSION_LOG, \ SPA_CALLBACKS_INIT(&name.methods, &name) }, \ SPA_LOG_LEVEL_INFO, }, \ - { SPA_VERSION_LOG_METHODS_LOGT, \ + { SPA_VERSION_LOG_METHODS, \ spa_log_impl_log, \ spa_log_impl_logv, \ spa_log_impl_logt, \ diff --git a/spa/plugins/support/journal.c b/spa/plugins/support/journal.c index d1362540c..ed4fd183f 100644 --- a/spa/plugins/support/journal.c +++ b/spa/plugins/support/journal.c @@ -168,7 +168,7 @@ impl_log_topic_init(void *object, struct spa_log_topic *t) } static const struct spa_log_methods impl_log = { - SPA_VERSION_LOG_METHODS_LOGT, + SPA_VERSION_LOG_METHODS, .log = impl_log_log, .logv = impl_log_logv, .logt = impl_log_logt, diff --git a/spa/plugins/support/logger.c b/spa/plugins/support/logger.c index 82f90d663..83b754eea 100644 --- a/spa/plugins/support/logger.c +++ b/spa/plugins/support/logger.c @@ -250,7 +250,7 @@ impl_log_topic_init(void *object, struct spa_log_topic *t) } static const struct spa_log_methods impl_log = { - SPA_VERSION_LOG_METHODS_LOGT, + SPA_VERSION_LOG_METHODS, .log = impl_log_log, .logv = impl_log_logv, .logt = impl_log_logt, diff --git a/test/test-spa-log.c b/test/test-spa-log.c index 4bcc76bf6..ed5e2a916 100644 --- a/test/test-spa-log.c +++ b/test/test-spa-log.c @@ -113,7 +113,7 @@ PWTEST(utils_log_logt) pwtest_ptr_null(data.topic); data.invoked = false; - impl_log.version = SPA_VERSION_LOG_METHODS_LOGT; + impl_log.version = SPA_VERSION_LOG_METHODS; /* impl_log is v1 so we expect logt to be called */ spa_log_debug(&log, "call v1"); @@ -148,7 +148,7 @@ PWTEST(utils_log_logt) PWTEST(utils_log_logt_levels) { struct spa_log_methods impl_log = { - SPA_VERSION_LOG_METHODS_LOGT, + SPA_VERSION_LOG_METHODS, .log = impl_log_log, .logv = impl_log_logv, .logt = impl_log_logt,