X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fsignalbase.hpp;h=fd7c38f5ea627d768830170db4768d46ad81fd69;hb=b4d448004ab0899f231b26325e646499d5874144;hp=32085a43b929a68e5223019eb04ec94e81e3e88f;hpb=8e15445ccd6994348eb74b24b5324d26c9be0cce;p=pulseview.git

diff --git a/pv/data/signalbase.hpp b/pv/data/signalbase.hpp
index 32085a4..fd7c38f 100644
--- a/pv/data/signalbase.hpp
+++ b/pv/data/signalbase.hpp
@@ -63,7 +63,6 @@ public:
 		AnalogChannel = 1, ///< Analog data
 		LogicChannel,  ///< Logic data
 		DecodeChannel, ///< Protocol Decoder channel using libsigrokdecode
-		A2LChannel,    ///< Analog converted to logic, joint representation
 		MathChannel    ///< Virtual channel generated by math operations
 	};
 
@@ -73,6 +72,16 @@ public:
 		A2LConversionBySchmittTrigger = 2
 	};
 
+	/**
+	 * Conversion presets range from -1 to n, where 1..n are dependent on
+	 * the conversion these presets apply to. -1 and 0 have fixed meanings,
+	 * however.
+	 */
+	enum ConversionPreset {
+		NoPreset = -1,     ///< Conversion uses custom values
+		DynamicPreset = 0  ///< Conversion uses calculated values
+	};
+
 private:
 	static const int ColourBGAlpha;
 	static const uint64_t ConversionBlockSize;
@@ -227,7 +236,7 @@ public:
 	 * @return the ID of the currently used conversion preset. -1 if no preset
 	 *         is used. In that case, a user setting is used instead.
 	 */
-	int get_current_conversion_preset() const;
+	ConversionPreset get_current_conversion_preset() const;
 
 	/**
 	 * Sets the conversion preset to be used.
@@ -236,7 +245,7 @@ public:
 	 *
 	 * @param id the id of the preset to use
 	 */
-	void set_conversion_preset(int id);
+	void set_conversion_preset(ConversionPreset id);
 
 #ifdef ENABLE_DECODE
 	bool is_decode_signal() const;