X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fdetailedevents%2Fevents.c;h=1b6c422530b230739476c8b9f4171d218c911075;hb=05463aa54c3a5bd881c830177a83f468c208e74e;hp=858ca4813e814f2cc981a3974041f9c64c717ed1;hpb=13f86ce27e6f7697d83d912c391517a1239fa378;p=lttv.git

diff --git a/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c b/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c
index 858ca481..1b6c4225 100644
--- a/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c
+++ b/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c
@@ -28,7 +28,7 @@
  * 
  * This plugin adds a Events Viewer functionnality to Linux TraceToolkit
  * GUI when this plugin is loaded. The init and destroy functions add the
- * viewer's insertion menu item and toolbar icon by calling gtkTraceSet's
+ * viewer's insertion menu item and toolbar icon by calling viewer.h's
  * API functions. Then, when a viewer's object is created, the constructor
  * creates ans register through API functions what is needed to interact
  * with the TraceSet window.
@@ -45,7 +45,7 @@
 
 #include <lttv/module.h>
 #include <lttv/hook.h>
-#include <lttvwindow/gtktraceset.h>
+#include <lttvwindow/viewer.h>
 #include <lttv/tracecontext.h>
 #include <lttv/state.h>
 #include <ltt/ltt.h>
@@ -55,7 +55,6 @@
 #include <ltt/facility.h>
 #include <string.h>
 
-//#include "mw_api.h"
 #include "gtktreeprivate.h"
 
 #include "hGuiEventsInsert.xpm"
@@ -1283,7 +1282,7 @@ void add_context_hooks(EventViewerData * event_viewer_data,
   }
   
   //add hooks for process_traceset
-  //    context_add_hooks_api(event_viewer_data->mw, NULL, NULL, NULL, NULL, NULL, NULL,
+  //    lttv_traceset_context_add_hooks(tsc, NULL, NULL, NULL, NULL, NULL, NULL,
   //        NULL, NULL, NULL,event_viewer_data->before_event_hooks,NULL);  
 }
 
@@ -1350,7 +1349,7 @@ void remove_context_hooks(EventViewerData * event_viewer_data,
     }
   }
   //remove hooks from context
-  //    context_remove_hooks_api(event_viewer_data->mw, NULL, NULL, NULL, NULL, NULL, NULL,
+  //    lttv_traceset_context_remove_hooks(tsc, NULL, NULL, NULL, NULL, NULL, NULL,
   //           NULL, NULL, NULL,event_viewer_data->before_event_hooks,NULL);
 }
 
@@ -1619,15 +1618,12 @@ void get_events(EventViewerData* event_viewer_data, LttTime start,
   int size;
   LttvTracesetContext * tsc = get_traceset_context(event_viewer_data->mw);
 
-  //  context_add_hooks_api(event_viewer_data->mw, NULL, NULL, NULL, NULL, NULL, NULL,
-  //      NULL, NULL, NULL,event_viewer_data->before_event_hooks,NULL);
   add_context_hooks(event_viewer_data,tsc);
 
-  process_traceset_api(event_viewer_data->mw, start, end, max_num_events);
+  lttv_process_traceset_seek_time(tsc, start);
+  lttv_process_traceset(tsc, end, max_num_events);
 
   remove_context_hooks(event_viewer_data,tsc);
-  //  context_remove_hooks_api(event_viewer_data->mw, NULL, NULL, NULL, NULL, NULL, NULL,
-  //         NULL, NULL, NULL,event_viewer_data->before_event_hooks,NULL);
 
   size = event_viewer_data->raw_trace_data_queue_tmp->length;
   *real_num_events = size;