info and subscription work

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@114 fefdeb5f-60dc-0310-8127-8f9354f1896f

1 files changed, 1 insertions, 28 deletions

diff --git a/polyp/subscribe.h b/polyp/subscribe.h
index 1561249f..a88677d2 100644
--- a/polyp/subscribe.h
+++ b/polyp/subscribe.h
@@ -2,33 +2,8 @@
 #define foosubscribehfoo
 
 #include "core.h"
+#include "native-common.h"
 
-enum pa_subscription_mask {
-    PA_SUBSCRIPTION_FACILITY_SINK = 1,
-    PA_SUBSCRIPTION_FACILITY_SOURCE = 2,
-    PA_SUBSCRIPTION_FACILITY_SINK_INPUT = 4,
-    PA_SUBSCRIPTION_FACILITY_SOURCE_OUTPUT = 8,
-    PA_SUBSCRIPTION_FACILITY_MODULE = 16,
-    PA_SUBSCRIPTION_FACILITY_CLIENT = 32,
-    PA_SUBSCRIPTION_FACILITY_SAMPLE_CACHE = 64,
-};
-
-enum pa_subscription_event_type {
-    PA_SUBSCRIPTION_EVENT_SINK = 0,
-    PA_SUBSCRIPTION_EVENT_SOURCE = 1,
-    PA_SUBSCRIPTION_EVENT_SINK_INPUT = 2,
-    PA_SUBSCRIPTION_EVENT_SOURCE_OUTPUT = 3,
-    PA_SUBSCRIPTION_EVENT_MODULE = 4,
-    PA_SUBSCRIPTION_EVENT_CLIENT = 5,
-    PA_SUBSCRIPTION_EVENT_SAMPLE_CACHE = 6,
-    PA_SUBSCRIPTION_EVENT_FACILITY_MASK = 7,
-
-    PA_SUBSCRIPTION_EVENT_NEW = 0,
-    PA_SUBSCRIPTION_EVENT_CHANGE = 16,
-    PA_SUBSCRIPTION_EVENT_REMOVE = 32,
-    PA_SUBSCRIPTION_EVENT_TYPE_MASK = 16+32,
-};
-    
 struct pa_subscription;
 struct pa_subscription_event;
 
@@ -38,6 +13,4 @@ void pa_subscription_free_all(struct pa_core *c);
 
 void pa_subscription_post(struct pa_core *c, enum pa_subscription_event_type t, uint32_t index);
 
-int pa_subscription_match_flags(enum pa_subscription_mask m, enum pa_subscription_event_type e);
-
 #endif