-int init(struct output *o, int default_spl, enum outputmode mode);
-int event(struct output *o, int event_type, char **data_out,
+int init(struct sr_output *o, int default_spl, enum outputmode mode);
+int event(struct sr_output *o, int event_type, char **data_out,