Initialise sample_rate in pv::SigSession::feed_in_header

[pulseview.git] / pv / sigsession.cpp

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index afe6f955a1e1e51c6aed5990e5d4dc5009220146..6a69fdca2b99970aa0a86234a92fc0336dcb33c0 100644 (file)
--- a/pv/sigsession.cpp
+++ b/pv/sigsession.cpp
@@ -72,13 +72,13 @@ SigSession::capture_state SigSession::get_capture_state() const
 }
 
 void SigSession::start_capture(struct sr_dev_inst *sdi,
 }
 
 void SigSession::start_capture(struct sr_dev_inst *sdi,

-       uint64_t record_length, uint64_t sample_rate)
+       uint64_t record_length)

 {
        stop_capture();
 
        _sampling_thread.reset(new boost::thread(
                &SigSession::sample_thread_proc, this, sdi,
 {
        stop_capture();
 
        _sampling_thread.reset(new boost::thread(
                &SigSession::sample_thread_proc, this, sdi,

-               record_length, sample_rate));
+               record_length));

 }
 
 void SigSession::stop_capture()
 }
 
 void SigSession::stop_capture()


@@ -135,7 +135,7 @@ void SigSession::load_thread_proc(const string name)
 }
 
 void SigSession::sample_thread_proc(struct sr_dev_inst *sdi,
 }
 
 void SigSession::sample_thread_proc(struct sr_dev_inst *sdi,

-       uint64_t record_length, uint64_t sample_rate)
+       uint64_t record_length)

 {
        assert(sdi);
 
 {
        assert(sdi);
 


@@ -156,14 +156,6 @@ void SigSession::sample_thread_proc(struct sr_dev_inst *sdi,
                return;
        }
 
                return;
        }
 

-       // Set the samplerate
-       if (sr_config_set(sdi, SR_CONF_SAMPLERATE,
-               &sample_rate) != SR_OK) {
-               qDebug() << "Failed to configure samplerate.";
-               sr_session_destroy();
-               return;
-       }
-

        if (sr_session_start() != SR_OK) {
                qDebug() << "Failed to start session.";
                return;
        if (sr_session_start() != SR_OK) {
                qDebug() << "Failed to start session.";
                return;


@@ -180,7 +172,7 @@ void SigSession::sample_thread_proc(struct sr_dev_inst *sdi,
 void SigSession::feed_in_header(const sr_dev_inst *sdi)
 {
        shared_ptr<view::Signal> signal;
 void SigSession::feed_in_header(const sr_dev_inst *sdi)
 {
        shared_ptr<view::Signal> signal;

-       uint64_t *sample_rate;
+       uint64_t *sample_rate = NULL;

        unsigned int logic_probe_count = 0;
        unsigned int analog_probe_count = 0;
 
        unsigned int logic_probe_count = 0;
        unsigned int analog_probe_count = 0;
 


@@ -259,6 +251,8 @@ void SigSession::feed_in_header(const sr_dev_inst *sdi)
 void SigSession::feed_in_meta(const sr_dev_inst *sdi,
        const sr_datafeed_meta &meta)
 {
 void SigSession::feed_in_meta(const sr_dev_inst *sdi,
        const sr_datafeed_meta &meta)
 {

+       (void)sdi;
+

        for (const GSList *l = meta.config; l; l = l->next) {
                const sr_config *const src = (const sr_config*)l->data;
                switch (src->key) {
        for (const GSList *l = meta.config; l; l = l->next) {
                const sr_config *const src = (const sr_config*)l->data;
                switch (src->key) {