X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Froute_time_axis.cc;h=29794eb54f3fe52d40d23a5345713cf50dc975ec;hb=19bb2b33a89a1291451f0740739a36daebe00bae;hp=4467bdc6d75eb7e5ae4f0974ddac582d130a8ac5;hpb=fc14ecb93b35e00a76de98a20f6ff2cecc40bbd1;p=ardour.git diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc index 4467bdc6d7..29794eb54f 100644 --- a/gtk2_ardour/route_time_axis.cc +++ b/gtk2_ardour/route_time_axis.cc @@ -43,6 +43,7 @@ #include #include "ardour/amp.h" +#include "ardour/meter.h" #include "ardour/event_type_map.h" #include "ardour/processor.h" #include "ardour/profile.h" @@ -57,7 +58,6 @@ #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" @@ -68,7 +68,6 @@ #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" @@ -85,22 +84,7 @@ using namespace Editing; using namespace std; using std::list; -Glib::RefPtr RouteTimeAxisView::slider; -Glib::RefPtr 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) @@ -117,7 +101,7 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session* sess, Canvas& c , playlist_action_menu (0) , mode_menu (0) , color_mode_menu (0) - , gm (sess, slider, slider_desensitised, true, 115) + , gm (sess, true, 125, 18) , _ignore_set_layer_display (false) { } @@ -126,10 +110,14 @@ void RouteTimeAxisView::set_route (boost::shared_ptr rt) { RouteUI::set_route (rt); - + + 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"); @@ -139,7 +127,7 @@ RouteTimeAxisView::set_route (boost::shared_ptr rt) set_height (preset_height (HeightNormal)); } - if (!_route->is_hidden()) { + if (!_route->is_auditioner()) { if (gui_property ("visible").empty()) { set_gui_property ("visible", true); } @@ -181,8 +169,10 @@ RouteTimeAxisView::set_route (boost::shared_ptr rt) 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()); @@ -190,10 +180,16 @@ RouteTimeAxisView::set_route (boost::shared_ptr rt) /* 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()); @@ -205,11 +201,7 @@ RouteTimeAxisView::set_route (boost::shared_ptr rt) } 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 (*pad, 0, 5, 1, 2, Gtk::SHRINK, Gtk::SHRINK, 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")); @@ -246,27 +238,22 @@ RouteTimeAxisView::set_route (boost::shared_ptr rt) /* pick up the correct freeze state */ map_frozen (); - } - _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(); - plist->add (ARDOUR::Properties::edit, true); plist->add (ARDOUR::Properties::mute, true); plist->add (ARDOUR::Properties::solo, true); 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 ("TrackGainFader"); gm.get_level_meter().signal_scroll_event().connect (sigc::mem_fun (*this, &RouteTimeAxisView::controls_ebox_scroll), false); - - show_name_entry (); - hide_name_label (); } RouteTimeAxisView::~RouteTimeAxisView () @@ -340,15 +327,10 @@ RouteTimeAxisView::label_view () { string x = _route->name(); - if (x != name_entry.get_text()) { - name_entry.set_text (x); - } - if (x != name_label.get_text()) { name_label.set_text (x); } - ARDOUR_UI::instance()->set_tip (name_entry, x); } void @@ -411,14 +393,13 @@ RouteTimeAxisView::build_automation_action_menu (bool for_selection) 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);; } } @@ -663,10 +644,6 @@ RouteTimeAxisView::build_display_menu () 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()); @@ -714,7 +691,7 @@ RouteTimeAxisView::build_display_menu () } items.push_back (CheckMenuElem (_("Active"))); - CheckMenuItem* i = dynamic_cast (&items.back()); + Gtk::CheckMenuItem* i = dynamic_cast (&items.back()); bool click_sets_active = true; if (active > 0 && inactive == 0) { i->set_active (true); @@ -804,13 +781,9 @@ RouteTimeAxisView::show_timestretch (framepos_t start, framepos_t end, int layer #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 (); @@ -819,10 +792,8 @@ RouteTimeAxisView::show_timestretch (framepos_t start, framepos_t end, int layer 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 @@ -858,9 +829,14 @@ RouteTimeAxisView::show_selection (TimeSelection& ts) 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); @@ -927,21 +903,13 @@ RouteTimeAxisView::route_color_changed () } 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; @@ -950,10 +918,10 @@ RouteTimeAxisView::set_samples_per_unit (double spu) } 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 @@ -1028,7 +996,7 @@ RouteTimeAxisView::resolve_new_group_playlist_name(std::string &basename, vector 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; } @@ -1062,7 +1030,7 @@ RouteTimeAxisView::use_copy_playlist (bool prompt, vectorname(); - if (route_group() && route_group()->is_active() && route_group()->enabled_property (ARDOUR::Properties::edit.property_id)) { + if (route_group() && route_group()->is_active() && route_group()->enabled_property (ARDOUR::Properties::select.property_id)) { name = resolve_new_group_playlist_name(name, playlists_before_op); } @@ -1117,7 +1085,7 @@ RouteTimeAxisView::use_new_playlist (bool prompt, vectorname(); - if (route_group() && route_group()->is_active() && route_group()->enabled_property (ARDOUR::Properties::edit.property_id)) { + if (route_group() && route_group()->is_active() && route_group()->enabled_property (ARDOUR::Properties::select.property_id)) { name = resolve_new_group_playlist_name(name,playlists_before_op); } @@ -1171,7 +1139,7 @@ RouteTimeAxisView::clear_playlist () 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 @@ -1305,7 +1273,9 @@ RouteTimeAxisView::playlist () const 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; @@ -1314,18 +1284,18 @@ RouteTimeAxisView::name_entry_changed () 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 (); } } @@ -1498,7 +1468,7 @@ RouteTimeAxisView::build_playlist_menu () playlist_items.push_back (MenuElem (_("Rename..."), sigc::mem_fun(*this, &RouteTimeAxisView::rename_current_playlist))); playlist_items.push_back (SeparatorElem()); - if (!route_group() || !route_group()->is_active() || !route_group()->enabled_property (ARDOUR::Properties::edit.property_id)) { + if (!route_group() || !route_group()->is_active() || !route_group()->enabled_property (ARDOUR::Properties::select.property_id)) { playlist_items.push_back (MenuElem (_("New..."), sigc::bind(sigc::mem_fun(_editor, &PublicEditor::new_playlists), this))); playlist_items.push_back (MenuElem (_("New Copy..."), sigc::bind(sigc::mem_fun(_editor, &PublicEditor::copy_playlists), this))); @@ -1542,7 +1512,7 @@ RouteTimeAxisView::use_playlist (RadioMenuItem *item, boost::weak_ptr RouteGroup* rg = route_group(); - if (rg && rg->is_active() && rg->enabled_property (ARDOUR::Properties::edit.property_id)) { + if (rg && rg->is_active() && rg->enabled_property (ARDOUR::Properties::select.property_id)) { std::string group_string = "." + rg->name() + "."; std::string take_name = pl->name(); @@ -1588,7 +1558,7 @@ void RouteTimeAxisView::update_playlist_tip () { RouteGroup* rg = route_group (); - if (rg && rg->is_active() && rg->enabled_property (ARDOUR::Properties::edit.property_id)) { + if (rg && rg->is_active() && rg->enabled_property (ARDOUR::Properties::select.property_id)) { string group_string = "." + rg->name() + "."; string take_name = track()->playlist()->name(); @@ -1601,7 +1571,9 @@ RouteTimeAxisView::update_playlist_tip () /* set the playlist button tooltip to the take name */ ARDOUR_UI::instance()->set_tip ( playlist_button, - string_compose(_("Take: %1.%2"), escape_angled_brackets (rg->name()), escape_angled_brackets (take_name)) + string_compose(_("Take: %1.%2"), + Glib::Markup::escape_text(rg->name()), + Glib::Markup::escape_text(take_name)) ); return; @@ -1609,7 +1581,7 @@ RouteTimeAxisView::update_playlist_tip () } /* set the playlist button tooltip to the playlist name */ - ARDOUR_UI::instance()->set_tip (playlist_button, _("Playlist") + std::string(": ") + escape_angled_brackets (track()->playlist()->name())); + ARDOUR_UI::instance()->set_tip (playlist_button, _("Playlist") + std::string(": ") + Glib::Markup::escape_text(track()->playlist()->name())); } @@ -1645,11 +1617,11 @@ RouteTimeAxisView::color_handler () { //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(); @@ -2049,12 +2021,12 @@ RouteTimeAxisView::add_processor_to_subplugin_menu (boost::weak_ptr p for (std::set::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 (&items.back()); + mitem = dynamic_cast (&items.back()); _subplugin_menu_map[*i] = mitem; @@ -2173,11 +2145,18 @@ RouteTimeAxisView::reset_processor_automation_curves () } } +bool +RouteTimeAxisView::can_edit_name () const +{ + /* we do not allow track name changes if it is record enabled + */ + return !_route->record_enabled(); +} + void RouteTimeAxisView::update_rec_display () { RouteUI::update_rec_display (); - name_entry.set_sensitive (!_route->record_enabled()); } void @@ -2246,7 +2225,11 @@ 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 (); } @@ -2263,12 +2246,18 @@ RouteTimeAxisView::meter_changed () { ENSURE_GUI_THREAD (*this, &RouteTimeAxisView::meter_changed) reset_meter(); + if (_route && !no_redraw) { + request_redraw (); + } } void RouteTimeAxisView::io_changed (IOChange /*change*/, void */*src*/) { reset_meter (); + if (_route && !no_redraw) { + request_redraw (); + } } void @@ -2390,31 +2379,26 @@ RouteTimeAxisView::remove_underlay (StreamView* v) 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()); - 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")); }