Changeset 452

Timestamp:

04/09/07 02:06:44 (16 years ago)

Author:

ppalmers

Message:

libosc
- add type conversion functions to convert between the argument

type and the wanted data type

Files:

• trunk/libffado/src/libosc/OscArgument.cpp (modified) (1 diff)
• trunk/libffado/src/libosc/OscArgument.h (modified) (1 diff)
• trunk/libffado/src/libosc/unittests.cpp (modified) (1 diff)

trunk/libffado/src/libosc/OscArgument.cpp

@@ -91 +91 @@
-}
-
+int32_t 
+OscArgument::toInt() {
+    if(m_isInt) {
+        return m_intVal;
+    } else if(m_isInt64) {
+        return (int32_t)(m_int64Val & 0xFFFFFFFF);
+    } else if(m_isFloat) {
+        return (int32_t)(m_floatVal);
+    } else {
+        return 0;
+    }
+}
+
+int64_t 
+OscArgument::toInt64() {
+    if(m_isInt) {
+        return (int64_t)(m_intVal);
+    } else if(m_isInt64) {
+        return m_int64Val;
+    } else if(m_isFloat) {
+        return (int64_t)(m_floatVal);
+    } else {
+        return 0;
+    }
+}
+
+float 
+OscArgument::toFloat() {
+    if(m_isInt) {
+        return (float)(m_intVal);
+    } else if(m_isInt64) {
+        return (float)(m_int64Val);
+    } else if(m_isFloat) {
+        return m_floatVal;
+    } else {
+        return 0;
+    }
+}
+
-void
-OscArgument::print()

trunk/libffado/src/libosc/OscArgument.h

@@ -45 +45 @@
-    bool operator == ( const OscArgument& rhs );
-
+    /**
+     * @brief Returns the argument's integer value
+     * @return 32 bit integer argument value
+     */
-    int32_t getInt() { return m_intVal;};
+    /**
+     * @brief Returns the argument's value converted to integer.
+     * if the argument type is float or int64 it will be 
+     * cast (and trunctacted) to 32bit integer
+     * @return 
+     */
+    int32_t toInt();
+    /**
+     * @brief Is the argument a 32 bit integer?
+     * @return true if the argument is a 32 bit integer 
+     */
-    bool isInt() { return m_isInt;};
+    
+    /**
+     * @brief Returns the argument's 64 bit integer value
+     * @return 64 bit integer argument value 
+     */
-    int64_t getInt64() { return m_int64Val;};
+    /**
+     * @brief Returns the argument's value converted to a 64bit integer.
+     * if the argument type is float or int it will be 
+     * cast to a 64 bit integer
+     * @return 
+     */
+    int64_t toInt64();
+    /**
+     * @brief Is the argument a 64 bit integer?
+     * @return true if the argument is a 64 bit integer 
+     */
-    bool isInt64() { return m_isInt64;};
+    
+    /**
+     * @brief Returns the argument's float value
+     * @return float argument value 
+     */
-    float getFloat() { return m_floatVal;};
+    /**
+     * @brief Returns the argument's value converted to float.
+     * if the argument type is int32 or int64 it will be 
+     * cast to a float
+     * @return 
+     */
+    float toFloat();
+    /**
+     * @brief Is the argument a float?
+     * @return true if the argument is a float 
+     */
-    bool isFloat() { return m_isFloat;};
+    
+    /**
+     * @brief Returns the argument's string value
+     * @return string argument value 
+     */
-    string& getString() { return m_stringVal;};
+    /**
+     * @brief Is the argument a string?
+     * @return true if the argument is a string 
+     */
-    bool isString() { return m_isString;};
+    
+    
+    /**
+     * @brief Is the argument a numeric?
+     * @return true if the argument is a numeric value 
+     */
+    bool isNumeric() { return (m_isInt|| m_isInt64 || m_isFloat);};
+    
-
-    void print();

trunk/libffado/src/libosc/unittests.cpp

@@ -63 +63 @@
-    result &= TEST_SHOULD_RETURN_TRUE(m.getArgument(1).getString()==string("teststring"));
-    result &= TEST_SHOULD_RETURN_TRUE(m.getArgument(2).getInt()==1);
-
+
+
+
-    return result;
-}