projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add code to disable AppNap on OS X/MacOS
[ardour.git]
/
gtk2_ardour
/
meterbridge.h
diff --git
a/gtk2_ardour/meterbridge.h
b/gtk2_ardour/meterbridge.h
index cca31d370c21beeab21ca09892f17d4f3b83760d..a1715b2633941499082b2850a72386d1fe05e1ec 100644
(file)
--- a/
gtk2_ardour/meterbridge.h
+++ b/
gtk2_ardour/meterbridge.h
@@
-80,7
+80,7
@@
class Meterbridge :
void remove_strip (MeterStrip *);
void session_going_away ();
void remove_strip (MeterStrip *);
void session_going_away ();
- void sync_order_keys (
ARDOUR::RouteSortOrderKey src
);
+ void sync_order_keys ();
void resync_order ();
mutable Glib::Threads::Mutex _resync_mutex;
void resync_order ();
mutable Glib::Threads::Mutex _resync_mutex;
@@
-107,7
+107,7
@@
class Meterbridge :
/* everything comes before b */
return true;
}
/* everything comes before b */
return true;
}
- return a->
order_key (ARDOUR::MixerSort) < b->order_key (ARDOUR::MixerSort
);
+ return a->
presentation_info().order() < b->presentation_info().order(
);
}
};
}
};
@@
-147,6
+147,12
@@
class Meterbridge :
void parameter_changed (std::string const & p);
void on_theme_changed ();
void parameter_changed (std::string const & p);
void on_theme_changed ();
+
+ void on_scroll ();
+ sigc::connection scroll_connection;
+
+ int _mm_left, _mm_right;
+ ARDOUR::MeterType _mt_left, _mt_right;
};
#endif
};
#endif