From: Robin Gareus <robin@gareus.org>
Date: Mon, 17 Nov 2014 02:49:19 +0000 (+0100)
Subject: add some assert() messages.
X-Git-Tag: 4.0-rc1~1385
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=ad739cd018df8d746de77cbe7feb8e52fb315114;p=ardour.git

add some assert() messages.

as hints clang static analyzer "Called C++ object pointer is null"
---

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index ac35e0db79..246d19a969 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -4029,6 +4029,8 @@ ARDOUR_UI::plugin_scan_dialog (std::string type, std::string plugin, bool can_ca
 		scan_dlg->get_vbox()->pack_start (*scan_tbox, PACK_SHRINK, 4);
 	}
 
+	assert(scan_dlg && scan_tbox && cancel_button);
+
 	if (type == X_("closeme")) {
 		scan_dlg->hide();
 	} else {
diff --git a/gtk2_ardour/editor_route_groups.cc b/gtk2_ardour/editor_route_groups.cc
index c7a148304b..6d56b7d8c0 100644
--- a/gtk2_ardour/editor_route_groups.cc
+++ b/gtk2_ardour/editor_route_groups.cc
@@ -473,6 +473,7 @@ EditorRouteGroups::groups_changed ()
 void
 EditorRouteGroups::property_changed (RouteGroup* group, const PropertyChange&)
 {
+	assert(group);
 	_in_row_change = true;
 
 	Gtk::TreeModel::Children children = _model->children();
diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc
index 5e50e8e02b..6f3f734116 100644
--- a/libs/ardour/tempo.cc
+++ b/libs/ardour/tempo.cc
@@ -765,6 +765,8 @@ TempoMap::recompute_map (bool reassign_tempo_bbt, framepos_t end)
 		}
 	}
 
+	assert(meter);
+
 	for (Metrics::iterator i = metrics.begin(); i != metrics.end(); ++i) {
 		TempoSection* ts;
 
@@ -774,6 +776,8 @@ TempoMap::recompute_map (bool reassign_tempo_bbt, framepos_t end)
 		}
 	}
 
+	assert(tempo);
+
 	/* assumes that the first meter & tempo are at frame zero */
 	current_frame = 0;
 	meter->set_frame (0);
@@ -1840,6 +1844,7 @@ TempoMap::framepos_plus_beats (framepos_t pos, Evoral::MusicalTime beats) const
 	   tempo       -> the Tempo for "pos"
 	   next_tempo  -> first tempo after "pos", possibly metrics.end()
 	*/
+	assert(tempo);
 
 	DEBUG_TRACE (DEBUG::TempoMath,
 	             string_compose ("frame %1 plus %2 beats, start with tempo = %3 @ %4\n",
@@ -1941,6 +1946,7 @@ TempoMap::framepos_minus_beats (framepos_t pos, Evoral::MusicalTime beats) const
 		}
 	}
 
+	assert(tempo);
 	DEBUG_TRACE (DEBUG::TempoMath,
 	             string_compose ("frame %1 minus %2 beats, start with tempo = %3 @ %4 prev at beg? %5\n",
 	                             pos, beats, *((const Tempo*)tempo), tempo->frame(),
@@ -2169,7 +2175,6 @@ TempoMap::framewalk_to_beats (framepos_t pos, framecnt_t distance) const
 	   tempo -> the Tempo for "pos"
 	   next_tempo -> the next tempo after "pos", possibly metrics.end()
 	*/
-
 	assert (tempo);
 
 	DEBUG_TRACE (DEBUG::TempoMath,