Rename bt_ctf_X -> bt_X, maintain backward compat. for pre-2.0 CTF writer

[babeltrace.git] / plugins / ctf / fs-sink / writer.h

diff --git a/plugins/ctf/fs-sink/writer.h b/plugins/ctf/fs-sink/writer.h
index 07e8674affe9eaae2595140bf8ea47061b8a8e58..04e55070f6ae1052cfce4aa23c2afa30109419a9 100644 (file)
--- a/plugins/ctf/fs-sink/writer.h
+++ b/plugins/ctf/fs-sink/writer.h
@@ -36,7 +36,7 @@ struct writer_component {
        GString *trace_name_base;
        /* For the directory name suffix. */
        int trace_id;
-       /* Map between struct bt_ctf_trace and struct fs_writer. */
+       /* Map between struct bt_trace and struct fs_writer. */
        GHashTable *trace_map;
        FILE *err;
        struct bt_notification_iterator *input_iterator;
@@ -59,8 +59,8 @@ enum fs_writer_stream_state {
 
 struct fs_writer {
        struct bt_ctf_writer *writer;
-       struct bt_ctf_trace *trace;
-       struct bt_ctf_trace *writer_trace;
+       struct bt_trace *trace;
+       struct bt_trace *writer_trace;
        struct writer_component *writer_component;
        int static_listener_id;
        int trace_static;
@@ -76,19 +76,19 @@ void writer_close(struct writer_component *writer_component,
                struct fs_writer *fs_writer);
 BT_HIDDEN
 enum bt_component_status writer_output_event(struct writer_component *writer,
-               struct bt_ctf_event *event);
+               struct bt_event *event);
 BT_HIDDEN
 enum bt_component_status writer_new_packet(struct writer_component *writer,
-               struct bt_ctf_packet *packet);
+               struct bt_packet *packet);
 BT_HIDDEN
 enum bt_component_status writer_close_packet(struct writer_component *writer,
-               struct bt_ctf_packet *packet);
+               struct bt_packet *packet);
 BT_HIDDEN
 enum bt_component_status writer_stream_begin(struct writer_component *writer,
-               struct bt_ctf_stream *stream);
+               struct bt_stream *stream);
 BT_HIDDEN
 enum bt_component_status writer_stream_end(struct writer_component *writer,
-               struct bt_ctf_stream *stream);
+               struct bt_stream *stream);
 
 BT_HIDDEN
 enum bt_component_status writer_component_init(