X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=lttv%2Fmodules%2Fgui%2Flttvwindow%2Flttvwindow%2Flttvwindow.h;h=b83c058c0b91861e5ad1549922b098103960752f;hb=9a366873e0ed6ecc7f23e2d3a959ecddd4f2f91d;hp=42a8ba3083087756470b5c3a12a2bf8909f0f667;hpb=1e3594a344fc57ed19aed95efa9e27bedb287df4;p=lttv.git

diff --git a/lttv/modules/gui/lttvwindow/lttvwindow/lttvwindow.h b/lttv/modules/gui/lttvwindow/lttvwindow/lttvwindow.h
index 42a8ba30..b83c058c 100644
--- a/lttv/modules/gui/lttvwindow/lttvwindow/lttvwindow.h
+++ b/lttv/modules/gui/lttvwindow/lttvwindow/lttvwindow.h
@@ -254,10 +254,12 @@ FIXME : explain other important events
 #include <gtk/gtk.h>
 #include <ltt/ltt.h>
 #include <ltt/time.h>
+#include <lttv/traceset.h>
 #include <lttv/hook.h>
-#include <lttv/tracecontext.h>
+#ifdef BABEL_CLEANUP
 #include <lttv/stats.h>
 #include <lttv/filter.h>
+#endif /* BABEL_CLEANUP */
 #include <lttvwindow/mainwindow.h>
 #include <lttvwindow/lttv_plugin.h>
 
@@ -663,7 +665,7 @@ void lttvwindow_report_current_time(Tab *tab,
  */
 
 void lttvwindow_report_current_position(Tab *tab,
-                                        LttvTracesetContextPosition *pos);
+                                        LttvTracesetPosition *pos);
 
 /**
  * Function to set the position of the hpane's dividor (viewer).
@@ -684,18 +686,17 @@ typedef struct _EventsRequest {
   gpointer                     viewer_data;     /* Unset : NULL             */
   gboolean                     servicing;       /* service in progress: TRUE*/ 
   LttTime                      start_time;      /* Unset : ltt_time_infinite*/
-  LttvTracesetContextPosition *start_position;  /* Unset : NULL             */
+  LttvTracesetPosition *start_position;  /* Unset : NULL             */
   gboolean                     stop_flag;       /* Continue:TRUE Stop:FALSE */
   LttTime                      end_time;        /* Unset : ltt_time_infinite*/
   guint                        num_events;      /* Unset : G_MAXUINT        */
-  LttvTracesetContextPosition *end_position;    /* Unset : NULL             */
+  LttvTracesetPosition *end_position;    /* Unset : NULL             */
   gint                         trace;           /* unset : -1               */
   GArray                      *hooks;           /* Unset : NULL             */
   LttvHooks                   *before_chunk_traceset; /* Unset : NULL       */
   LttvHooks                   *before_chunk_trace;    /* Unset : NULL       */
   LttvHooks                   *before_chunk_tracefile;/* Unset : NULL       */
   LttvHooks                   *event;           /* Unset : NULL             */
-  LttvHooksByIdChannelArray   *event_by_id_channel;/* Unset : NULL          */
   LttvHooks                   *after_chunk_tracefile; /* Unset : NULL       */
   LttvHooks                   *after_chunk_trace;     /* Unset : NULL       */
   LttvHooks                   *after_chunk_traceset;  /* Unset : NULL       */
@@ -806,7 +807,7 @@ LttTime lttvwindow_get_current_time(Tab *tab);
 
 void lttvwindow_report_filter(Tab *tab, LttvFilter *filter);
 
-
+#ifdef BABEL_CLEANUP
 
 /**
  * Function to get the stats of the traceset 
@@ -817,17 +818,9 @@ void lttvwindow_report_filter(Tab *tab, LttvFilter *filter);
  */
 
 LttvTracesetStats* lttvwindow_get_traceset_stats(Tab *tab);
+#endif /*BABEL_CLEANUP*/
 
-/**
- * Function to get the context of the traceset 
- * It must be non const so the viewer can add and remove hooks from it.
- * @param tab the tab the viewer belongs to.
- * @return Context of the current tab.
- */
-
-
-LttvTracesetContext* lttvwindow_get_traceset_context(Tab *tab);
-
+LttvTraceset* lttvwindow_get_traceset(Tab *tab);
 
 /* set_time_window 
  *
@@ -858,7 +851,7 @@ void events_request_free(EventsRequest *events_request);
 
 GtkWidget *main_window_get_widget(Tab *tab);
 
-void set_current_position(Tab *tab, const LttvTracesetContextPosition *pos);
+void set_current_position(Tab *tab, const LttvTracesetPosition *pos);
 
 
 /**
@@ -881,6 +874,6 @@ static inline void lttvwindow_events_request_enable(void)
 
 
 void current_position_change_manager(Tab *tab,
-                                     LttvTracesetContextPosition *pos);
+                                     LttvTracesetPosition *pos);
 
 #endif //LTTVWINDOW_H