diff options
| -rw-r--r-- | include/window/wayland.h (renamed from include/window/window_wayland.h) | 0 | ||||
| -rw-r--r-- | include/window/x11.h (renamed from include/window/window_x11.h) | 0 | ||||
| -rw-r--r-- | meson.build | 4 | ||||
| -rw-r--r-- | src/main.cpp | 4 | ||||
| -rw-r--r-- | src/sound.cpp | 2 | ||||
| -rw-r--r-- | src/window/wayland.c (renamed from src/window/window_wayland.c) | 2 | ||||
| -rw-r--r-- | src/window/x11.c (renamed from src/window/window_x11.c) | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/include/window/window_wayland.h b/include/window/wayland.h index 3535b0f..3535b0f 100644 --- a/include/window/window_wayland.h +++ b/include/window/wayland.h diff --git a/include/window/window_x11.h b/include/window/x11.h index e0c2948..e0c2948 100644 --- a/include/window/window_x11.h +++ b/include/window/x11.h diff --git a/meson.build b/meson.build index 1fc6643..08c9025 100644 --- a/meson.build +++ b/meson.build @@ -22,8 +22,8 @@ src = [ 'src/codec_query/vaapi.c', 'src/codec_query/vulkan.c', 'src/window/window.c', - 'src/window/window_x11.c', - 'src/window/window_wayland.c', + 'src/window/x11.c', + 'src/window/wayland.c', 'src/egl.c', 'src/cuda.c', 'src/xnvctrl.c', diff --git a/src/main.cpp b/src/main.cpp index 5fe9118..c2d90a8 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -16,8 +16,8 @@ extern "C" { #include "../include/codec_query/nvenc.h" #include "../include/codec_query/vaapi.h" #include "../include/codec_query/vulkan.h" -#include "../include/window/window_x11.h" -#include "../include/window/window_wayland.h" +#include "../include/window/x11.h" +#include "../include/window/wayland.h" #include "../include/egl.h" #include "../include/utils.h" #include "../include/damage.h" diff --git a/src/sound.cpp b/src/sound.cpp index aaf8ef5..5a0ce77 100644 --- a/src/sound.cpp +++ b/src/sound.cpp @@ -124,7 +124,7 @@ static void subscribe_update_default_devices(pa_context*, const pa_server_info * static void subscribe_cb(pa_context *c, pa_subscription_event_type_t t, uint32_t idx, void *userdata) { (void)idx; pa_handle *handle = (pa_handle*)userdata; - if(t & PA_SUBSCRIPTION_EVENT_FACILITY_MASK) { + if((t & PA_SUBSCRIPTION_EVENT_FACILITY_MASK) == PA_SUBSCRIPTION_EVENT_SERVER) { pa_operation *pa = pa_context_get_server_info(c, subscribe_update_default_devices, handle); if(pa) pa_operation_unref(pa); diff --git a/src/window/window_wayland.c b/src/window/wayland.c index 3a82bfa..ba7b547 100644 --- a/src/window/window_wayland.c +++ b/src/window/wayland.c @@ -1,4 +1,4 @@ -#include "../../include/window/window_wayland.h" +#include "../../include/window/wayland.h" #include "../../include/vec2.h" #include "../../include/defs.h" diff --git a/src/window/window_x11.c b/src/window/x11.c index 55b0a75..964422d 100644 --- a/src/window/window_x11.c +++ b/src/window/x11.c @@ -1,4 +1,4 @@ -#include "../../include/window/window_x11.h" +#include "../../include/window/x11.h" #include "../../include/vec2.h" #include "../../include/defs.h" |