got_data = FALSE;
vdev = sdi->priv;
+
if (!vdev->capfile) {
/* No capture file opened yet, or finished with the last
* chunked one. */
- if (vdev->cur_chunk == 0) {
+ if (vdev->capturefile && (vdev->cur_chunk == 0)) {
/* capturefile is always the unchunked base name. */
if (zip_stat(vdev->archive, vdev->capturefile, 0, &zs) != -1) {
/* No chunks, just a single capture file. */
sr_dbg("Opened %s.", capturefile);
} else if (vdev->cur_analog_channel < vdev->num_analog_channels) {
vdev->capturefile = g_strdup_printf("analog-1-%d",
- vdev->cur_analog_channel + 1);
+ vdev->num_channels + vdev->cur_analog_channel + 1);
vdev->cur_analog_channel++;
vdev->cur_chunk = 0;
return TRUE;
buf = g_malloc(CHUNKSIZE);
- ret = zip_fread(vdev->capfile, buf,
- CHUNKSIZE / vdev->unitsize * vdev->unitsize);
+ /* unitsize is not defined for purely analog session files. */
+ if (vdev->unitsize)
+ ret = zip_fread(vdev->capfile, buf,
+ CHUNKSIZE / vdev->unitsize * vdev->unitsize);
+ else
+ ret = zip_fread(vdev->capfile, buf, CHUNKSIZE);
+
if (ret > 0) {
got_data = TRUE;
if (vdev->cur_analog_channel != 0) {
{
struct sr_dev_inst *sdi;
struct session_vdev *vdev;
- struct sr_datafeed_packet packet;
(void)fd;
(void)revents;
zip_discard(vdev->archive);
vdev->archive = NULL;
}
- packet.type = SR_DF_END;
- packet.payload = NULL;
- sr_session_send(sdi, &packet);
+
+ std_session_send_df_end(sdi, LOG_PREFIX);
return G_SOURCE_REMOVE;
}
return SR_ERR;
}
- /* Send header packet to the session bus. */
std_session_send_df_header(sdi, LOG_PREFIX);
/* freewheeling source */