X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fstoresession.cpp;h=9ad494e2be3e34a2fced82ea34a961f354358483;hb=6ac6242b25cfbd4df14abe7580adc9d0f4cffe43;hp=dede6a064cb8eda309f7384e180059bdb6398fd8;hpb=e40b2f294066331dc04598f4b0dccac2bab7c295;p=pulseview.git diff --git a/pv/storesession.cpp b/pv/storesession.cpp index dede6a0..9ad494e 100644 --- a/pv/storesession.cpp +++ b/pv/storesession.cpp @@ -110,26 +110,26 @@ bool StoreSession::start() const shared_ptr snapshot(snapshots.front()); assert(snapshot); - // Make a list of probes - char **const probes = new char*[sigs.size() + 1]; + // Make a list of channels + char **const channels = new char*[sigs.size() + 1]; for (size_t i = 0; i < sigs.size(); i++) { shared_ptr sig(sigs[i]); assert(sig); - probes[i] = strdup(sig->get_name().toUtf8().constData()); + channels[i] = strdup(sig->get_name().toUtf8().constData()); } - probes[sigs.size()] = NULL; + channels[sigs.size()] = NULL; // Begin storing - if (sr_session_save_init(_file_name.c_str(), - data->samplerate(), probes) != SR_OK) { + if (sr_session_save_init(SigSession::_sr_session, _file_name.c_str(), + data->samplerate(), channels) != SR_OK) { _error = tr("Error while saving."); return false; } - // Delete the probes array + // Delete the channels array for (size_t i = 0; i <= sigs.size(); i++) - free(probes[i]); - delete[] probes; + free(channels[i]); + delete[] channels; _thread = std::thread(&StoreSession::store_proc, this, snapshot); return true; @@ -179,8 +179,8 @@ void StoreSession::store_proc(shared_ptr snapshot) start_sample + samples_per_block, sample_count); snapshot->get_samples(data, start_sample, end_sample); - if(sr_session_append(_file_name.c_str(), data, unit_size, - end_sample - start_sample) != SR_OK) + if(sr_session_append(SigSession::_sr_session, _file_name.c_str(), data, + unit_size, end_sample - start_sample) != SR_OK) { _error = tr("Error while saving."); break;