Use get_cylinder_index instead of get_gasidx

Replace get_gasmix_from_event and get_gasidx with get_cylinder_index.

get_cylinder_index actually knows about both types of gaschange events
and the difference between them.

Signed-off-by: Anton Lundin <glance@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Anton Lundin 2014-07-17 08:55:02 +02:00 committed by Dirk Hohndel
parent b4679c819f
commit 6f8dc22e08

View file

@ -128,9 +128,8 @@ bool DiveEventItem::shouldBeHidden()
* Don't bother showing them if they match the first gas already
*/
if (!strcmp(event->name, "gaschange") && !event->time.seconds) {
struct gasmix *mix = get_gasmix_from_event(event);
struct dive *dive = current_dive;
if (dive && get_gasidx(dive, mix) <= 0)
if (dive && get_cylinder_index(dive, event) == 0)
return true;
}
for (int i = 0; i < evn_used; i++) {