diff options
| -rw-r--r-- | .build.yml | 6 | ||||
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | tests/integration/test-indicator.cpp | 10 | ||||
| -rw-r--r-- | tests/pa-mock.cpp | 600 | ||||
| -rw-r--r-- | tests/volume-control-test.cc | 4 |
6 files changed, 315 insertions, 310 deletions
@@ -272,11 +272,11 @@ build_scripts: - - if [ -e ./CMakeLists.txt ]; then - if [ ${DISTRO_NAME} == "debian" ]; then - - scan-build $CHECKERS cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_TESTS=ON -DENABLE_LOMIRI_FEATURES=ON + - scan-build $CHECKERS cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_WERROR=ON -DENABLE_TESTS=ON -DENABLE_LOMIRI_FEATURES=ON - elif [ ${DISTRO_NAME} == "ubuntu" ]; then - - scan-build $CHECKERS cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_TESTS=ON + - scan-build $CHECKERS cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_WERROR=ON -DENABLE_TESTS=ON - else - - scan-build $CHECKERS cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON + - scan-build $CHECKERS cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_WERROR=ON - fi - else - exit 1 diff --git a/CMakeLists.txt b/CMakeLists.txt index 9c3dfa4..89fd075 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,6 +36,8 @@ else() add_definitions("-Wall") endif() +add_definitions("-Wno-sign-compare") # Needed for GTest on Ubuntu + set(GETTEXT_PACKAGE "ayatana-indicator-sound") set(LOCALEDIR "${CMAKE_INSTALL_FULL_LOCALEDIR}") add_definitions( -DGETTEXT_PACKAGE="${GETTEXT_PACKAGE}" ) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 9a72e0e..dab8408 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -80,7 +80,7 @@ vala_init(vala-mocks --vapidir=. ) -set_source_files_properties(media-player-mock.c PROPERTIES COMPILE_FLAGS "${CMAKE_C_FLAGS} -Wno-incompatible-pointer-types -Wno-discarded-qualifiers") +set_source_files_properties(media-player-mock.c PROPERTIES COMPILE_FLAGS "${CMAKE_C_FLAGS} -Wno-unknown-warning-option -Wno-incompatible-pointer-types -Wno-discarded-qualifiers") set_source_files_properties(media-player-list-mock.c PROPERTIES COMPILE_FLAGS "${CMAKE_C_FLAGS} -Wno-incompatible-pointer-types -Wno-unused-variable") set_source_files_properties(options-mock.c PROPERTIES COMPILE_FLAGS "${CMAKE_C_FLAGS} -Wno-incompatible-pointer-types -Wno-unused-variable") set_source_files_properties(volume-control-mock.c PROPERTIES COMPILE_FLAGS "${CMAKE_C_FLAGS} -Wno-incompatible-pointer-types -Wno-int-to-pointer-cast -Wno-implicit-function-declaration") @@ -131,6 +131,7 @@ set( ) add_definitions( + -Wno-unknown-warning-option -Wno-unused-but-set-variable -DVALA_EXTERN=extern ) diff --git a/tests/integration/test-indicator.cpp b/tests/integration/test-indicator.cpp index cbf1c6d..624176a 100644 --- a/tests/integration/test-indicator.cpp +++ b/tests/integration/test-indicator.cpp @@ -1,6 +1,6 @@ /* * Copyright 2015 Canonical Ltd. - * Copyright 2021 Robert Tari + * Copyright 2021-2022 Robert Tari * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License version 3, as published @@ -276,8 +276,8 @@ TEST_F(TestIndicator, DISABLED_PhoneChangeRoleVolume) // Generate a random volume in the range [0...0.33] QTime now = QTime::currentTime(); - qsrand(now.msec()); - int randInt = qrand() % 33; + QRandomGenerator::global()->bounded(now.msec()); + int randInt = QRandomGenerator::global()->generate() % 33; const double randomVolume = randInt / 100.0; QSignalSpy &userAccountsSpy = *signal_spy_volume_changed_; @@ -1412,8 +1412,8 @@ TEST_F(TestIndicator, DISABLED_DesktopChangeRoleVolume) // Generate a random volume in the range [0...0.33] QTime now = QTime::currentTime(); - qsrand(now.msec()); - int randInt = qrand() % 33; + QRandomGenerator::global()->bounded(now.msec()); + int randInt = QRandomGenerator::global()->generate() % 33; const double randomVolume = randInt / 100.0; // play a test sound, it should NOT change the role in the indicator diff --git a/tests/pa-mock.cpp b/tests/pa-mock.cpp index 0ab73e1..bb11b86 100644 --- a/tests/pa-mock.cpp +++ b/tests/pa-mock.cpp @@ -1,5 +1,6 @@ /* * Copyright 2015 Canonical Ltd. + * Copyright 2022 Robert Tari * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,6 +16,7 @@ * * Authors: * Ted Gould <ted@canonical.com> + * Robert Tari <robert@tari.in> */ #include <atomic> @@ -34,104 +36,104 @@ /* Core class of the PA Mock state */ class PAMockContext { public: - /* Accounting */ - std::atomic<unsigned int> refcnt; - - /* State stuff */ - std::vector<std::function<void(void)>> stateCallbacks; - pa_context_state_t currentState; - pa_context_state_t futureState; - - /* Event stuff */ - std::vector<std::function<void(pa_subscription_event_type_t, uint32_t)>> eventCallbacks; - pa_subscription_mask_t eventMask; - - PAMockContext () - : refcnt(1) - , currentState(PA_CONTEXT_UNCONNECTED) - , futureState(PA_CONTEXT_UNCONNECTED) - , eventMask(PA_SUBSCRIPTION_MASK_NULL) - { - g_debug("Creating Context: %p", this); - } + /* Accounting */ + std::atomic<unsigned int> refcnt; + + /* State stuff */ + std::vector<std::function<void(void)>> stateCallbacks; + pa_context_state_t currentState; + pa_context_state_t futureState; + + /* Event stuff */ + std::vector<std::function<void(pa_subscription_event_type_t, uint32_t)>> eventCallbacks; + pa_subscription_mask_t eventMask; + + PAMockContext () + : refcnt(1) + , currentState(PA_CONTEXT_UNCONNECTED) + , futureState(PA_CONTEXT_UNCONNECTED) + , eventMask(PA_SUBSCRIPTION_MASK_NULL) + { + g_debug("Creating Context: %p", this); + } private: /* To ensure we're the only ones who can delete it */ - ~PAMockContext () { - g_debug("Destroying Context: %p", this); - } + ~PAMockContext () { + g_debug("Destroying Context: %p", this); + } public: - /* Ref counting */ - void ref () { - refcnt++; - } - - void unref () { - refcnt--; - if (refcnt == 0) - delete this; - } - - /* C/C++ boundry */ - operator pa_context *() { - return reinterpret_cast<pa_context *>(this); - } - - /* State Stuff */ - void setState (pa_context_state_t state) - { - if (state == currentState) - return; - - currentState = state; - for (auto callback : stateCallbacks) { - callback(); - } - } - - void idleOnce (std::function<void(void)> idleFunc) { - auto allocated = new std::function<void(void)>(idleFunc); - - g_idle_add_full(G_PRIORITY_DEFAULT_IDLE, - [](gpointer data) -> gboolean { - std::function<void(void)> * pidleFunc = reinterpret_cast<std::function<void(void)> *>(data); - (*pidleFunc)(); - return G_SOURCE_REMOVE; - }, - allocated, - [](gpointer data) -> void { - std::function<void(void)> * pidleFunc = reinterpret_cast<std::function<void(void)> *>(data); - delete pidleFunc; - }); - } - - void queueState (pa_context_state_t state) - { - idleOnce([this, state](){ - setState(state); - }); - } - - pa_context_state_t getState (void) - { - return currentState; - } - - void addStateCallback (std::function<void(void)> &callback) - { - stateCallbacks.push_back(callback); - } - - /* Event Stuff */ - void setMask (pa_subscription_mask_t mask) - { - eventMask = mask; - } - - void addEventCallback (std::function<void(pa_subscription_event_type_t, uint32_t)> &callback) - { - eventCallbacks.push_back(callback); - } + /* Ref counting */ + void ref () { + refcnt++; + } + + void unref () { + refcnt--; + if (refcnt == 0) + delete this; + } + + /* C/C++ boundry */ + operator pa_context *() { + return reinterpret_cast<pa_context *>(this); + } + + /* State Stuff */ + void setState (pa_context_state_t state) + { + if (state == currentState) + return; + + currentState = state; + for (auto callback : stateCallbacks) { + callback(); + } + } + + void idleOnce (std::function<void(void)> idleFunc) { + auto allocated = new std::function<void(void)>(idleFunc); + + g_idle_add_full(G_PRIORITY_DEFAULT_IDLE, + [](gpointer data) -> gboolean { + std::function<void(void)> * pidleFunc = reinterpret_cast<std::function<void(void)> *>(data); + (*pidleFunc)(); + return G_SOURCE_REMOVE; + }, + allocated, + [](gpointer data) -> void { + std::function<void(void)> * pidleFunc = reinterpret_cast<std::function<void(void)> *>(data); + delete pidleFunc; + }); + } + + void queueState (pa_context_state_t state) + { + idleOnce([this, state](){ + setState(state); + }); + } + + pa_context_state_t getState (void) + { + return currentState; + } + + void addStateCallback (std::function<void(void)> &callback) + { + stateCallbacks.push_back(callback); + } + + /* Event Stuff */ + void setMask (pa_subscription_mask_t mask) + { + eventMask = mask; + } + + void addEventCallback (std::function<void(pa_subscription_event_type_t, uint32_t)> &callback) + { + eventCallbacks.push_back(callback); + } }; /* ******************************* @@ -141,52 +143,52 @@ public: pa_context * pa_context_new_with_proplist (pa_mainloop_api *mainloop, const char *name, pa_proplist *proplist) { - return *(new PAMockContext()); + return *(new PAMockContext()); } void pa_context_unref (pa_context *c) { - reinterpret_cast<PAMockContext*>(c)->unref(); + reinterpret_cast<PAMockContext*>(c)->unref(); } pa_context * pa_context_ref (pa_context *c) { - reinterpret_cast<PAMockContext*>(c)->ref(); - return c; + reinterpret_cast<PAMockContext*>(c)->ref(); + return c; } int pa_context_connect (pa_context *c, const char *server, pa_context_flags_t flags, const pa_spawn_api *api) { - reinterpret_cast<PAMockContext*>(c)->queueState(PA_CONTEXT_READY); - return 0; + reinterpret_cast<PAMockContext*>(c)->queueState(PA_CONTEXT_READY); + return 0; } void pa_context_disconnect (pa_context *c) { - reinterpret_cast<PAMockContext*>(c)->queueState(PA_CONTEXT_UNCONNECTED); + reinterpret_cast<PAMockContext*>(c)->queueState(PA_CONTEXT_UNCONNECTED); } int pa_context_errno (pa_context *c) { - return 0; + return 0; } void pa_context_set_state_callback (pa_context *c, pa_context_notify_cb_t cb, void *userdata) { - std::function<void(void)> cppcb([c, cb, userdata]() { - cb(c, userdata); - }); - reinterpret_cast<PAMockContext*>(c)->addStateCallback(cppcb); + std::function<void(void)> cppcb([c, cb, userdata]() { + cb(c, userdata); + }); + reinterpret_cast<PAMockContext*>(c)->addStateCallback(cppcb); } pa_context_state_t pa_context_get_state (pa_context *c) { - return reinterpret_cast<PAMockContext*>(c)->getState(); + return reinterpret_cast<PAMockContext*>(c)->getState(); } /* ******************************* @@ -196,177 +198,177 @@ pa_context_get_state (pa_context *c) static pa_operation * dummy_operation (void) { - GObject * goper = (GObject *)g_object_new(G_TYPE_OBJECT, nullptr); - pa_operation * oper = (pa_operation *)goper; - return oper; + GObject * goper = (GObject *)g_object_new(G_TYPE_OBJECT, nullptr); + pa_operation * oper = (pa_operation *)goper; + return oper; } pa_operation* pa_context_get_server_info (pa_context *c, pa_server_info_cb_t cb, void *userdata) { - reinterpret_cast<PAMockContext*>(c)->idleOnce( - [c, cb, userdata]() { - if (cb == nullptr) - return; - - pa_server_info server{ - .user_name = "user", - .host_name = "host", - .server_version = "1.2.3", - .server_name = "server", - .sample_spec = { - .format = PA_SAMPLE_U8, - .rate = 44100, - .channels = 1 - }, - .default_sink_name = "default-sink", - .default_source_name = "default-source", - .cookie = 1234, - .channel_map = { - .channels = 0 - } - }; - - cb(c, &server, userdata); - }); - - return dummy_operation(); + reinterpret_cast<PAMockContext*>(c)->idleOnce( + [c, cb, userdata]() { + if (cb == nullptr) + return; + + pa_server_info server{ + .user_name = "user", + .host_name = "host", + .server_version = "1.2.3", + .server_name = "server", + .sample_spec = { + .format = PA_SAMPLE_U8, + .rate = 44100, + .channels = 1 + }, + .default_sink_name = "default-sink", + .default_source_name = "default-source", + .cookie = 1234, + .channel_map = { + .channels = 0 + } + }; + + cb(c, &server, userdata); + }); + + return dummy_operation(); } pa_operation* pa_context_get_sink_info_by_name (pa_context *c, const gchar * name, pa_sink_info_cb_t cb, void *userdata) { - reinterpret_cast<PAMockContext*>(c)->idleOnce( - [c, name, cb, userdata]() { - if (cb == nullptr) - return; + reinterpret_cast<PAMockContext*>(c)->idleOnce( + [c, cb, userdata]() { + if (cb == nullptr) + return; - pa_sink_port_info active_port = {0}; - active_port.name = "speaker"; + pa_sink_port_info active_port = {0}; + active_port.name = "speaker"; - pa_sink_info sink = {0}; - sink.name = "default-sink"; - sink.index = 0; - sink.description = "Default Sink"; - sink.channel_map.channels = 0; - sink.active_port = &active_port; + pa_sink_info sink = {0}; + sink.name = "default-sink"; + sink.index = 0; + sink.description = "Default Sink"; + sink.channel_map.channels = 0; + sink.active_port = &active_port; - cb(c, &sink, 1, userdata); - }); + cb(c, &sink, 1, userdata); + }); - return dummy_operation(); + return dummy_operation(); } pa_operation* pa_context_get_sink_info_list (pa_context *c, pa_sink_info_cb_t cb, void *userdata) { - /* Only have one today, so this is the same */ - return pa_context_get_sink_info_by_name(c, "default-sink", cb, userdata); + /* Only have one today, so this is the same */ + return pa_context_get_sink_info_by_name(c, "default-sink", cb, userdata); } pa_operation * pa_context_get_sink_input_info (pa_context *c, uint32_t idx, pa_sink_input_info_cb_t cb, void * userdata) { - reinterpret_cast<PAMockContext*>(c)->idleOnce( - [c, idx, cb, userdata]() { - if (cb == nullptr) - return; + reinterpret_cast<PAMockContext*>(c)->idleOnce( + [c, cb, userdata]() { + if (cb == nullptr) + return; - pa_sink_input_info sink = { 0 }; + pa_sink_input_info sink = { 0 }; - cb(c, &sink, 1, userdata); - }); + cb(c, &sink, 1, userdata); + }); - return dummy_operation(); + return dummy_operation(); } pa_operation* pa_context_get_source_info_by_name (pa_context *c, const char * name, pa_source_info_cb_t cb, void *userdata) { - reinterpret_cast<PAMockContext*>(c)->idleOnce( - [c, name, cb, userdata]() { - if (cb == nullptr) - return; + reinterpret_cast<PAMockContext*>(c)->idleOnce( + [c, cb, userdata]() { + if (cb == nullptr) + return; - pa_source_info source = { - .name = "default-source" - }; + pa_source_info source = { + .name = "default-source" + }; - cb(c, &source, 1, userdata); - }); + cb(c, &source, 1, userdata); + }); - return dummy_operation(); + return dummy_operation(); } pa_operation* pa_context_get_source_output_info (pa_context *c, uint32_t idx, pa_source_output_info_cb_t cb, void *userdata) { - reinterpret_cast<PAMockContext*>(c)->idleOnce( - [c, idx, cb, userdata]() { - if (cb == nullptr) - return; + reinterpret_cast<PAMockContext*>(c)->idleOnce( + [c, cb, userdata]() { + if (cb == nullptr) + return; - pa_source_output_info source = {0}; - source.name = "default source"; + pa_source_output_info source = {0}; + source.name = "default source"; - cb(c, &source, 1, userdata); - }); + cb(c, &source, 1, userdata); + }); - return dummy_operation(); + return dummy_operation(); } pa_operation* pa_context_set_sink_mute_by_index (pa_context *c, uint32_t idx, int mute, pa_context_success_cb_t cb, void *userdata) { - reinterpret_cast<PAMockContext*>(c)->idleOnce( - [c, idx, mute, cb, userdata]() { - if (cb != nullptr) - cb(c, 1, userdata); - }); + reinterpret_cast<PAMockContext*>(c)->idleOnce( + [c, cb, userdata]() { + if (cb != nullptr) + cb(c, 1, userdata); + }); - return dummy_operation(); + return dummy_operation(); } pa_operation* pa_context_set_sink_volume_by_index (pa_context *c, uint32_t idx, const pa_cvolume * cvol, pa_context_success_cb_t cb, void *userdata) { - reinterpret_cast<PAMockContext*>(c)->idleOnce( - [c, idx, cvol, cb, userdata]() { - if (cb != nullptr) - cb(c, 1, userdata); - }); + reinterpret_cast<PAMockContext*>(c)->idleOnce( + [c, cb, userdata]() { + if (cb != nullptr) + cb(c, 1, userdata); + }); - return dummy_operation(); + return dummy_operation(); } pa_operation* pa_context_set_source_volume_by_name (pa_context *c, const char * name, const pa_cvolume * cvol, pa_context_success_cb_t cb, void *userdata) { - reinterpret_cast<PAMockContext*>(c)->idleOnce( - [c, name, cvol, cb, userdata]() { - if (cb != nullptr) - cb(c, 1, userdata); - }); + reinterpret_cast<PAMockContext*>(c)->idleOnce( + [c, cb, userdata]() { + if (cb != nullptr) + cb(c, 1, userdata); + }); - return dummy_operation(); + return dummy_operation(); } pa_operation* pa_context_get_sink_input_info_list(pa_context *c, pa_sink_input_info_cb_t cb, void *userdata) { - reinterpret_cast<PAMockContext*>(c)->idleOnce( - [c, cb, userdata]() { + reinterpret_cast<PAMockContext*>(c)->idleOnce( + [c, cb, userdata]() { - pa_sink_input_info sink_input; - sink_input.name = "default-sink-input"; - sink_input.proplist = nullptr; - sink_input.has_volume = false; + pa_sink_input_info sink_input; + sink_input.name = "default-sink-input"; + sink_input.proplist = nullptr; + sink_input.has_volume = false; - if (cb != nullptr) - cb(c, &sink_input, true, userdata); - }); + if (cb != nullptr) + cb(c, &sink_input, true, userdata); + }); - return dummy_operation(); + return dummy_operation(); } @@ -377,25 +379,25 @@ pa_context_get_sink_input_info_list(pa_context *c, pa_sink_input_info_cb_t cb, v pa_operation * pa_context_subscribe (pa_context * c, pa_subscription_mask_t mask, pa_context_success_cb_t callback, void * userdata) { - reinterpret_cast<PAMockContext*>(c)->idleOnce( - [c, mask, callback, userdata]() { - reinterpret_cast<PAMockContext*>(c)->setMask(mask); - if (callback != nullptr) - callback(c, 1, userdata); - }); + reinterpret_cast<PAMockContext*>(c)->idleOnce( + [c, mask, callback, userdata]() { + reinterpret_cast<PAMockContext*>(c)->setMask(mask); + if (callback != nullptr) + callback(c, 1, userdata); + }); - return dummy_operation(); + return dummy_operation(); } void pa_context_set_subscribe_callback (pa_context * c, pa_context_subscribe_cb_t callback, void * userdata) { - std::function<void(pa_subscription_event_type_t, uint32_t)> cppcb([c, callback, userdata](pa_subscription_event_type_t event, uint32_t index) { - if (callback != nullptr) - callback(c, event, index, userdata); - }); + std::function<void(pa_subscription_event_type_t, uint32_t)> cppcb([c, callback, userdata](pa_subscription_event_type_t event, uint32_t index) { + if (callback != nullptr) + callback(c, event, index, userdata); + }); - reinterpret_cast<PAMockContext*>(c)->addEventCallback(cppcb); + reinterpret_cast<PAMockContext*>(c)->addEventCallback(cppcb); } /* ******************************* @@ -403,7 +405,7 @@ pa_context_set_subscribe_callback (pa_context * c, pa_context_subscribe_cb_t cal * *******************************/ struct pa_glib_mainloop { - GMainContext * context; + GMainContext * context; }; struct pa_mainloop_api mock_mainloop = { 0 }; @@ -411,28 +413,28 @@ struct pa_mainloop_api mock_mainloop = { 0 }; pa_mainloop_api * pa_glib_mainloop_get_api (pa_glib_mainloop * g) { - return &mock_mainloop; + return &mock_mainloop; } pa_glib_mainloop * pa_glib_mainloop_new (GMainContext * c) { - pa_glib_mainloop * loop = g_new0(pa_glib_mainloop, 1); + pa_glib_mainloop * loop = g_new0(pa_glib_mainloop, 1); - if (c == nullptr) - loop->context = g_main_context_default(); - else - loop->context = c; + if (c == nullptr) + loop->context = g_main_context_default(); + else + loop->context = c; - g_main_context_ref(loop->context); - return loop; + g_main_context_ref(loop->context); + return loop; } void pa_glib_mainloop_free (pa_glib_mainloop * g) { - g_main_context_unref(g->context); - g_free(g); + g_main_context_unref(g->context); + g_free(g); } /* ******************************* @@ -442,8 +444,8 @@ pa_glib_mainloop_free (pa_glib_mainloop * g) void pa_operation_unref (pa_operation * operation) { - g_return_if_fail(G_IS_OBJECT(operation)); - g_object_unref(G_OBJECT(operation)); + g_return_if_fail(G_IS_OBJECT(operation)); + g_object_unref(G_OBJECT(operation)); } /* ******************************* @@ -453,33 +455,33 @@ pa_operation_unref (pa_operation * operation) pa_proplist * pa_proplist_new (void) { - return (pa_proplist *)g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free); + return (pa_proplist *)g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free); } void pa_proplist_free (pa_proplist * p) { - g_return_if_fail(p != nullptr); - g_hash_table_destroy((GHashTable *)p); + g_return_if_fail(p != nullptr); + g_hash_table_destroy((GHashTable *)p); } const char * pa_proplist_gets (pa_proplist * p, const char * key) { - g_return_val_if_fail(p != nullptr, nullptr); - g_return_val_if_fail(key != nullptr, nullptr); - return (const char *)g_hash_table_lookup((GHashTable *)p, key); + g_return_val_if_fail(p != nullptr, nullptr); + g_return_val_if_fail(key != nullptr, nullptr); + return (const char *)g_hash_table_lookup((GHashTable *)p, key); } int pa_proplist_sets (pa_proplist *p, const char * key, const char * value) { - g_return_val_if_fail(p != nullptr, -1); - g_return_val_if_fail(key != nullptr, -1); - g_return_val_if_fail(value != nullptr, -1); + g_return_val_if_fail(p != nullptr, -1); + g_return_val_if_fail(key != nullptr, -1); + g_return_val_if_fail(value != nullptr, -1); - g_hash_table_insert((GHashTable *)p, g_strdup(key), g_strdup(value)); - return 0; + g_hash_table_insert((GHashTable *)p, g_strdup(key), g_strdup(value)); + return 0; } /* ******************************* @@ -489,7 +491,7 @@ pa_proplist_sets (pa_proplist *p, const char * key, const char * value) const char * pa_strerror (int error) { - return "This is error text"; + return "This is error text"; } /* ******************************* @@ -499,92 +501,92 @@ pa_strerror (int error) pa_volume_t pa_sw_volume_from_dB (double f) { - double linear = pow(10.0, f / 20.0); + double linear = pow(10.0, f / 20.0); - pa_volume_t calculated = lround(cbrt(linear) * PA_VOLUME_NORM); + pa_volume_t calculated = lround(cbrt(linear) * PA_VOLUME_NORM); - if (G_UNLIKELY(calculated > PA_VOLUME_MAX)) { - return PA_VOLUME_MAX; - } else if (G_UNLIKELY(calculated < PA_VOLUME_MUTED)) { - return PA_VOLUME_MUTED; - } else { - return calculated; - } + if (G_UNLIKELY(calculated > PA_VOLUME_MAX)) { + return PA_VOLUME_MAX; + } else if (G_UNLIKELY(calculated < PA_VOLUME_MUTED)) { + return PA_VOLUME_MUTED; + } else { + return calculated; + } } pa_cvolume * pa_cvolume_init (pa_cvolume * cvol) { - g_return_val_if_fail(cvol != nullptr, nullptr); + g_return_val_if_fail(cvol != nullptr, nullptr); - cvol->channels = 0; + cvol->channels = 0; - unsigned int i; - for (i = 0; i < PA_CHANNELS_MAX; i++) - cvol->values[i] = PA_VOLUME_INVALID; + unsigned int i; + for (i = 0; i < PA_CHANNELS_MAX; i++) + cvol->values[i] = PA_VOLUME_INVALID; - return cvol; + return cvol; } pa_cvolume * pa_cvolume_set (pa_cvolume * cvol, unsigned channels, pa_volume_t volume) { - g_return_val_if_fail(cvol != nullptr, nullptr); - g_warn_if_fail(channels > 0); - g_return_val_if_fail(channels <= PA_CHANNELS_MAX, nullptr); + g_return_val_if_fail(cvol != nullptr, nullptr); + g_warn_if_fail(channels > 0); + g_return_val_if_fail(channels <= PA_CHANNELS_MAX, nullptr); - cvol->channels = channels; + cvol->channels = channels; - unsigned int i; - for (i = 0; i < channels; i++) { - if (G_UNLIKELY(volume > PA_VOLUME_MAX)) { - cvol->values[i] = PA_VOLUME_MAX; - } else if (G_UNLIKELY(volume < PA_VOLUME_MUTED)) { - cvol->values[i] = PA_VOLUME_MUTED; - } else { - cvol->values[i] = volume; - } - } + unsigned int i; + for (i = 0; i < channels; i++) { + if (G_UNLIKELY(volume > PA_VOLUME_MAX)) { + cvol->values[i] = PA_VOLUME_MAX; + } else if (G_UNLIKELY(volume < PA_VOLUME_MUTED)) { + cvol->values[i] = PA_VOLUME_MUTED; + } else { + cvol->values[i] = volume; + } + } - return cvol; + return cvol; } pa_volume_t pa_cvolume_max (const pa_cvolume * cvol) { - g_return_val_if_fail(cvol != nullptr, PA_VOLUME_MUTED); - pa_volume_t max = PA_VOLUME_MUTED; + g_return_val_if_fail(cvol != nullptr, PA_VOLUME_MUTED); + pa_volume_t max = PA_VOLUME_MUTED; - unsigned int i; - for (i = 0; i < cvol->channels; i++) - max = MAX(max, cvol->values[i]); - - return max; + unsigned int i; + for (i = 0; i < cvol->channels; i++) + max = MAX(max, cvol->values[i]); + + return max; } pa_cvolume * pa_cvolume_scale (pa_cvolume * cvol, pa_volume_t max) { - g_return_val_if_fail(cvol != nullptr, nullptr); + g_return_val_if_fail(cvol != nullptr, nullptr); - pa_volume_t originalmax = pa_cvolume_max(cvol); + pa_volume_t originalmax = pa_cvolume_max(cvol); - if (originalmax <= PA_VOLUME_MUTED) - return pa_cvolume_set(cvol, cvol->channels, max); + if (originalmax <= PA_VOLUME_MUTED) + return pa_cvolume_set(cvol, cvol->channels, max); - unsigned int i; - for (i = 0; i < cvol->channels; i++) { - pa_volume_t calculated = (cvol->values[i] * max) / originalmax; + unsigned int i; + for (i = 0; i < cvol->channels; i++) { + pa_volume_t calculated = (cvol->values[i] * max) / originalmax; - if (G_UNLIKELY(calculated > PA_VOLUME_MAX)) { - cvol->values[i] = PA_VOLUME_MAX; - } else if (G_UNLIKELY(calculated < PA_VOLUME_MUTED)) { - cvol->values[i] = PA_VOLUME_MUTED; - } else { - cvol->values[i] = calculated; - } - } + if (G_UNLIKELY(calculated > PA_VOLUME_MAX)) { + cvol->values[i] = PA_VOLUME_MAX; + } else if (G_UNLIKELY(calculated < PA_VOLUME_MUTED)) { + cvol->values[i] = PA_VOLUME_MUTED; + } else { + cvol->values[i] = calculated; + } + } - return cvol; + return cvol; } diff --git a/tests/volume-control-test.cc b/tests/volume-control-test.cc index 36fa05e..15032b5 100644 --- a/tests/volume-control-test.cc +++ b/tests/volume-control-test.cc @@ -1,6 +1,6 @@ /* * Copyright 2014 Canonical Ltd. - * Copyright 2021 Robert Tari + * Copyright 2021-2022 Robert Tari * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -49,7 +49,7 @@ class VolumeControlTest : public ::testing::Test g_object_add_weak_pointer(G_OBJECT(session), (gpointer *)&session); } - virtual void TearDown() { + virtual void TearDown() override { g_clear_object(&service); g_object_unref(session); |