src/plugins/ctf/common: restructure subtree

[babeltrace.git] / src / plugins / ctf / fs-src / fs.cpp

diff --git a/src/plugins/ctf/fs-src/fs.cpp b/src/plugins/ctf/fs-src/fs.cpp
index 1946fdcb87a53214e3d3ef06444f560990bc92c7..a60c8ddce5923f0cdc1fe7a36e5f87ce8c6b831a 100644 (file)
--- a/src/plugins/ctf/fs-src/fs.cpp
+++ b/src/plugins/ctf/fs-src/fs.cpp
@@ -13,7 +13,7 @@
 #include <babeltrace2/babeltrace.h>
 
 #define BT_COMP_LOG_SELF_COMP self_comp
-#define BT_LOG_OUTPUT_LEVEL   log_level
+#define BT_LOG_OUTPUT_LEVEL   ((enum bt_log_level) log_level)
 #define BT_LOG_TAG            "PLUGIN/SRC.CTF.FS"
 #include "logging/comp-logging.h"
 
@@ -23,9 +23,8 @@
 
 #include "plugins/common/param-validation/param-validation.h"
 
-#include "../common/metadata/ctf-meta-configure-ir-trace.hpp"
-#include "../common/metadata/decoder.hpp"
-#include "../common/msg-iter/msg-iter.hpp"
+#include "../common/src/metadata/tsdl/ctf-meta-configure-ir-trace.hpp"
+#include "../common/src/msg-iter/msg-iter.hpp"
 #include "data-stream-file.hpp"
 #include "file.hpp"
 #include "fs.hpp"
@@ -137,7 +136,7 @@ ctf_fs_iterator_next(bt_self_message_iterator *iterator, bt_message_array_const
          * accumulated message objects in the output
          * message array, so we need to return
          * BT_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK so that they are
-         * transfered to downstream. This other status occurs
+         * transferred to downstream. This other status occurs
          * again the next time muxer_msg_iter_do_next() is
          * called, possibly without any accumulated
          * message, in which case we'll return it.