ardour/livetrax
13
0
Fork 0
Code

continuing tweaks for livetrax

Browse Source
This commit is contained in:
Paul Davis 2024-03-22 23:00:04 -06:00
parent 60cd084a84
commit 8c5764f1e7
4 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gtk2_ardour/ardour_ui_dependents.cc
View File

@ -396,7 +396,6 @@ ARDOUR_UI::livetrax_setup_windows ()
livetrax_time_info_box = new TimeInfoBox ("LiveTraxTimeInfo", false); livetrax_time_info_box = new TimeInfoBox ("LiveTraxTimeInfo", false);
Gtk::Image* icon = manage (new Gtk::Image (ARDOUR_UI_UTILS::get_icon ("allenheath"))); Gtk::Image* icon = manage (new Gtk::Image (ARDOUR_UI_UTILS::get_icon ("allenheath")));
Gtk::Label* l;
Gtk::VBox* vb; Gtk::VBox* vb;
Gtk::HBox* hb; Gtk::HBox* hb;
ArdourButton::Element elements (ArdourButton::Element (ArdourButton::Text|ArdourButton::VectorIcon)); ArdourButton::Element elements (ArdourButton::Element (ArdourButton::Text|ArdourButton::VectorIcon));
@ -440,9 +439,9 @@ ARDOUR_UI::livetrax_setup_windows ()
/* transport bar */ /* transport bar */
livetrax_meter_view_button = manage (new ArdourButton (_("Meter"), elements)); livetrax_meter_view_button = manage (new ArdourButton (_("METER"), ArdourButton::Element (elements|ArdourButton::Edge|ArdourButton::Body), true));;
livetrax_mixer_view_button = manage (new ArdourButton (_("Mixer"), elements)); livetrax_mixer_view_button = manage (new ArdourButton (_("MIXER"), ArdourButton::Element (elements|ArdourButton::Edge|ArdourButton::Body), true));
livetrax_editor_view_button = manage (new ArdourButton (_("Tracks"), elements)); livetrax_editor_view_button = manage (new ArdourButton (_("TRACKS"), ArdourButton::Element (elements|ArdourButton::Edge|ArdourButton::Body), true));
livetrax_transport_bar.pack_start (*livetrax_editor_view_button, false, false); livetrax_transport_bar.pack_start (*livetrax_editor_view_button, false, false);
livetrax_transport_bar.pack_start (*livetrax_mixer_view_button, false, false); livetrax_transport_bar.pack_start (*livetrax_mixer_view_button, false, false);
@ -465,7 +464,7 @@ ARDOUR_UI::livetrax_setup_windows ()
/* meter display */ /* meter display */
livetrax_meters = manage (new LiveTraxMeters (16)); livetrax_meters = manage (new LiveTraxMeters (48));
livetrax_meters->show_all (); livetrax_meters->show_all ();
livetrax_meter_bar.set_border_width (12); livetrax_meter_bar.set_border_width (12);
livetrax_meter_bar.pack_start (*livetrax_meters, true, true, 12); livetrax_meter_bar.pack_start (*livetrax_meters, true, true, 12);

4
gtk2_ardour/livetrax_meters.cc
View File

@ -17,7 +17,7 @@ LiveTraxMeters::LiveTraxMeters (size_t initial_cnt)
resize (initial_cnt); resize (initial_cnt);
meter_box.set_spacing (PX_SCALE (6)); meter_box.set_spacing (PX_SCALE (10));
add (meter_box); add (meter_box);
fast_screen_update_connection = Glib::signal_timeout().connect (sigc::mem_fun (*this, &LiveTraxMeters::update_meters), 40, GDK_PRIORITY_REDRAW + 10); fast_screen_update_connection = Glib::signal_timeout().connect (sigc::mem_fun (*this, &LiveTraxMeters::update_meters), 40, GDK_PRIORITY_REDRAW + 10);
@ -75,7 +75,7 @@ LiveTraxMeters::resize (size_t sz)
for (size_t i = old; i < sz; ++i) { for (size_t i = old; i < sz; ++i) {
meters.push_back (manage (new FastMeter ((uint32_t)floor (UIConfiguration::instance ().get_meter_hold ()), meters.push_back (manage (new FastMeter (10 /* (uint32_t)floor (UIConfiguration::instance ().get_meter_hold ()) */,
8, FastMeter::Vertical, PX_SCALE (64), 8, FastMeter::Vertical, PX_SCALE (64),
c[0], c[1], c[2], c[3], c[4], c[5], c[6], c[7], c[8], c[9], c[0], c[1], c[2], c[3], c[4], c[5], c[6], c[7], c[8], c[9],
b[0], b[1], b[2], b[3], b[0], b[1], b[2], b[3],

10
gtk2_ardour/mixer_strip.cc
View File

@ -353,7 +353,7 @@ MixerStrip::init ()
global_vpacker.pack_start (output_button, Gtk::PACK_SHRINK); global_vpacker.pack_start (output_button, Gtk::PACK_SHRINK);
global_vpacker.pack_start (_comment_button, Gtk::PACK_SHRINK); global_vpacker.pack_start (_comment_button, Gtk::PACK_SHRINK);
} else { } else {
global_vpacker.pack_start (name_button, Gtk::PACK_SHRINK); global_vpacker.pack_start (name_button, true, true);
} }
#ifndef MIXBUS #ifndef MIXBUS
@ -1086,7 +1086,13 @@ MixerStrip::route_color_changed ()
{ {
using namespace ARDOUR_UI_UTILS; using namespace ARDOUR_UI_UTILS;
name_button.modify_bg (STATE_NORMAL, color()); name_button.modify_bg (STATE_NORMAL, color());
number_label.set_fixed_colors (gdk_color_to_rgba (color()), gdk_color_to_rgba (color())); Gtkmm2ext::Color c (gdk_color_to_rgba (color()));
if (Profile->get_livetrax()) {
name_button.set_fixed_colors (c, c);
}
number_label.set_fixed_colors (c, c);
reset_strip_style (); reset_strip_style ();
} }

2
gtk2_ardour/ui_config_vars.h
View File

@ -33,7 +33,7 @@ UI_CONFIG_VARIABLE (bool, all_floating_windows_are_dialogs, "all-floating-window
UI_CONFIG_VARIABLE (bool, floating_monitor_section, "floating-monitor-section", false) UI_CONFIG_VARIABLE (bool, floating_monitor_section, "floating-monitor-section", false)
UI_CONFIG_VARIABLE (bool, transients_follow_front, "transients-follow-front", false) UI_CONFIG_VARIABLE (bool, transients_follow_front, "transients-follow-front", false)
UI_CONFIG_VARIABLE (bool, allow_to_resize_engine_dialog, "allow-to-resize-engine-dialog", false) UI_CONFIG_VARIABLE (bool, allow_to_resize_engine_dialog, "allow-to-resize-engine-dialog", false)
UI_CONFIG_VARIABLE (bool, color_regions_using_track_color, "color-regions-using-track-color", false) UI_CONFIG_VARIABLE (bool, color_regions_using_track_color, "color-regions-using-track-color", true)
UI_CONFIG_VARIABLE (bool, use_route_color_widely, "use-route-color-widely", false) UI_CONFIG_VARIABLE (bool, use_route_color_widely, "use-route-color-widely", false)
UI_CONFIG_VARIABLE (uint32_t, vertical_region_gap, "vertical-region-gap", 0) UI_CONFIG_VARIABLE (uint32_t, vertical_region_gap, "vertical-region-gap", 0)
UI_CONFIG_VARIABLE (bool, editor_stereo_only_meters, "editor-stereo-only-meters", true) UI_CONFIG_VARIABLE (bool, editor_stereo_only_meters, "editor-stereo-only-meters", true)