smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-20 21:56:30 +01:00
Code Issues Projects Releases Wiki Activity

Use non-deprecated Gtk::Widget::get_visible API in gtk2_ardour

Browse source
This commit is contained in:
Tim Mayberry 2015-02-27 22:19:31 +10:00
parent b8cc0ef948
commit fa6777f7ce
10 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gtk2_ardour/ardour_dialog.cc
View file

@ -96,7 +96,7 @@ ArdourDialog::on_show ()
Splash* spl = Splash::instance(); Splash* spl = Splash::instance();
if (spl && spl->is_visible()) { if (spl && spl->get_visible()) {
spl->pop_back_for (*this); spl->pop_back_for (*this);
_splash_pushed = true; _splash_pushed = true;
} }

10
gtk2_ardour/ardour_ui.cc
View file

@ -1175,7 +1175,7 @@ ARDOUR_UI::starting ()
BootMessage (string_compose (_("%1 is ready for use"), PROGRAM_NAME)); BootMessage (string_compose (_("%1 is ready for use"), PROGRAM_NAME));
if (splash && splash->is_visible()) { if (splash && splash->get_visible()) {
// in 1 second, hide the splash screen // in 1 second, hide the splash screen
Glib::signal_timeout().connect (sigc::bind (sigc::ptr_fun (_hide_splash), this), 1000); Glib::signal_timeout().connect (sigc::bind (sigc::ptr_fun (_hide_splash), this), 1000);
} }
@ -1820,7 +1820,7 @@ ARDOUR_UI::open_recent_session ()
can_return = false; can_return = false;
} }
if (splash && splash->is_visible()) { if (splash && splash->get_visible()) {
// in 1 second, hide the splash screen // in 1 second, hide the splash screen
Glib::signal_timeout().connect (sigc::bind (sigc::ptr_fun (_hide_splash), this), 1000); Glib::signal_timeout().connect (sigc::bind (sigc::ptr_fun (_hide_splash), this), 1000);
} }
@ -3436,7 +3436,7 @@ ARDOUR_UI::close_session()
if (get_session_parameters (true, false)) { if (get_session_parameters (true, false)) {
exit (1); exit (1);
} }
if (splash && splash->is_visible()) { if (splash && splash->get_visible()) {
// in 1 second, hide the splash screen // in 1 second, hide the splash screen
Glib::signal_timeout().connect (sigc::bind (sigc::ptr_fun (_hide_splash), this), 1000); Glib::signal_timeout().connect (sigc::bind (sigc::ptr_fun (_hide_splash), this), 1000);
} }
@ -4108,7 +4108,7 @@ ARDOUR_UI::add_route ()
return; return;
} }
if (add_route_dialog->is_visible()) { if (add_route_dialog->get_visible()) {
/* we're already doing this */ /* we're already doing this */
return; return;
} }
@ -4434,7 +4434,7 @@ ARDOUR_UI::add_video (Gtk::Window* float_window)
add_video_dialog->set_transient_for (*float_window); add_video_dialog->set_transient_for (*float_window);
} }
if (add_video_dialog->is_visible()) { if (add_video_dialog->get_visible()) {
/* we're already doing this */ /* we're already doing this */
return; return;
} }

2
gtk2_ardour/audio_clock.cc
View file

@ -960,7 +960,7 @@ AudioClock::session_configuration_changed (std::string p)
void void
AudioClock::set (framepos_t when, bool force, framecnt_t offset) AudioClock::set (framepos_t when, bool force, framecnt_t offset)
{ {
if ((!force && !is_visible()) || _session == 0) { if ((!force && !get_visible()) || _session == 0) {
return; return;
} }

4
gtk2_ardour/editor.cc
View file

@ -1929,7 +1929,7 @@ Editor::add_region_context_items (Menu_Helpers::MenuList& edit_items, boost::sha
const framepos_t position = get_preferred_edit_position (EDIT_IGNORE_NONE, true); const framepos_t position = get_preferred_edit_position (EDIT_IGNORE_NONE, true);
edit_items.push_back (*_popup_region_menu_item); edit_items.push_back (*_popup_region_menu_item);
if (Config->get_layer_model() == Manual && track->playlist()->count_regions_at (position) > 1 && (layering_order_editor == 0 || !layering_order_editor->is_visible ())) { if (Config->get_layer_model() == Manual && track->playlist()->count_regions_at (position) > 1 && (layering_order_editor == 0 || !layering_order_editor->get_visible ())) {
edit_items.push_back (*manage (_region_actions->get_action ("choose-top-region-context-menu")->create_menu_item ())); edit_items.push_back (*manage (_region_actions->get_action ("choose-top-region-context-menu")->create_menu_item ()));
} }
edit_items.push_back (SeparatorElem()); edit_items.push_back (SeparatorElem());
@ -5864,7 +5864,7 @@ Editor::change_region_layering_order (bool from_context_menu)
void void
Editor::update_region_layering_order_editor () Editor::update_region_layering_order_editor ()
{ {
if (layering_order_editor && layering_order_editor->is_visible ()) { if (layering_order_editor && layering_order_editor->get_visible ()) {
change_region_layering_order (true); change_region_layering_order (true);
} }
} }

2
gtk2_ardour/editor_canvas.cc
View file

@ -314,7 +314,7 @@ Editor::reset_controls_layout_width ()
edit_controls_vbox.size_request (req); edit_controls_vbox.size_request (req);
w = req.width; w = req.width;
if (_group_tabs->is_visible()) { if (_group_tabs->get_visible()) {
_group_tabs->size_request (req); _group_tabs->size_request (req);
w += req.width; w += req.width;
} }

2
gtk2_ardour/monitor_section.cc
View file

@ -555,7 +555,7 @@ MonitorSection::update_processor_box ()
toggle_processorbox_button.set_name (X_("monitor section processors toggle")); toggle_processorbox_button.set_name (X_("monitor section processors toggle"));
} }
if (insert_box->is_visible() == show_processor_box) { if (insert_box->get_visible() == show_processor_box) {
return; return;
} }

2
gtk2_ardour/plugin_eq_gui.cc
View file

@ -193,7 +193,7 @@ PluginEqGui::stop_updating()
void void
PluginEqGui::start_updating() PluginEqGui::start_updating()
{ {
if (!_update_connection.connected() && is_visible()) { if (!_update_connection.connected() && get_visible()) {
_update_connection = Glib::signal_timeout().connect( sigc::mem_fun(this, &PluginEqGui::timeout_callback), 250); _update_connection = Glib::signal_timeout().connect( sigc::mem_fun(this, &PluginEqGui::timeout_callback), 250);
} }
} }

2
gtk2_ardour/plugin_pin_dialog.cc
View file

@ -1560,7 +1560,7 @@ PluginPinWidget::connect_sidechain ()
_sidechain_selector = new IOSelectorWindow (_session, _pi->sidechain_input ()); _sidechain_selector = new IOSelectorWindow (_session, _pi->sidechain_input ());
} }
if (_sidechain_selector->is_visible ()) { if (_sidechain_selector->get_visible ()) {
_sidechain_selector->get_toplevel ()->get_window ()->raise (); _sidechain_selector->get_toplevel ()->get_window ()->raise ();
} else { } else {
_sidechain_selector->present (); _sidechain_selector->present ();

8
gtk2_ardour/processor_box.cc
View file

@ -658,7 +658,7 @@ ProcessorEntry::add_control_state (XMLNode* node) const
if (_plugin_display) { if (_plugin_display) {
XMLNode* c = new XMLNode (X_("Object")); XMLNode* c = new XMLNode (X_("Object"));
c->add_property (X_("id"), X_("InlineDisplay")); c->add_property (X_("id"), X_("InlineDisplay"));
c->add_property (X_("visible"), _plugin_display->is_visible ()); c->add_property (X_("visible"), _plugin_display->get_visible ());
node->add_child_nocopy (*c); node->add_child_nocopy (*c);
} }
} }
@ -708,7 +708,7 @@ ProcessorEntry::build_controls_menu ()
if (_plugin_display) { if (_plugin_display) {
items.push_back (CheckMenuElem (_("Inline Display"))); items.push_back (CheckMenuElem (_("Inline Display")));
Gtk::CheckMenuItem* c = dynamic_cast<Gtk::CheckMenuItem*> (&items.back ()); Gtk::CheckMenuItem* c = dynamic_cast<Gtk::CheckMenuItem*> (&items.back ());
c->set_active (_plugin_display->is_visible ()); c->set_active (_plugin_display->get_visible ());
c->signal_toggled().connect (sigc::mem_fun (*this, &ProcessorEntry::toggle_inline_display_visibility)); c->signal_toggled().connect (sigc::mem_fun (*this, &ProcessorEntry::toggle_inline_display_visibility));
items.push_back (SeparatorElem ()); items.push_back (SeparatorElem ());
} }
@ -738,7 +738,7 @@ ProcessorEntry::build_controls_menu ()
void void
ProcessorEntry::toggle_inline_display_visibility () ProcessorEntry::toggle_inline_display_visibility ()
{ {
if (_plugin_display->is_visible ()) { if (_plugin_display->get_visible ()) {
_plugin_display->hide(); _plugin_display->hide();
} else { } else {
_plugin_display->show(); _plugin_display->show();
@ -1631,7 +1631,7 @@ ProcessorEntry::PluginDisplay::update_height_alloc (uint32_t inline_height)
Gtk::ScrolledWindow* sw = dynamic_cast<Gtk::ScrolledWindow*> (pr); Gtk::ScrolledWindow* sw = dynamic_cast<Gtk::ScrolledWindow*> (pr);
if (sw) { if (sw) {
const Gtk::VScrollbar* vsb = sw->get_vscrollbar(); const Gtk::VScrollbar* vsb = sw->get_vscrollbar();
sc = vsb && vsb->is_visible(); sc = vsb && vsb->get_visible();
} }
if (shm != _cur_height) { if (shm != _cur_height) {

10
gtk2_ardour/route_ui.cc
View file

@ -509,7 +509,7 @@ RouteUI::edit_output_configuration ()
output_selector = new IOSelectorWindow (_session, output); output_selector = new IOSelectorWindow (_session, output);
} }
if (output_selector->is_visible()) { if (output_selector->get_visible()) {
output_selector->get_toplevel()->get_window()->raise(); output_selector->get_toplevel()->get_window()->raise();
} else { } else {
output_selector->present (); output_selector->present ();
@ -525,7 +525,7 @@ RouteUI::edit_input_configuration ()
input_selector = new IOSelectorWindow (_session, _route->input()); input_selector = new IOSelectorWindow (_session, _route->input());
} }
if (input_selector->is_visible()) { if (input_selector->get_visible()) {
input_selector->get_toplevel()->get_window()->raise(); input_selector->get_toplevel()->get_window()->raise();
} else { } else {
input_selector->present (); input_selector->present ();
@ -551,8 +551,8 @@ RouteUI::solo_press(GdkEventButton* ev)
if (Keyboard::is_context_menu_event (ev)) { if (Keyboard::is_context_menu_event (ev)) {
if (! (solo_isolated_led && solo_isolated_led->is_visible()) || if (! (solo_isolated_led && solo_isolated_led->get_visible()) ||
! (solo_safe_led && solo_safe_led->is_visible())) { ! (solo_safe_led && solo_safe_led->get_visible())) {
if (solo_menu == 0) { if (solo_menu == 0) {
build_solo_menu (); build_solo_menu ();
@ -1667,7 +1667,7 @@ RouteUI::toggle_comment_editor ()
// return; // return;
// } // }
if (comment_window && comment_window->is_visible ()) { if (comment_window && comment_window->get_visible ()) {
comment_window->hide (); comment_window->hide ();
} else { } else {
open_comment_editor (); open_comment_editor ();