X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bindings%2Fpython%2Fbt2%2Fbt2%2Fctf_writer.py;h=bbcc2b403fa9f20bb10667df3459011ae6be6ee1;hb=af4bbfc790800f252f974ac3ea77643b2b0ffc4a;hp=0bbabaf4ce0cef2ae7f9b8b83f4cc692d0deb634;hpb=1b8fb86234d51aff255b8e97435d4dbb3316eaec;p=babeltrace.git

diff --git a/bindings/python/bt2/bt2/ctf_writer.py b/bindings/python/bt2/bt2/ctf_writer.py
index 0bbabaf4..bbcc2b40 100644
--- a/bindings/python/bt2/bt2/ctf_writer.py
+++ b/bindings/python/bt2/bt2/ctf_writer.py
@@ -23,11 +23,12 @@
 from bt2 import native_bt, object, stream, utils
 import uuid as uuidp
 import bt2.event
+import bt2.field
 import abc
 import bt2
 
 
-class CtfWriterClock(object._Object):
+class CtfWriterClock(bt2.object._SharedObject):
     def __init__(self, name, description=None, frequency=None, precision=None,
                  offset=None, is_absolute=None, uuid=None):
         utils._check_str(name)
@@ -183,66 +184,66 @@ class CtfWriterClock(object._Object):
     time = property(fset=_time)
 
 
-class _CtfWriterStream(stream._StreamBase):
+class _CtfWriterStream:
     @property
     def discarded_events_count(self):
-        ret, count = native_bt.ctf_stream_get_discarded_events_count(self._ptr)
+        ret, count = native_bt.stream_get_discarded_events_count(self._ptr)
         utils._handle_ret(ret, "cannot get CTF writer stream object's discarded events count")
         return count
 
     def append_discarded_events(self, count):
         utils._check_uint64(count)
-        native_bt.ctf_stream_append_discarded_events(self._ptr, count)
+        native_bt.stream_append_discarded_events(self._ptr, count)
 
     def append_event(self, event):
         utils._check_type(event, bt2.event._Event)
-        ret = native_bt.ctf_stream_append_event(self._ptr, event._ptr)
+        ret = native_bt.stream_append_event(self._ptr, event._ptr)
         utils._handle_ret(ret, 'cannot append event object to CTF writer stream object')
 
     def flush(self):
-        ret = native_bt.ctf_stream_flush(self._ptr)
-        utils._handle_ret(ret, 'cannot cannot flush CTF writer stream object')
+        ret = native_bt.stream_flush(self._ptr)
+        utils._handle_ret(ret, 'cannot flush CTF writer stream object')
 
     @property
     def packet_header_field(self):
-        field_ptr = native_bt.ctf_stream_get_packet_header(self._ptr)
+        field_ptr = native_bt.stream_get_packet_header(self._ptr)
 
         if field_ptr is None:
             return
 
-        return fields._create_from_ptr(field_ptr)
+        return bt2.field._create_from_ptr(field_ptr)
 
     @packet_header_field.setter
     def packet_header_field(self, packet_header_field):
         packet_header_field_ptr = None
 
         if packet_header_field is not None:
-            utils._check_type(packet_header_field, fields._Field)
+            utils._check_type(packet_header_field, bt2.field._Field)
             packet_header_field_ptr = packet_header_field._ptr
 
-        ret = native_bt.ctf_stream_set_packet_header(self._ptr,
-                                                     packet_header_field_ptr)
+        ret = native_bt.stream_set_packet_header(self._ptr,
+                                                 packet_header_field_ptr)
         utils._handle_ret(ret, "cannot set CTF writer stream object's packet header field")
 
     @property
     def packet_context_field(self):
-        field_ptr = native_bt.ctf_stream_get_packet_context(self._ptr)
+        field_ptr = native_bt.stream_get_packet_context(self._ptr)
 
         if field_ptr is None:
             return
 
-        return fields._create_from_ptr(field_ptr)
+        return bt2.field._create_from_ptr(field_ptr)
 
     @packet_context_field.setter
     def packet_context_field(self, packet_context_field):
         packet_context_field_ptr = None
 
         if packet_context_field is not None:
-            utils._check_type(packet_context_field, fields._Field)
+            utils._check_type(packet_context_field, bt2.field._Field)
             packet_context_field_ptr = packet_context_field._ptr
 
-        ret = native_bt.ctf_stream_set_packet_context(self._ptr,
-                                                      packet_context_field_ptr)
+        ret = native_bt.stream_set_packet_context(self._ptr,
+                                                  packet_context_field_ptr)
         utils._handle_ret(ret, "cannot set CTF writer stream object's packet context field")
 
     def __eq__(self, other):
@@ -283,7 +284,7 @@ class _CtfWriterStream(stream._StreamBase):
         return cpy
 
 
-class CtfWriter(object._Object):
+class CtfWriter(bt2.object._SharedObject):
     def __init__(self, path):
         utils._check_str(path)
         ptr = native_bt.ctf_writer_create(path)