projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RouteDialog: Move built-in types into template list experiment
[ardour.git]
/
gtk2_ardour
/
meter_strip.h
diff --git
a/gtk2_ardour/meter_strip.h
b/gtk2_ardour/meter_strip.h
index 5436df1ebb311dbe585a72e279652971e5031681..a877ab998c31a25619f1d8ef626d79d99ae7be6c 100644
(file)
--- a/
gtk2_ardour/meter_strip.h
+++ b/
gtk2_ardour/meter_strip.h
@@
-21,35
+21,42
@@
#define __ardour_meter_strip__
#include <vector>
#define __ardour_meter_strip__
#include <vector>
-
#include <cmath>
#include <cmath>
+#include <gtkmm/alignment.h>
+#include <gtkmm/box.h>
+#include <gtkmm/drawingarea.h>
+#include <gtkmm/eventbox.h>
+#include <gtkmm/separator.h>
+
#include "pbd/stateful.h"
#include "ardour/types.h"
#include "ardour/ardour.h"
#include "pbd/stateful.h"
#include "ardour/types.h"
#include "ardour/ardour.h"
-#include "route_ui.h"
-#include "ardour_button.h"
+
+#include "
widgets/
ardour_button.h"
#include "level_meter.h"
#include "level_meter.h"
+#include "route_ui.h"
namespace ARDOUR {
class Route;
class RouteGroup;
class Session;
}
namespace ARDOUR {
class Route;
class RouteGroup;
class Session;
}
-namespace Gtk {
- class Window;
- class Style;
-}
-class MeterStrip : public Gtk::VBox, public RouteUI
+class MeterStrip : public Gtk::VBox, public
AxisView, public
RouteUI
{
{
-
public:
+public:
MeterStrip (ARDOUR::Session*, boost::shared_ptr<ARDOUR::Route>);
MeterStrip (int, ARDOUR::MeterType);
~MeterStrip ();
MeterStrip (ARDOUR::Session*, boost::shared_ptr<ARDOUR::Route>);
MeterStrip (int, ARDOUR::MeterType);
~MeterStrip ();
+ std::string name() const;
+ Gdk::Color color () const;
+
+ boost::shared_ptr<ARDOUR::Stripable> stripable() const { return RouteUI::stripable(); }
+
void set_session (ARDOUR::Session* s);
void fast_update ();
boost::shared_ptr<ARDOUR::Route> route() { return _route; }
void set_session (ARDOUR::Session* s);
void fast_update ();
boost::shared_ptr<ARDOUR::Route> route() { return _route; }
@@
-72,9
+79,11
@@
class MeterStrip : public Gtk::VBox, public RouteUI
bool is_metric_display() { return _strip_type == 0; }
ARDOUR::MeterType meter_type();
bool is_metric_display() { return _strip_type == 0; }
ARDOUR::MeterType meter_type();
- protected:
+ bool selected() const { return false; }
+
+protected:
boost::shared_ptr<ARDOUR::Route> _route;
boost::shared_ptr<ARDOUR::Route> _route;
- PBD::ScopedConnectionList route_connections;
+ PBD::ScopedConnectionList
meter_
route_connections;
PBD::ScopedConnectionList level_meter_connection;
void self_delete ();
PBD::ScopedConnectionList level_meter_connection;
void self_delete ();
@@
-88,11
+97,11
@@
class MeterStrip : public Gtk::VBox, public RouteUI
void on_size_request (Gtk::Requisition*);
/* route UI */
void on_size_request (Gtk::Requisition*);
/* route UI */
- void
update_rec_display (
);
+ void
blink_rec_display (bool onoff
);
std::string state_id() const;
void set_button_names ();
std::string state_id() const;
void set_button_names ();
-
private:
+private:
Gtk::VBox mtr_vbox;
Gtk::VBox nfo_vbox;
Gtk::EventBox mtr_container;
Gtk::VBox mtr_vbox;
Gtk::VBox nfo_vbox;
Gtk::EventBox mtr_container;
@@
-101,8
+110,8
@@
class MeterStrip : public Gtk::VBox, public RouteUI
Gtk::HBox spacer;
Gtk::HBox namebx;
Gtk::VBox namenumberbx;
Gtk::HBox spacer;
Gtk::HBox namebx;
Gtk::VBox namenumberbx;
- ArdourButton name_label;
- ArdourButton number_label;
+ Ardour
Widgets::Ardour
Button name_label;
+ Ardour
Widgets::Ardour
Button number_label;
Gtk::DrawingArea meter_metric_area;
Gtk::DrawingArea meter_ticks1_area;
Gtk::DrawingArea meter_ticks2_area;
Gtk::DrawingArea meter_metric_area;
Gtk::DrawingArea meter_ticks1_area;
Gtk::DrawingArea meter_ticks2_area;
@@
-117,7
+126,7
@@
class MeterStrip : public Gtk::VBox, public RouteUI
Gtk::Alignment peak_align;
Gtk::HBox peakbx;
Gtk::VBox btnbox;
Gtk::Alignment peak_align;
Gtk::HBox peakbx;
Gtk::VBox btnbox;
- ArdourButton peak_display;
+ Ardour
Widgets::Ardour
Button peak_display;
std::vector<ARDOUR::DataType> _types;
ARDOUR::MeterType metric_type;
std::vector<ARDOUR::DataType> _types;
ARDOUR::MeterType metric_type;
@@
-130,7
+139,7
@@
class MeterStrip : public Gtk::VBox, public RouteUI
LevelMeterHBox *level_meter;
LevelMeterHBox *level_meter;
- void
strip
_property_changed (const PBD::PropertyChange&);
+ void
route
_property_changed (const PBD::PropertyChange&);
void meter_configuration_changed (ARDOUR::ChanCount);
void meter_type_changed (ARDOUR::MeterType);
void update_background (ARDOUR::MeterType);
void meter_configuration_changed (ARDOUR::ChanCount);
void meter_type_changed (ARDOUR::MeterType);
void update_background (ARDOUR::MeterType);
@@
-143,8
+152,10
@@
class MeterStrip : public Gtk::VBox, public RouteUI
void update_name_box ();
void name_changed ();
void update_name_box ();
void name_changed ();
+ void route_color_changed ();
+
bool _suspend_menu_callbacks;
bool _suspend_menu_callbacks;
- bool level_meter_button_
release
(GdkEventButton* ev);
+ bool level_meter_button_
press
(GdkEventButton* ev);
void popup_level_meter_menu (GdkEventButton* ev);
void add_level_meter_type_item (Gtk::Menu_Helpers::MenuList&, Gtk::RadioMenuItem::Group&, std::string const &, ARDOUR::MeterType);
void popup_level_meter_menu (GdkEventButton* ev);
void add_level_meter_type_item (Gtk::Menu_Helpers::MenuList&, Gtk::RadioMenuItem::Group&, std::string const &, ARDOUR::MeterType);