smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 14:54:56 +01:00
Code Issues Projects Releases Wiki Activity

add some assert() messages.

Browse source 
as hints clang static analyzer "Called C++ object pointer is null"
This commit is contained in:
Robin Gareus 2014-11-17 03:49:19 +01:00
parent 47f4005dbc
commit ad739cd018
3 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gtk2_ardour/ardour_ui.cc
View file

@ -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 {

1
gtk2_ardour/editor_route_groups.cc
View file

@ -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();

7
libs/ardour/tempo.cc
View file

@ -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,