diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2005-10-09 05:03:29 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2005-10-09 05:03:29 +0000 |
| commit | c38fdbc64c73c686f9f55729b352f8d0f4c09070 (patch) | |
| tree | 557a93364933446a7192adb0072d75c2b9b84fc9 /gtk2_ardour/panner_ui.cc | |
| parent | 4c509656223d3ed1f0fab504cb483090d38972f9 (diff) | |
"finalmunge" patch from nick, plus work on editor region list and actions infrastructure from me
git-svn-id: svn://localhost/trunk/ardour2@52 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/panner_ui.cc')
| -rw-r--r-- | gtk2_ardour/panner_ui.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/gtk2_ardour/panner_ui.cc b/gtk2_ardour/panner_ui.cc index d39db28075..192d472662 100644 --- a/gtk2_ardour/panner_ui.cc +++ b/gtk2_ardour/panner_ui.cc @@ -114,9 +114,9 @@ PannerUI::PannerUI (IO& io, Session& s) we need a pixmap in the button just to get started. */ - panning_link_direction_button.add (*(manage (new Pixmap (forwdblarrow_xpm)))); + panning_link_direction_button.add (*(manage (new Image (forwdblarrow_xpm)))); - panning_link_direction_button.clicked.connect + panning_link_direction_button.signal_clicked().connect (mem_fun(*this, &PannerUI::panning_link_direction_clicked)); panning_link_button.signal_button_press_event().connect @@ -319,7 +319,7 @@ PannerUI::setup_pan () _io.panner()[asz]->get_position (x); pan_adjustments.push_back (new Adjustment (x, 0, 1.0, 0.05, 0.1)); - pan_adjustments.back()->value_changed.connect (bind (mem_fun(*this, &PannerUI::pan_adjustment_changed), (uint32_t) asz)); + pan_adjustments.back()->signal_value_changed().connect (bind (mem_fun(*this, &PannerUI::pan_adjustment_changed), (uint32_t) asz)); _io.panner()[asz]->Changed.connect (bind (mem_fun(*this, &PannerUI::pan_value_changed), (uint32_t) asz)); @@ -332,10 +332,10 @@ PannerUI::setup_pan () } bc->set_name ("PanSlider"); - bc->set_shadow_type (GTK_SHADOW_NONE); + bc->set_shadow_type (Gtk::SHADOW_NONE); bc->set_style (BarController::Line); - bc->get_spin_button().signal_focus_in_event()().connect (mem_fun(*this, &PannerUI::entry_focus_event)); - bc->get_spin_button().signal_focus_out_event()().connect (mem_fun(*this, &PannerUI::entry_focus_event)); + bc->get_spin_button().signal_focus_in_event().connect (mem_fun(*this, &PannerUI::entry_focus_event)); + bc->get_spin_button().signal_focus_out_event().connect (mem_fun(*this, &PannerUI::entry_focus_event)); bc->StartGesture.connect (bind (mem_fun (_io, &IO::start_pan_touch), (uint32_t) asz)); bc->StopGesture.connect (bind (mem_fun (_io, &IO::end_pan_touch), (uint32_t) asz)); @@ -434,17 +434,17 @@ PannerUI::build_pan_menu (uint32_t which) /* set state first, connect second */ - (dynamic_cast<CheckMenuItem*> (items.back()))->set_active (_io.panner()[which]->muted()); - (dynamic_cast<CheckMenuItem*> (items.back()))->toggled.connect + (dynamic_cast<CheckMenuItem*> (&items.back()))->set_active (_io.panner()[which]->muted()); + (dynamic_cast<CheckMenuItem*> (&items.back()))->signal_toggled().connect (bind (mem_fun(*this, &PannerUI::pan_mute), which)); items.push_back (CheckMenuElem (_("Bypass"), mem_fun(*this, &PannerUI::pan_bypass_toggle))); - bypass_menu_item = static_cast<CheckMenuItem*> (items.back()); + bypass_menu_item = static_cast<CheckMenuItem*> (&items.back()); /* set state first, connect second */ bypass_menu_item->set_active (_io.panner().bypassed()); - bypass_menu_item->toggled.connect (mem_fun(*this, &PannerUI::pan_bypass_toggle)); + bypass_menu_item->signal_toggled().connect (mem_fun(*this, &PannerUI::pan_bypass_toggle)); items.push_back (MenuElem (_("Reset"), mem_fun(*this, &PannerUI::pan_reset))); items.push_back (SeparatorElem()); |