X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.cpp;h=77b2061c6e3b793d554613158761d7707a7af127;hb=30677c1392b54604b01558cf29b44572731659fc;hp=2a3ad14b56743b5d7adb5b152aa76cfd03320807;hpb=c5f9553c0b1ccd134b0d8f37b1b6c31ef3be114c;p=pulseview.git

diff --git a/pv/data/decodesignal.cpp b/pv/data/decodesignal.cpp
index 2a3ad14..77b2061 100644
--- a/pv/data/decodesignal.cpp
+++ b/pv/data/decodesignal.cpp
@@ -361,7 +361,7 @@ int64_t DecodeSignal::get_working_sample_count(uint32_t segment_id) const
 			try {
 				const shared_ptr<LogicSegment> segment = logic_data->logic_segments().at(segment_id);
 				count = min(count, (int64_t)segment->get_sample_count());
-			} catch (out_of_range) {
+			} catch (out_of_range&) {
 				return 0;
 			}
 		}
@@ -378,7 +378,7 @@ int64_t DecodeSignal::get_decoded_sample_count(uint32_t segment_id) const
 	try {
 		const DecodeSegment *segment = &(segments_.at(segment_id));
 		result = segment->samples_decoded;
-	} catch (out_of_range) {
+	} catch (out_of_range&) {
 		// Do nothing
 	}
 
@@ -431,7 +431,7 @@ void DecodeSignal::get_annotation_subset(
 		if (iter != rows->end())
 			(*iter).second.get_annotation_subset(dest,
 				start_sample, end_sample);
-	} catch (out_of_range) {
+	} catch (out_of_range&) {
 		// Do nothing
 	}
 }
@@ -607,7 +607,7 @@ uint32_t DecodeSignal::get_input_samplerate(uint32_t segment_id) const
 			try {
 				const shared_ptr<LogicSegment> segment = logic_data->logic_segments().at(segment_id);
 				samplerate = segment->samplerate();
-			} catch (out_of_range) {
+			} catch (out_of_range&) {
 				// Do nothing
 			}
 			break;
@@ -736,7 +736,7 @@ void DecodeSignal::mux_logic_samples(uint32_t segment_id, const int64_t start, c
 			shared_ptr<LogicSegment> segment;
 			try {
 				segment = logic_data->logic_segments().at(segment_id);
-			} catch (out_of_range) {
+			} catch (out_of_range&) {
 				qDebug() << "Muxer error for" << name() << ":" << ch.assigned_signal->name() \
 					<< "has no logic segment" << segment_id;
 				return;
@@ -756,7 +756,7 @@ void DecodeSignal::mux_logic_samples(uint32_t segment_id, const int64_t start, c
 	shared_ptr<LogicSegment> output_segment;
 	try {
 		output_segment = logic_mux_data_->logic_segments().at(segment_id);
-	} catch (out_of_range) {
+	} catch (out_of_range&) {
 		qDebug() << "Muxer error for" << name() << ": no logic mux segment" \
 			<< segment_id << "in mux_logic_samples(), mux segments size is" \
 			<< logic_mux_data_->logic_segments().size();
@@ -948,7 +948,7 @@ void DecodeSignal::decode_proc()
 
 				try {
 					input_segment = logic_mux_data_->logic_segments().at(current_segment_id_);
-				} catch (out_of_range) {
+				} catch (out_of_range&) {
 					qDebug() << "Decode error for" << name() << ": no logic mux segment" \
 						<< current_segment_id_ << "in decode_proc(), mux segments size is" \
 						<< logic_mux_data_->logic_segments().size();
@@ -978,6 +978,8 @@ void DecodeSignal::decode_proc()
 
 void DecodeSignal::start_srd_session()
 {
+	uint64_t samplerate;
+
 	if (srd_session_)
 		stop_srd_session();
 
@@ -1004,8 +1006,10 @@ void DecodeSignal::start_srd_session()
 	}
 
 	// Start the session
-	srd_session_metadata_set(srd_session_, SRD_CONF_SAMPLERATE,
-		g_variant_new_uint64(segments_.at(current_segment_id_).samplerate));
+	samplerate = segments_.at(current_segment_id_).samplerate;
+	if (samplerate)
+		srd_session_metadata_set(srd_session_, SRD_CONF_SAMPLERATE,
+			g_variant_new_uint64(samplerate));
 
 	srd_pd_output_callback_add(srd_session_, SRD_OUTPUT_ANN,
 		DecodeSignal::annotation_callback, this);
@@ -1036,7 +1040,7 @@ void DecodeSignal::connect_input_notifiers()
 		const data::SignalBase *signal = ch.assigned_signal;
 		connect(signal, SIGNAL(samples_cleared()),
 			this, SLOT(on_data_cleared()));
-		connect(signal, SIGNAL(samples_added(QObject*, uint64_t, uint64_t)),
+		connect(signal, SIGNAL(samples_added(uint64_t, uint64_t, uint64_t)),
 			this, SLOT(on_data_received()));
 	}
 }