* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include <config.h>
}
/**
- * Convert a string representation of a numeric value to a @sr_rational. The
- * conversion is strict and will fail if the complete string does not represent
- * a valid number. The function sets errno according to the details of the
- * failure. This version ignores the locale.
+ * Convert a string representation of a numeric value to a sr_rational.
+ *
+ * The conversion is strict and will fail if the complete string does not
+ * represent a valid number. The function sets errno according to the details
+ * of the failure. This version ignores the locale.
*
* @param str The string representation to convert.
* @param ret Pointer to sr_rational where the result of the conversion will be stored.
*
* @since 0.1.0
*/
-SR_API char *sr_period_string(uint64_t frequency)
+SR_API char *sr_period_string(uint64_t v_p, uint64_t v_q)
{
+ double freq, v;
char *o;
- int r;
+ int prec, r;
+
+ freq = 1 / ((double)v_p / v_q);
- /* Allocate enough for a uint64_t as string + " ms". */
o = g_malloc0(30 + 1);
- if (frequency >= SR_GHZ(1))
- r = snprintf(o, 30, "%" PRIu64 " ns", frequency / 1000000000);
- else if (frequency >= SR_MHZ(1))
- r = snprintf(o, 30, "%" PRIu64 " us", frequency / 1000000);
- else if (frequency >= SR_KHZ(1))
- r = snprintf(o, 30, "%" PRIu64 " ms", frequency / 1000);
- else
- r = snprintf(o, 30, "%" PRIu64 " s", frequency);
+ if (freq > SR_GHZ(1)) {
+ v = (double)v_p / v_q * 1000000000000.0;
+ prec = ((v - (uint64_t)v) < FLT_MIN) ? 0 : 3;
+ r = snprintf(o, 30, "%.*f ps", prec, v);
+ } else if (freq > SR_MHZ(1)) {
+ v = (double)v_p / v_q * 1000000000.0;
+ prec = ((v - (uint64_t)v) < FLT_MIN) ? 0 : 3;
+ r = snprintf(o, 30, "%.*f ns", prec, v);
+ } else if (freq > SR_KHZ(1)) {
+ v = (double)v_p / v_q * 1000000.0;
+ prec = ((v - (uint64_t)v) < FLT_MIN) ? 0 : 3;
+ r = snprintf(o, 30, "%.*f us", prec, v);
+ } else if (freq > 1) {
+ v = (double)v_p / v_q * 1000.0;
+ prec = ((v - (uint64_t)v) < FLT_MIN) ? 0 : 3;
+ r = snprintf(o, 30, "%.*f ms", prec, v);
+ } else {
+ v = (double)v_p / v_q;
+ prec = ((v - (uint64_t)v) < FLT_MIN) ? 0 : 3;
+ r = snprintf(o, 30, "%.*f s", prec, v);
+ }
if (r < 0) {
/* Something went wrong... */