cleanup

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

1 files changed, 4 insertions, 16 deletions

diff --git a/src/sink.h b/src/sink.h
index bd43d49d..ccfa2590 100644
--- a/src/sink.h
+++ b/src/sink.h
@@ -10,21 +10,10 @@ struct sink;
 #include "idxset.h"
 #include "source.h"
 
-
-struct sink_input {
-    int (*peek) (struct sink_input *i, struct memchunk *chunk, uint8_t *volume);
-    void (*drop) (struct sink_input *i, size_t length);
-    void (*kill) (struct sink_input *i);
-
-    void *userdata;
-    int index;
-    struct sink *sink;
-};
-
 struct sink {
-    char *name;
     uint32_t index;
-    
+
+    char *name;
     struct core *core;
     struct sample_spec sample_spec;
     struct idxset *inputs;
@@ -33,8 +22,8 @@ struct sink {
 
     uint8_t volume;
 
-    void (*notify)(struct sink*sink, void *userdata);
-    void *notify_userdata;
+    void (*notify)(struct sink*sink);
+    void *userdata;
 };
 
 struct sink* sink_new(struct core *core, const char *name, const struct sample_spec *spec);
@@ -44,6 +33,5 @@ int sink_render(struct sink*s, size_t length, struct memchunk *result);
 int sink_render_into(struct sink*s, struct memblock *target, struct memchunk *result);
 
 void sink_notify(struct sink*s);
-void sink_set_notify_callback(struct sink *s, void (*notify_callback)(struct sink*sink, void *userdata), void *userdata);
 
 #endif