fix/revert/modify changes from 13617 that hide the gain + peak display from a generic GainMeter; name import dialog preview fader (fixes 5288)
git-svn-id: svn://localhost/ardour2/branches/3.0@13947 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
7a2f3e6380
commit
dabd5bd174
|
@ -854,7 +854,10 @@ GainMeter::GainMeter (Session* s, int fader_length)
|
||||||
, gain_display_box(true, 0)
|
, gain_display_box(true, 0)
|
||||||
, hbox(true, 2)
|
, hbox(true, 2)
|
||||||
{
|
{
|
||||||
// gain_display_box.pack_start (gain_display, true, true);
|
if (gain_display.get_parent()) {
|
||||||
|
gain_display.get_parent()->remove (gain_display);
|
||||||
|
}
|
||||||
|
gain_display_box.pack_start (gain_display, true, true);
|
||||||
|
|
||||||
meter_metric_area.set_name ("AudioTrackMetrics");
|
meter_metric_area.set_name ("AudioTrackMetrics");
|
||||||
set_size_request_to_display_given_text (meter_metric_area, "-127", 0, 0);
|
set_size_request_to_display_given_text (meter_metric_area, "-127", 0, 0);
|
||||||
|
@ -901,9 +904,9 @@ GainMeter::set_controls (boost::shared_ptr<Route> r,
|
||||||
hbox.remove (meter_alignment);
|
hbox.remove (meter_alignment);
|
||||||
}
|
}
|
||||||
|
|
||||||
// if (peak_display.get_parent()) {
|
if (peak_display.get_parent()) {
|
||||||
// gain_display_box.remove (peak_display);
|
peak_display.get_parent()->remove (peak_display);
|
||||||
// }
|
}
|
||||||
|
|
||||||
// if (gain_automation_state_button.get_parent()) {
|
// if (gain_automation_state_button.get_parent()) {
|
||||||
// fader_vbox->remove (gain_automation_state_button);
|
// fader_vbox->remove (gain_automation_state_button);
|
||||||
|
@ -925,7 +928,7 @@ GainMeter::set_controls (boost::shared_ptr<Route> r,
|
||||||
pack some route-dependent stuff.
|
pack some route-dependent stuff.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
// gain_display_box.pack_end (peak_display, true, true);
|
gain_display_box.pack_end (peak_display, true, true);
|
||||||
hbox.pack_start (meter_alignment, true, true);
|
hbox.pack_start (meter_alignment, true, true);
|
||||||
|
|
||||||
// if (r && !r->is_hidden()) {
|
// if (r && !r->is_hidden()) {
|
||||||
|
|
|
@ -401,11 +401,11 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
|
||||||
revert_to_default_display ();
|
revert_to_default_display ();
|
||||||
|
|
||||||
if (gpm.gain_display.get_parent()) {
|
if (gpm.gain_display.get_parent()) {
|
||||||
middle_button_table.remove (gpm.gain_display);
|
gpm.gain_display.get_parent()->remove (gpm.gain_display);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (gpm.peak_display.get_parent()) {
|
if (gpm.peak_display.get_parent()) {
|
||||||
middle_button_table.remove (gpm.peak_display);
|
gpm.peak_display.get_parent()->remove (gpm.peak_display);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (solo_button->get_parent()) {
|
if (solo_button->get_parent()) {
|
||||||
|
@ -603,17 +603,22 @@ MixerStrip::set_width_enum (Width w, void* owner)
|
||||||
|
|
||||||
set_button_names ();
|
set_button_names ();
|
||||||
|
|
||||||
switch (w) {
|
/* unpack these from the parent and stuff them into our own
|
||||||
case Wide:
|
table
|
||||||
if (!gpm.peak_display.get_parent()) {
|
*/
|
||||||
middle_button_table.attach (gpm.peak_display,1,2,1,2);
|
|
||||||
|
if (gpm.peak_display.get_parent()) {
|
||||||
|
gpm.peak_display.get_parent()->remove (gpm.peak_display);
|
||||||
}
|
}
|
||||||
if (gpm.gain_display.get_parent()) {
|
if (gpm.gain_display.get_parent()) {
|
||||||
middle_button_table.remove (gpm.gain_display);
|
gpm.gain_display.get_parent()->remove (gpm.gain_display);
|
||||||
}
|
}
|
||||||
if (!gpm.gain_display.get_parent()) {
|
|
||||||
middle_button_table.attach (gpm.gain_display,0,1,1,2);
|
middle_button_table.attach (gpm.gain_display,0,1,1,2);
|
||||||
}
|
middle_button_table.attach (gpm.peak_display,1,2,1,2);
|
||||||
|
|
||||||
|
switch (w) {
|
||||||
|
case Wide:
|
||||||
|
|
||||||
if (show_sends_button) {
|
if (show_sends_button) {
|
||||||
show_sends_button->set_text (_("Aux\nSends"));
|
show_sends_button->set_text (_("Aux\nSends"));
|
||||||
|
@ -640,16 +645,6 @@ MixerStrip::set_width_enum (Width w, void* owner)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case Narrow:
|
case Narrow:
|
||||||
if (gpm.peak_display.get_parent()) {
|
|
||||||
middle_button_table.remove (gpm.peak_display);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (gpm.gain_display.get_parent()) {
|
|
||||||
middle_button_table.remove (gpm.gain_display);
|
|
||||||
}
|
|
||||||
if (!gpm.gain_display.get_parent()) {
|
|
||||||
middle_button_table.attach (gpm.gain_display,0,2,1,2);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (show_sends_button) {
|
if (show_sends_button) {
|
||||||
show_sends_button->set_text (_("Snd"));
|
show_sends_button->set_text (_("Snd"));
|
||||||
|
|
|
@ -707,6 +707,7 @@ SoundFileBrowser::add_gain_meter ()
|
||||||
boost::shared_ptr<Route> r = _session->the_auditioner ();
|
boost::shared_ptr<Route> r = _session->the_auditioner ();
|
||||||
|
|
||||||
gm->set_controls (r, r->shared_peak_meter(), r->amp());
|
gm->set_controls (r, r->shared_peak_meter(), r->amp());
|
||||||
|
gm->set_fader_name (X_("AudioTrackFader"));
|
||||||
|
|
||||||
meter_packer.set_border_width (12);
|
meter_packer.set_border_width (12);
|
||||||
meter_packer.pack_start (*gm, false, true);
|
meter_packer.pack_start (*gm, false, true);
|
||||||
|
|
|
@ -63,12 +63,6 @@ static string poor_mans_glob (string path)
|
||||||
return copy;
|
return copy;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void show_me (Gtk::FileChooserButton* fcb)
|
|
||||||
{
|
|
||||||
cerr << " Current folder of " << fcb << " changed to " << fcb->get_current_folder() << endl;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
ArdourStartup::ArdourStartup (bool require_new, const std::string& session_name, const std::string& session_path, const std::string& template_name)
|
ArdourStartup::ArdourStartup (bool require_new, const std::string& session_name, const std::string& session_path, const std::string& template_name)
|
||||||
: _response (RESPONSE_OK)
|
: _response (RESPONSE_OK)
|
||||||
, config_modified (false)
|
, config_modified (false)
|
||||||
|
@ -99,8 +93,6 @@ Ardour will play NO role in monitoring"))
|
||||||
need_audio_setup = EngineControl::need_setup ();
|
need_audio_setup = EngineControl::need_setup ();
|
||||||
need_session_info = (session_name.empty() || require_new);
|
need_session_info = (session_name.empty() || require_new);
|
||||||
|
|
||||||
new_folder_chooser.signal_current_folder_changed().connect (sigc::bind (sigc::ptr_fun (show_me), &new_folder_chooser));
|
|
||||||
|
|
||||||
_provided_session_name = session_name;
|
_provided_session_name = session_name;
|
||||||
_provided_session_path = session_path;
|
_provided_session_path = session_path;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user