bindings: Use SR_DF_ANALOG, drop SR_DF_ANALOG_OLD support.

[libsigrok.git] / bindings / python / sigrok / core / classes.i

diff --git a/bindings/python/sigrok/core/classes.i b/bindings/python/sigrok/core/classes.i
index 07b13715964a699ee685f77084bdabd658e49ce5..49cfba98791443e48c7b0f4fe8d7eec246d7a873 100644 (file)
--- a/bindings/python/sigrok/core/classes.i
+++ b/bindings/python/sigrok/core/classes.i
@@ -250,9 +250,9 @@ typedef guint pyg_flags_type;
     {
         return dynamic_pointer_cast<sigrok::Meta>($self->payload());
     }
-    std::shared_ptr<sigrok::AnalogOld> _payload_analog_old()
+    std::shared_ptr<sigrok::Analog> _payload_analog()
     {
-        return dynamic_pointer_cast<sigrok::AnalogOld>($self->payload());
+        return dynamic_pointer_cast<sigrok::Analog>($self->payload());
     }
     std::shared_ptr<sigrok::Logic> _payload_logic()
     {
@@ -271,8 +271,8 @@ typedef guint pyg_flags_type;
             return self._payload_meta()
         elif self.type == PacketType.LOGIC:
             return self._payload_logic()
-        elif self.type == PacketType.ANALOG_OLD:
-            return self._payload_analog_old()
+        elif self.type == PacketType.ANALOG:
+            return self._payload_analog()
         else:
             return None
 
@@ -377,7 +377,7 @@ std::map<std::string, Glib::VariantBase> dict_to_map_options(PyObject *dict,
 %}
 
 /* Ignore these methods, we will override them below. */
-%ignore sigrok::AnalogOld::data;
+%ignore sigrok::Analog::data;
 %ignore sigrok::Driver::scan;
 %ignore sigrok::InputFormat::create_input;
 %ignore sigrok::OutputFormat::create_output;
@@ -506,8 +506,8 @@ std::map<std::string, Glib::VariantBase> dict_to_map_options(PyObject *dict,
     }
 }
 
-/* Return NumPy array from AnalogOld::data(). */
-%extend sigrok::AnalogOld
+/* Return NumPy array from Analog::data(). */
+%extend sigrok::Analog
 {
     PyObject * _data()
     {