license: remove FSF postal address from boiler plate license text

[libsigrok.git] / src / transform / scale.c

diff --git a/src/transform/scale.c b/src/transform/scale.c
index e0ecd3de72907b56aa408f672d73eff312c28a84..c7c60dd2b456ac5bfa317bf76592a28fc2e84c38 100644 (file)
--- a/src/transform/scale.c
+++ b/src/transform/scale.c
@@ -14,8 +14,7 @@
  * 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>
@@ -26,7 +25,7 @@
 #define LOG_PREFIX "transform/scale"
 
 struct context {
-       double factor;
+       struct sr_rational factor;
 };
 
 static int init(struct sr_transform *t, GHashTable *options)
@@ -38,7 +37,8 @@ static int init(struct sr_transform *t, GHashTable *options)
 
        t->priv = ctx = g_malloc0(sizeof(struct context));
 
-       ctx->factor = g_variant_get_double(g_hash_table_lookup(options, "factor"));
+       g_variant_get(g_hash_table_lookup(options, "factor"), "(xt)",
+                       &ctx->factor.p, &ctx->factor.q);
 
        return SR_OK;
 }
@@ -49,10 +49,6 @@ static int receive(const struct sr_transform *t,
 {
        struct context *ctx;
        const struct sr_datafeed_analog *analog;
-       struct sr_channel *ch;
-       GSList *l;
-       float *fdata;
-       int i, num_channels, c;
 
        if (!t || !t->sdi || !packet_in || !packet_out)
                return SR_ERR_ARG;
@@ -61,16 +57,8 @@ static int receive(const struct sr_transform *t,
        switch (packet_in->type) {
        case SR_DF_ANALOG:
                analog = packet_in->payload;
-               fdata = (float *)analog->data;
-               num_channels = g_slist_length(analog->channels);
-               for (i = 0; i < analog->num_samples; i++) {
-                       /* For now scale all values in all channels. */
-                       for (l = analog->channels, c = 0; l; l = l->next, c++) {
-                               ch = l->data;
-                               (void)ch;
-                               fdata[i * num_channels + c] *= ctx->factor;
-                       }
-               }
+               analog->encoding->scale.p *= ctx->factor.p;
+               analog->encoding->scale.q *= ctx->factor.q;
                break;
        default:
                sr_spew("Unsupported packet type %d, ignoring.", packet_in->type);
@@ -104,9 +92,12 @@ static struct sr_option options[] = {
 
 static const struct sr_option *get_options(void)
 {
+       int64_t p = 1;
+       uint64_t q = 1;
+
        /* Default to a scaling factor of 1.0. */
        if (!options[0].def)
-               options[0].def = g_variant_ref_sink(g_variant_new_double(1.0));
+               options[0].def = g_variant_ref_sink(g_variant_new("(xt)", &p, &q));
 
        return options;
 }