diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 6b6e8b98bf..d2058fde3c 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -652,9 +652,9 @@ Editor::Editor (AudioEngine& eng) named_selection_display.signal_button_press_event().connect (mem_fun(*this, &Editor::named_selection_display_button_press)); named_selection_display.get_selection()->signal_changed().connect (mem_fun (*this, &Editor::named_selection_display_selection_changed)); - the_notebook.append_page (route_list_scroller, _("Tracks/Busses")); + the_notebook.append_page (region_list_scroller, _("Regions")); + the_notebook.append_page (route_list_scroller, _("Tracks/Busses")); the_notebook.append_page (edit_group_vbox, _("Edit Groups")); - the_notebook.append_page (region_list_scroller, _("Regions")); the_notebook.append_page (named_selection_scroller, _("Chunks")); the_notebook.set_show_tabs (true); diff --git a/gtk2_ardour/editor_mixer.cc b/gtk2_ardour/editor_mixer.cc index 70df0b1bf9..ec1511f2a2 100644 --- a/gtk2_ardour/editor_mixer.cc +++ b/gtk2_ardour/editor_mixer.cc @@ -95,16 +95,16 @@ Editor::show_editor_mixer (bool yn) current_mixer_strip->Hiding.connect (mem_fun(*this, &Editor::current_mixer_strip_hidden)); current_mixer_strip->GoingAway.connect (mem_fun(*this, &Editor::current_mixer_strip_removed)); current_mixer_strip->set_width (editor_mixer_strip_width); - current_mixer_strip->show_all (); - global_hpacker.pack_start (*current_mixer_strip, false, false); + global_hpacker.pack_start (*current_mixer_strip, Gtk::PACK_SHRINK ); global_hpacker.reorder_child (*current_mixer_strip, 0); + current_mixer_strip->show_all (); } } else { if (current_mixer_strip) { - editor_mixer_strip_width = current_mixer_strip->get_width (); + editor_mixer_strip_width = current_mixer_strip->get_width (); if (current_mixer_strip->get_parent() != 0) { global_hpacker.remove (*current_mixer_strip); } @@ -133,7 +133,6 @@ Editor::set_selected_mixer_strip (TimeAxisView& view) if (current_mixer_strip->get_parent()) { show = true; } - delete current_mixer_strip; current_mixer_strip = 0; } diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc index 74b734dbb9..5009da522e 100644 --- a/gtk2_ardour/gain_meter.cc +++ b/gtk2_ardour/gain_meter.cc @@ -108,7 +108,6 @@ GainMeter::GainMeter (IO& io, Session& s) } gain_display.set_print_func (_gain_printer, this); - set_size_request_to_display_given_text (gain_display, "-86.0", 2, 2); gain_unit_button.add (gain_unit_label); gain_unit_button.set_name ("MixerStripGainUnitButton"); @@ -151,46 +150,41 @@ GainMeter::GainMeter (IO& io, Session& s) top_table.attach (meter_point_button, 1, 2, 0, 1); } - gain_display_box.set_spacing (2); + set_size_request_to_display_given_text (gain_display_frame, "-86.0", 2, 2); gain_display_frame.set_shadow_type (Gtk::SHADOW_IN); gain_display_frame.set_name ("BaseFrame"); gain_display_frame.add (gain_display); - gain_display_box.pack_start (gain_display_frame, false, false); + gain_display_box.pack_start (gain_display_frame, Gtk::PACK_SHRINK); peak_display.set_name ("MixerStripPeakDisplay"); - set_size_request_to_display_given_text (peak_display, "-86.0", 2, 2); peak_display.add (peak_display_label); + set_size_request_to_display_given_text (peak_display_frame, "-86.0", 2, 2); peak_display_frame.set_shadow_type (Gtk::SHADOW_IN); peak_display_frame.set_name ("BaseFrame"); peak_display_frame.add (peak_display); max_peak = minus_infinity(); peak_display_label.set_text (_("-inf")); - - gain_display_box.pack_start (peak_display_frame, false, false); + gain_display_box.pack_end (peak_display_frame, Gtk::PACK_SHRINK); meter_metric_area.set_size_request (18, -1); meter_metric_area.set_name ("MeterMetricsStrip"); - meter_packer.show (); - gain_slider->show_all (); - meter_packer.set_spacing (2); fader_box.set_spacing (2); - fader_box.pack_start (*gain_slider, false, false); + fader_box.pack_start (*gain_slider, Gtk::PACK_SHRINK); hbox.set_spacing (4); - hbox.pack_start (fader_box, false, false); - hbox.pack_start (meter_packer, false, false); + hbox.pack_start (fader_box, Gtk::PACK_SHRINK); + hbox.pack_start (meter_packer, Gtk::PACK_SHRINK); set_spacing (4); - pack_start (top_table, false, false); - pack_start (gain_display_box, false, false); - pack_start (hbox, false, false); - - show_all (); + pack_start (top_table, Gtk::PACK_SHRINK); + /* here's the culprit gain display box*/ + pack_start (gain_display_box, Gtk::PACK_SHRINK); + pack_start (hbox, Gtk::PACK_SHRINK); _io.gain_changed.connect (mem_fun(*this, &GainMeter::gain_changed)); @@ -402,7 +396,7 @@ GainMeter::setup_meters () } if (_width == Wide) { - meter_packer.pack_start (meter_metric_area, false, false); + meter_packer.pack_start (meter_metric_area, Gtk::PACK_SHRINK); meter_metric_area.show_all (); } @@ -426,7 +420,7 @@ GainMeter::setup_meters () meters[n].meter->signal_button_release_event().connect (bind (mem_fun(*this, &GainMeter::meter_button_release), n)); } - meter_packer.pack_start (*meters[n].meter, false, false); + meter_packer.pack_start (*meters[n].meter, Gtk::PACK_SHRINK); meters[n].meter->show_all (); meters[n].packed = true; } diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index 490774be06..771a3eda9f 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -259,13 +259,10 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, Route& rt, bool in_mixer) ARDOUR_UI::instance()->tooltips().set_tip (speed_spinner, _("varispeed")); - speed_spinner.show (); - speed_frame.show (); - button_table.attach (speed_frame, 0, 2, 6, 7); button_table.attach (*rec_enable_button, 0, 2, 7, 8); } - + name_button.add (name_label); name_button.set_name ("MixerNameButton"); Gtkmm2ext::set_size_request_to_display_given_text (name_button, "longest label", 2, 2); @@ -299,14 +296,14 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, Route& rt, bool in_mixer) whvbox->pack_start (width_hide_box, true, true); - global_vpacker.pack_start (*whvbox, false, false); - global_vpacker.pack_start (button_table, false, false); + global_vpacker.pack_start (*whvbox, Gtk::PACK_SHRINK); + global_vpacker.pack_start (button_table,Gtk::PACK_SHRINK); global_vpacker.pack_start (pre_redirect_box, true, true); - global_vpacker.pack_start (gpm, false, false); + global_vpacker.pack_start (gpm, Gtk::PACK_SHRINK); global_vpacker.pack_start (post_redirect_box, true, true); - global_vpacker.pack_start (panners, false, false); - global_vpacker.pack_start (output_button, false, false); - global_vpacker.pack_start (comment_button, false, false); + global_vpacker.pack_start (panners, Gtk::PACK_SHRINK); + global_vpacker.pack_start (output_button, Gtk::PACK_SHRINK); + global_vpacker.pack_start (comment_button, Gtk::PACK_SHRINK); global_frame.add (global_vpacker); global_frame.set_shadow_type (Gtk::SHADOW_IN); @@ -319,30 +316,6 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, Route& rt, bool in_mixer) _selected = true; set_selected (false); - whvbox->show_all (); - name_label.show (); - group_label.show(); - input_label.show (); - output_label.show (); - pre_redirect_box.show_all (); - post_redirect_box.show_all (); - button_table.show (); - comment_button.show (); - name_button.show (); - input_button.show (); - group_button.show (); - output_button.show (); - rec_enable_button->show (); - solo_button->show (); - mute_button->show (); - gain_automation_style_button.show (); - gain_automation_state_button.show (); - pan_automation_style_button.show (); - pan_automation_state_button.show (); - polarity_button.show (); - global_vpacker.show (); - global_frame.show (); - _packed = false; _embedded = false; diff --git a/gtk2_ardour/panner_ui.cc b/gtk2_ardour/panner_ui.cc index 6d629118ac..142552bb39 100644 --- a/gtk2_ardour/panner_ui.cc +++ b/gtk2_ardour/panner_ui.cc @@ -137,12 +137,10 @@ PannerUI::PannerUI (IO& io, Session& s) panning_down_arrow.set_name (X_("PanScrollerArrow")); pan_vbox.set_spacing (4); - pan_vbox.pack_start (panning_viewport, false, false); - pan_vbox.pack_start (panning_link_box, false, false); + pan_vbox.pack_start (panning_viewport, Gtk::PACK_SHRINK); + pan_vbox.pack_start (panning_link_box, Gtk::PACK_SHRINK); pack_start (pan_vbox, true, false); - pan_vbox.show_all (); - show (); panner = 0; diff --git a/gtk2_ardour/redirect_box.cc b/gtk2_ardour/redirect_box.cc index 4172d7e9ef..895cb84f34 100644 --- a/gtk2_ardour/redirect_box.cc +++ b/gtk2_ardour/redirect_box.cc @@ -110,11 +110,6 @@ RedirectBox::RedirectBox (Placement pcmnt, Session& sess, Route& rt, PluginSelec redirect_eventbox.add (redirect_scroller); pack_start (redirect_eventbox, true, true); - redirect_scroller.show (); - redirect_display.show (); - redirect_eventbox.show (); - show_all (); - _route.redirects_changed.connect (mem_fun(*this, &RedirectBox::redirects_changed)); redirect_eventbox.signal_enter_notify_event().connect (bind (sigc::ptr_fun (RedirectBox::enter_box), this)); diff --git a/libs/ardour/ardour/source.h b/libs/ardour/ardour/source.h index a6138f8239..e9afc04f03 100644 --- a/libs/ardour/ardour/source.h +++ b/libs/ardour/ardour/source.h @@ -174,7 +174,7 @@ class Source : public Stateful, public sigc::trackable private: ARDOUR::id_t _id; - bool Source::file_changed (string path); + bool file_changed (string path); }; }