#include <gtkmm2ext/utils.h>
#include "ardour/amp.h"
+#include "ardour/meter.h"
#include "ardour/event_type_map.h"
#include "ardour/processor.h"
#include "ardour/profile.h"
#include "ardour/route_group.h"
#include "ardour/session.h"
#include "ardour/session_playlists.h"
+
#include "evoral/Parameter.hpp"
+#include "canvas/debug.h"
+
#include "ardour_ui.h"
#include "ardour_button.h"
#include "debug.h"
#include "global_signals.h"
#include "route_time_axis.h"
#include "automation_time_axis.h"
-#include "canvas_impl.h"
#include "enums.h"
#include "gui_thread.h"
#include "keyboard.h"
#include "region_view.h"
#include "rgb_macros.h"
#include "selection.h"
-#include "simplerect.h"
#include "streamview.h"
#include "utils.h"
#include "route_group_menu.h"
#include "i18n.h"
using namespace ARDOUR;
+using namespace ARDOUR_UI_UTILS;
using namespace PBD;
using namespace Gtkmm2ext;
using namespace Gtk;
using namespace std;
using std::list;
-Glib::RefPtr<Gdk::Pixbuf> RouteTimeAxisView::slider;
-Glib::RefPtr<Gdk::Pixbuf> RouteTimeAxisView::slider_desensitised;
-
-void
-RouteTimeAxisView::setup_slider_pix ()
-{
- if ((slider = ::get_icon ("fader_belt_h_medium")) == 0) {
- throw failed_constructor ();
- }
-
- if ((slider_desensitised = ::get_icon ("fader_belt_h_medium_desensitised")) == 0) {
- throw failed_constructor ();
- }
-}
-
-RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session* sess, Canvas& canvas)
+RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session* sess, ArdourCanvas::Canvas& canvas)
: AxisView(sess)
, RouteUI(sess)
, TimeAxisView(sess,ed,(TimeAxisView*) 0, canvas)
, playlist_action_menu (0)
, mode_menu (0)
, color_mode_menu (0)
- , gm (sess, slider, slider_desensitised, true, 125)
+ , gm (sess, true, 125, 18)
, _ignore_set_layer_display (false)
{
+ number_label.set_corner_radius(2);
+ number_label.set_name("tracknumber label");
+ number_label.set_alignment(.5, .5);
+
+ sess->config.ParameterChanged.connect (*this, invalidator (*this), boost::bind (&RouteTimeAxisView::parameter_changed, this, _1), gui_context());
}
void
RouteTimeAxisView::set_route (boost::shared_ptr<Route> rt)
{
RouteUI::set_route (rt);
-
+
+ CANVAS_DEBUG_NAME (_canvas_display, string_compose ("main for %1", rt->name()));
+ CANVAS_DEBUG_NAME (selection_group, string_compose ("selections for %1", rt->name()));
+ CANVAS_DEBUG_NAME (_ghost_group, string_compose ("ghosts for %1", rt->name()));
+
+ int meter_width = 3;
+ if (_route && _route->shared_peak_meter()->input_streams().n_total() == 1) {
+ meter_width = 6;
+ }
gm.set_controls (_route, _route->shared_peak_meter(), _route->amp());
gm.get_level_meter().set_no_show_all();
- gm.get_level_meter().setup_meters(50);
+ gm.get_level_meter().setup_meters(50, meter_width);
gm.update_gain_sensitive ();
string str = gui_property ("height");
set_height (preset_height (HeightNormal));
}
- if (!_route->is_hidden()) {
+ if (!_route->is_auditioner()) {
if (gui_property ("visible").empty()) {
set_gui_property ("visible", true);
}
if (is_midi_track()) {
ARDOUR_UI::instance()->set_tip(*rec_enable_button, _("Record (Right-click for Step Edit)"));
+ gm.set_fader_name ("MidiTrackFader");
} else {
ARDOUR_UI::instance()->set_tip(*rec_enable_button, _("Record"));
+ gm.set_fader_name ("AudioTrackFader");
}
rec_enable_button->set_sensitive (_session->writable());
/* set playlist button tip to the current playlist, and make it update when it changes */
update_playlist_tip ();
track()->PlaylistChanged.connect (*this, invalidator (*this), ui_bind(&RouteTimeAxisView::update_playlist_tip, this), gui_context());
-
+
+ } else {
+ gm.set_fader_name ("AudioBusFader");
}
-
- controls_hbox.pack_start(gm.get_level_meter(), false, false);
+
+ Gtk::VBox *mtrbox = manage(new Gtk::VBox());
+ mtrbox->pack_start(gm.get_level_meter(), false, false, 2);
+ controls_hbox.pack_start(*mtrbox, false, false, 4);
+ mtrbox->show();
+
_route->meter_change.connect (*this, invalidator (*this), bind (&RouteTimeAxisView::meter_changed, this), gui_context());
_route->input()->changed.connect (*this, invalidator (*this), boost::bind (&RouteTimeAxisView::io_changed, this, _1, _2), gui_context());
_route->output()->changed.connect (*this, invalidator (*this), boost::bind (&RouteTimeAxisView::io_changed, this, _1, _2), gui_context());
+ _route->track_number_changed.connect (*this, invalidator (*this), boost::bind (&RouteTimeAxisView::label_view, this), gui_context());
controls_table.attach (*mute_button, 6, 7, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
controls_table.attach (*solo_button, 7, 8, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
}
- controls_table.attach (route_group_button, 7, 8, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
-// Gtk::VBox* pad = manage (new Gtk::VBox);
-// pad->pack_start (gm.get_gain_slider(), false, false);
-// pad->pack_start (*manage (new Gtk::Label), true, true);
-// pad->show_all ();
- controls_table.attach (gm.get_gain_slider(), 0, 5, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 3, 0);
+ if (!ARDOUR::Profile->get_trx()) {
+ controls_table.attach (route_group_button, 7, 8, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
+ controls_table.attach (gm.get_gain_slider(), 0, 5, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::AttachOptions (0), 3, 0);
+ }
ARDOUR_UI::instance()->set_tip(*solo_button,_("Solo"));
ARDOUR_UI::instance()->set_tip(*mute_button,_("Mute"));
ARDOUR_UI::instance()->set_tip(automation_button, _("Automation"));
}
+ update_track_number_visibility();
label_view ();
- controls_table.attach (automation_button, 6, 7, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+ if (!ARDOUR::Profile->get_trx()) {
+ controls_table.attach (automation_button, 6, 7, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+ }
- if (is_track() && track()->mode() == ARDOUR::Normal) {
+ if (!ARDOUR::Profile->get_trx() && is_track() && track()->mode() == ARDOUR::Normal) {
controls_table.attach (playlist_button, 5, 6, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
}
}
- _editor.ZoomChanged.connect (sigc::mem_fun(*this, &RouteTimeAxisView::reset_samples_per_unit));
- _editor.HorizontalPositionChanged.connect (sigc::mem_fun (*this, &RouteTimeAxisView::horizontal_position_changed));
+ _editor.ZoomChanged.connect (sigc::mem_fun(*this, &RouteTimeAxisView::reset_samples_per_pixel));
ColorsChanged.connect (sigc::mem_fun (*this, &RouteTimeAxisView::color_handler));
PropertyList* plist = new PropertyList();
route_group_menu = new RouteGroupMenu (_session, plist);
- // gm.get_gain_slider().signal_scroll_event().connect(sigc::mem_fun(*this, &RouteTimeAxisView::controls_ebox_scroll), false);
- gm.get_gain_slider().set_name ("GainFader");
+ gm.get_gain_slider().signal_scroll_event().connect(sigc::mem_fun(*this, &RouteTimeAxisView::controls_ebox_scroll), false);
gm.get_level_meter().signal_scroll_event().connect (sigc::mem_fun (*this, &RouteTimeAxisView::controls_ebox_scroll), false);
}
void
RouteTimeAxisView::label_view ()
{
- string x = _route->name();
+ string x = _route->name ();
+ if (x != name_label.get_text ()) {
+ name_label.set_text (x);
+ }
+ const int64_t track_number = _route->track_number ();
+ if (track_number == 0) {
+ number_label.set_text ("");
+ } else {
+ number_label.set_text (PBD::to_string (abs(_route->track_number ()), std::dec));
+ }
+}
+
+void
+RouteTimeAxisView::update_track_number_visibility ()
+{
+ bool show_label = _session->config.get_track_name_number();
- if (x != name_entry.get_text()) {
- name_entry.set_text (x);
+ if (_route && _route->is_master()) {
+ show_label = false;
}
- if (x != name_label.get_text()) {
- name_label.set_text (x);
+ //if (show_label == number_label.is_visible()) { return; }
+ if (number_label.get_parent()) {
+ controls_table.remove (number_label);
+ }
+ if (name_hbox.get_parent()) {
+ controls_table.remove (name_hbox);
}
+ if (show_label) {
+ controls_table.attach (number_label, 0, 1, 0, 1, Gtk::SHRINK, Gtk::FILL|Gtk::EXPAND, 3, 0);
+ controls_table.attach (name_hbox, 1, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 3, 0);
+ number_label.set_size_request(3 + _session->track_number_decimals() * 8, -1);
+ name_hbox.show ();
+ number_label.show ();
+ } else {
+ controls_table.attach (name_hbox, 0, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 3, 0);
+ name_hbox.show ();
+ number_label.hide ();
+ }
+}
- ARDOUR_UI::instance()->set_tip (name_entry, Glib::Markup::escape_text(x));
+void
+RouteTimeAxisView::parameter_changed (string const & p)
+{
+ if (p == "track-name-number") {
+ update_track_number_visibility();
+ }
}
void
items.push_back (MenuElem (_("Hide All Automation"),
sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::hide_all_automation), for_selection)));
- items.push_back (SeparatorElem ());
-
/* Attach the plugin submenu. It may have previously been used elsewhere,
so it was detached above
*/
if (!subplugin_menu.items().empty()) {
- items.push_back (MenuElem (_("Plugins"), subplugin_menu));
+ items.push_back (SeparatorElem ());
+ items.push_back (MenuElem (_("Processor automation"), subplugin_menu));
items.back().set_sensitive (!for_selection || _editor.get_selection().tracks.size() == 1);;
}
}
items.push_back (MenuElem (_("Mode"), *mode_menu));
}
- color_mode_menu = build_color_mode_menu();
- if (color_mode_menu) {
- items.push_back (MenuElem (_("Color Mode"), *color_mode_menu));
- }
items.push_back (SeparatorElem());
}
items.push_back (CheckMenuElem (_("Active")));
- CheckMenuItem* i = dynamic_cast<CheckMenuItem *> (&items.back());
+ Gtk::CheckMenuItem* i = dynamic_cast<Gtk::CheckMenuItem *> (&items.back());
bool click_sets_active = true;
if (active > 0 && inactive == 0) {
i->set_active (true);
} else if (active > 0 && inactive > 0) {
i->set_inconsistent (true);
}
+ i->set_sensitive(! _session->transport_rolling());
i->signal_activate().connect (sigc::bind (sigc::mem_fun (*this, &RouteUI::set_route_active), click_sets_active, true));
items.push_back (SeparatorElem());
_editor.get_selection().tracks.foreach_route_time_axis (boost::bind (&RouteTimeAxisView::set_track_mode, _1, mode, false));
} else {
- bool needs_bounce;
+ bool needs_bounce = false;
if (!track()->can_use_mode (mode, needs_bounce)) {
#endif
if (timestretch_rect == 0) {
- timestretch_rect = new SimpleRect (*canvas_display ());
- timestretch_rect->property_x1() = 0.0;
- timestretch_rect->property_y1() = 0.0;
- timestretch_rect->property_x2() = 0.0;
- timestretch_rect->property_y2() = 0.0;
- timestretch_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_TimeStretchFill.get();
- timestretch_rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_TimeStretchOutline.get();
+ timestretch_rect = new ArdourCanvas::Rectangle (canvas_display ());
+ timestretch_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_TimeStretchFill());
+ timestretch_rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_TimeStretchOutline());
}
timestretch_rect->show ();
double const x1 = start / _editor.get_current_zoom();
double const x2 = (end - 1) / _editor.get_current_zoom();
- timestretch_rect->property_x1() = x1;
- timestretch_rect->property_y1() = current_height() * (layers - layer - 1) / layers;
- timestretch_rect->property_x2() = x2;
- timestretch_rect->property_y2() = current_height() * (layers - layer) / layers;
+ timestretch_rect->set (ArdourCanvas::Rect (x1, current_height() * (layers - layer - 1) / layers,
+ x2, current_height() * (layers - layer) / layers));
}
void
void
RouteTimeAxisView::set_height (uint32_t h)
{
- int gmlen = h - 5;
+ int gmlen = h - 9;
bool height_changed = (height == 0) || (h != height);
- gm.get_level_meter().setup_meters (gmlen);
+
+ int meter_width = 3;
+ if (_route && _route->shared_peak_meter()->input_streams().n_total() == 1) {
+ meter_width = 6;
+ }
+ gm.get_level_meter().setup_meters (gmlen, meter_width);
TimeAxisView::set_height (h);
}
void
-RouteTimeAxisView::reset_samples_per_unit ()
+RouteTimeAxisView::reset_samples_per_pixel ()
{
- set_samples_per_unit (_editor.get_current_zoom());
+ set_samples_per_pixel (_editor.get_current_zoom());
}
void
-RouteTimeAxisView::horizontal_position_changed ()
-{
- if (_view) {
- _view->horizontal_position_changed ();
- }
-}
-
-void
-RouteTimeAxisView::set_samples_per_unit (double spu)
+RouteTimeAxisView::set_samples_per_pixel (double fpp)
{
double speed = 1.0;
}
if (_view) {
- _view->set_samples_per_unit (spu * speed);
+ _view->set_samples_per_pixel (fpp * speed);
}
- TimeAxisView::set_samples_per_unit (spu * speed);
+ TimeAxisView::set_samples_per_pixel (fpp * speed);
}
void
tmp = tmp.substr(idx + group_string.length());
// and find the largest current number
- int x = atoi(tmp.c_str());
+ int x = atoi(tmp);
if (x > maxnumber) {
maxnumber = x;
}
void
RouteTimeAxisView::speed_changed ()
{
- Gtkmm2ext::UI::instance()->call_slot (invalidator (*this), boost::bind (&RouteTimeAxisView::reset_samples_per_unit, this));
+ Gtkmm2ext::UI::instance()->call_slot (invalidator (*this), boost::bind (&RouteTimeAxisView::reset_samples_per_pixel, this));
}
void
void
RouteTimeAxisView::name_entry_changed ()
{
- string x = name_entry.get_text ();
+ TimeAxisView::name_entry_changed ();
+
+ string x = name_entry->get_text ();
if (x == _route->name()) {
return;
strip_whitespace_edges (x);
if (x.length() == 0) {
- name_entry.set_text (_route->name());
+ name_entry->set_text (_route->name());
return;
}
if (_session->route_name_internal (x)) {
ARDOUR_UI::instance()->popup_error (string_compose (_("You cannot create a track with that name as it is reserved for %1"),
PROGRAM_NAME));
- name_entry.grab_focus ();
+ name_entry->grab_focus ();
} else if (RouteUI::verify_new_route_name (x)) {
_route->set_name (x);
} else {
- name_entry.grab_focus ();
+ name_entry->grab_focus ();
}
}
{
//case cTimeStretchOutline:
if (timestretch_rect) {
- timestretch_rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_TimeStretchOutline.get();
+ timestretch_rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_TimeStretchOutline());
}
//case cTimeStretchFill:
if (timestretch_rect) {
- timestretch_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_TimeStretchFill.get();
+ timestretch_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_TimeStretchFill());
}
reset_meter();
for (std::set<Evoral::Parameter>::const_iterator i = automatable.begin(); i != automatable.end(); ++i) {
ProcessorAutomationNode* pan;
- CheckMenuItem* mitem;
+ Gtk::CheckMenuItem* mitem;
string name = processor->describe_parameter (*i);
items.push_back (CheckMenuElem (name));
- mitem = dynamic_cast<CheckMenuItem*> (&items.back());
+ mitem = dynamic_cast<Gtk::CheckMenuItem*> (&items.back());
_subplugin_menu_map[*i] = mitem;
RouteTimeAxisView::update_rec_display ()
{
RouteUI::update_rec_display ();
-
- if (_route->record_enabled()) {
- hide_name_entry ();
- show_name_label ();
- } else {
- hide_name_label ();
- show_name_entry ();
- }
}
void
RouteTimeAxisView::reset_meter ()
{
if (Config->get_show_track_meters()) {
- gm.get_level_meter().setup_meters (height-5);
+ int meter_width = 3;
+ if (_route && _route->shared_peak_meter()->input_streams().n_total() == 1) {
+ meter_width = 6;
+ }
+ gm.get_level_meter().setup_meters (height - 9, meter_width);
} else {
hide_meter ();
}
{
ENSURE_GUI_THREAD (*this, &RouteTimeAxisView::meter_changed)
reset_meter();
+ if (_route && !no_redraw) {
+ request_redraw ();
+ }
+ // reset peak when meter point changes
+ gm.reset_peak_display();
}
void
RouteTimeAxisView::io_changed (IOChange /*change*/, void */*src*/)
{
reset_meter ();
+ if (_route && !no_redraw) {
+ request_redraw ();
+ }
}
void
void
RouteTimeAxisView::set_button_names ()
{
- if (_route && _route->solo_safe()) {
- solo_button->remove ();
- if (solo_safe_pixbuf == 0) {
- solo_safe_pixbuf = ::get_icon("solo-safe-icon");
- }
- solo_button->set_image (solo_safe_pixbuf);
- solo_button->set_text (string());
- } else {
- solo_button->set_image (Glib::RefPtr<Gdk::Pixbuf>());
- if (Config->get_solo_control_is_listen_control()) {
- switch (Config->get_listen_position()) {
- case AfterFaderListen:
- solo_button->set_text (_("A"));
+ if (_route && _route->solo_safe()) {
+ solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() | Gtkmm2ext::Insensitive));
+ } else {
+ solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() & ~Gtkmm2ext::Insensitive));
+ }
+ if (Config->get_solo_control_is_listen_control()) {
+ switch (Config->get_listen_position()) {
+ case AfterFaderListen:
+ solo_button->set_text (_("A"));
ARDOUR_UI::instance()->set_tip (*solo_button, _("After-fade listen (AFL)"));
- break;
- case PreFaderListen:
- solo_button->set_text (_("P"));
+ break;
+ case PreFaderListen:
+ solo_button->set_text (_("P"));
ARDOUR_UI::instance()->set_tip (*solo_button, _("Pre-fade listen (PFL)"));
- break;
- }
- } else {
- solo_button->set_text (_("s"));
- ARDOUR_UI::instance()->set_tip (*solo_button, _("Solo"));
- }
- }
+ break;
+ }
+ } else {
+ solo_button->set_text (_("s"));
+ ARDOUR_UI::instance()->set_tip (*solo_button, _("Solo"));
+ }
mute_button->set_text (_("m"));
}
projects / ardour.git / blobdiff