gtk: Use +/- to zoom in/out.

[sigrok-gtk.git] / main.c

diff --git a/main.c b/main.c
index f5fb05e233dc37d1da3989e875e82ebe23ccdcd3..43bea06470b2c8c7af37cffb750550c68361ca57 100644 (file)
--- a/main.c
+++ b/main.c
@@ -34,26 +34,26 @@ static const char *colours[8] = {
 };
 
 static void
-datafeed_in(struct sr_device *device, struct sr_datafeed_packet *packet)
+datafeed_in(struct sr_dev *dev, struct sr_datafeed_packet *packet)
 {
-       static int probelist[65] = { 0 };
+       static int probelist[SR_MAX_NUM_PROBES + 1] = { 0 };
        static int unitsize = 0;
        struct sr_probe *probe;
        struct sr_datafeed_header *header;
        struct sr_datafeed_logic *logic = NULL;
        int num_enabled_probes, sample_size, i;
        uint64_t filter_out_len;
-       char *filter_out;
+       uint8_t *filter_out;
        GArray *data;
 
        switch (packet->type) {
        case SR_DF_HEADER:
-               g_message("cli: Received SR_DF_HEADER");
+               g_message("fe: Received SR_DF_HEADER");
                header = packet->payload;
                num_enabled_probes = 0;
                gtk_list_store_clear(siglist);
                for (i = 0; i < header->num_logic_probes; i++) {
-                       probe = g_slist_nth_data(device->probes, i);
+                       probe = g_slist_nth_data(dev->probes, i);
                        if (probe->enabled) {
                                GtkTreeIter iter;
                                probelist[num_enabled_probes++] = probe->index;
@@ -73,21 +73,16 @@ datafeed_in(struct sr_device *device, struct sr_datafeed_packet *packet)
                break;
        case SR_DF_END:
                sigview_zoom(sigview, 1, 0);
-               g_message("cli: Received SR_DF_END");
+               g_message("fe: Received SR_DF_END");
                sr_session_halt();
                break;
        case SR_DF_TRIGGER:
-               g_message("cli: received SR_DF_TRIGGER at %"PRIu64" ms",
-                               packet->timeoffset / 1000000);
+               g_message("fe: received SR_DF_TRIGGER");
                break;
        case SR_DF_LOGIC:
                logic = packet->payload;
                sample_size = logic->unitsize;
-               g_message("cli: received SR_DF_LOGIC at %f ms duration %f ms, %"PRIu64" bytes",
-                               packet->timeoffset / 1000000.0, packet->duration / 1000000.0,
-                               logic->length);
-               break;
-       case SR_DF_ANALOG:
+               g_message("fe: received SR_DF_LOGIC, %"PRIu64" bytes", logic->length);
                break;
        }
 
@@ -159,7 +154,7 @@ int main(int argc, char **argv)
        gtk_container_add(GTK_CONTAINER(window), vbox);
        gtk_widget_show_all(GTK_WIDGET(window));
 
-       sr_set_loglevel(1);
+       sr_log_loglevel_set(SR_LOG_ERR);
 
        gtk_main();