Merge pull request #14 from hypperd/fix-pipewire

Fixes for pipewire 0.3.77
ErikReider · Aug 9, 2023 · c850bc4 · c850bc4
2 parents 1e8817e + 45733fe
commit c850bc4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/main.cpp b/src/main.cpp
@@ -46,8 +46,8 @@ int main(int argc, char *argv[]) {
   }
 
   pa_subscription_mask_t all_mask =
-      (pa_subscription_mask_t)(PA_SUBSCRIPTION_MASK_SINK |
-                               PA_SUBSCRIPTION_MASK_SOURCE);
+      (pa_subscription_mask_t)(PA_SUBSCRIPTION_MASK_SINK_INPUT |
+                               PA_SUBSCRIPTION_MASK_SOURCE_OUTPUT);
   if (!printSink && !printSource && !printBoth && !printBothWayBar) {
     return Pulse().init(SUBSCRIPTION_TYPE_IDLE, all_mask, EVENT_TYPE_IDLE);
   } else if (printBoth) {
@@ -57,11 +57,11 @@ int main(int argc, char *argv[]) {
     return Pulse().init(SUBSCRIPTION_TYPE_DRY_BOTH_WAYBAR, all_mask,
                         EVENT_TYPE_DRY_BOTH);
   } else if (printSink) {
-    return Pulse().init(SUBSCRIPTION_TYPE_DRY_SINK, PA_SUBSCRIPTION_MASK_SINK,
+    return Pulse().init(SUBSCRIPTION_TYPE_DRY_SINK, PA_SUBSCRIPTION_MASK_SINK_INPUT,
                         EVENT_TYPE_DRY_SINK);
   } else if (printSource) {
     return Pulse().init(SUBSCRIPTION_TYPE_DRY_SOURCE,
-                        PA_SUBSCRIPTION_MASK_SOURCE, EVENT_TYPE_DRY_SOURCE);
+                        PA_SUBSCRIPTION_MASK_SOURCE_OUTPUT, EVENT_TYPE_DRY_SOURCE);
   }
   return 0;
 }
diff --git a/src/pulse.cpp b/src/pulse.cpp
@@ -77,10 +77,10 @@ void Pulse::subscribe_callback(pa_context *, pa_subscription_event_type_t type,
   Data *data = (Data *)userdata;
   EventType eventType;
   switch (type & PA_SUBSCRIPTION_EVENT_FACILITY_MASK) {
-    case PA_SUBSCRIPTION_EVENT_SINK:
+    case PA_SUBSCRIPTION_EVENT_SINK_INPUT:
       eventType = EVENT_TYPE_DRY_SINK;
       break;
-    case PA_SUBSCRIPTION_EVENT_SOURCE:
+    case PA_SUBSCRIPTION_EVENT_SOURCE_OUTPUT:
       eventType = EVENT_TYPE_DRY_SOURCE;
       break;
     default: