Merge pull request #16 from 01org/64_bit_support_port_from_android

krocard · krocard · commit a9ddec031daf · 2015-06-10T12:00:30.000+02:00
Replace 32 bit sizes by size_t

Correct size_t/uint32_t miss alignment between header and source.
diff --git a/tinyalsa/TinyAmixerControl.hpp b/tinyalsa/TinyAmixerControl.hpp
@@ -85,7 +85,7 @@ class TinyAmixerControl : public AmixerControl
      * @return true if no error
      */
     virtual bool readControl(struct mixer_ctl *mixerControl,
-                             uint32_t elementCount,
+                             size_t elementCount,
                              std::string &error) = 0;
 
     /**
@@ -98,6 +98,6 @@ class TinyAmixerControl : public AmixerControl
      * @return true if no error
      */
     virtual bool writeControl(struct mixer_ctl *mixerControl,
-                              uint32_t elementCount,
+                              size_t elementCount,
                               std::string &error) = 0;
 };
diff --git a/tinyalsa/TinyAmixerControlArray.cpp b/tinyalsa/TinyAmixerControlArray.cpp
@@ -83,7 +83,7 @@ int TinyAmixerControlArray::setArrayMixer(struct mixer_ctl *mixerControl, size_t
 }
 
 bool TinyAmixerControlArray::readControl(struct mixer_ctl *mixerControl,
-                                         uint32_t elementCount,
+                                         size_t elementCount,
                                          std::string &error)
 {
     int err;
@@ -99,7 +99,7 @@ bool TinyAmixerControlArray::readControl(struct mixer_ctl *mixerControl,
 }
 
 bool TinyAmixerControlArray::writeControl(struct mixer_ctl *mixerControl,
-                                          uint32_t elementCount,
+                                          size_t elementCount,
                                           std::string &error)
 {
     int err;
@@ -123,7 +123,7 @@ void TinyAmixerControlArray::displayAndCleanString(std::stringstream &stringValu
 
 void TinyAmixerControlArray::logControlValues(bool receive,
                                               const void *array,
-                                              uint32_t elementCount) const
+                                              size_t elementCount) const
 {
     const unsigned char *buffer = reinterpret_cast<const unsigned char *>(array);
     unsigned int idx;
diff --git a/tinyalsa/TinyAmixerControlArray.hpp b/tinyalsa/TinyAmixerControlArray.hpp
@@ -51,11 +51,11 @@ class TinyAmixerControlArray : public TinyAmixerControl
 
 protected:
     virtual bool readControl(struct mixer_ctl *mixerControl,
-                             uint32_t elementCount,
+                             size_t elementCount,
                              std::string &error);
 
     virtual bool writeControl(struct mixer_ctl *mixerControl,
-                              uint32_t elementCount,
+                              size_t elementCount,
                               std::string &error);
 
     /**
@@ -105,7 +105,7 @@ class TinyAmixerControlArray : public TinyAmixerControl
      * @param[in] receive a boolean indicating if we receive or send the values from/to tinyalsa
      * @param[in] elementCount the number of element to log
      */
-    void logControlValues(bool receive, const void *array, uint32_t elementCount) const;
+    void logControlValues(bool receive, const void *array, size_t elementCount) const;
     /**
      * Method for displaying and cleaning stringstream objects
      *
diff --git a/tinyalsa/TinyAmixerControlValue.cpp b/tinyalsa/TinyAmixerControlValue.cpp
@@ -47,7 +47,7 @@ TinyAmixerControlValue::TinyAmixerControlValue(
 }
 
 bool TinyAmixerControlValue::readControl(struct mixer_ctl *mixerControl,
-                                         uint32_t elementCount,
+                                         size_t elementCount,
                                          std::string &error)
 {
     uint32_t elementNumber;
@@ -75,7 +75,7 @@ bool TinyAmixerControlValue::readControl(struct mixer_ctl *mixerControl,
 }
 
 bool TinyAmixerControlValue::writeControl(struct mixer_ctl *mixerControl,
-                                          uint32_t elementCount,
+                                          size_t elementCount,
                                           std::string &error)
 {
     uint32_t elementNumber;
diff --git a/tinyalsa/TinyAmixerControlValue.hpp b/tinyalsa/TinyAmixerControlValue.hpp
@@ -51,10 +51,10 @@ class TinyAmixerControlValue : public TinyAmixerControl
 
 protected:
     virtual bool readControl(struct mixer_ctl *mixerControl,
-                             uint32_t elementCount,
+                             size_t elementCount,
                              std::string &error);
 
     virtual bool writeControl(struct mixer_ctl *mixerControl,
-                              uint32_t elementCount,
+                              size_t elementCount,
                               std::string &error);
 };

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ int TinyAmixerControlArray::setArrayMixer(struct mixer_ctl *mixerControl, size_t`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`bool TinyAmixerControlArray::readControl(struct mixer_ctl *mixerControl,`
`86`		`- uint32_t elementCount,`
	`86`	`+ size_t elementCount,`
`87`	`87`	`std::string &error)`
`88`	`88`	`{`
`89`	`89`	`int err;`
`@@ -99,7 +99,7 @@ bool TinyAmixerControlArray::readControl(struct mixer_ctl *mixerControl,`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`bool TinyAmixerControlArray::writeControl(struct mixer_ctl *mixerControl,`
`102`		`- uint32_t elementCount,`
	`102`	`+ size_t elementCount,`
`103`	`103`	`std::string &error)`
`104`	`104`	`{`
`105`	`105`	`int err;`
`@@ -123,7 +123,7 @@ void TinyAmixerControlArray::displayAndCleanString(std::stringstream &stringValu`
`123`	`123`
`124`	`124`	`void TinyAmixerControlArray::logControlValues(bool receive,`
`125`	`125`	`const void *array,`
`126`		`- uint32_t elementCount) const`
	`126`	`+ size_t elementCount) const`
`127`	`127`	`{`
`128`	`128`	`const unsigned char buffer = reinterpret_cast<const unsigned char >(array);`
`129`	`129`	`unsigned int idx;`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ TinyAmixerControlValue::TinyAmixerControlValue(`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`bool TinyAmixerControlValue::readControl(struct mixer_ctl *mixerControl,`
`50`		`- uint32_t elementCount,`
	`50`	`+ size_t elementCount,`
`51`	`51`	`std::string &error)`
`52`	`52`	`{`
`53`	`53`	`uint32_t elementNumber;`
`@@ -75,7 +75,7 @@ bool TinyAmixerControlValue::readControl(struct mixer_ctl *mixerControl,`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`bool TinyAmixerControlValue::writeControl(struct mixer_ctl *mixerControl,`
`78`		`- uint32_t elementCount,`
	`78`	`+ size_t elementCount,`
`79`	`79`	`std::string &error)`
`80`	`80`	`{`
`81`	`81`	`uint32_t elementNumber;`