notebook->pages().push_back (TabElem (*translator_scroller, *translator_tab_label));
notebook->set_name ("AboutNoteBook");
- notebook->button_release_event.connect_after (bind (slot (stoppit), notebook));
+ notebook->button_release_event.connect_after (bind (ptr_fun (stoppit), notebook));
logo_pixmap = 0;
logo_height = 0;
load_logo (*this);
vbox.pack_start (logo_area, false, false);
- logo_area.expose_event.connect (slot (*this, &About::logo_area_expose));
+ logo_area.expose_event.connect (mem_fun(*this, &About::logo_area_expose));
} else {
- expose_event.connect (slot (*this, &About::logo_area_expose));
+ expose_event.connect (mem_fun(*this, &About::logo_area_expose));
}
small_label->set_name ("AboutWindowSmallLabel");
subvbox.pack_start (*payment_box, false, false);
#endif
- delete_event.connect (bind (slot (just_hide_it), static_cast<Gtk::Window*> (this)));
+ delete_event.connect (bind (ptr_fun (just_hide_it), static_cast<Gtk::Window*> (this)));
add (vbox);
add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
add (*vb2);
- delete_event.connect (slot (*this, &ArdourDialog::wm_close_event));
- ok_button.signal_clicked().connect (bind (slot (*this, &ArdourDialog::stop), 0));
- cancel_button.signal_clicked().connect (bind (slot (*this, &ArdourDialog::stop), 1));
+ delete_event.connect (mem_fun(*this, &ArdourDialog::wm_close_event));
+ ok_button.signal_clicked().connect (bind (mem_fun(*this, &ArdourDialog::stop), 0));
+ cancel_button.signal_clicked().connect (bind (mem_fun(*this, &ArdourDialog::stop), 1));
}
AddRouteDialog::~AddRouteDialog ()
label.set_name (X_("PrompterLabel"));
ok_button.set_name ("EditorGTKButton");
- ok_button.signal_clicked().connect (bind (slot (*this, &ArdourDialog::stop), 1));
+ ok_button.signal_clicked().connect (bind (mem_fun(*this, &ArdourDialog::stop), 1));
packer.set_spacing (10);
packer.set_border_width (10);
set_shuttle_units (Percentage);
set_shuttle_behaviour (Sprung);
- shuttle_unit_menu.items().push_back (MenuElem (_("Percentage"), bind (slot (*this, &ARDOUR_UI::set_shuttle_units),
+ shuttle_unit_menu.items().push_back (MenuElem (_("Percentage"), bind (mem_fun(*this, &ARDOUR_UI::set_shuttle_units),
Percentage)));
- shuttle_unit_menu.items().push_back (MenuElem (_("Semitones"), bind (slot (*this, &ARDOUR_UI::set_shuttle_units),
+ shuttle_unit_menu.items().push_back (MenuElem (_("Semitones"), bind (mem_fun(*this, &ARDOUR_UI::set_shuttle_units),
Semitones)));
- shuttle_style_menu.items().push_back (MenuElem (_("Sprung"), bind (slot (*this, &ARDOUR_UI::set_shuttle_behaviour),
+ shuttle_style_menu.items().push_back (MenuElem (_("Sprung"), bind (mem_fun(*this, &ARDOUR_UI::set_shuttle_behaviour),
Sprung)));
- shuttle_style_menu.items().push_back (MenuElem (_("Wheel"), bind (slot (*this, &ARDOUR_UI::set_shuttle_behaviour),
+ shuttle_style_menu.items().push_back (MenuElem (_("Wheel"), bind (mem_fun(*this, &ARDOUR_UI::set_shuttle_behaviour),
Wheel)));
gettimeofday (&last_peak_grab, 0);
gettimeofday (&last_shuttle_request, 0);
- ARDOUR::DiskStream::CannotRecordNoInput.connect (slot (*this, &ARDOUR_UI::cannot_record_no_input));
- ARDOUR::DiskStream::DeleteSources.connect (slot (*this, &ARDOUR_UI::delete_sources_in_the_right_thread));
- ARDOUR::DiskStream::DiskOverrun.connect (slot (*this, &ARDOUR_UI::disk_overrun_handler));
- ARDOUR::DiskStream::DiskUnderrun.connect (slot (*this, &ARDOUR_UI::disk_underrun_handler));
+ ARDOUR::DiskStream::CannotRecordNoInput.connect (mem_fun(*this, &ARDOUR_UI::cannot_record_no_input));
+ ARDOUR::DiskStream::DeleteSources.connect (mem_fun(*this, &ARDOUR_UI::delete_sources_in_the_right_thread));
+ ARDOUR::DiskStream::DiskOverrun.connect (mem_fun(*this, &ARDOUR_UI::disk_overrun_handler));
+ ARDOUR::DiskStream::DiskUnderrun.connect (mem_fun(*this, &ARDOUR_UI::disk_underrun_handler));
/* handle pending state with a dialog */
- ARDOUR::Session::AskAboutPendingState.connect (slot (*this, &ARDOUR_UI::pending_state_dialog));
+ ARDOUR::Session::AskAboutPendingState.connect (mem_fun(*this, &ARDOUR_UI::pending_state_dialog));
channel_combo_strings = internationalize (channel_setup_names);
void
ARDOUR_UI::cannot_record_no_input (DiskStream* ds)
{
- ENSURE_GUI_THREAD (bind (slot (*this, &ARDOUR_UI::cannot_record_no_input), ds));
+ ENSURE_GUI_THREAD (bind (mem_fun(*this, &ARDOUR_UI::cannot_record_no_input), ds));
string msg = compose (_("\
You cannot record-enable\n\
{
engine = &e;
- engine->Stopped.connect (slot (*this, &ARDOUR_UI::engine_stopped));
- engine->Running.connect (slot (*this, &ARDOUR_UI::engine_running));
- engine->Halted.connect (slot (*this, &ARDOUR_UI::engine_halted));
- engine->SampleRateChanged.connect (slot (*this, &ARDOUR_UI::update_sample_rate));
+ engine->Stopped.connect (mem_fun(*this, &ARDOUR_UI::engine_stopped));
+ engine->Running.connect (mem_fun(*this, &ARDOUR_UI::engine_running));
+ engine->Halted.connect (mem_fun(*this, &ARDOUR_UI::engine_halted));
+ engine->SampleRateChanged.connect (mem_fun(*this, &ARDOUR_UI::update_sample_rate));
_tooltips.enable();
/* start the time-of-day-clock */
update_wall_clock ();
- Main::timeout.connect (slot (*this, &ARDOUR_UI::update_wall_clock), 60000);
+ Main::timeout.connect (mem_fun(*this, &ARDOUR_UI::update_wall_clock), 60000);
update_disk_space ();
update_cpu_load ();
update_sample_rate (engine->frame_rate());
- starting.connect (slot (*this, &ARDOUR_UI::startup));
- stopping.connect (slot (*this, &ARDOUR_UI::shutdown));
+ starting.connect (mem_fun(*this, &ARDOUR_UI::startup));
+ stopping.connect (mem_fun(*this, &ARDOUR_UI::shutdown));
}
ARDOUR_UI::~ARDOUR_UI ()
gettimeofday (&last_configure_time, 0);
} else {
TimeoutSig t;
- t.connect (slot (*this, &ARDOUR_UI::configure_timeout), 100);
+ t.connect (mem_fun(*this, &ARDOUR_UI::configure_timeout), 100);
have_configure_timeout = true;
}
with the scheduling of the audio thread.
*/
- Gtk::Main::idle.connect (slot (*this, &ARDOUR_UI::start_engine));
+ Gtk::Main::idle.connect (mem_fun(*this, &ARDOUR_UI::start_engine));
}
void
prompt_label.set_alignment (0.5, 0.5);
prompt_label.set_name (X_("PrompterLabel"));
- save_button.signal_clicked().connect (bind(slot(window,&ArdourDialog::stop), 1));
- nosave_button.signal_clicked().connect (bind(slot(window,&ArdourDialog::stop), 0));
- noquit_button.signal_clicked().connect (bind(slot(window,&ArdourDialog::stop), -1));
+ save_button.signal_clicked().connect (bind(mem_fun(window,&ArdourDialog::stop), 1));
+ nosave_button.signal_clicked().connect (bind(mem_fun(window,&ArdourDialog::stop), 0));
+ noquit_button.signal_clicked().connect (bind(mem_fun(window,&ArdourDialog::stop), -1));
button_packer.set_spacing (10);
button_packer.pack_start (save_button);
{
char buf[32];
- ENSURE_GUI_THREAD (bind (slot (*this, &ARDOUR_UI::update_sample_rate), ignored));
+ ENSURE_GUI_THREAD (bind (mem_fun(*this, &ARDOUR_UI::update_sample_rate), ignored));
if (!engine->connected()) {
void
ARDOUR_UI::queue_map_control_change (Session::ControlType t)
{
- ENSURE_GUI_THREAD (bind (slot (*this, &ARDOUR_UI::map_control_change), t));
+ ENSURE_GUI_THREAD (bind (mem_fun(*this, &ARDOUR_UI::map_control_change), t));
}
void
session_selector_window->set_name ("SessionSelectorWindow");
session_selector_window->set_size_request (200, 400);
- session_selector_window->delete_event.connect (bind (slot (just_hide_it), static_cast<Gtk::Window*>(session_selector_window)));
- cancel_button-.signal_clicked().connect (bind (slot (*this, &ARDOUR_UI::hide_dialog), session_selector_window));
- session_selector.tree_select_row.connect (slot (*this, &ARDOUR_UI::session_selection));
+ session_selector_window->delete_event.connect (bind (ptr_fun (just_hide_it), static_cast<Gtk::Window*>(session_selector_window)));
+ cancel_button-.signal_clicked().connect (bind (mem_fun(*this, &ARDOUR_UI::hide_dialog), session_selector_window));
+ session_selector.tree_select_row.connect (mem_fun(*this, &ARDOUR_UI::session_selection));
}
void
if (open_session_selector == 0) {
open_session_selector = new Gtk::FileSelection(_("open session"));
- open_session_selector->get_ok_button()-.signal_clicked().connect (slot (*this, &ARDOUR_UI::open_ok_clicked));
- open_session_selector->get_cancel_button()-.signal_clicked().connect (bind (slot (*this, &ARDOUR_UI::fs_cancel_clicked), open_session_selector));
- open_session_selector->delete_event.connect (bind (slot (*this, &ARDOUR_UI::fs_delete_event), open_session_selector));
+ open_session_selector->get_ok_button()-.signal_clicked().connect (mem_fun(*this, &ARDOUR_UI::open_ok_clicked));
+ open_session_selector->get_cancel_button()-.signal_clicked().connect (bind (mem_fun(*this, &ARDOUR_UI::fs_cancel_clicked), open_session_selector));
+ open_session_selector->delete_event.connect (bind (mem_fun(*this, &ARDOUR_UI::fs_delete_event), open_session_selector));
}
open_session_selector->show_all ();
void
ARDOUR_UI::queue_transport_change ()
{
- Gtkmm2ext::UI::instance()->call_slot (slot (*this, &ARDOUR_UI::map_transport_state));
+ Gtkmm2ext::UI::instance()->call_slot (mem_fun(*this, &ARDOUR_UI::map_transport_state));
}
void
void
ARDOUR_UI::engine_stopped ()
{
- ENSURE_GUI_THREAD (slot (*this, &ARDOUR_UI::engine_stopped));
+ ENSURE_GUI_THREAD (mem_fun(*this, &ARDOUR_UI::engine_stopped));
jack_disconnect_item->set_sensitive (false);
jack_reconnect_item->set_sensitive (true);
void
ARDOUR_UI::engine_running ()
{
- ENSURE_GUI_THREAD (slot (*this, &ARDOUR_UI::engine_running));
+ ENSURE_GUI_THREAD (mem_fun(*this, &ARDOUR_UI::engine_running));
jack_disconnect_item->set_sensitive (true);
jack_reconnect_item->set_sensitive (false);
void
ARDOUR_UI::engine_halted ()
{
- ENSURE_GUI_THREAD (slot (*this, &ARDOUR_UI::engine_halted));
+ ENSURE_GUI_THREAD (mem_fun(*this, &ARDOUR_UI::engine_halted));
jack_disconnect_item->set_sensitive (false);
jack_reconnect_item->set_sensitive (true);
solution, its what we have.
*/
- Main::timeout.connect (slot (*this, &ARDOUR_UI::make_session_clean), 1000);
+ Main::timeout.connect (mem_fun(*this, &ARDOUR_UI::make_session_clean), 1000);
}
return FALSE;
void
ARDOUR_UI::start_clocking ()
{
- clock_signal_connection = RapidScreenUpdate.connect (slot (*this, &ARDOUR_UI::update_clocks));
+ clock_signal_connection = RapidScreenUpdate.connect (mem_fun(*this, &ARDOUR_UI::update_clocks));
}
void
}
MenuList& items = diskstream_menu->items();
- items.push_back (MenuElem (dstream.name(), bind (slot (*this, &ARDOUR_UI::diskstream_selected), (gint32) dstream.id())));
+ items.push_back (MenuElem (dstream.name(), bind (mem_fun(*this, &ARDOUR_UI::diskstream_selected), (gint32) dstream.id())));
}
void
using namespace Menu_Helpers;
MenuList& items = diskstream_menu->items();
- items.push_back (MenuElem (_("No Stream"), (bind (slot (*this, &ARDOUR_UI::diskstream_selected), -1))));
+ items.push_back (MenuElem (_("No Stream"), (bind (mem_fun(*this, &ARDOUR_UI::diskstream_selected), -1))));
session->foreach_diskstream (this, &ARDOUR_UI::add_diskstream_to_menu);
checker.realize ();
checker.get_window().set_decorations (GdkWMDecoration (GDK_DECOR_BORDER|GDK_DECOR_RESIZEH));
- ok_button.signal_clicked().connect (bind (slot (checker, &ArdourDialog::stop), 1));
- cancel_button.signal_clicked().connect (bind (slot (checker, &ArdourDialog::stop), 0));
+ ok_button.signal_clicked().connect (bind (mem_fun (checker, &ArdourDialog::stop), 1));
+ cancel_button.signal_clicked().connect (bind (mem_fun (checker, &ArdourDialog::stop), 0));
checker.run ();
void
ARDOUR_UI::halt_on_xrun_message ()
{
- ENSURE_GUI_THREAD (slot (*this, &ARDOUR_UI::halt_on_xrun_message));
+ ENSURE_GUI_THREAD (mem_fun(*this, &ARDOUR_UI::halt_on_xrun_message));
ArdourMessage msg (editor, X_("haltonxrun"),
_("Recording was stopped because your system could not keep up."));
void
ARDOUR_UI::delete_sources_in_the_right_thread (list<ARDOUR::Source*>* deletion_list)
{
- ENSURE_GUI_THREAD (bind (slot (*this, &ARDOUR_UI::delete_sources_in_the_right_thread), deletion_list));
+ ENSURE_GUI_THREAD (bind (mem_fun(*this, &ARDOUR_UI::delete_sources_in_the_right_thread), deletion_list));
for (list<Source*>::iterator i = deletion_list->begin(); i != deletion_list->end(); ++i) {
delete *i;
void
ARDOUR_UI::disk_overrun_handler ()
{
- ENSURE_GUI_THREAD (slot (*this, &ARDOUR_UI::disk_underrun_handler));
+ ENSURE_GUI_THREAD (mem_fun(*this, &ARDOUR_UI::disk_underrun_handler));
if (!have_disk_overrun_displayed) {
have_disk_overrun_displayed = true;
void
ARDOUR_UI::disk_underrun_handler ()
{
- ENSURE_GUI_THREAD (slot (*this, &ARDOUR_UI::disk_underrun_handler));
+ ENSURE_GUI_THREAD (mem_fun(*this, &ARDOUR_UI::disk_underrun_handler));
if (!have_disk_underrun_displayed) {
have_disk_underrun_displayed = true;
hpacker.pack_start (use_button);
hpacker.pack_start (cancel_button);
- use_button.signal_clicked().connect (bind (slot (dialog, &ArdourDialog::stop), 0));
- cancel_button.signal_clicked().connect (bind (slot (dialog, &ArdourDialog::stop), 1));
+ use_button.signal_clicked().connect (bind (mem_fun (dialog, &ArdourDialog::stop), 0));
+ cancel_button.signal_clicked().connect (bind (mem_fun (dialog, &ArdourDialog::stop), 1));
dialog.add (vpacker);
dialog.set_position (GTK_WIN_POS_CENTER);
online_control_button = new GlobalClickBox ("CONTROL",
online_control_strings);
- online_control_button->adjustment.value_changed.connect(slot (*this,&ARDOUR_UI::control_methods_adjusted));
+ online_control_button->adjustment.value_changed.connect(mem_fun(*this,&ARDOUR_UI::control_methods_adjusted));
mmc_id_strings.push_back ("1");
mmc_id_strings.push_back ("2");
mmc_id_button = new GlobalClickBox (_("MMC ID"), mmc_id_strings);
- mmc_id_button->adjustment.value_changed.connect (slot (*this,&ARDOUR_UI::mmc_device_id_adjusted));
+ mmc_id_button->adjustment.value_changed.connect (mem_fun(*this,&ARDOUR_UI::mmc_device_id_adjusted));
adjuster_table.attach (*online_control_button, 0, 2, 1, 2, Gtk::FILL|Gtk::EXPAND, 0, 5, 5);
adjuster_table.attach (*mmc_id_button, 2, 3, 1, 2, 0, 0, 5, 5);
transport_frame.set_name ("BaseFrame");
transport_frame.add (transport_base);
- transport_tearoff->Detach.connect (bind (slot (*this, &ARDOUR_UI::detach_tearoff), static_cast<Gtk::Box*>(&top_packer),
+ transport_tearoff->Detach.connect (bind (mem_fun(*this, &ARDOUR_UI::detach_tearoff), static_cast<Gtk::Box*>(&top_packer),
static_cast<Gtk::Widget*>(&transport_frame)));
- transport_tearoff->Attach.connect (bind (slot (*this, &ARDOUR_UI::reattach_tearoff), static_cast<Gtk::Box*> (&top_packer),
+ transport_tearoff->Attach.connect (bind (mem_fun(*this, &ARDOUR_UI::reattach_tearoff), static_cast<Gtk::Box*> (&top_packer),
static_cast<Gtk::Widget*> (&transport_frame), 1));
punch_in_button.set_events (punch_in_button.get_events() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK));
punch_out_button.set_events (punch_out_button.get_events() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK));
- goto_start_button.signal_clicked().connect (slot (*this,&ARDOUR_UI::transport_goto_start));
- goto_end_button.signal_clicked().connect (slot (*this,&ARDOUR_UI::transport_goto_end));
+ goto_start_button.signal_clicked().connect (mem_fun(*this,&ARDOUR_UI::transport_goto_start));
+ goto_end_button.signal_clicked().connect (mem_fun(*this,&ARDOUR_UI::transport_goto_end));
- roll_button.button_release_event.connect (slot (*this,&ARDOUR_UI::mouse_transport_roll));
- play_selection_button.button_release_event.connect (slot (*this,&ARDOUR_UI::mouse_transport_play_selection));
- auto_loop_button.button_release_event.connect (slot (*this,&ARDOUR_UI::mouse_transport_loop));
+ roll_button.button_release_event.connect (mem_fun(*this,&ARDOUR_UI::mouse_transport_roll));
+ play_selection_button.button_release_event.connect (mem_fun(*this,&ARDOUR_UI::mouse_transport_play_selection));
+ auto_loop_button.button_release_event.connect (mem_fun(*this,&ARDOUR_UI::mouse_transport_loop));
- stop_button.button_release_event.connect (slot (*this,&ARDOUR_UI::mouse_transport_stop));
- rec_button.button_release_event.connect (slot (*this,&ARDOUR_UI::mouse_transport_record));
+ stop_button.button_release_event.connect (mem_fun(*this,&ARDOUR_UI::mouse_transport_stop));
+ rec_button.button_release_event.connect (mem_fun(*this,&ARDOUR_UI::mouse_transport_record));
- shuttle_box.button_press_event.connect (slot (*this, &ARDOUR_UI::shuttle_box_button_press));
- shuttle_box.button_release_event.connect (slot (*this, &ARDOUR_UI::shuttle_box_button_release));
- shuttle_box.motion_notify_event.connect (slot (*this, &ARDOUR_UI::shuttle_box_motion));
- shuttle_box.expose_event.connect (slot (*this, &ARDOUR_UI::shuttle_box_expose));
+ shuttle_box.button_press_event.connect (mem_fun(*this, &ARDOUR_UI::shuttle_box_button_press));
+ shuttle_box.button_release_event.connect (mem_fun(*this, &ARDOUR_UI::shuttle_box_button_release));
+ shuttle_box.motion_notify_event.connect (mem_fun(*this, &ARDOUR_UI::shuttle_box_motion));
+ shuttle_box.expose_event.connect (mem_fun(*this, &ARDOUR_UI::shuttle_box_expose));
/* clocks, etc. */
- ARDOUR_UI::Clock.connect (bind (slot (primary_clock, &AudioClock::set), false));
- ARDOUR_UI::Clock.connect (bind (slot (secondary_clock, &AudioClock::set), false));
+ ARDOUR_UI::Clock.connect (bind (mem_fun (primary_clock, &AudioClock::set), false));
+ ARDOUR_UI::Clock.connect (bind (mem_fun (secondary_clock, &AudioClock::set), false));
primary_clock.set_mode (AudioClock::SMPTE);
primary_clock.set_name ("TransportClockDisplay");
secondary_clock.set_name ("TransportClockDisplay");
- primary_clock.ValueChanged.connect (slot (*this, &ARDOUR_UI::primary_clock_value_changed));
- secondary_clock.ValueChanged.connect (slot (*this, &ARDOUR_UI::secondary_clock_value_changed));
+ primary_clock.ValueChanged.connect (mem_fun(*this, &ARDOUR_UI::primary_clock_value_changed));
+ secondary_clock.ValueChanged.connect (mem_fun(*this, &ARDOUR_UI::secondary_clock_value_changed));
ARDOUR_UI::instance()->tooltips().set_tip (primary_clock, _("Primary clock"));
ARDOUR_UI::instance()->tooltips().set_tip (secondary_clock, _("secondary clock"));
/* options */
- auto_return_button.toggled.connect (slot (*this,&ARDOUR_UI::toggle_auto_return));
- auto_play_button.toggled.connect (slot (*this,&ARDOUR_UI::toggle_auto_play));
- auto_input_button.toggled.connect (slot (*this,&ARDOUR_UI::toggle_auto_input));
- click_button.toggled.connect (slot (*this,&ARDOUR_UI::toggle_click));
- follow_button.toggled.connect (slot (*this,&ARDOUR_UI::toggle_follow));
- punch_in_button.toggled.connect (slot (*this,&ARDOUR_UI::toggle_punch_in));
- punch_out_button.toggled.connect (slot (*this,&ARDOUR_UI::toggle_punch_out));
+ auto_return_button.toggled.connect (mem_fun(*this,&ARDOUR_UI::toggle_auto_return));
+ auto_play_button.toggled.connect (mem_fun(*this,&ARDOUR_UI::toggle_auto_play));
+ auto_input_button.toggled.connect (mem_fun(*this,&ARDOUR_UI::toggle_auto_input));
+ click_button.toggled.connect (mem_fun(*this,&ARDOUR_UI::toggle_click));
+ follow_button.toggled.connect (mem_fun(*this,&ARDOUR_UI::toggle_follow));
+ punch_in_button.toggled.connect (mem_fun(*this,&ARDOUR_UI::toggle_punch_in));
+ punch_out_button.toggled.connect (mem_fun(*this,&ARDOUR_UI::toggle_punch_out));
preroll_button.unset_flags (Gtk::CAN_FOCUS);
preroll_button.set_events (preroll_button.get_events() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK));
/* CANNOT bind these to clicked or toggled, must use pressed or released */
solo_alert_button.set_name ("TransportSoloAlert");
- solo_alert_button.pressed.connect (slot (*this,&ARDOUR_UI::solo_alert_toggle));
+ solo_alert_button.pressed.connect (mem_fun(*this,&ARDOUR_UI::solo_alert_toggle));
auditioning_alert_button.set_name ("TransportAuditioningAlert");
- auditioning_alert_button.pressed.connect (slot (*this,&ARDOUR_UI::audition_alert_toggle));
+ auditioning_alert_button.pressed.connect (mem_fun(*this,&ARDOUR_UI::audition_alert_toggle));
alert_box.pack_start (solo_alert_button);
alert_box.pack_start (auditioning_alert_button);
speed_display_box.set_name (X_("ShuttleDisplay"));
shuttle_units_button.set_name (X_("ShuttleButton"));
- shuttle_units_button.signal_clicked().connect (slot (*this, &ARDOUR_UI::shuttle_unit_clicked));
+ shuttle_units_button.signal_clicked().connect (mem_fun(*this, &ARDOUR_UI::shuttle_unit_clicked));
shuttle_style_button.set_name (X_("ShuttleButton"));
- shuttle_style_button.signal_clicked().connect (slot (*this, &ARDOUR_UI::shuttle_style_clicked));
+ shuttle_style_button.signal_clicked().connect (mem_fun(*this, &ARDOUR_UI::shuttle_style_clicked));
Gtk::Frame* sdframe = manage (new Frame);
void
ARDOUR_UI::setup_clock ()
{
- ARDOUR_UI::Clock.connect (bind (slot (big_clock, &AudioClock::set), false));
+ ARDOUR_UI::Clock.connect (bind (mem_fun (big_clock, &AudioClock::set), false));
big_clock_window = new BigClockWindow;
big_clock_window->add (big_clock);
big_clock_window->set_title (_("ardour: clock"));
- big_clock_window->delete_event.connect (bind (slot (just_hide_it), static_cast<Gtk::Window*>(big_clock_window)));
- big_clock_window->realize.connect (slot (*this, &ARDOUR_UI::big_clock_realize));
- big_clock_window->size_allocate.connect (slot (*this, &ARDOUR_UI::big_clock_size_event));
+ big_clock_window->delete_event.connect (bind (ptr_fun (just_hide_it), static_cast<Gtk::Window*>(big_clock_window)));
+ big_clock_window->realize.connect (mem_fun(*this, &ARDOUR_UI::big_clock_realize));
+ big_clock_window->size_allocate.connect (mem_fun(*this, &ARDOUR_UI::big_clock_size_event));
- big_clock_window->Hiding.connect (slot (*this, &ARDOUR_UI::big_clock_hiding));
+ big_clock_window->Hiding.connect (mem_fun(*this, &ARDOUR_UI::big_clock_hiding));
}
void
void
ARDOUR_UI::auditioning_changed (bool onoff)
{
- Gtkmm2ext::UI::instance()->call_slot(bind (slot (*this, &ARDOUR_UI::_auditioning_changed), onoff));
+ Gtkmm2ext::UI::instance()->call_slot(bind (mem_fun(*this, &ARDOUR_UI::_auditioning_changed), onoff));
}
void
{
session = s;
- session->HaltOnXrun.connect (slot (*this, &ARDOUR_UI::halt_on_xrun_message));
+ session->HaltOnXrun.connect (mem_fun(*this, &ARDOUR_UI::halt_on_xrun_message));
/* sensitize menu bar options that are now valid */
if (session->n_diskstreams()) {
// meter_bridge_dialog_check->set_sensitive (true);
} else {
- session->DiskStreamAdded.connect (slot (*this, &ARDOUR_UI::diskstream_added));
+ session->DiskStreamAdded.connect (mem_fun(*this, &ARDOUR_UI::diskstream_added));
}
if (connection_editor) {
}
- Blink.connect (slot (*this, &ARDOUR_UI::transport_rec_enable_blink));
- Blink.connect (slot (*this, &ARDOUR_UI::solo_blink));
- Blink.connect (slot (*this, &ARDOUR_UI::audition_blink));
+ Blink.connect (mem_fun(*this, &ARDOUR_UI::transport_rec_enable_blink));
+ Blink.connect (mem_fun(*this, &ARDOUR_UI::solo_blink));
+ Blink.connect (mem_fun(*this, &ARDOUR_UI::audition_blink));
/* these are all need to be handled in an RT-safe and MT way, so don't
do any GUI work, just queue it for handling by the GUI thread.
*/
- session->TransportStateChange.connect (slot (*this, &ARDOUR_UI::queue_transport_change));
- session->ControlChanged.connect (slot (*this, &ARDOUR_UI::queue_map_control_change));
+ session->TransportStateChange.connect (mem_fun(*this, &ARDOUR_UI::queue_transport_change));
+ session->ControlChanged.connect (mem_fun(*this, &ARDOUR_UI::queue_map_control_change));
/* alert the user to these things happening */
- session->AuditionActive.connect (slot (*this, &ARDOUR_UI::auditioning_changed));
- session->SoloActive.connect (slot (*this, &ARDOUR_UI::soloing_changed));
+ session->AuditionActive.connect (mem_fun(*this, &ARDOUR_UI::auditioning_changed));
+ session->SoloActive.connect (mem_fun(*this, &ARDOUR_UI::soloing_changed));
solo_alert_button.set_active (session->soloing());
transport_stopped ();
- second_connection = Main::timeout.connect (slot (*this, &ARDOUR_UI::every_second), 1000);
- point_one_second_connection = Main::timeout.connect (slot (*this, &ARDOUR_UI::every_point_one_seconds), 100);
- point_zero_one_second_connection = Main::timeout.connect (slot (*this, &ARDOUR_UI::every_point_zero_one_seconds), 40);
+ second_connection = Main::timeout.connect (mem_fun(*this, &ARDOUR_UI::every_second), 1000);
+ point_one_second_connection = Main::timeout.connect (mem_fun(*this, &ARDOUR_UI::every_point_one_seconds), 100);
+ point_zero_one_second_connection = Main::timeout.connect (mem_fun(*this, &ARDOUR_UI::every_point_zero_one_seconds), 40);
}
int
{
if (meter_bridge == 0) {
meter_bridge = new MeterBridge ();
- meter_bridge->Hiding.connect (slot (*this, &ARDOUR_UI::meter_bridge_hiding));
+ meter_bridge->Hiding.connect (mem_fun(*this, &ARDOUR_UI::meter_bridge_hiding));
}
return 0;
}
{
if (connection_editor == 0) {
connection_editor = new ConnectionEditor ();
- connection_editor->Hiding.connect (slot (*this, &ARDOUR_UI::connection_editor_hiding));
+ connection_editor->Hiding.connect (mem_fun(*this, &ARDOUR_UI::connection_editor_hiding));
}
if (session) {
{
if (option_editor == 0) {
option_editor = new OptionEditor (*this, *editor, *mixer);
- option_editor->Hiding.connect(slot(*this, &ARDOUR_UI::option_hiding));
+ option_editor->Hiding.connect(mem_fun(*this, &ARDOUR_UI::option_hiding));
option_editor->set_session (session);
} else if (option_editor->within_hiding()) {
return;
if (location_ui == 0) {
location_ui = new LocationUI ();
location_ui->set_session (session);
- location_ui->Hiding.connect (slot (*this, &ARDOUR_UI::location_ui_hiding));
+ location_ui->Hiding.connect (mem_fun(*this, &ARDOUR_UI::location_ui_hiding));
}
return 0;
}
if (route_params == 0) {
route_params = new RouteParams_UI (*engine);
route_params->set_session (session);
- route_params->Hiding.connect (slot (*this, &ARDOUR_UI::route_params_hiding));
+ route_params->Hiding.connect (mem_fun(*this, &ARDOUR_UI::route_params_hiding));
}
return 0;
}
{
if (sfdb_window == 0) {
sfdb_window = new SoundFileSelector ();
- sfdb_window->Hiding.connect (slot (*this, &ARDOUR_UI::sfdb_hiding));
+ sfdb_window->Hiding.connect (mem_fun(*this, &ARDOUR_UI::sfdb_hiding));
sfdb_window->hide_all ();
}
return -1;
}
- editor->DisplayControlChanged.connect (slot (*this, &ARDOUR_UI::editor_display_control_changed));
+ editor->DisplayControlChanged.connect (mem_fun(*this, &ARDOUR_UI::editor_display_control_changed));
return 0;
}
MenuList& session_items = session_menu->items();
session_menu->set_name ("ArdourContextMenu");
- session_items.push_back (MenuElem (_("New"), bind (slot (*this, &ARDOUR_UI::new_session), false, string ())));
- session_items.push_back (MenuElem (_("Open"), slot (*this, &ARDOUR_UI::open_session)));
- session_items.push_back (MenuElem (_("Recent"), slot (*this, &ARDOUR_UI::open_recent_session)));
- session_items.push_back (MenuElem (_("Close"), slot (*this, &ARDOUR_UI::close_session)));
+ session_items.push_back (MenuElem (_("New"), bind (mem_fun(*this, &ARDOUR_UI::new_session), false, string ())));
+ session_items.push_back (MenuElem (_("Open"), mem_fun(*this, &ARDOUR_UI::open_session)));
+ session_items.push_back (MenuElem (_("Recent"), mem_fun(*this, &ARDOUR_UI::open_recent_session)));
+ session_items.push_back (MenuElem (_("Close"), mem_fun(*this, &ARDOUR_UI::close_session)));
close_item = session_items.back();
close_item->set_sensitive (false);
session_items.push_back (SeparatorElem());
- session_items.push_back (MenuElem (_("Add Track/Bus"), slot (*this, &ARDOUR_UI::add_route)));
+ session_items.push_back (MenuElem (_("Add Track/Bus"), mem_fun(*this, &ARDOUR_UI::add_route)));
add_track_item = session_items.back ();
add_track_item->set_sensitive (false);
Menu* image_compositor_menu = manage(new Menu());
MenuList& image_compositor_items = image_compositor_menu->items();
image_compositor_menu->set_name ("ArdourContextMenu");
- image_compositor_items.push_back(MenuElem (_("Connect"), (slot (editor, &PublicEditor::connect_to_image_compositor)))) ;
+ image_compositor_items.push_back(MenuElem (_("Connect"), (mem_fun (editor, &PublicEditor::connect_to_image_compositor)))) ;
session_items.push_back(MenuElem (_("Image Compositor"), *image_compositor_menu)) ;
image_compositor_item = session_items.back() ;
image_compositor_item->set_sensitive(false) ;
/* </CMT Additions> */
- session_items.push_back (MenuElem (_("Save"), bind (slot (*this, &ARDOUR_UI::save_state), string(""))));
+ session_items.push_back (MenuElem (_("Save"), bind (mem_fun(*this, &ARDOUR_UI::save_state), string(""))));
save_item = session_items.back();
save_item->set_sensitive (false);
- session_items.push_back (MenuElem (_("Snapshot"), slot (*this, &ARDOUR_UI::snapshot_session)));
+ session_items.push_back (MenuElem (_("Snapshot"), mem_fun(*this, &ARDOUR_UI::snapshot_session)));
snapshot_item = session_items.back();
snapshot_item->set_sensitive (false);
/*
save_as_item = session_items.back();
save_as_item->set_sensitive (false);
*/
- session_items.push_back (MenuElem (_("Save Template..."), slot (*this, &ARDOUR_UI::save_template)));
+ session_items.push_back (MenuElem (_("Save Template..."), mem_fun(*this, &ARDOUR_UI::save_template)));
save_template_item = session_items.back();
save_template_item->set_sensitive (false);
Menu *export_menu = manage (new Menu);
MenuList& export_items = export_menu->items();
export_menu->set_name ("ArdourContextMenu");
- export_items.push_back (MenuElem (_("Export session to audiofile..."), slot (*editor, &PublicEditor::export_session)));
- export_items.push_back (MenuElem (_("Export range to audiofile..."), slot (*editor, &PublicEditor::export_selection)));
+ export_items.push_back (MenuElem (_("Export session to audiofile..."), mem_fun (*editor, &PublicEditor::export_session)));
+ export_items.push_back (MenuElem (_("Export range to audiofile..."), mem_fun (*editor, &PublicEditor::export_selection)));
// export_items.back()->set_sensitive (false);
session_items.push_back (MenuElem (_("Export"), *export_menu));
Menu *cleanup_menu = manage (new Menu);
MenuList& cleanup_items = cleanup_menu->items();
cleanup_menu->set_name ("ArdourContextMenu");
- cleanup_items.push_back (MenuElem (_("Cleanup unused sources"), slot (*(ARDOUR_UI::instance()), &ARDOUR_UI::cleanup)));
- cleanup_items.push_back (MenuElem (_("Flush wastebasket"), slot (*(ARDOUR_UI::instance()), &ARDOUR_UI::flush_trash)));
+ cleanup_items.push_back (MenuElem (_("Cleanup unused sources"), mem_fun (*(ARDOUR_UI::instance()), &ARDOUR_UI::cleanup)));
+ cleanup_items.push_back (MenuElem (_("Flush wastebasket"), mem_fun (*(ARDOUR_UI::instance()), &ARDOUR_UI::flush_trash)));
session_items.push_back (MenuElem (_("Cleanup"), *cleanup_menu));
cleanup_item = session_items.back ();
session_items.push_back (SeparatorElem());
- session_items.push_back (MenuElem (_("Quit"), slot (*(ARDOUR_UI::instance()), &ARDOUR_UI::finish)));
+ session_items.push_back (MenuElem (_("Quit"), mem_fun (*(ARDOUR_UI::instance()), &ARDOUR_UI::finish)));
items.push_back (MenuElem (_("Session"), *session_menu));
MenuList& jack_items = jack_menu->items();
jack_menu->set_name ("ArdourContextMenu");
- jack_items.push_back (MenuElem (_("Disconnect"), slot (*(ARDOUR_UI::instance()), &ARDOUR_UI::disconnect_from_jack)));
+ jack_items.push_back (MenuElem (_("Disconnect"), mem_fun (*(ARDOUR_UI::instance()), &ARDOUR_UI::disconnect_from_jack)));
jack_disconnect_item = jack_items.back();
jack_disconnect_item->set_sensitive (false);
- jack_items.push_back (MenuElem (_("Reconnect"), slot (*(ARDOUR_UI::instance()), &ARDOUR_UI::reconnect_to_jack)));
+ jack_items.push_back (MenuElem (_("Reconnect"), mem_fun (*(ARDOUR_UI::instance()), &ARDOUR_UI::reconnect_to_jack)));
jack_reconnect_item = jack_items.back();
jack_reconnect_item->set_sensitive (false);
MenuList& jack_bufsize_items = jack_bufsize_menu->items();
jack_bufsize_menu->set_name ("ArdourContextMenu");
- jack_bufsize_items.push_back (MenuElem (X_("32"), bind (slot (*this, &ARDOUR_UI::set_jack_buffer_size), (jack_nframes_t) 32)));
- jack_bufsize_items.push_back (MenuElem (X_("64"), bind (slot (*this, &ARDOUR_UI::set_jack_buffer_size), (jack_nframes_t) 64)));
- jack_bufsize_items.push_back (MenuElem (X_("128"), bind (slot (*this, &ARDOUR_UI::set_jack_buffer_size), (jack_nframes_t) 128)));
- jack_bufsize_items.push_back (MenuElem (X_("256"), bind (slot (*this, &ARDOUR_UI::set_jack_buffer_size), (jack_nframes_t) 256)));
- jack_bufsize_items.push_back (MenuElem (X_("512"), bind (slot (*this, &ARDOUR_UI::set_jack_buffer_size), (jack_nframes_t) 512)));
- jack_bufsize_items.push_back (MenuElem (X_("1024"), bind (slot (*this, &ARDOUR_UI::set_jack_buffer_size), (jack_nframes_t) 1024)));
- jack_bufsize_items.push_back (MenuElem (X_("2048"), bind (slot (*this, &ARDOUR_UI::set_jack_buffer_size), (jack_nframes_t) 2048)));
- jack_bufsize_items.push_back (MenuElem (X_("4096"), bind (slot (*this, &ARDOUR_UI::set_jack_buffer_size), (jack_nframes_t) 4096)));
- jack_bufsize_items.push_back (MenuElem (X_("8192"), bind (slot (*this, &ARDOUR_UI::set_jack_buffer_size), (jack_nframes_t) 8192)));
+ jack_bufsize_items.push_back (MenuElem (X_("32"), bind (mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (jack_nframes_t) 32)));
+ jack_bufsize_items.push_back (MenuElem (X_("64"), bind (mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (jack_nframes_t) 64)));
+ jack_bufsize_items.push_back (MenuElem (X_("128"), bind (mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (jack_nframes_t) 128)));
+ jack_bufsize_items.push_back (MenuElem (X_("256"), bind (mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (jack_nframes_t) 256)));
+ jack_bufsize_items.push_back (MenuElem (X_("512"), bind (mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (jack_nframes_t) 512)));
+ jack_bufsize_items.push_back (MenuElem (X_("1024"), bind (mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (jack_nframes_t) 1024)));
+ jack_bufsize_items.push_back (MenuElem (X_("2048"), bind (mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (jack_nframes_t) 2048)));
+ jack_bufsize_items.push_back (MenuElem (X_("4096"), bind (mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (jack_nframes_t) 4096)));
+ jack_bufsize_items.push_back (MenuElem (X_("8192"), bind (mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (jack_nframes_t) 8192)));
jack_items.push_back (MenuElem (_("Latency"), *jack_bufsize_menu));
jack_bufsize_menu->set_sensitive (false);
window_items.push_back (TearoffMenuElem());
- window_items.push_back (MenuElem (_("Editor"), slot (*this, &ARDOUR_UI::goto_editor_window)));
- window_items.push_back (MenuElem (_("Mixer"), slot (*this, &ARDOUR_UI::goto_mixer_window)));
+ window_items.push_back (MenuElem (_("Editor"), mem_fun(*this, &ARDOUR_UI::goto_editor_window)));
+ window_items.push_back (MenuElem (_("Mixer"), mem_fun(*this, &ARDOUR_UI::goto_mixer_window)));
window_items.push_back (SeparatorElem());
window_items.push_back
(CheckMenuElem
(_("Options Editor"),
- slot (*this, &ARDOUR_UI::toggle_options_window)));
+ mem_fun(*this, &ARDOUR_UI::toggle_options_window)));
options_window_check = dynamic_cast<CheckMenuItem*>(window_items.back());
// options_window_check->set_sensitive (false);
window_items.push_back
(CheckMenuElem
(_("Audio Library"),
- slot (*this, &ARDOUR_UI::toggle_sfdb_window)));
+ mem_fun(*this, &ARDOUR_UI::toggle_sfdb_window)));
sfdb_check = dynamic_cast<CheckMenuItem*>(window_items.back());
window_items.push_back
(CheckMenuElem
(_("Track/Bus Inspector"),
- slot (*this, &ARDOUR_UI::toggle_route_params_window)));
+ mem_fun(*this, &ARDOUR_UI::toggle_route_params_window)));
route_params_check = dynamic_cast<CheckMenuItem*>(window_items.back());
route_params_check->set_sensitive (false);
window_items.push_back
(CheckMenuElem
(_("Connections"),
- slot (*this, &ARDOUR_UI::toggle_connection_editor)));
+ mem_fun(*this, &ARDOUR_UI::toggle_connection_editor)));
connection_editor_check = dynamic_cast<CheckMenuItem*>(window_items.back());
connection_editor_check->set_sensitive (false);
window_items.push_back
(CheckMenuElem
(_("Meter Bridge"),
- slot (*this, &ARDOUR_UI::toggle_meter_bridge_window)));
+ mem_fun(*this, &ARDOUR_UI::toggle_meter_bridge_window)));
meter_bridge_dialog_check = dynamic_cast<CheckMenuItem*>(window_items.back());
meter_bridge_dialog_check->set_sensitive (false);
#endif
window_items.push_back
(CheckMenuElem
(_("Locations"),
- slot (*this, &ARDOUR_UI::toggle_location_window)));
+ mem_fun(*this, &ARDOUR_UI::toggle_location_window)));
locations_dialog_check = dynamic_cast<CheckMenuItem*>(window_items.back());
locations_dialog_check->set_sensitive (false);
window_items.push_back
(CheckMenuElem
(_("Big Clock"),
- slot (*this, &ARDOUR_UI::toggle_big_clock_window)));
+ mem_fun(*this, &ARDOUR_UI::toggle_big_clock_window)));
big_clock_check = dynamic_cast<CheckMenuItem*>(window_items.back());
window_items.push_back (SeparatorElem());
- window_items.push_back (MenuElem (_("About"), slot (*this, &ARDOUR_UI::show_splash)));
+ window_items.push_back (MenuElem (_("About"), mem_fun(*this, &ARDOUR_UI::show_splash)));
items.push_back (MenuElem (_("Windows"), *window_menu));
*/
clock_base.add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
- clock_base.button_release_event.connect (bind (slot (*this, &AudioClock::field_button_release_event), SMPTE_Hours));
+ clock_base.button_release_event.connect (bind (mem_fun(*this, &AudioClock::field_button_release_event), SMPTE_Hours));
if (editable) {
setup_events ();
ms_minutes_ebox.set_flags (Gtk::CAN_FOCUS);
ms_seconds_ebox.set_flags (Gtk::CAN_FOCUS);
- hours_ebox.motion_notify_event.connect (bind (slot (*this, &AudioClock::field_motion_notify_event), SMPTE_Hours));
- minutes_ebox.motion_notify_event.connect (bind (slot (*this, &AudioClock::field_motion_notify_event), SMPTE_Minutes));
- seconds_ebox.motion_notify_event.connect (bind (slot (*this, &AudioClock::field_motion_notify_event), SMPTE_Seconds));
- frames_ebox.motion_notify_event.connect (bind (slot (*this, &AudioClock::field_motion_notify_event), SMPTE_Frames));
- audio_frames_ebox.motion_notify_event.connect (bind (slot (*this, &AudioClock::field_motion_notify_event), AudioFrames));
- bars_ebox.motion_notify_event.connect (bind (slot (*this, &AudioClock::field_motion_notify_event), Bars));
- beats_ebox.motion_notify_event.connect (bind (slot (*this, &AudioClock::field_motion_notify_event), Beats));
- ticks_ebox.motion_notify_event.connect (bind (slot (*this, &AudioClock::field_motion_notify_event), Ticks));
- ms_hours_ebox.motion_notify_event.connect (bind (slot (*this, &AudioClock::field_motion_notify_event), MS_Hours));
- ms_minutes_ebox.motion_notify_event.connect (bind (slot (*this, &AudioClock::field_motion_notify_event), MS_Minutes));
- ms_seconds_ebox.motion_notify_event.connect (bind (slot (*this, &AudioClock::field_motion_notify_event), MS_Seconds));
-
- hours_ebox.button_press_event.connect (bind (slot (*this, &AudioClock::field_button_press_event), SMPTE_Hours));
- minutes_ebox.button_press_event.connect (bind (slot (*this, &AudioClock::field_button_press_event), SMPTE_Minutes));
- seconds_ebox.button_press_event.connect (bind (slot (*this, &AudioClock::field_button_press_event), SMPTE_Seconds));
- frames_ebox.button_press_event.connect (bind (slot (*this, &AudioClock::field_button_press_event), SMPTE_Frames));
- audio_frames_ebox.button_press_event.connect (bind (slot (*this, &AudioClock::field_button_press_event), AudioFrames));
- bars_ebox.button_press_event.connect (bind (slot (*this, &AudioClock::field_button_press_event), Bars));
- beats_ebox.button_press_event.connect (bind (slot (*this, &AudioClock::field_button_press_event), Beats));
- ticks_ebox.button_press_event.connect (bind (slot (*this, &AudioClock::field_button_press_event), Ticks));
- ms_hours_ebox.button_press_event.connect (bind (slot (*this, &AudioClock::field_button_press_event), MS_Hours));
- ms_minutes_ebox.button_press_event.connect (bind (slot (*this, &AudioClock::field_button_press_event), MS_Minutes));
- ms_seconds_ebox.button_press_event.connect (bind (slot (*this, &AudioClock::field_button_press_event), MS_Seconds));
-
- hours_ebox.button_release_event.connect (bind (slot (*this, &AudioClock::field_button_release_event), SMPTE_Hours));
- minutes_ebox.button_release_event.connect (bind (slot (*this, &AudioClock::field_button_release_event), SMPTE_Minutes));
- seconds_ebox.button_release_event.connect (bind (slot (*this, &AudioClock::field_button_release_event), SMPTE_Seconds));
- frames_ebox.button_release_event.connect (bind (slot (*this, &AudioClock::field_button_release_event), SMPTE_Frames));
- audio_frames_ebox.button_release_event.connect (bind (slot (*this, &AudioClock::field_button_release_event), AudioFrames));
- bars_ebox.button_release_event.connect (bind (slot (*this, &AudioClock::field_button_release_event), Bars));
- beats_ebox.button_release_event.connect (bind (slot (*this, &AudioClock::field_button_release_event), Beats));
- ticks_ebox.button_release_event.connect (bind (slot (*this, &AudioClock::field_button_release_event), Ticks));
- ms_hours_ebox.button_release_event.connect (bind (slot (*this, &AudioClock::field_button_release_event), MS_Hours));
- ms_minutes_ebox.button_release_event.connect (bind (slot (*this, &AudioClock::field_button_release_event), MS_Minutes));
- ms_seconds_ebox.button_release_event.connect (bind (slot (*this, &AudioClock::field_button_release_event), MS_Seconds));
-
- hours_ebox.key_release_event.connect (bind (slot (*this, &AudioClock::field_key_release_event), SMPTE_Hours));
- minutes_ebox.key_release_event.connect (bind (slot (*this, &AudioClock::field_key_release_event), SMPTE_Minutes));
- seconds_ebox.key_release_event.connect (bind (slot (*this, &AudioClock::field_key_release_event), SMPTE_Seconds));
- frames_ebox.key_release_event.connect (bind (slot (*this, &AudioClock::field_key_release_event), SMPTE_Frames));
- audio_frames_ebox.key_release_event.connect (bind (slot (*this, &AudioClock::field_key_release_event), AudioFrames));
- bars_ebox.key_release_event.connect (bind (slot (*this, &AudioClock::field_key_release_event), Bars));
- beats_ebox.key_release_event.connect (bind (slot (*this, &AudioClock::field_key_release_event), Beats));
- ticks_ebox.key_release_event.connect (bind (slot (*this, &AudioClock::field_key_release_event), Ticks));
- ms_hours_ebox.key_release_event.connect (bind (slot (*this, &AudioClock::field_key_release_event), MS_Hours));
- ms_minutes_ebox.key_release_event.connect (bind (slot (*this, &AudioClock::field_key_release_event), MS_Minutes));
- ms_seconds_ebox.key_release_event.connect (bind (slot (*this, &AudioClock::field_key_release_event), MS_Seconds));
-
- hours_ebox.signal_focus_in_event().connect (bind (slot (*this, &AudioClock::field_focus_in_event), SMPTE_Hours));
- minutes_ebox.signal_focus_in_event().connect (bind (slot (*this, &AudioClock::field_focus_in_event), SMPTE_Minutes));
- seconds_ebox.signal_focus_in_event().connect (bind (slot (*this, &AudioClock::field_focus_in_event), SMPTE_Seconds));
- frames_ebox.signal_focus_in_event().connect (bind (slot (*this, &AudioClock::field_focus_in_event), SMPTE_Frames));
- audio_frames_ebox.signal_focus_in_event().connect (bind (slot (*this, &AudioClock::field_focus_in_event), AudioFrames));
- bars_ebox.signal_focus_in_event().connect (bind (slot (*this, &AudioClock::field_focus_in_event), Bars));
- beats_ebox.signal_focus_in_event().connect (bind (slot (*this, &AudioClock::field_focus_in_event), Beats));
- ticks_ebox.signal_focus_in_event().connect (bind (slot (*this, &AudioClock::field_focus_in_event), Ticks));
- ms_hours_ebox.signal_focus_in_event().connect (bind (slot (*this, &AudioClock::field_focus_in_event), MS_Hours));
- ms_minutes_ebox.signal_focus_in_event().connect (bind (slot (*this, &AudioClock::field_focus_in_event), MS_Minutes));
- ms_seconds_ebox.signal_focus_in_event().connect (bind (slot (*this, &AudioClock::field_focus_in_event), MS_Seconds));
-
- hours_ebox.signal_focus_out_event().connect (bind (slot (*this, &AudioClock::field_focus_out_event), SMPTE_Hours));
- minutes_ebox.signal_focus_out_event().connect (bind (slot (*this, &AudioClock::field_focus_out_event), SMPTE_Minutes));
- seconds_ebox.signal_focus_out_event().connect (bind (slot (*this, &AudioClock::field_focus_out_event), SMPTE_Seconds));
- frames_ebox.signal_focus_out_event().connect (bind (slot (*this, &AudioClock::field_focus_out_event), SMPTE_Frames));
- audio_frames_ebox.signal_focus_out_event().connect (bind (slot (*this, &AudioClock::field_focus_out_event), AudioFrames));
- bars_ebox.signal_focus_out_event().connect (bind (slot (*this, &AudioClock::field_focus_out_event), Bars));
- beats_ebox.signal_focus_out_event().connect (bind (slot (*this, &AudioClock::field_focus_out_event), Beats));
- ticks_ebox.signal_focus_out_event().connect (bind (slot (*this, &AudioClock::field_focus_out_event), Ticks));
- ms_hours_ebox.signal_focus_out_event().connect (bind (slot (*this, &AudioClock::field_focus_out_event), MS_Hours));
- ms_minutes_ebox.signal_focus_out_event().connect (bind (slot (*this, &AudioClock::field_focus_out_event), MS_Minutes));
- ms_seconds_ebox.signal_focus_out_event().connect (bind (slot (*this, &AudioClock::field_focus_out_event), MS_Seconds));
+ hours_ebox.motion_notify_event.connect (bind (mem_fun(*this, &AudioClock::field_motion_notify_event), SMPTE_Hours));
+ minutes_ebox.motion_notify_event.connect (bind (mem_fun(*this, &AudioClock::field_motion_notify_event), SMPTE_Minutes));
+ seconds_ebox.motion_notify_event.connect (bind (mem_fun(*this, &AudioClock::field_motion_notify_event), SMPTE_Seconds));
+ frames_ebox.motion_notify_event.connect (bind (mem_fun(*this, &AudioClock::field_motion_notify_event), SMPTE_Frames));
+ audio_frames_ebox.motion_notify_event.connect (bind (mem_fun(*this, &AudioClock::field_motion_notify_event), AudioFrames));
+ bars_ebox.motion_notify_event.connect (bind (mem_fun(*this, &AudioClock::field_motion_notify_event), Bars));
+ beats_ebox.motion_notify_event.connect (bind (mem_fun(*this, &AudioClock::field_motion_notify_event), Beats));
+ ticks_ebox.motion_notify_event.connect (bind (mem_fun(*this, &AudioClock::field_motion_notify_event), Ticks));
+ ms_hours_ebox.motion_notify_event.connect (bind (mem_fun(*this, &AudioClock::field_motion_notify_event), MS_Hours));
+ ms_minutes_ebox.motion_notify_event.connect (bind (mem_fun(*this, &AudioClock::field_motion_notify_event), MS_Minutes));
+ ms_seconds_ebox.motion_notify_event.connect (bind (mem_fun(*this, &AudioClock::field_motion_notify_event), MS_Seconds));
+
+ hours_ebox.button_press_event.connect (bind (mem_fun(*this, &AudioClock::field_button_press_event), SMPTE_Hours));
+ minutes_ebox.button_press_event.connect (bind (mem_fun(*this, &AudioClock::field_button_press_event), SMPTE_Minutes));
+ seconds_ebox.button_press_event.connect (bind (mem_fun(*this, &AudioClock::field_button_press_event), SMPTE_Seconds));
+ frames_ebox.button_press_event.connect (bind (mem_fun(*this, &AudioClock::field_button_press_event), SMPTE_Frames));
+ audio_frames_ebox.button_press_event.connect (bind (mem_fun(*this, &AudioClock::field_button_press_event), AudioFrames));
+ bars_ebox.button_press_event.connect (bind (mem_fun(*this, &AudioClock::field_button_press_event), Bars));
+ beats_ebox.button_press_event.connect (bind (mem_fun(*this, &AudioClock::field_button_press_event), Beats));
+ ticks_ebox.button_press_event.connect (bind (mem_fun(*this, &AudioClock::field_button_press_event), Ticks));
+ ms_hours_ebox.button_press_event.connect (bind (mem_fun(*this, &AudioClock::field_button_press_event), MS_Hours));
+ ms_minutes_ebox.button_press_event.connect (bind (mem_fun(*this, &AudioClock::field_button_press_event), MS_Minutes));
+ ms_seconds_ebox.button_press_event.connect (bind (mem_fun(*this, &AudioClock::field_button_press_event), MS_Seconds));
+
+ hours_ebox.button_release_event.connect (bind (mem_fun(*this, &AudioClock::field_button_release_event), SMPTE_Hours));
+ minutes_ebox.button_release_event.connect (bind (mem_fun(*this, &AudioClock::field_button_release_event), SMPTE_Minutes));
+ seconds_ebox.button_release_event.connect (bind (mem_fun(*this, &AudioClock::field_button_release_event), SMPTE_Seconds));
+ frames_ebox.button_release_event.connect (bind (mem_fun(*this, &AudioClock::field_button_release_event), SMPTE_Frames));
+ audio_frames_ebox.button_release_event.connect (bind (mem_fun(*this, &AudioClock::field_button_release_event), AudioFrames));
+ bars_ebox.button_release_event.connect (bind (mem_fun(*this, &AudioClock::field_button_release_event), Bars));
+ beats_ebox.button_release_event.connect (bind (mem_fun(*this, &AudioClock::field_button_release_event), Beats));
+ ticks_ebox.button_release_event.connect (bind (mem_fun(*this, &AudioClock::field_button_release_event), Ticks));
+ ms_hours_ebox.button_release_event.connect (bind (mem_fun(*this, &AudioClock::field_button_release_event), MS_Hours));
+ ms_minutes_ebox.button_release_event.connect (bind (mem_fun(*this, &AudioClock::field_button_release_event), MS_Minutes));
+ ms_seconds_ebox.button_release_event.connect (bind (mem_fun(*this, &AudioClock::field_button_release_event), MS_Seconds));
+
+ hours_ebox.key_release_event.connect (bind (mem_fun(*this, &AudioClock::field_key_release_event), SMPTE_Hours));
+ minutes_ebox.key_release_event.connect (bind (mem_fun(*this, &AudioClock::field_key_release_event), SMPTE_Minutes));
+ seconds_ebox.key_release_event.connect (bind (mem_fun(*this, &AudioClock::field_key_release_event), SMPTE_Seconds));
+ frames_ebox.key_release_event.connect (bind (mem_fun(*this, &AudioClock::field_key_release_event), SMPTE_Frames));
+ audio_frames_ebox.key_release_event.connect (bind (mem_fun(*this, &AudioClock::field_key_release_event), AudioFrames));
+ bars_ebox.key_release_event.connect (bind (mem_fun(*this, &AudioClock::field_key_release_event), Bars));
+ beats_ebox.key_release_event.connect (bind (mem_fun(*this, &AudioClock::field_key_release_event), Beats));
+ ticks_ebox.key_release_event.connect (bind (mem_fun(*this, &AudioClock::field_key_release_event), Ticks));
+ ms_hours_ebox.key_release_event.connect (bind (mem_fun(*this, &AudioClock::field_key_release_event), MS_Hours));
+ ms_minutes_ebox.key_release_event.connect (bind (mem_fun(*this, &AudioClock::field_key_release_event), MS_Minutes));
+ ms_seconds_ebox.key_release_event.connect (bind (mem_fun(*this, &AudioClock::field_key_release_event), MS_Seconds));
+
+ hours_ebox.signal_focus_in_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_in_event), SMPTE_Hours));
+ minutes_ebox.signal_focus_in_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_in_event), SMPTE_Minutes));
+ seconds_ebox.signal_focus_in_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_in_event), SMPTE_Seconds));
+ frames_ebox.signal_focus_in_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_in_event), SMPTE_Frames));
+ audio_frames_ebox.signal_focus_in_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_in_event), AudioFrames));
+ bars_ebox.signal_focus_in_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_in_event), Bars));
+ beats_ebox.signal_focus_in_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_in_event), Beats));
+ ticks_ebox.signal_focus_in_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_in_event), Ticks));
+ ms_hours_ebox.signal_focus_in_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_in_event), MS_Hours));
+ ms_minutes_ebox.signal_focus_in_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_in_event), MS_Minutes));
+ ms_seconds_ebox.signal_focus_in_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_in_event), MS_Seconds));
+
+ hours_ebox.signal_focus_out_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_out_event), SMPTE_Hours));
+ minutes_ebox.signal_focus_out_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_out_event), SMPTE_Minutes));
+ seconds_ebox.signal_focus_out_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_out_event), SMPTE_Seconds));
+ frames_ebox.signal_focus_out_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_out_event), SMPTE_Frames));
+ audio_frames_ebox.signal_focus_out_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_out_event), AudioFrames));
+ bars_ebox.signal_focus_out_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_out_event), Bars));
+ beats_ebox.signal_focus_out_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_out_event), Beats));
+ ticks_ebox.signal_focus_out_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_out_event), Ticks));
+ ms_hours_ebox.signal_focus_out_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_out_event), MS_Hours));
+ ms_minutes_ebox.signal_focus_out_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_out_event), MS_Minutes));
+ ms_seconds_ebox.signal_focus_out_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_out_event), MS_Seconds));
Gtkmm2ext::set_size_request_to_display_given_text (hours_label, "-88", 0, 2);
Gtkmm2ext::set_size_request_to_display_given_text (minutes_label, "88", 0, 2);
MenuList& mode_items = mode_menu->items();
mode_menu->set_name ("ArdourContextMenu");
- mode_items.push_back (MenuElem (_("SMPTE"), bind (slot (*this, &AudioClock::set_mode), SMPTE)));
- mode_items.push_back (MenuElem (_("Bars:Beats"), bind (slot (*this, &AudioClock::set_mode), BBT)));
- mode_items.push_back (MenuElem (_("Minutes:Seconds"), bind (slot (*this, &AudioClock::set_mode), MinSec)));
- mode_items.push_back (MenuElem (_("Audio Frames"), bind (slot (*this, &AudioClock::set_mode), Frames)));
- mode_items.push_back (MenuElem (_("Off"), bind (slot (*this, &AudioClock::set_mode), Off)));
+ mode_items.push_back (MenuElem (_("SMPTE"), bind (mem_fun(*this, &AudioClock::set_mode), SMPTE)));
+ mode_items.push_back (MenuElem (_("Bars:Beats"), bind (mem_fun(*this, &AudioClock::set_mode), BBT)));
+ mode_items.push_back (MenuElem (_("Minutes:Seconds"), bind (mem_fun(*this, &AudioClock::set_mode), MinSec)));
+ mode_items.push_back (MenuElem (_("Audio Frames"), bind (mem_fun(*this, &AudioClock::set_mode), Frames)));
+ mode_items.push_back (MenuElem (_("Off"), bind (mem_fun(*this, &AudioClock::set_mode), Off)));
ops_items.push_back (MenuElem (_("Mode"), *mode_menu));
}
hide_button.add (*(manage (new Pixmap (small_x_xpm))));
- _route.mute_changed.connect (slot (*this, &RouteUI::mute_changed));
- _route.solo_changed.connect (slot (*this, &RouteUI::solo_changed));
- _route.solo_safe_changed.connect (slot (*this, &RouteUI::solo_changed));
-
- _route.panner().Changed.connect (slot (*this, &AudioTimeAxisView::update_pans));
-
- solo_button->button_press_event.connect (slot (*this, &RouteUI::solo_press));
- solo_button->button_release_event.connect (slot (*this, &RouteUI::solo_release));
- mute_button->button_press_event.connect (slot (*this, &RouteUI::mute_press));
- mute_button->button_release_event.connect (slot (*this, &RouteUI::mute_release));
- rec_enable_button->button_press_event.connect (slot (*this, &RouteUI::rec_enable_press));
- edit_group_button.button_release_event.connect (slot (*this, &AudioTimeAxisView::edit_click));
- playlist_button.signal_clicked().connect (slot (*this, &AudioTimeAxisView::playlist_click));
- automation_button.signal_clicked().connect (slot (*this, &AudioTimeAxisView::automation_click));
- size_button.button_release_event.connect (slot (*this, &AudioTimeAxisView::size_click));
- visual_button.signal_clicked().connect (slot (*this, &AudioTimeAxisView::visual_click));
- hide_button.signal_clicked().connect (slot (*this, &AudioTimeAxisView::hide_click));
-
- name_entry.activate.connect (slot (*this, &AudioTimeAxisView::name_entry_activated));
- name_entry.signal_focus_out_event().connect (slot (*this, &AudioTimeAxisView::name_entry_focus_out_handler));
- name_entry.button_press_event.connect (slot (*this, &AudioTimeAxisView::name_entry_button_press_handler));
- name_entry.button_release_event.connect (slot (*this, &AudioTimeAxisView::name_entry_button_release_handler));
- name_entry.key_release_event.connect (slot (*this, &AudioTimeAxisView::name_entry_key_release_handler));
+ _route.mute_changed.connect (mem_fun(*this, &RouteUI::mute_changed));
+ _route.solo_changed.connect (mem_fun(*this, &RouteUI::solo_changed));
+ _route.solo_safe_changed.connect (mem_fun(*this, &RouteUI::solo_changed));
+
+ _route.panner().Changed.connect (mem_fun(*this, &AudioTimeAxisView::update_pans));
+
+ solo_button->button_press_event.connect (mem_fun(*this, &RouteUI::solo_press));
+ solo_button->button_release_event.connect (mem_fun(*this, &RouteUI::solo_release));
+ mute_button->button_press_event.connect (mem_fun(*this, &RouteUI::mute_press));
+ mute_button->button_release_event.connect (mem_fun(*this, &RouteUI::mute_release));
+ rec_enable_button->button_press_event.connect (mem_fun(*this, &RouteUI::rec_enable_press));
+ edit_group_button.button_release_event.connect (mem_fun(*this, &AudioTimeAxisView::edit_click));
+ playlist_button.signal_clicked().connect (mem_fun(*this, &AudioTimeAxisView::playlist_click));
+ automation_button.signal_clicked().connect (mem_fun(*this, &AudioTimeAxisView::automation_click));
+ size_button.button_release_event.connect (mem_fun(*this, &AudioTimeAxisView::size_click));
+ visual_button.signal_clicked().connect (mem_fun(*this, &AudioTimeAxisView::visual_click));
+ hide_button.signal_clicked().connect (mem_fun(*this, &AudioTimeAxisView::hide_click));
+
+ name_entry.activate.connect (mem_fun(*this, &AudioTimeAxisView::name_entry_activated));
+ name_entry.signal_focus_out_event().connect (mem_fun(*this, &AudioTimeAxisView::name_entry_focus_out_handler));
+ name_entry.button_press_event.connect (mem_fun(*this, &AudioTimeAxisView::name_entry_button_press_handler));
+ name_entry.button_release_event.connect (mem_fun(*this, &AudioTimeAxisView::name_entry_button_release_handler));
+ name_entry.key_release_event.connect (mem_fun(*this, &AudioTimeAxisView::name_entry_key_release_handler));
if (is_audio_track()) {
controls_table.attach (*rec_enable_button, 6, 7, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
}
controls_table.attach (*mute_button, 7, 8, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
- controls_table.attach (*solo_button, 8, 9, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|GTK_FILL|Gtk::EXPAND, 0, 0);
+ controls_table.attach (*solo_button, 8, 9, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::FILL|Gtk::EXPAND, 0, 0);
controls_table.attach (edit_group_button, 7, 8, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
set_state (*xml_node);
- _route.mute_changed.connect (slot (*this, &RouteUI::mute_changed));
- _route.solo_changed.connect (slot (*this, &RouteUI::solo_changed));
- _route.redirects_changed.connect (slot (*this, &AudioTimeAxisView::redirects_changed));
+ _route.mute_changed.connect (mem_fun(*this, &RouteUI::mute_changed));
+ _route.solo_changed.connect (mem_fun(*this, &RouteUI::solo_changed));
+ _route.redirects_changed.connect (mem_fun(*this, &AudioTimeAxisView::redirects_changed));
- _route.name_changed.connect (slot (*this, &AudioTimeAxisView::route_name_changed));
+ _route.name_changed.connect (mem_fun(*this, &AudioTimeAxisView::route_name_changed));
if (is_audio_track()) {
/* track */
- audio_track()->FreezeChange.connect (slot (*this, &AudioTimeAxisView::map_frozen));
+ audio_track()->FreezeChange.connect (mem_fun(*this, &AudioTimeAxisView::map_frozen));
- audio_track()->diskstream_changed.connect (slot (*this, &AudioTimeAxisView::diskstream_changed));
- get_diskstream()->speed_changed.connect (slot (*this, &AudioTimeAxisView::speed_changed));
+ audio_track()->diskstream_changed.connect (mem_fun(*this, &AudioTimeAxisView::diskstream_changed));
+ get_diskstream()->speed_changed.connect (mem_fun(*this, &AudioTimeAxisView::speed_changed));
controls_ebox.set_name ("AudioTrackControlsBaseUnselected");
controls_base_selected_name = "AudioTrackControlsBaseSelected";
/* ask for notifications of any new RegionViews */
- view->AudioRegionViewAdded.connect (slot (*this, &AudioTimeAxisView::region_view_added));
+ view->AudioRegionViewAdded.connect (mem_fun(*this, &AudioTimeAxisView::region_view_added));
view->attach ();
controls_base_unselected_name = "BusControlsBaseUnselected";
}
- editor.ZoomChanged.connect (slot (*this, &AudioTimeAxisView::reset_samples_per_unit));
+ editor.ZoomChanged.connect (mem_fun(*this, &AudioTimeAxisView::reset_samples_per_unit));
}
AudioTimeAxisView::~AudioTimeAxisView ()
state_changed_connection.disconnect ();
if ((pl = dynamic_cast<AudioPlaylist*> (playlist())) != 0) {
- state_changed_connection = pl->StateChanged.connect (slot (*this, &AudioTimeAxisView::playlist_state_changed));
- modified_connection = pl->Modified.connect (slot (*this, &AudioTimeAxisView::playlist_modified));
+ state_changed_connection = pl->StateChanged.connect (mem_fun(*this, &AudioTimeAxisView::playlist_state_changed));
+ modified_connection = pl->Modified.connect (mem_fun(*this, &AudioTimeAxisView::playlist_modified));
}
}
items.clear ();
items.push_back (RadioMenuElem (edit_group_menu_radio_group, _("No group"),
- bind (slot (*this, &AudioTimeAxisView::set_edit_group_from_menu), (RouteGroup *) 0)));
+ bind (mem_fun(*this, &AudioTimeAxisView::set_edit_group_from_menu), (RouteGroup *) 0)));
if (_route.edit_group() == 0) {
static_cast<RadioMenuItem*>(items.back())->set_active ();
MenuList &items = edit_group_menu.items();
items.push_back (RadioMenuElem (edit_group_menu_radio_group,
- eg->name(), bind (slot (*this, &AudioTimeAxisView::set_edit_group_from_menu), eg)));
+ eg->name(), bind (mem_fun(*this, &AudioTimeAxisView::set_edit_group_from_menu), eg)));
if (_route.edit_group() == eg) {
static_cast<RadioMenuItem*>(items.back())->set_active ();
}
void
AudioTimeAxisView::playlist_state_changed (Change ignored)
{
- // ENSURE_GUI_THREAD (bind (slot (*this, &AudioTimeAxisView::playlist_state_changed), ignored));
+ // ENSURE_GUI_THREAD (bind (mem_fun(*this, &AudioTimeAxisView::playlist_state_changed), ignored));
// why are we here ?
}
display_menu->set_name ("ArdourContextMenu");
items.push_back (MenuElem (_("Height"), *size_menu));
- items.push_back (MenuElem (_("Color"), slot (*this, &AudioTimeAxisView::select_track_color)));
+ items.push_back (MenuElem (_("Color"), mem_fun(*this, &AudioTimeAxisView::select_track_color)));
items.push_back (SeparatorElem());
- items.push_back (MenuElem (_("Hide all crossfades"), slot (*this, &AudioTimeAxisView::hide_all_xfades)));
- items.push_back (MenuElem (_("Show all crossfades"), slot (*this, &AudioTimeAxisView::show_all_xfades)));
+ items.push_back (MenuElem (_("Hide all crossfades"), mem_fun(*this, &AudioTimeAxisView::hide_all_xfades)));
+ items.push_back (MenuElem (_("Show all crossfades"), mem_fun(*this, &AudioTimeAxisView::show_all_xfades)));
items.push_back (SeparatorElem());
automation_action_menu->set_name ("ArdourContextMenu");
automation_items.push_back (MenuElem (_("show all automation"),
- slot (*this, &AudioTimeAxisView::show_all_automation)));
+ mem_fun(*this, &AudioTimeAxisView::show_all_automation)));
automation_items.push_back (MenuElem (_("show existing automation"),
- slot (*this, &AudioTimeAxisView::show_existing_automation)));
+ mem_fun(*this, &AudioTimeAxisView::show_existing_automation)));
automation_items.push_back (MenuElem (_("hide all automation"),
- slot (*this, &AudioTimeAxisView::hide_all_automation)));
+ mem_fun(*this, &AudioTimeAxisView::hide_all_automation)));
automation_items.push_back (SeparatorElem());
automation_items.push_back (CheckMenuElem (_("gain"),
- slot (*this, &AudioTimeAxisView::toggle_gain_track)));
+ mem_fun(*this, &AudioTimeAxisView::toggle_gain_track)));
gain_automation_item = static_cast<CheckMenuItem*> (automation_items.back());
gain_automation_item->set_active(show_gain_automation);
automation_items.push_back (CheckMenuElem (_("pan"),
- slot (*this, &AudioTimeAxisView::toggle_pan_track)));
+ mem_fun(*this, &AudioTimeAxisView::toggle_pan_track)));
pan_automation_item = static_cast<CheckMenuItem*> (automation_items.back());
pan_automation_item->set_active(show_pan_automation);
MenuList& waveform_items = waveform_menu->items();
waveform_menu->set_name ("ArdourContextMenu");
- waveform_items.push_back (CheckMenuElem (_("Show waveforms"), slot (*this, &AudioTimeAxisView::toggle_waveforms)));
+ waveform_items.push_back (CheckMenuElem (_("Show waveforms"), mem_fun(*this, &AudioTimeAxisView::toggle_waveforms)));
waveform_item = static_cast<CheckMenuItem *> (waveform_items.back());
ignore_toggle = true;
waveform_item->set_active (editor.show_waveforms());
RadioMenuItem::Group group;
- waveform_items.push_back (RadioMenuElem (group, _("Traditional"), bind (slot (*this, &AudioTimeAxisView::set_waveform_shape), Traditional)));
+ waveform_items.push_back (RadioMenuElem (group, _("Traditional"), bind (mem_fun(*this, &AudioTimeAxisView::set_waveform_shape), Traditional)));
traditional_item = static_cast<RadioMenuItem *> (waveform_items.back());
- waveform_items.push_back (RadioMenuElem (group, _("Rectified"), bind (slot (*this, &AudioTimeAxisView::set_waveform_shape), Rectified)));
+ waveform_items.push_back (RadioMenuElem (group, _("Rectified"), bind (mem_fun(*this, &AudioTimeAxisView::set_waveform_shape), Rectified)));
rectified_item = static_cast<RadioMenuItem *> (waveform_items.back());
items.push_back (MenuElem (_("Waveform"), *waveform_menu));
RadioMenuItem::Group align_group;
- alignment_items.push_back (RadioMenuElem (align_group, _("align with existing material"), bind (slot (*this, &AudioTimeAxisView::set_align_style), ExistingMaterial)));
+ alignment_items.push_back (RadioMenuElem (align_group, _("align with existing material"), bind (mem_fun(*this, &AudioTimeAxisView::set_align_style), ExistingMaterial)));
align_existing_item = dynamic_cast<RadioMenuItem*>(alignment_items.back());
if (get_diskstream()->alignment_style() == ExistingMaterial) {
align_existing_item->set_active();
}
- alignment_items.push_back (RadioMenuElem (align_group, _("align with capture time"), bind (slot (*this, &AudioTimeAxisView::set_align_style), CaptureTime)));
+ alignment_items.push_back (RadioMenuElem (align_group, _("align with capture time"), bind (mem_fun(*this, &AudioTimeAxisView::set_align_style), CaptureTime)));
align_capture_item = dynamic_cast<RadioMenuItem*>(alignment_items.back());
if (get_diskstream()->alignment_style() == CaptureTime) {
align_capture_item->set_active();
items.push_back (MenuElem (_("Alignment"), *alignment_menu));
- get_diskstream()->AlignmentStyleChanged.connect (slot (*this, &AudioTimeAxisView::align_style_changed));
+ get_diskstream()->AlignmentStyleChanged.connect (mem_fun(*this, &AudioTimeAxisView::align_style_changed));
}
items.push_back (SeparatorElem());
- items.push_back (CheckMenuElem (_("Active"), slot (*this, &RouteUI::toggle_route_active)));
+ items.push_back (CheckMenuElem (_("Active"), mem_fun(*this, &RouteUI::toggle_route_active)));
route_active_menu_item = dynamic_cast<CheckMenuItem *> (items.back());
route_active_menu_item->set_active (_route.active());
items.push_back (SeparatorElem());
- items.push_back (MenuElem (_("Remove"), slot (*this, &RouteUI::remove_this_route)));
+ items.push_back (MenuElem (_("Remove"), mem_fun(*this, &RouteUI::remove_this_route)));
}
void
AudioTimeAxisView::speed_changed ()
{
- Gtkmm2ext::UI::instance()->call_slot (slot (*this, &AudioTimeAxisView::reset_samples_per_unit));
+ Gtkmm2ext::UI::instance()->call_slot (mem_fun(*this, &AudioTimeAxisView::reset_samples_per_unit));
}
void
AudioTimeAxisView::diskstream_changed (void *src)
{
- Gtkmm2ext::UI::instance()->call_slot (slot (*this, &AudioTimeAxisView::update_diskstream_display));
+ Gtkmm2ext::UI::instance()->call_slot (mem_fun(*this, &AudioTimeAxisView::update_diskstream_display));
}
void
add_child (gain_track);
- gain_track->Hiding.connect (slot (*this, &AudioTimeAxisView::gain_hidden));
+ gain_track->Hiding.connect (mem_fun(*this, &AudioTimeAxisView::gain_hidden));
bool hideit = true;
add_child (pan_track);
- pan_track->Hiding.connect (slot (*this, &AudioTimeAxisView::pan_hidden));
+ pan_track->Hiding.connect (mem_fun(*this, &AudioTimeAxisView::pan_hidden));
ensure_xml_node ();
bool hideit = true;
ran->view->add_line (*ral);
- ran->view->Hiding.connect (bind (slot (*this, &AudioTimeAxisView::redirect_automation_track_hidden), ran, redirect));
+ ran->view->Hiding.connect (bind (mem_fun(*this, &AudioTimeAxisView::redirect_automation_track_hidden), ran, redirect));
if (!ran->view->marked_for_display()) {
ran->view->hide ();
add_child (ran->view);
- view->foreach_regionview (bind (slot (*this, &AudioTimeAxisView::add_ghost_to_redirect), ran->view));
+ view->foreach_regionview (bind (mem_fun(*this, &AudioTimeAxisView::add_ghost_to_redirect), ran->view));
redirect->mark_automation_visible (what, true);
}
}
- mitem->toggled.connect (bind (slot (*this, &AudioTimeAxisView::redirect_menu_item_toggled), rai, ran));
+ mitem->toggled.connect (bind (mem_fun(*this, &AudioTimeAxisView::redirect_menu_item_toggled), rai, ran));
}
/* add the menu for this redirect, because the subplugin
playlist_items.push_back (MenuElem (compose (_("Current: %1"), get_diskstream()->playlist()->name())));
playlist_items.push_back (SeparatorElem());
- playlist_items.push_back (MenuElem (_("Rename"), slot (*this, &AudioTimeAxisView::rename_current_playlist)));
+ playlist_items.push_back (MenuElem (_("Rename"), mem_fun(*this, &AudioTimeAxisView::rename_current_playlist)));
playlist_items.push_back (SeparatorElem());
- playlist_items.push_back (MenuElem (_("New"), slot (*this, &AudioTimeAxisView::use_new_playlist)));
- playlist_items.push_back (MenuElem (_("New Copy"), slot(*this, &AudioTimeAxisView::use_copy_playlist)));
+ playlist_items.push_back (MenuElem (_("New"), mem_fun(*this, &AudioTimeAxisView::use_new_playlist)));
+ playlist_items.push_back (MenuElem (_("New Copy"), mem_fun(*this, &AudioTimeAxisView::use_copy_playlist)));
playlist_items.push_back (SeparatorElem());
- playlist_items.push_back (MenuElem (_("Clear Current"), slot (*this, &AudioTimeAxisView::clear_playlist)));
+ playlist_items.push_back (MenuElem (_("Clear Current"), mem_fun(*this, &AudioTimeAxisView::clear_playlist)));
playlist_items.push_back (SeparatorElem());
- playlist_items.push_back (MenuElem(_("Select"), slot (*this, &AudioTimeAxisView::show_playlist_selector)));
+ playlist_items.push_back (MenuElem(_("Select"), mem_fun(*this, &AudioTimeAxisView::show_playlist_selector)));
}
return;
}
- ENSURE_GUI_THREAD (slot (*this, &AudioTimeAxisView::map_frozen));
+ ENSURE_GUI_THREAD (mem_fun(*this, &AudioTimeAxisView::map_frozen));
switch (audio_track()->freeze_state()) {
gtk_object_set_data (GTK_OBJECT(line), "line", this);
gtk_signal_connect (GTK_OBJECT(line), "event", (GtkSignalFunc) line_handler, this);
- alist.StateChanged.connect (slot (*this, &AutomationLine::list_changed));
+ alist.StateChanged.connect (mem_fun(*this, &AutomationLine::list_changed));
}
AutomationLine::~AutomationLine ()
{
if (!update_pending) {
update_pending = true;
- Gtkmm2ext::UI::instance()->call_slot (slot (*this, &AutomationLine::reset));
+ Gtkmm2ext::UI::instance()->call_slot (mem_fun(*this, &AutomationLine::reset));
}
}
controls_table.show_all ();
- height_button.signal_clicked().connect (slot (*this, &AutomationTimeAxisView::height_clicked));
- clear_button.signal_clicked().connect (slot (*this, &AutomationTimeAxisView::clear_clicked));
- hide_button.signal_clicked().connect (slot (*this, &AutomationTimeAxisView::hide_clicked));
- auto_button.signal_clicked().connect (slot (*this, &AutomationTimeAxisView::auto_clicked));
+ height_button.signal_clicked().connect (mem_fun(*this, &AutomationTimeAxisView::height_clicked));
+ clear_button.signal_clicked().connect (mem_fun(*this, &AutomationTimeAxisView::clear_clicked));
+ hide_button.signal_clicked().connect (mem_fun(*this, &AutomationTimeAxisView::hide_clicked));
+ auto_button.signal_clicked().connect (mem_fun(*this, &AutomationTimeAxisView::auto_clicked));
controls_base_selected_name = X_("AutomationTrackControlsBaseSelected");
controls_base_unselected_name = X_("AutomationTrackControlsBase");
MenuList& items (automation_menu->items());
items.push_back (MenuElem (_("off"),
- bind (slot (*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Off)));
+ bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Off)));
items.push_back (MenuElem (_("play"),
- bind (slot (*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Play)));
+ bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Play)));
items.push_back (MenuElem (_("write"),
- bind (slot (*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Write)));
+ bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Write)));
items.push_back (MenuElem (_("touch"),
- bind (slot (*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Touch)));
+ bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Touch)));
}
automation_menu->popup (1, 0);
items.push_back (MenuElem (_("Height"), *size_menu));
items.push_back (SeparatorElem());
- items.push_back (MenuElem (_("Hide"), slot (*this, &AutomationTimeAxisView::hide_clicked)));
+ items.push_back (MenuElem (_("Hide"), mem_fun(*this, &AutomationTimeAxisView::hide_clicked)));
items.push_back (SeparatorElem());
- items.push_back (MenuElem (_("Clear"), slot (*this, &AutomationTimeAxisView::clear_clicked)));
+ items.push_back (MenuElem (_("Clear"), mem_fun(*this, &AutomationTimeAxisView::clear_clicked)));
items.push_back (SeparatorElem());
Menu* auto_state_menu = manage (new Menu);
MenuList& as_items = auto_state_menu->items();
as_items.push_back (CheckMenuElem (_("off"),
- bind (slot (*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Off)));
+ bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Off)));
auto_off_item = dynamic_cast<CheckMenuItem*>(as_items.back());
as_items.push_back (CheckMenuElem (_("play"),
- bind (slot (*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Play)));
+ bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Play)));
auto_play_item = dynamic_cast<CheckMenuItem*>(as_items.back());
as_items.push_back (CheckMenuElem (_("write"),
- bind (slot (*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Write)));
+ bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Write)));
auto_write_item = dynamic_cast<CheckMenuItem*>(as_items.back());
as_items.push_back (CheckMenuElem (_("touch"),
- bind (slot (*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Touch)));
+ bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Touch)));
auto_touch_item = dynamic_cast<CheckMenuItem*>(as_items.back());
items.push_back (MenuElem (_("State"), *auto_state_menu));
AutomationTimeAxisView::add_ghost (GhostRegion* gr)
{
ghosts.push_back (gr);
- gr->GoingAway.connect (slot (*this, &AutomationTimeAxisView::remove_ghost));
+ gr->GoingAway.connect (mem_fun(*this, &AutomationTimeAxisView::remove_ghost));
}
void
if (lines.empty()) {
/* first line is the Model for automation state */
automation_connection = line.the_list().automation_state_changed.connect
- (slot (*this, &AutomationTimeAxisView::automation_state_changed));
+ (mem_fun(*this, &AutomationTimeAxisView::automation_state_changed));
get = true;
}
cancel_button.hide();
button_frame.add (button_box);
- ok_button.signal_clicked().connect (slot (*this, &ConnectionEditor::accept));
- cancel_button.signal_clicked().connect (slot (*this, &ConnectionEditor::cancel));
- cancel_button.signal_clicked().connect (slot (*this, &ConnectionEditor::rescan));
+ ok_button.signal_clicked().connect (mem_fun(*this, &ConnectionEditor::accept));
+ cancel_button.signal_clicked().connect (mem_fun(*this, &ConnectionEditor::cancel));
+ cancel_button.signal_clicked().connect (mem_fun(*this, &ConnectionEditor::rescan));
notebook.set_name ("ConnectionEditorNotebook");
notebook.set_size_request (-1, 125);
input_connection_display.set_selection_mode (GTK_SELECTION_SINGLE);
input_connection_display.set_size_request (80, -1);
input_connection_display.set_name ("ConnectionEditorConnectionList");
- input_connection_display.select_row.connect (bind (slot (*this, &ConnectionEditor::connection_selected), true));
+ input_connection_display.select_row.connect (bind (mem_fun(*this, &ConnectionEditor::connection_selected), true));
output_connection_display.set_shadow_type (Gtk::SHADOW_IN);
output_connection_display.set_selection_mode (GTK_SELECTION_SINGLE);
output_connection_display.set_size_request (80, -1);
output_connection_display.set_name ("ConnectionEditorConnectionList");
- output_connection_display.select_row.connect (bind (slot (*this, &ConnectionEditor::connection_selected), false));
+ output_connection_display.select_row.connect (bind (mem_fun(*this, &ConnectionEditor::connection_selected), false));
input_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
output_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
set_title (_("ardour: connections"));
add (main_vbox);
- delete_event.connect (bind (slot (just_hide_it), reinterpret_cast<Window *> (this)));
+ delete_event.connect (bind (ptr_fun (just_hide_it), reinterpret_cast<Window *> (this)));
- clear_button.signal_clicked().connect (slot (*this, &ConnectionEditor::clear));
- add_port_button.signal_clicked().connect (slot (*this, &ConnectionEditor::add_port));
- new_input_connection_button.signal_clicked().connect (bind (slot (*this, &ConnectionEditor::new_connection), true));
- new_output_connection_button.signal_clicked().connect (bind (slot (*this, &ConnectionEditor::new_connection), false));
- delete_connection_button.signal_clicked().connect (slot (*this, &ConnectionEditor::delete_connection));
+ clear_button.signal_clicked().connect (mem_fun(*this, &ConnectionEditor::clear));
+ add_port_button.signal_clicked().connect (mem_fun(*this, &ConnectionEditor::add_port));
+ new_input_connection_button.signal_clicked().connect (bind (mem_fun(*this, &ConnectionEditor::new_connection), true));
+ new_output_connection_button.signal_clicked().connect (bind (mem_fun(*this, &ConnectionEditor::new_connection), false));
+ delete_connection_button.signal_clicked().connect (mem_fun(*this, &ConnectionEditor::delete_connection));
}
ConnectionEditor::~ConnectionEditor()
ArdourDialog::set_session (s);
if (session) {
- session->ConnectionAdded.connect (slot (*this, &ConnectionEditor::proxy_add_connection_and_select));
- session->ConnectionRemoved.connect (slot (*this, &ConnectionEditor::proxy_remove_connection));
+ session->ConnectionAdded.connect (mem_fun(*this, &ConnectionEditor::proxy_add_connection_and_select));
+ session->ConnectionRemoved.connect (mem_fun(*this, &ConnectionEditor::proxy_remove_connection));
} else {
hide ();
}
void
ConnectionEditor::proxy_add_connection_and_select (ARDOUR::Connection *connection)
{
- Gtkmm2ext::UI::instance()->call_slot (bind (slot (*this, &ConnectionEditor::add_connection_and_select), connection));
+ Gtkmm2ext::UI::instance()->call_slot (bind (mem_fun(*this, &ConnectionEditor::add_connection_and_select), connection));
}
void
ConnectionEditor::proxy_remove_connection (ARDOUR::Connection *connection)
{
- Gtkmm2ext::UI::instance()->call_slot (bind (slot (*this, &ConnectionEditor::remove_connection), connection));
+ Gtkmm2ext::UI::instance()->call_slot (bind (mem_fun(*this, &ConnectionEditor::remove_connection), connection));
}
void
if (current_connection) {
config_connection = current_connection->ConfigurationChanged.connect
- (bind (slot (*this, &ConnectionEditor::configuration_changed), input));
+ (bind (mem_fun(*this, &ConnectionEditor::configuration_changed), input));
connect_connection = current_connection->ConnectionsChanged.connect
- (bind (slot (*this, &ConnectionEditor::connections_changed), input));
+ (bind (mem_fun(*this, &ConnectionEditor::connections_changed), input));
}
display_connection_state (input);
}
client_port_display->columns_autosize ();
- client_port_display->select_row.connect (bind (slot (*this, &ConnectionEditor::port_selection_handler), client_port_display));
+ client_port_display->select_row.connect (bind (mem_fun(*this, &ConnectionEditor::port_selection_handler), client_port_display));
Label *tab_label = manage (new Label);
}
notebook.set_page (current_page);
- notebook.show.connect (bind (slot (notebook, &Notebook::set_page), current_page));
+ notebook.show.connect (bind (mem_fun (notebook, &Notebook::set_page), current_page));
selector_box.show_all ();
}
clist->set_data ("port", (gpointer) ((intptr_t) n));
clist->set_name ("ConnectionEditorPortList");
- clist->click_column.connect (bind (slot (*this, &ConnectionEditor::port_column_click), clist));
+ clist->click_column.connect (bind (mem_fun(*this, &ConnectionEditor::port_column_click), clist));
clist->set_selection_mode (GTK_SELECTION_SINGLE);
clist->set_shadow_type (Gtk::SHADOW_IN);
}
clist->columns_autosize ();
- clist->button_release_event.connect (bind (slot (*this, &ConnectionEditor::port_button_event), clist));
+ clist->button_release_event.connect (bind (mem_fun(*this, &ConnectionEditor::port_button_event), clist));
}
port_box.show_all ();
_canvas = gtk_canvas_new_aa ();
canvas = wrap (_canvas);
- canvas->size_allocate.connect (slot (*this, &CrossfadeEditor::canvas_allocation));
+ canvas->size_allocate.connect (mem_fun(*this, &CrossfadeEditor::canvas_allocation));
canvas->set_size_request (425, 200);
toplevel = gtk_canvas_item_new (gtk_canvas_root (GTK_CANVAS(_canvas)),
select_in_button.set_name (X_("CrossfadeEditCurveButton"));
select_out_button.set_name (X_("CrossfadeEditCurveButton"));
- select_in_button.signal_clicked().connect (bind (slot (this, &CrossfadeEditor::curve_select_clicked), In));
- select_out_button.signal_clicked().connect (bind (slot (this, &CrossfadeEditor::curve_select_clicked), Out));
+ select_in_button.signal_clicked().connect (bind (mem_fun (*this, &CrossfadeEditor::curve_select_clicked), In));
+ select_out_button.signal_clicked().connect (bind (mem_fun (*this, &CrossfadeEditor::curve_select_clicked), Out));
HBox* acbox = manage (new HBox);
pbutton = manage (new Button);
pbutton->add (*pxmap);
pbutton->set_name ("CrossfadeEditButton");
- pbutton-.signal_clicked().connect (bind (slot (*this, &CrossfadeEditor::apply_preset), *i));
+ pbutton-.signal_clicked().connect (bind (mem_fun(*this, &CrossfadeEditor::apply_preset), *i));
fade_in_table.attach (*pbutton, col, col+1, row, row+1);
fade_in_buttons.push_back (pbutton);
pbutton = manage (new Button);
pbutton->add (*pxmap);
pbutton->set_name ("CrossfadeEditButton");
- pbutton-.signal_clicked().connect (bind (slot (*this, &CrossfadeEditor::apply_preset), *i));
+ pbutton-.signal_clicked().connect (bind (mem_fun(*this, &CrossfadeEditor::apply_preset), *i));
fade_out_table.attach (*pbutton, col, col+1, row, row+1);
fade_out_buttons.push_back (pbutton);
audition_right_dry_button.set_name ("CrossfadeEditAuditionButton");
audition_right_button.set_name ("CrossfadeEditAuditionButton");
- clear_button.signal_clicked().connect (slot (*this, &CrossfadeEditor::clear));
- revert_button.signal_clicked().connect (slot (*this, &CrossfadeEditor::reset));
- audition_both_button.toggled.connect (slot (*this, &CrossfadeEditor::audition_toggled));
- audition_right_button.toggled.connect (slot (*this, &CrossfadeEditor::audition_right_toggled));
- audition_right_dry_button.toggled.connect (slot (*this, &CrossfadeEditor::audition_right_dry_toggled));
- audition_left_button.toggled.connect (slot (*this, &CrossfadeEditor::audition_left_toggled));
- audition_left_dry_button.toggled.connect (slot (*this, &CrossfadeEditor::audition_left_dry_toggled));
+ clear_button.signal_clicked().connect (mem_fun(*this, &CrossfadeEditor::clear));
+ revert_button.signal_clicked().connect (mem_fun(*this, &CrossfadeEditor::reset));
+ audition_both_button.toggled.connect (mem_fun(*this, &CrossfadeEditor::audition_toggled));
+ audition_right_button.toggled.connect (mem_fun(*this, &CrossfadeEditor::audition_right_toggled));
+ audition_right_dry_button.toggled.connect (mem_fun(*this, &CrossfadeEditor::audition_right_dry_toggled));
+ audition_left_button.toggled.connect (mem_fun(*this, &CrossfadeEditor::audition_left_toggled));
+ audition_left_dry_button.toggled.connect (mem_fun(*this, &CrossfadeEditor::audition_left_dry_toggled));
action_box.set_border_width (7);
action_box.set_spacing (5);
/* button to allow hackers to check the actual curve values */
// Button* foobut = manage (new Button ("dump"));
-// foobut-.signal_clicked().connect (slot (*this, &CrossfadeEditor::dump));
+// foobut-.signal_clicked().connect (mem_fun(*this, &CrossfadeEditor::dump));
// vpacker.pack_start (*foobut, false, false);
current = In;
curve_select_clicked (In);
- xfade.StateChanged.connect (slot (*this, &CrossfadeEditor::xfade_changed));
+ xfade.StateChanged.connect (mem_fun(*this, &CrossfadeEditor::xfade_changed));
- session.AuditionActive.connect (slot (*this, &CrossfadeEditor::audition_state_changed));
+ session.AuditionActive.connect (mem_fun(*this, &CrossfadeEditor::audition_state_changed));
}
CrossfadeEditor::~CrossfadeEditor()
void
CrossfadeEditor::audition_state_changed (bool yn)
{
- ENSURE_GUI_THREAD (bind (slot (*this, &CrossfadeEditor::audition_state_changed), yn));
+ ENSURE_GUI_THREAD (bind (mem_fun(*this, &CrossfadeEditor::audition_state_changed), yn));
if (!yn) {
audition_both_button.set_active (false);
gdouble yoff = n * ht;
- if (region.source(n).peaks_ready (bind (slot (*this, &CrossfadeEditor::peaks_ready), ®ion, which))) {
+ if (region.source(n).peaks_ready (bind (mem_fun(*this, &CrossfadeEditor::peaks_ready), ®ion, which))) {
GtkCanvasItem *wave = gtk_canvas_item_new (gtk_canvas_root (GTK_CANVAS(_canvas)),
gtk_canvas_waveview_get_type (),
crossfade_changed (Change (~0));
- crossfade.StateChanged.connect (slot (*this, &CrossfadeView::crossfade_changed));
+ crossfade.StateChanged.connect (mem_fun(*this, &CrossfadeView::crossfade_changed));
}
CrossfadeView::~CrossfadeView ()
void
ARDOUR_UI::install_keybindings ()
{
- KeyboardTarget::add_action ("start-prefix", slot (*this, &ARDOUR_UI::start_keyboard_prefix));
+ KeyboardTarget::add_action ("start-prefix", mem_fun(*this, &ARDOUR_UI::start_keyboard_prefix));
- KeyboardTarget::add_action ("toggle-editor-window", slot (*this, &ARDOUR_UI::goto_editor_window));
- KeyboardTarget::add_action ("toggle-mixer-window", slot (*this, &ARDOUR_UI::goto_mixer_window));
- KeyboardTarget::add_action ("toggle-locations-window", slot (*this, &ARDOUR_UI::toggle_location_window));
- KeyboardTarget::add_action ("toggle-big-clock-window", slot (*this, &ARDOUR_UI::toggle_big_clock_window));
- KeyboardTarget::add_action ("toggle-options-window", slot (*this, &ARDOUR_UI::toggle_options_window));
- KeyboardTarget::add_action ("toggle-auto-loop", slot (*this, &ARDOUR_UI::toggle_session_auto_loop));
- KeyboardTarget::add_action ("toggle-punch-in", slot (*this, &ARDOUR_UI::toggle_session_punch_in));
+ KeyboardTarget::add_action ("toggle-editor-window", mem_fun(*this, &ARDOUR_UI::goto_editor_window));
+ KeyboardTarget::add_action ("toggle-mixer-window", mem_fun(*this, &ARDOUR_UI::goto_mixer_window));
+ KeyboardTarget::add_action ("toggle-locations-window", mem_fun(*this, &ARDOUR_UI::toggle_location_window));
+ KeyboardTarget::add_action ("toggle-big-clock-window", mem_fun(*this, &ARDOUR_UI::toggle_big_clock_window));
+ KeyboardTarget::add_action ("toggle-options-window", mem_fun(*this, &ARDOUR_UI::toggle_options_window));
+ KeyboardTarget::add_action ("toggle-auto-loop", mem_fun(*this, &ARDOUR_UI::toggle_session_auto_loop));
+ KeyboardTarget::add_action ("toggle-punch-in", mem_fun(*this, &ARDOUR_UI::toggle_session_punch_in));
- KeyboardTarget::add_action ("new-session", bind (slot (*this, &ARDOUR_UI::new_session), false, string()));
- KeyboardTarget::add_action ("add-audio-track", bind (slot (*this, &ARDOUR_UI::session_add_audio_track), 1, 1));
- KeyboardTarget::add_action ("add-audio-bus", bind (slot (*this, &ARDOUR_UI::session_add_audio_bus), 1, 1));
+ KeyboardTarget::add_action ("new-session", bind (mem_fun(*this, &ARDOUR_UI::new_session), false, string()));
+ KeyboardTarget::add_action ("add-audio-track", bind (mem_fun(*this, &ARDOUR_UI::session_add_audio_track), 1, 1));
+ KeyboardTarget::add_action ("add-audio-bus", bind (mem_fun(*this, &ARDOUR_UI::session_add_audio_bus), 1, 1));
- KeyboardTarget::add_action ("save-state", bind (slot (*this, &ARDOUR_UI::save_state), string ("")));
- KeyboardTarget::add_action ("quit", (slot (*this, &ARDOUR_UI::finish)));
+ KeyboardTarget::add_action ("save-state", bind (mem_fun(*this, &ARDOUR_UI::save_state), string ("")));
+ KeyboardTarget::add_action ("quit", (mem_fun(*this, &ARDOUR_UI::finish)));
- KeyboardTarget::add_action ("remove-last-capture", slot (*this, &ARDOUR_UI::remove_last_capture));
+ KeyboardTarget::add_action ("remove-last-capture", mem_fun(*this, &ARDOUR_UI::remove_last_capture));
- KeyboardTarget::add_action ("transport-stop", slot (*this, &ARDOUR_UI::transport_stop));
- KeyboardTarget::add_action ("transport-stop-and-forget-capture", slot (*this, &ARDOUR_UI::transport_stop_and_forget_capture));
- KeyboardTarget::add_action ("transport-roll", slot (*this, &ARDOUR_UI::transport_roll));
- KeyboardTarget::add_action ("transport-loop", slot (*this, &ARDOUR_UI::transport_loop));
- KeyboardTarget::add_action ("transport-record", slot (*this, &ARDOUR_UI::transport_record));
- KeyboardTarget::add_action ("transport-rewind", bind (slot (*this, &ARDOUR_UI::transport_rewind), 0));
- KeyboardTarget::add_action ("transport-rewind-slow", bind (slot (*this, &ARDOUR_UI::transport_rewind), -1));
- KeyboardTarget::add_action ("transport-rewind-fast", bind (slot (*this, &ARDOUR_UI::transport_rewind), 1));
- KeyboardTarget::add_action ("transport-forward", bind (slot (*this, &ARDOUR_UI::transport_forward), 0));
- KeyboardTarget::add_action ("transport-forward-slow", bind (slot (*this, &ARDOUR_UI::transport_forward), -1));
- KeyboardTarget::add_action ("transport-forward-fast", bind (slot (*this, &ARDOUR_UI::transport_forward), 1));
+ KeyboardTarget::add_action ("transport-stop", mem_fun(*this, &ARDOUR_UI::transport_stop));
+ KeyboardTarget::add_action ("transport-stop-and-forget-capture", mem_fun(*this, &ARDOUR_UI::transport_stop_and_forget_capture));
+ KeyboardTarget::add_action ("transport-roll", mem_fun(*this, &ARDOUR_UI::transport_roll));
+ KeyboardTarget::add_action ("transport-loop", mem_fun(*this, &ARDOUR_UI::transport_loop));
+ KeyboardTarget::add_action ("transport-record", mem_fun(*this, &ARDOUR_UI::transport_record));
+ KeyboardTarget::add_action ("transport-rewind", bind (mem_fun(*this, &ARDOUR_UI::transport_rewind), 0));
+ KeyboardTarget::add_action ("transport-rewind-slow", bind (mem_fun(*this, &ARDOUR_UI::transport_rewind), -1));
+ KeyboardTarget::add_action ("transport-rewind-fast", bind (mem_fun(*this, &ARDOUR_UI::transport_rewind), 1));
+ KeyboardTarget::add_action ("transport-forward", bind (mem_fun(*this, &ARDOUR_UI::transport_forward), 0));
+ KeyboardTarget::add_action ("transport-forward-slow", bind (mem_fun(*this, &ARDOUR_UI::transport_forward), -1));
+ KeyboardTarget::add_action ("transport-forward-fast", bind (mem_fun(*this, &ARDOUR_UI::transport_forward), 1));
- KeyboardTarget::add_action ("transport-goto-start", slot (*this, &ARDOUR_UI::transport_goto_start));
- KeyboardTarget::add_action ("transport-goto-end", slot (*this, &ARDOUR_UI::transport_goto_end));
+ KeyboardTarget::add_action ("transport-goto-start", mem_fun(*this, &ARDOUR_UI::transport_goto_start));
+ KeyboardTarget::add_action ("transport-goto-end", mem_fun(*this, &ARDOUR_UI::transport_goto_end));
- KeyboardTarget::add_action ("send-all-midi-feedback", slot (*this, &ARDOUR_UI::send_all_midi_feedback));
+ KeyboardTarget::add_action ("send-all-midi-feedback", mem_fun(*this, &ARDOUR_UI::send_all_midi_feedback));
- KeyboardTarget::add_action ("toggle-record-enable-track1", bind (slot (*this, &ARDOUR_UI::toggle_record_enable), 0U));
- KeyboardTarget::add_action ("toggle-record-enable-track2", bind (slot (*this, &ARDOUR_UI::toggle_record_enable), 1U));
- KeyboardTarget::add_action ("toggle-record-enable-track3", bind (slot (*this, &ARDOUR_UI::toggle_record_enable), 2U));
- KeyboardTarget::add_action ("toggle-record-enable-track4", bind (slot (*this, &ARDOUR_UI::toggle_record_enable), 3U));
- KeyboardTarget::add_action ("toggle-record-enable-track5", bind (slot (*this, &ARDOUR_UI::toggle_record_enable), 4U));
- KeyboardTarget::add_action ("toggle-record-enable-track6", bind (slot (*this, &ARDOUR_UI::toggle_record_enable), 5U));
- KeyboardTarget::add_action ("toggle-record-enable-track7", bind (slot (*this, &ARDOUR_UI::toggle_record_enable), 6U));
- KeyboardTarget::add_action ("toggle-record-enable-track8", bind (slot (*this, &ARDOUR_UI::toggle_record_enable), 7U));
- KeyboardTarget::add_action ("toggle-record-enable-track9", bind (slot (*this, &ARDOUR_UI::toggle_record_enable), 8U));
- KeyboardTarget::add_action ("toggle-record-enable-track10", bind (slot (*this, &ARDOUR_UI::toggle_record_enable), 9U));
- KeyboardTarget::add_action ("toggle-record-enable-track11", bind (slot (*this, &ARDOUR_UI::toggle_record_enable), 10U));
- KeyboardTarget::add_action ("toggle-record-enable-track12", bind (slot (*this, &ARDOUR_UI::toggle_record_enable), 11U));
- KeyboardTarget::add_action ("toggle-record-enable-track13", bind (slot (*this, &ARDOUR_UI::toggle_record_enable), 12U));
- KeyboardTarget::add_action ("toggle-record-enable-track14", bind (slot (*this, &ARDOUR_UI::toggle_record_enable), 13U));
- KeyboardTarget::add_action ("toggle-record-enable-track15", bind (slot (*this, &ARDOUR_UI::toggle_record_enable), 14U));
- KeyboardTarget::add_action ("toggle-record-enable-track16", bind (slot (*this, &ARDOUR_UI::toggle_record_enable), 15U));
- KeyboardTarget::add_action ("toggle-record-enable-track17", bind (slot (*this, &ARDOUR_UI::toggle_record_enable), 16U));
- KeyboardTarget::add_action ("toggle-record-enable-track18", bind (slot (*this, &ARDOUR_UI::toggle_record_enable), 17U));
- KeyboardTarget::add_action ("toggle-record-enable-track19", bind (slot (*this, &ARDOUR_UI::toggle_record_enable), 18U));
- KeyboardTarget::add_action ("toggle-record-enable-track20", bind (slot (*this, &ARDOUR_UI::toggle_record_enable), 19U));
- KeyboardTarget::add_action ("toggle-record-enable-track21", bind (slot (*this, &ARDOUR_UI::toggle_record_enable), 20U));
- KeyboardTarget::add_action ("toggle-record-enable-track22", bind (slot (*this, &ARDOUR_UI::toggle_record_enable), 21U));
- KeyboardTarget::add_action ("toggle-record-enable-track23", bind (slot (*this, &ARDOUR_UI::toggle_record_enable), 22U));
- KeyboardTarget::add_action ("toggle-record-enable-track24", bind (slot (*this, &ARDOUR_UI::toggle_record_enable), 23U));
- KeyboardTarget::add_action ("toggle-record-enable-track25", bind (slot (*this, &ARDOUR_UI::toggle_record_enable), 24U));
- KeyboardTarget::add_action ("toggle-record-enable-track26", bind (slot (*this, &ARDOUR_UI::toggle_record_enable), 25U));
- KeyboardTarget::add_action ("toggle-record-enable-track27", bind (slot (*this, &ARDOUR_UI::toggle_record_enable), 26U));
- KeyboardTarget::add_action ("toggle-record-enable-track28", bind (slot (*this, &ARDOUR_UI::toggle_record_enable), 27U));
- KeyboardTarget::add_action ("toggle-record-enable-track29", bind (slot (*this, &ARDOUR_UI::toggle_record_enable), 28U));
- KeyboardTarget::add_action ("toggle-record-enable-track30", bind (slot (*this, &ARDOUR_UI::toggle_record_enable), 29U));
- KeyboardTarget::add_action ("toggle-record-enable-track31", bind (slot (*this, &ARDOUR_UI::toggle_record_enable), 30U));
- KeyboardTarget::add_action ("toggle-record-enable-track32", bind (slot (*this, &ARDOUR_UI::toggle_record_enable), 31U));
+ KeyboardTarget::add_action ("toggle-record-enable-track1", bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 0U));
+ KeyboardTarget::add_action ("toggle-record-enable-track2", bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 1U));
+ KeyboardTarget::add_action ("toggle-record-enable-track3", bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 2U));
+ KeyboardTarget::add_action ("toggle-record-enable-track4", bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 3U));
+ KeyboardTarget::add_action ("toggle-record-enable-track5", bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 4U));
+ KeyboardTarget::add_action ("toggle-record-enable-track6", bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 5U));
+ KeyboardTarget::add_action ("toggle-record-enable-track7", bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 6U));
+ KeyboardTarget::add_action ("toggle-record-enable-track8", bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 7U));
+ KeyboardTarget::add_action ("toggle-record-enable-track9", bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 8U));
+ KeyboardTarget::add_action ("toggle-record-enable-track10", bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 9U));
+ KeyboardTarget::add_action ("toggle-record-enable-track11", bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 10U));
+ KeyboardTarget::add_action ("toggle-record-enable-track12", bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 11U));
+ KeyboardTarget::add_action ("toggle-record-enable-track13", bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 12U));
+ KeyboardTarget::add_action ("toggle-record-enable-track14", bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 13U));
+ KeyboardTarget::add_action ("toggle-record-enable-track15", bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 14U));
+ KeyboardTarget::add_action ("toggle-record-enable-track16", bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 15U));
+ KeyboardTarget::add_action ("toggle-record-enable-track17", bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 16U));
+ KeyboardTarget::add_action ("toggle-record-enable-track18", bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 17U));
+ KeyboardTarget::add_action ("toggle-record-enable-track19", bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 18U));
+ KeyboardTarget::add_action ("toggle-record-enable-track20", bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 19U));
+ KeyboardTarget::add_action ("toggle-record-enable-track21", bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 20U));
+ KeyboardTarget::add_action ("toggle-record-enable-track22", bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 21U));
+ KeyboardTarget::add_action ("toggle-record-enable-track23", bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 22U));
+ KeyboardTarget::add_action ("toggle-record-enable-track24", bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 23U));
+ KeyboardTarget::add_action ("toggle-record-enable-track25", bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 24U));
+ KeyboardTarget::add_action ("toggle-record-enable-track26", bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 25U));
+ KeyboardTarget::add_action ("toggle-record-enable-track27", bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 26U));
+ KeyboardTarget::add_action ("toggle-record-enable-track28", bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 27U));
+ KeyboardTarget::add_action ("toggle-record-enable-track29", bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 28U));
+ KeyboardTarget::add_action ("toggle-record-enable-track30", bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 29U));
+ KeyboardTarget::add_action ("toggle-record-enable-track31", bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 30U));
+ KeyboardTarget::add_action ("toggle-record-enable-track32", bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 31U));
#if 0
ADD ME TO ARDOUR RC SOMEDAY
- add_binding ("Shift-F1",, bind (slot (*this, &ARDOUR_UI::toggle_record_enable), 0+12U));
- add_binding ("Control-F1",, bind (slot (*this, &ARDOUR_UI::toggle_record_enable), 0+24U));
- add_binding ("Alt-F1",, bind (slot (*this, &ARDOUR_UI::toggle_monitor_enable), 0U));
- add_binding ("Alt-Shift-F1",, bind (slot (*this, &ARDOUR_UI::toggle_monitor_enable), 0+12U));
- add_binding ("Alt-Control-F1",, bind (slot (*this, &ARDOUR_UI::toggle_monitor_enable), 0+24U));
+ add_binding ("Shift-F1",, bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 0+12U));
+ add_binding ("Control-F1",, bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable), 0+24U));
+ add_binding ("Alt-F1",, bind (mem_fun(*this, &ARDOUR_UI::toggle_monitor_enable), 0U));
+ add_binding ("Alt-Shift-F1",, bind (mem_fun(*this, &ARDOUR_UI::toggle_monitor_enable), 0+12U));
+ add_binding ("Alt-Control-F1",, bind (mem_fun(*this, &ARDOUR_UI::toggle_monitor_enable), 0+24U));
#endif
}
selection = new Selection;
cut_buffer = new Selection;
- selection->TimeChanged.connect (slot (*this, &Editor::time_selection_changed));
- selection->TracksChanged.connect (slot (*this, &Editor::track_selection_changed));
- selection->RegionsChanged.connect (slot (*this, &Editor::region_selection_changed));
- selection->PointsChanged.connect (slot (*this, &Editor::point_selection_changed));
+ selection->TimeChanged.connect (mem_fun(*this, &Editor::time_selection_changed));
+ selection->TracksChanged.connect (mem_fun(*this, &Editor::track_selection_changed));
+ selection->RegionsChanged.connect (mem_fun(*this, &Editor::region_selection_changed));
+ selection->PointsChanged.connect (mem_fun(*this, &Editor::point_selection_changed));
clicked_regionview = 0;
clicked_trackview = 0;
frames_per_unit = 2048; /* too early to use set_frames_per_unit */
zoom_focus = ZoomFocusLeft;
- zoom_range_clock.ValueChanged.connect (slot (*this, &Editor::zoom_adjustment_changed));
+ zoom_range_clock.ValueChanged.connect (mem_fun(*this, &Editor::zoom_adjustment_changed));
initialize_rulers ();
initialize_canvas ();
track_canvas_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_NEVER);
track_canvas_scroller.set_name ("TrackCanvasScroller");
- track_canvas_scroller.get_vadjustment()->value_changed.connect (slot (*this, &Editor::tie_vertical_scrolling));
+ track_canvas_scroller.get_vadjustment()->value_changed.connect (mem_fun(*this, &Editor::tie_vertical_scrolling));
track_canvas_scroller.get_vadjustment()->set_step_increment (10.0);
track_canvas_scroller.get_hadjustment()->set_lower (0.0);
track_canvas_scroller.get_hadjustment()->set_upper (1200.0);
track_canvas_scroller.get_hadjustment()->set_step_increment (20.0);
- track_canvas_scroller.get_hadjustment()->value_changed.connect (slot (*this, &Editor::canvas_horizontally_scrolled));
+ track_canvas_scroller.get_hadjustment()->value_changed.connect (mem_fun(*this, &Editor::canvas_horizontally_scrolled));
edit_vscrollbar.set_adjustment(track_canvas_scroller.get_vadjustment());
edit_hscrollbar.set_adjustment(track_canvas_scroller.get_hadjustment());
- edit_hscrollbar.button_press_event.connect (slot (*this, &Editor::hscroll_slider_button_press));
- edit_hscrollbar.button_release_event.connect (slot (*this, &Editor::hscroll_slider_button_release));
- edit_hscrollbar.size_allocate.connect (slot (*this, &Editor::hscroll_slider_allocate));
+ edit_hscrollbar.button_press_event.connect (mem_fun(*this, &Editor::hscroll_slider_button_press));
+ edit_hscrollbar.button_release_event.connect (mem_fun(*this, &Editor::hscroll_slider_button_release));
+ edit_hscrollbar.size_allocate.connect (mem_fun(*this, &Editor::hscroll_slider_allocate));
time_canvas_scroller.add (*time_canvas);
time_canvas_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_NEVER);
viewport->set_shadow_type (GTK_SHADOW_NONE);
viewport->set_name ("EditControlsBase");
viewport->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK);
- viewport->button_release_event.connect (slot (*this, &Editor::edit_controls_button_release));
+ viewport->button_release_event.connect (mem_fun(*this, &Editor::edit_controls_button_release));
build_cursors ();
setup_toolbar ();
XMLNode* node = ARDOUR_UI::instance()->editor_settings();
set_state (*node);
- edit_cursor_clock.ValueChanged.connect (slot (*this, &Editor::edit_cursor_clock_changed));
+ edit_cursor_clock.ValueChanged.connect (mem_fun(*this, &Editor::edit_cursor_clock_changed));
time_canvas_vbox.pack_start (*minsec_ruler, false, false);
time_canvas_vbox.pack_start (*smpte_ruler, false, false);
time_button_event_box.set_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
time_button_event_box.set_name ("TimebarLabelBase");
- time_button_event_box.button_release_event.connect (slot (*this, &Editor::ruler_label_button_release));
+ time_button_event_box.button_release_event.connect (mem_fun(*this, &Editor::ruler_label_button_release));
/* these enable us to have a dedicated window (for cursor setting, etc.)
for the canvas areas.
// zoom_onetoone_button.add (*(manage (new Gtk::Image (zoom_onetoone_button_xpm))));
- zoom_in_button.signal_clicked().connect (bind (slot (*this, &Editor::temporal_zoom_step), false));
- zoom_out_button.signal_clicked().connect (bind (slot (*this, &Editor::temporal_zoom_step), true));
- zoom_out_full_button.signal_clicked().connect (slot (*this, &Editor::temporal_zoom_session));
-// zoom_onetoone_button.signal_clicked().connect (bind (slot (*this, &Editor::temporal_zoom), 1.0));
+ zoom_in_button.signal_clicked().connect (bind (mem_fun(*this, &Editor::temporal_zoom_step), false));
+ zoom_out_button.signal_clicked().connect (bind (mem_fun(*this, &Editor::temporal_zoom_step), true));
+ zoom_out_full_button.signal_clicked().connect (mem_fun(*this, &Editor::temporal_zoom_session));
+// zoom_onetoone_button.signal_clicked().connect (bind (mem_fun(*this, &Editor::temporal_zoom), 1.0));
zoom_indicator_box.pack_start (zoom_out_button, false, false);
zoom_indicator_box.pack_start (zoom_in_button, false, false);
route_list_scroller.add (route_list);
route_list_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
- route_list.select_row.connect (slot (*this, &Editor::route_list_selected));
- route_list.unselect_row.connect (slot (*this, &Editor::route_list_unselected));
- route_list.row_move.connect (slot (*this, &Editor::queue_route_list_reordered));
- route_list.click_column.connect (slot (*this, &Editor::route_list_column_click));
+ route_list.select_row.connect (mem_fun(*this, &Editor::route_list_selected));
+ route_list.unselect_row.connect (mem_fun(*this, &Editor::route_list_unselected));
+ route_list.row_move.connect (mem_fun(*this, &Editor::queue_route_list_reordered));
+ route_list.click_column.connect (mem_fun(*this, &Editor::route_list_column_click));
edit_group_list_button_label.set_text (_("Edit Groups"));
edit_group_list_button_label.set_name ("EditGroupTitleButton");
edit_group_list_scroller.add (edit_group_list);
edit_group_list_scroller.set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
- edit_group_list_button.signal_clicked().connect (slot (*this, &Editor::edit_group_list_button_clicked));
- edit_group_list.button_press_event.connect (slot (*this, &Editor::edit_group_list_button_press_event));
- edit_group_list.select_row.connect (slot (*this, &Editor::edit_group_selected));
- edit_group_list.unselect_row.connect (slot (*this, &Editor::edit_group_unselected));
+ edit_group_list_button.signal_clicked().connect (mem_fun(*this, &Editor::edit_group_list_button_clicked));
+ edit_group_list.button_press_event.connect (mem_fun(*this, &Editor::edit_group_list_button_press_event));
+ edit_group_list.select_row.connect (mem_fun(*this, &Editor::edit_group_selected));
+ edit_group_list.unselect_row.connect (mem_fun(*this, &Editor::edit_group_unselected));
list<string> stupid_list;
region_list_display.drag_dest_set (GTK_DEST_DEFAULT_ALL,
target_table, n_targets - 1,
GdkDragAction (Gdk::ACTION_COPY|Gdk::ACTION_MOVE));
- region_list_display.drag_data_received.connect (slot (*this, &Editor::region_list_display_drag_data_received));
+ region_list_display.drag_data_received.connect (mem_fun(*this, &Editor::region_list_display_drag_data_received));
region_list_scroller.add (region_list_display);
region_list_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
region_list_display.set_flags (Gtk::CAN_FOCUS);
- region_list_display.key_press_event.connect (slot (*this, &Editor::region_list_display_key_press));
- region_list_display.key_release_event.connect (slot (*this, &Editor::region_list_display_key_release));
- region_list_display.button_press_event.connect (slot (*this, &Editor::region_list_display_button_press));
- region_list_display.button_release_event.connect (slot (*this, &Editor::region_list_display_button_release));
- region_list_display.motion_notify_event.connect (slot (*this, &Editor::region_list_display_motion));
- region_list_display.enter_notify_event.connect (slot (*this, &Editor::region_list_display_enter_notify));
- region_list_display.leave_notify_event.connect (slot (*this, &Editor::region_list_display_leave_notify));
- region_list_display.select_row.connect (slot (*this, &Editor::region_list_display_selected));
- region_list_display.unselect_row.connect (slot (*this, &Editor::region_list_display_unselected));
- region_list_display.click_column.connect (slot (*this, &Editor::region_list_column_click));
+ region_list_display.key_press_event.connect (mem_fun(*this, &Editor::region_list_display_key_press));
+ region_list_display.key_release_event.connect (mem_fun(*this, &Editor::region_list_display_key_release));
+ region_list_display.button_press_event.connect (mem_fun(*this, &Editor::region_list_display_button_press));
+ region_list_display.button_release_event.connect (mem_fun(*this, &Editor::region_list_display_button_release));
+ region_list_display.motion_notify_event.connect (mem_fun(*this, &Editor::region_list_display_motion));
+ region_list_display.enter_notify_event.connect (mem_fun(*this, &Editor::region_list_display_enter_notify));
+ region_list_display.leave_notify_event.connect (mem_fun(*this, &Editor::region_list_display_leave_notify));
+ region_list_display.select_row.connect (mem_fun(*this, &Editor::region_list_display_selected));
+ region_list_display.unselect_row.connect (mem_fun(*this, &Editor::region_list_display_unselected));
+ region_list_display.click_column.connect (mem_fun(*this, &Editor::region_list_column_click));
named_selection_scroller.add (named_selection_display);
named_selection_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
named_selection_display.column_titles_active ();
named_selection_display.set_selection_mode (GTK_SELECTION_SINGLE);
- named_selection_display.button_press_event.connect (slot (*this, &Editor::named_selection_display_button_press));
- named_selection_display.select_row.connect (slot (*this, &Editor::named_selection_display_selected));
- named_selection_display.unselect_row.connect (slot (*this, &Editor::named_selection_display_unselected));
+ named_selection_display.button_press_event.connect (mem_fun(*this, &Editor::named_selection_display_button_press));
+ named_selection_display.select_row.connect (mem_fun(*this, &Editor::named_selection_display_selected));
+ named_selection_display.unselect_row.connect (mem_fun(*this, &Editor::named_selection_display_unselected));
region_selection_vpane.pack1 (region_list_scroller, true, true);
region_selection_vpane.pack2 (named_selection_scroller, true, true);
canvas_region_list_pane.pack1 (edit_frame, true, true);
canvas_region_list_pane.pack2 (region_selection_vpane, true, true);
- track_list_canvas_pane.size_allocate.connect_after (bind (slot (*this, &Editor::pane_allocation_handler),
+ track_list_canvas_pane.size_allocate.connect_after (bind (mem_fun(*this, &Editor::pane_allocation_handler),
static_cast<Gtk::Paned*> (&track_list_canvas_pane)));
- canvas_region_list_pane.size_allocate.connect_after (bind (slot (*this, &Editor::pane_allocation_handler),
+ canvas_region_list_pane.size_allocate.connect_after (bind (mem_fun(*this, &Editor::pane_allocation_handler),
static_cast<Gtk::Paned*> (&canvas_region_list_pane)));
- route_group_vpane.size_allocate.connect_after (bind (slot (*this, &Editor::pane_allocation_handler),
+ route_group_vpane.size_allocate.connect_after (bind (mem_fun(*this, &Editor::pane_allocation_handler),
static_cast<Gtk::Paned*> (&route_group_vpane)));
- region_selection_vpane.size_allocate.connect_after (bind (slot (*this, &Editor::pane_allocation_handler),
+ region_selection_vpane.size_allocate.connect_after (bind (mem_fun(*this, &Editor::pane_allocation_handler),
static_cast<Gtk::Paned*> (®ion_selection_vpane)));
track_list_canvas_pane.pack1 (list_vpacker, true, true);
canvas_region_list_pane.set_data ("collapse-direction", (gpointer) 0);
track_list_canvas_pane.set_data ("collapse-direction", (gpointer) 1);
- route_group_vpane.button_release_event.connect (bind (
slot (pane_handler), static_cast<Paned*> (&route_group_vpane)));
- region_selection_vpane.button_release_event.connect (bind (
slot (pane_handler), static_cast<Paned*> (®ion_selection_vpane)));
- canvas_region_list_pane.button_release_event.connect (bind (
slot (pane_handler), static_cast<Paned*> (&canvas_region_list_pane)));
- track_list_canvas_pane.button_release_event.connect (bind (
slot (pane_handler), static_cast<Paned*> (&track_list_canvas_pane)));
+ route_group_vpane.button_release_event.connect (bind (
ptr_fun (pane_handler), static_cast<Paned*> (&route_group_vpane)));
+ region_selection_vpane.button_release_event.connect (bind (
ptr_fun (pane_handler), static_cast<Paned*> (®ion_selection_vpane)));
+ canvas_region_list_pane.button_release_event.connect (bind (
ptr_fun (pane_handler), static_cast<Paned*> (&canvas_region_list_pane)));
+ track_list_canvas_pane.button_release_event.connect (bind (
ptr_fun (pane_handler), static_cast<Paned*> (&track_list_canvas_pane)));
top_hbox.pack_start (toolbar_frame, true, true);
vpacker.pack_end (global_hpacker, true, true);
_playlist_selector = new PlaylistSelector();
- _playlist_selector->delete_event.connect (bind (slot (just_hide_it), static_cast<Window *> (_playlist_selector)));
+ _playlist_selector->delete_event.connect (bind (ptr_fun (just_hide_it), static_cast<Window *> (_playlist_selector)));
- AudioRegionView::AudioRegionViewGoingAway.connect (slot (*this, &Editor::catch_vanishing_audio_regionview));
+ AudioRegionView::AudioRegionViewGoingAway.connect (mem_fun(*this, &Editor::catch_vanishing_audio_regionview));
/* nudge stuff */
add (vpacker);
add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK);
- configure_event.connect (slot (*ARDOUR_UI::instance(), &ARDOUR_UI::configure_handler));
- delete_event.connect (slot (*ARDOUR_UI::instance(), &ARDOUR_UI::exit_on_main_window_close));
+ configure_event.connect (mem_fun (*ARDOUR_UI::instance(), &ARDOUR_UI::configure_handler));
+ delete_event.connect (mem_fun (*ARDOUR_UI::instance(), &ARDOUR_UI::exit_on_main_window_close));
constructed = true;
instant_save ();
track_canvas->add_events (Gdk::POINTER_MOTION_HINT_MASK);
- track_canvas->leave_notify_event.connect (slot (*this, &Editor::left_track_canvas));
+ track_canvas->leave_notify_event.connect (mem_fun(*this, &Editor::left_track_canvas));
/* set up drag-n-drop */
track_canvas->drag_dest_set (GTK_DEST_DEFAULT_ALL,
target_table, n_targets - 1,
GdkDragAction (Gdk::ACTION_COPY|Gdk::ACTION_MOVE));
- track_canvas->drag_data_received.connect (slot (*this, &Editor::track_canvas_drag_data_received));
+ track_canvas->drag_data_received.connect (mem_fun(*this, &Editor::track_canvas_drag_data_received));
/* stuff for the verbose canvas cursor */
// cerr << "marker line @ " << marker_line << endl;
- ZoomChanged.connect (bind (slot (*this, &Editor::update_loop_range_view), false));
- ZoomChanged.connect (bind (slot (*this, &Editor::update_punch_range_view), false));
+ ZoomChanged.connect (bind (mem_fun(*this, &Editor::update_loop_range_view), false));
+ ZoomChanged.connect (bind (mem_fun(*this, &Editor::update_punch_range_view), false));
double time_height = timebar_height * 5;
double time_width = FLT_MAX/frames_per_unit;
edit_cursor = new Cursor (*this, "blue", (GtkSignalFunc) _canvas_edit_cursor_event);
playhead_cursor = new Cursor (*this, "red", (GtkSignalFunc) _canvas_playhead_cursor_event);
- track_canvas->size_allocate.connect (slot (*this, &Editor::track_canvas_allocate));
+ track_canvas->size_allocate.connect (mem_fun(*this, &Editor::track_canvas_allocate));
}
void
Editor::reposition_and_zoom (jack_nframes_t frame, double nfpu)
{
if (!repos_zoom_queued) {
- Main::idle.connect (bind (slot (*this, &Editor::deferred_reposition_and_zoom), frame, nfpu));
+ Main::idle.connect (bind (mem_fun(*this, &Editor::deferred_reposition_and_zoom), frame, nfpu));
repos_zoom_queued = true;
}
}
void
Editor::queue_session_control_changed (Session::ControlType t)
{
- Gtkmm2ext::UI::instance()->call_slot (bind (slot (*this, &Editor::session_control_changed), t));
+ Gtkmm2ext::UI::instance()->call_slot (bind (mem_fun(*this, &Editor::session_control_changed), t));
}
void
void
Editor::fake_add_edit_group (RouteGroup *group)
{
- Gtkmm2ext::UI::instance()->call_slot (bind (slot (*this, &Editor::add_edit_group), group));
+ Gtkmm2ext::UI::instance()->call_slot (bind (mem_fun(*this, &Editor::add_edit_group), group));
}
void
Editor::fake_handle_new_audio_region (AudioRegion *region)
{
- Gtkmm2ext::UI::instance()->call_slot (bind (slot (*this, &Editor::handle_new_audio_region), region));
+ Gtkmm2ext::UI::instance()->call_slot (bind (mem_fun(*this, &Editor::handle_new_audio_region), region));
}
void
Editor::fake_handle_audio_region_removed (AudioRegion *region)
{
- Gtkmm2ext::UI::instance()->call_slot (bind (slot (*this, &Editor::handle_audio_region_removed), region));
+ Gtkmm2ext::UI::instance()->call_slot (bind (mem_fun(*this, &Editor::handle_audio_region_removed), region));
}
void
Editor::fake_handle_new_duration ()
{
- Gtkmm2ext::UI::instance()->call_slot (slot (*this, &Editor::handle_new_duration));
+ Gtkmm2ext::UI::instance()->call_slot (mem_fun(*this, &Editor::handle_new_duration));
}
void
Editor::start_scrolling ()
{
scroll_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect
- (slot (*this, &Editor::update_current_screen));
+ (mem_fun(*this, &Editor::update_current_screen));
slower_update_connection = ARDOUR_UI::instance()->RapidScreenUpdate.connect
- (slot (*this, &Editor::update_slower));
+ (mem_fun(*this, &Editor::update_slower));
}
void
void
Editor::map_position_change (jack_nframes_t frame)
{
- ENSURE_GUI_THREAD (bind (slot (*this, &Editor::map_position_change), frame));
+ ENSURE_GUI_THREAD (bind (mem_fun(*this, &Editor::map_position_change), frame));
if (session == 0 || !_follow_playhead) {
return;
void
Editor::update_title_s (string snap_name)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &Editor::update_title_s), snap_name));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &Editor::update_title_s), snap_name));
update_title ();
}
void
Editor::update_title ()
{
- ENSURE_GUI_THREAD (slot (*this, &Editor::update_title));
+ ENSURE_GUI_THREAD (mem_fun(*this, &Editor::update_title));
if (session) {
bool dirty = session->dirty();
update_title ();
- session->going_away.connect (slot (*this, &Editor::session_going_away));
+ session->going_away.connect (mem_fun(*this, &Editor::session_going_away));
/* These signals can all be emitted by a non-GUI thread. Therefore the
handlers for them must not attempt to directly interact with the GUI,
but use Gtkmm2ext::UI::instance()->call_slot();
*/
- session_connections.push_back (session->TransportStateChange.connect (slot (*this, &Editor::map_transport_state)));
- session_connections.push_back (session->PositionChanged.connect (slot (*this, &Editor::map_position_change)));
- session_connections.push_back (session->RouteAdded.connect (slot (*this, &Editor::handle_new_route_p)));
- session_connections.push_back (session->AudioRegionAdded.connect (slot (*this, &Editor::fake_handle_new_audio_region)));
- session_connections.push_back (session->AudioRegionRemoved.connect (slot (*this, &Editor::fake_handle_audio_region_removed)));
- session_connections.push_back (session->DurationChanged.connect (slot (*this, &Editor::fake_handle_new_duration)));
- session_connections.push_back (session->edit_group_added.connect (slot (*this, &Editor::fake_add_edit_group)));
- session_connections.push_back (session->NamedSelectionAdded.connect (slot (*this, &Editor::handle_new_named_selection)));
- session_connections.push_back (session->NamedSelectionRemoved.connect (slot (*this, &Editor::handle_new_named_selection)));
- session_connections.push_back (session->DirtyChanged.connect (slot (*this, &Editor::update_title)));
- session_connections.push_back (session->StateSaved.connect (slot (*this, &Editor::update_title_s)));
- session_connections.push_back (session->AskAboutPlaylistDeletion.connect (slot (*this, &Editor::playlist_deletion_dialog)));
- session_connections.push_back (session->RegionHiddenChange.connect (slot (*this, &Editor::region_hidden)));
-
- session_connections.push_back (session->SMPTEOffsetChanged.connect (slot (*this, &Editor::update_just_smpte)));
- session_connections.push_back (session->SMPTETypeChanged.connect (slot (*this, &Editor::update_just_smpte)));
-
- session_connections.push_back (session->tempo_map().StateChanged.connect (slot (*this, &Editor::tempo_map_changed)));
+ session_connections.push_back (session->TransportStateChange.connect (mem_fun(*this, &Editor::map_transport_state)));
+ session_connections.push_back (session->PositionChanged.connect (mem_fun(*this, &Editor::map_position_change)));
+ session_connections.push_back (session->RouteAdded.connect (mem_fun(*this, &Editor::handle_new_route_p)));
+ session_connections.push_back (session->AudioRegionAdded.connect (mem_fun(*this, &Editor::fake_handle_new_audio_region)));
+ session_connections.push_back (session->AudioRegionRemoved.connect (mem_fun(*this, &Editor::fake_handle_audio_region_removed)));
+ session_connections.push_back (session->DurationChanged.connect (mem_fun(*this, &Editor::fake_handle_new_duration)));
+ session_connections.push_back (session->edit_group_added.connect (mem_fun(*this, &Editor::fake_add_edit_group)));
+ session_connections.push_back (session->NamedSelectionAdded.connect (mem_fun(*this, &Editor::handle_new_named_selection)));
+ session_connections.push_back (session->NamedSelectionRemoved.connect (mem_fun(*this, &Editor::handle_new_named_selection)));
+ session_connections.push_back (session->DirtyChanged.connect (mem_fun(*this, &Editor::update_title)));
+ session_connections.push_back (session->StateSaved.connect (mem_fun(*this, &Editor::update_title_s)));
+ session_connections.push_back (session->AskAboutPlaylistDeletion.connect (mem_fun(*this, &Editor::playlist_deletion_dialog)));
+ session_connections.push_back (session->RegionHiddenChange.connect (mem_fun(*this, &Editor::region_hidden)));
+
+ session_connections.push_back (session->SMPTEOffsetChanged.connect (mem_fun(*this, &Editor::update_just_smpte)));
+ session_connections.push_back (session->SMPTETypeChanged.connect (mem_fun(*this, &Editor::update_just_smpte)));
+
+ session_connections.push_back (session->tempo_map().StateChanged.connect (mem_fun(*this, &Editor::tempo_map_changed)));
session->foreach_edit_group(this, &Editor::add_edit_group);
- editor_mixer_button.toggled.connect (slot (*this, &Editor::editor_mixer_button_toggled));
+ editor_mixer_button.toggled.connect (mem_fun(*this, &Editor::editor_mixer_button_toggled));
editor_mixer_button.set_name (X_("EditorMixerButton"));
edit_cursor_clock.set_session (session);
update_loop_range_view (true);
update_punch_range_view (true);
- session->ControlChanged.connect (slot (*this, &Editor::queue_session_control_changed));
+ session->ControlChanged.connect (mem_fun(*this, &Editor::queue_session_control_changed));
refresh_location_display ();
- session->locations()->added.connect (slot (*this, &Editor::add_new_location));
- session->locations()->removed.connect (slot (*this, &Editor::location_gone));
- session->locations()->changed.connect (slot (*this, &Editor::refresh_location_display));
- session->locations()->StateChanged.connect (slot (*this, &Editor::refresh_location_display_s));
- session->locations()->end_location()->changed.connect (slot (*this, &Editor::end_location_changed));
+ session->locations()->added.connect (mem_fun(*this, &Editor::add_new_location));
+ session->locations()->removed.connect (mem_fun(*this, &Editor::location_gone));
+ session->locations()->changed.connect (mem_fun(*this, &Editor::refresh_location_display));
+ session->locations()->StateChanged.connect (mem_fun(*this, &Editor::refresh_location_display_s));
+ session->locations()->end_location()->changed.connect (mem_fun(*this, &Editor::end_location_changed));
reset_scrolling_region ();
switch (clicked_audio_trackview->audio_track()->freeze_state()) {
case AudioTrack::NoFreeze:
- edit_items.push_back (MenuElem (_("Freeze"), slot (*this, &Editor::freeze_route)));
+ edit_items.push_back (MenuElem (_("Freeze"), mem_fun(*this, &Editor::freeze_route)));
break;
case AudioTrack::Frozen:
- edit_items.push_back (MenuElem (_("Unfreeze"), slot (*this, &Editor::unfreeze_route)));
+ edit_items.push_back (MenuElem (_("Unfreeze"), mem_fun(*this, &Editor::unfreeze_route)));
break;
case AudioTrack::UnFrozen:
- edit_items.push_back (MenuElem (_("Freeze"), slot (*this, &Editor::freeze_route)));
+ edit_items.push_back (MenuElem (_("Freeze"), mem_fun(*this, &Editor::freeze_route)));
break;
}
str = _("Unmute");
}
- items.push_back (MenuElem (str, bind (slot (*this, &Editor::toggle_xfade_active), xfade)));
- items.push_back (MenuElem (_("Edit"), bind (slot (*this, &Editor::edit_xfade), xfade)));
+ items.push_back (MenuElem (str, bind (mem_fun(*this, &Editor::toggle_xfade_active), xfade)));
+ items.push_back (MenuElem (_("Edit"), bind (mem_fun(*this, &Editor::edit_xfade), xfade)));
if (xfade->can_follow_overlap()) {
str = _("Convert to full");
}
- items.push_back (MenuElem (str, bind (slot (*this, &Editor::toggle_xfade_length), xfade)));
+ items.push_back (MenuElem (str, bind (mem_fun(*this, &Editor::toggle_xfade_length), xfade)));
}
if (many) {
become selected.
*/
- region_menu->map_event.connect (bind (slot (*this, &Editor::set_selected_regionview_from_map_event), sv, region));
+ region_menu->map_event.connect (bind (mem_fun(*this, &Editor::set_selected_regionview_from_map_event), sv, region));
- items.push_back (MenuElem (_("Popup region editor"), slot (*this, &Editor::edit_region)));
- items.push_back (MenuElem (_("Raise to top layer"), slot (*this, &Editor::raise_region_to_top)));
+ items.push_back (MenuElem (_("Popup region editor"), mem_fun(*this, &Editor::edit_region)));
+ items.push_back (MenuElem (_("Raise to top layer"), mem_fun(*this, &Editor::raise_region_to_top)));
items.push_back (MenuElem (_("Lower to bottom layer"), slot (*this, &Editor::lower_region_to_bottom)));
items.push_back (SeparatorElem());
- items.push_back (MenuElem (_("Define sync point"), slot (*this, &Editor::set_region_sync_from_edit_cursor)));
- items.push_back (MenuElem (_("Remove sync point"), slot (*this, &Editor::remove_region_sync)));
+ items.push_back (MenuElem (_("Define sync point"), mem_fun(*this, &Editor::set_region_sync_from_edit_cursor)));
+ items.push_back (MenuElem (_("Remove sync point"), mem_fun(*this, &Editor::remove_region_sync)));
items.push_back (SeparatorElem());
- items.push_back (MenuElem (_("Audition"), slot (*this, &Editor::audition_selected_region)));
- items.push_back (MenuElem (_("Export"), slot (*this, &Editor::export_region)));
- items.push_back (MenuElem (_("Bounce"), slot (*this, &Editor::bounce_region_selection)));
+ items.push_back (MenuElem (_("Audition"), mem_fun(*this, &Editor::audition_selected_region)));
+ items.push_back (MenuElem (_("Export"), mem_fun(*this, &Editor::export_region)));
+ items.push_back (MenuElem (_("Bounce"), mem_fun(*this, &Editor::bounce_region_selection)));
items.push_back (SeparatorElem());
/* XXX hopefully this nonsense will go away with SigC++ 2.X, where the compiler
void (Editor::*type_A_pmf)(void (Region::*pmf)(bool), bool) = &Editor::region_selection_op;
- items.push_back (MenuElem (_("Lock"), bind (slot (*this, type_A_pmf), &Region::set_locked, true)));
- items.push_back (MenuElem (_("Unlock"), bind (slot (*this, type_A_pmf), &Region::set_locked, false)));
+ items.push_back (MenuElem (_("Lock"), bind (mem_fun(*this, type_A_pmf), &Region::set_locked, true)));
+ items.push_back (MenuElem (_("Unlock"), bind (mem_fun(*this, type_A_pmf), &Region::set_locked, false)));
items.push_back (SeparatorElem());
if (region->muted()) {
- items.push_back (MenuElem (_("Unmute"), bind (slot (*this, type_A_pmf), &Region::set_muted, false)));
+ items.push_back (MenuElem (_("Unmute"), bind (mem_fun(*this, type_A_pmf), &Region::set_muted, false)));
} else {
- items.push_back (MenuElem (_("Mute"), bind (slot (*this, type_A_pmf), &Region::set_muted, true)));
+ items.push_back (MenuElem (_("Mute"), bind (mem_fun(*this, type_A_pmf), &Region::set_muted, true)));
}
items.push_back (SeparatorElem());
- items.push_back (MenuElem (_("Original position"), slot (*this, &Editor::naturalize)));
+ items.push_back (MenuElem (_("Original position"), mem_fun(*this, &Editor::naturalize)));
items.push_back (SeparatorElem());
if (ar) {
- items.push_back (MenuElem (_("Toggle envelope visibility"), slot (*this, &Editor::toggle_gain_envelope_visibility)));
- items.push_back (MenuElem (_("Toggle envelope active"), slot (*this, &Editor::toggle_gain_envelope_active)));
+ items.push_back (MenuElem (_("Toggle envelope visibility"), mem_fun(*this, &Editor::toggle_gain_envelope_visibility)));
+ items.push_back (MenuElem (_("Toggle envelope active"), mem_fun(*this, &Editor::toggle_gain_envelope_active)));
items.push_back (SeparatorElem());
if (ar->scale_amplitude() != 1.0f) {
- items.push_back (MenuElem (_("DeNormalize"), slot (*this, &Editor::denormalize_region)));
+ items.push_back (MenuElem (_("DeNormalize"), mem_fun(*this, &Editor::denormalize_region)));
} else {
- items.push_back (MenuElem (_("Normalize"), slot (*this, &Editor::normalize_region)));
+ items.push_back (MenuElem (_("Normalize"), mem_fun(*this, &Editor::normalize_region)));
}
}
- items.push_back (MenuElem (_("Reverse"), slot (*this, &Editor::reverse_region)));
+ items.push_back (MenuElem (_("Reverse"), mem_fun(*this, &Editor::reverse_region)));
items.push_back (SeparatorElem());
/* Nudge region */
MenuList& nudge_items = nudge_menu->items();
nudge_menu->set_name ("ArdourContextMenu");
- nudge_items.push_back (MenuElem (_("Nudge fwd"), (bind (slot (*this, &Editor::nudge_forward), false))));
- nudge_items.push_back (MenuElem (_("Nudge bwd"), (bind (slot (*this, &Editor::nudge_backward), false))));
- nudge_items.push_back (MenuElem (_("Nudge fwd by capture offset"), (slot (*this, &Editor::nudge_forward_capture_offset))));
- nudge_items.push_back (MenuElem (_("Nudge bwd by capture offset"), (slot (*this, &Editor::nudge_backward_capture_offset))));
+ nudge_items.push_back (MenuElem (_("Nudge fwd"), (bind (mem_fun(*this, &Editor::nudge_forward), false))));
+ nudge_items.push_back (MenuElem (_("Nudge bwd"), (bind (mem_fun(*this, &Editor::nudge_backward), false))));
+ nudge_items.push_back (MenuElem (_("Nudge fwd by capture offset"), (mem_fun(*this, &Editor::nudge_forward_capture_offset))));
+ nudge_items.push_back (MenuElem (_("Nudge bwd by capture offset"), (mem_fun(*this, &Editor::nudge_backward_capture_offset))));
items.push_back (MenuElem (_("Nudge"), *nudge_menu));
items.push_back (SeparatorElem());
MenuList& trim_items = trim_menu->items();
trim_menu->set_name ("ArdourContextMenu");
- trim_items.push_back (MenuElem (_("Start to edit cursor"), slot (*this, &Editor::trim_region_from_edit_cursor)));
- trim_items.push_back (MenuElem (_("Edit cursor to end"), slot (*this, &Editor::trim_region_to_edit_cursor)));
+ trim_items.push_back (MenuElem (_("Start to edit cursor"), mem_fun(*this, &Editor::trim_region_from_edit_cursor)));
+ trim_items.push_back (MenuElem (_("Edit cursor to end"), mem_fun(*this, &Editor::trim_region_to_edit_cursor)));
items.push_back (MenuElem (_("Trim"), *trim_menu));
items.push_back (SeparatorElem());
- items.push_back (MenuElem (_("Split"), (slot (*this, &Editor::split_region))));
+ items.push_back (MenuElem (_("Split"), (mem_fun(*this, &Editor::split_region))));
region_edit_menu_split_item = items.back();
- items.push_back (MenuElem (_("Make mono regions"), (slot (*this, &Editor::split_multichannel_region))));
+ items.push_back (MenuElem (_("Make mono regions"), (mem_fun(*this, &Editor::split_multichannel_region))));
region_edit_menu_split_multichannel_item = items.back();
- items.push_back (MenuElem (_("Duplicate"), (bind (slot (*this, &Editor::duplicate_dialog), true))));
- items.push_back (MenuElem (_("Fill Track"), (slot (*this, &Editor::region_fill_track))));
+ items.push_back (MenuElem (_("Duplicate"), (bind (mem_fun(*this, &Editor::duplicate_dialog), true))));
+ items.push_back (MenuElem (_("Fill Track"), (mem_fun(*this, &Editor::region_fill_track))));
items.push_back (SeparatorElem());
- items.push_back (MenuElem (_("Remove"), slot (*this, &Editor::remove_clicked_region)));
+ items.push_back (MenuElem (_("Remove"), mem_fun(*this, &Editor::remove_clicked_region)));
items.push_back (SeparatorElem());
- items.push_back (MenuElem (_("Destroy"), slot (*this, &Editor::destroy_clicked_region)));
+ items.push_back (MenuElem (_("Destroy"), mem_fun(*this, &Editor::destroy_clicked_region)));
/* OK, stick the region submenu at the top of the list, and then add
the standard items.
MenuList& items = selection_menu->items();
selection_menu->set_name ("ArdourContextMenu");
- items.push_back (MenuElem (_("Play range"), slot (*this, &Editor::play_selection)));
- items.push_back (MenuElem (_("Loop range"), slot (*this, &Editor::set_route_loop_selection)));
+ items.push_back (MenuElem (_("Play range"), mem_fun(*this, &Editor::play_selection)));
+ items.push_back (MenuElem (_("Loop range"), mem_fun(*this, &Editor::set_route_loop_selection)));
items.push_back (SeparatorElem());
- items.push_back (MenuElem (_("Create chunk from range"), slot (*this, &Editor::name_selection)));
+ items.push_back (MenuElem (_("Create chunk from range"), mem_fun(*this, &Editor::name_selection)));
items.push_back (SeparatorElem());
- items.push_back (MenuElem (_("Create Region"), slot (*this, &Editor::new_region_from_selection)));
- items.push_back (MenuElem (_("Separate Region"), slot (*this, &Editor::separate_region_from_selection)));
- items.push_back (MenuElem (_("Crop Region to range"), slot (*this, &Editor::crop_region_to_selection)));
- items.push_back (MenuElem (_("Bounce range"), slot (*this, &Editor::bounce_range_selection)));
+ items.push_back (MenuElem (_("Create Region"), mem_fun(*this, &Editor::new_region_from_selection)));
+ items.push_back (MenuElem (_("Separate Region"), mem_fun(*this, &Editor::separate_region_from_selection)));
+ items.push_back (MenuElem (_("Crop Region to range"), mem_fun(*this, &Editor::crop_region_to_selection)));
+ items.push_back (MenuElem (_("Bounce range"), mem_fun(*this, &Editor::bounce_range_selection)));
items.push_back (SeparatorElem());
- items.push_back (MenuElem (_("Duplicate"), bind (slot (*this, &Editor::duplicate_dialog), false)));
+ items.push_back (MenuElem (_("Duplicate"), bind (mem_fun(*this, &Editor::duplicate_dialog), false)));
items.push_back (SeparatorElem());
- items.push_back (MenuElem (_("Export"), slot (*this, &Editor::export_selection)));
+ items.push_back (MenuElem (_("Export"), mem_fun(*this, &Editor::export_selection)));
items.push_back (SeparatorElem());
- items.push_back (MenuElem (_("Fill range w/Region"), slot (*this, &Editor::region_fill_selection)));
+ items.push_back (MenuElem (_("Fill range w/Region"), mem_fun(*this, &Editor::region_fill_selection)));
edit_items.push_back (MenuElem (_("Range"), *selection_menu));
edit_items.push_back (SeparatorElem());
play_menu->set_name ("ArdourContextMenu");
play_items.push_back (MenuElem (_("Play from edit cursor")));
- play_items.push_back (MenuElem (_("Play from start"), slot (*this, &Editor::play_from_start)));
- play_items.push_back (MenuElem (_("Play region"), slot (*this, &Editor::play_selected_region)));
+ play_items.push_back (MenuElem (_("Play from start"), mem_fun(*this, &Editor::play_from_start)));
+ play_items.push_back (MenuElem (_("Play region"), mem_fun(*this, &Editor::play_selected_region)));
play_items.push_back (SeparatorElem());
- play_items.push_back (MenuElem (_("Loop Region"), slot (*this, &Editor::loop_selected_region)));
+ play_items.push_back (MenuElem (_("Loop Region"), mem_fun(*this, &Editor::loop_selected_region)));
edit_items.push_back (MenuElem (_("Play"), *play_menu));
MenuList& select_items = select_menu->items();
select_menu->set_name ("ArdourContextMenu");
- select_items.push_back (MenuElem (_("Select All in track"), bind (slot (*this, &Editor::select_all_in_track), false)));
- select_items.push_back (MenuElem (_("Select All"), bind (slot (*this, &Editor::select_all), false)));
- select_items.push_back (MenuElem (_("Invert in track"), slot (*this, &Editor::invert_selection_in_track)));
- select_items.push_back (MenuElem (_("Invert"), slot (*this, &Editor::invert_selection)));
+ select_items.push_back (MenuElem (_("Select All in track"), bind (mem_fun(*this, &Editor::select_all_in_track), false)));
+ select_items.push_back (MenuElem (_("Select All"), bind (mem_fun(*this, &Editor::select_all), false)));
+ select_items.push_back (MenuElem (_("Invert in track"), mem_fun(*this, &Editor::invert_selection_in_track)));
+ select_items.push_back (MenuElem (_("Invert"), mem_fun(*this, &Editor::invert_selection)));
select_items.push_back (SeparatorElem());
- select_items.push_back (MenuElem (_("Select loop range"), slot (*this, &Editor::set_selection_from_loop)));
- select_items.push_back (MenuElem (_("Select punch range"), slot (*this, &Editor::set_selection_from_punch)));
+ select_items.push_back (MenuElem (_("Select loop range"), mem_fun(*this, &Editor::set_selection_from_loop)));
+ select_items.push_back (MenuElem (_("Select punch range"), mem_fun(*this, &Editor::set_selection_from_punch)));
select_items.push_back (SeparatorElem());
edit_items.push_back (MenuElem (_("Select"), *select_menu));
MenuList& cutnpaste_items = cutnpaste_menu->items();
cutnpaste_menu->set_name ("ArdourContextMenu");
- cutnpaste_items.push_back (MenuElem (_("Cut"), slot (*this, &Editor::cut)));
- cutnpaste_items.push_back (MenuElem (_("Copy"), slot (*this, &Editor::copy)));
- cutnpaste_items.push_back (MenuElem (_("Paste at edit cursor"), bind (slot (*this, &Editor::paste), 1.0f)));
- cutnpaste_items.push_back (MenuElem (_("Paste at mouse"), slot (*this, &Editor::mouse_paste)));
+ cutnpaste_items.push_back (MenuElem (_("Cut"), mem_fun(*this, &Editor::cut)));
+ cutnpaste_items.push_back (MenuElem (_("Copy"), mem_fun(*this, &Editor::copy)));
+ cutnpaste_items.push_back (MenuElem (_("Paste at edit cursor"), bind (mem_fun(*this, &Editor::paste), 1.0f)));
+ cutnpaste_items.push_back (MenuElem (_("Paste at mouse"), mem_fun(*this, &Editor::mouse_paste)));
cutnpaste_items.push_back (SeparatorElem());
- cutnpaste_items.push_back (MenuElem (_("Align"), bind (slot (*this, &Editor::align), ARDOUR::SyncPoint)));
- cutnpaste_items.push_back (MenuElem (_("Align Relative"), bind (slot (*this, &Editor::align_relative), ARDOUR::SyncPoint)));
+ cutnpaste_items.push_back (MenuElem (_("Align"), bind (mem_fun(*this, &Editor::align), ARDOUR::SyncPoint)));
+ cutnpaste_items.push_back (MenuElem (_("Align Relative"), bind (mem_fun(*this, &Editor::align_relative), ARDOUR::SyncPoint)));
cutnpaste_items.push_back (SeparatorElem());
- cutnpaste_items.push_back (MenuElem (_("Insert chunk"), bind (slot (*this, &Editor::paste_named_selection), 1.0f)));
+ cutnpaste_items.push_back (MenuElem (_("Insert chunk"), bind (mem_fun(*this, &Editor::paste_named_selection), 1.0f)));
cutnpaste_items.push_back (SeparatorElem());
- cutnpaste_items.push_back (MenuElem (_("New Region from range"), slot (*this, &Editor::new_region_from_selection)));
- cutnpaste_items.push_back (MenuElem (_("Separate Range"), slot (*this, &Editor::separate_region_from_selection)));
+ cutnpaste_items.push_back (MenuElem (_("New Region from range"), mem_fun(*this, &Editor::new_region_from_selection)));
+ cutnpaste_items.push_back (MenuElem (_("Separate Range"), mem_fun(*this, &Editor::separate_region_from_selection)));
edit_items.push_back (MenuElem (_("Edit"), *cutnpaste_menu));
MenuList& import_items = import_menu->items();
import_menu->set_name ("ArdourContextMenu");
- import_items.push_back (MenuElem (_("Insert Region"), bind (slot (*this, &Editor::insert_region_list_selection), 1.0f)));
- import_items.push_back (MenuElem (_("Insert external sndfile"), bind (slot (*this, &Editor::insert_sndfile), false)));
+ import_items.push_back (MenuElem (_("Insert Region"), bind (mem_fun(*this, &Editor::insert_region_list_selection), 1.0f)));
+ import_items.push_back (MenuElem (_("Insert external sndfile"), bind (mem_fun(*this, &Editor::insert_sndfile), false)));
edit_items.push_back (MenuElem (_("Import"), *import_menu));
nudge_menu->set_name ("ArdourContextMenu");
edit_items.push_back (SeparatorElem());
- nudge_items.push_back (MenuElem (_("Nudge entire track fwd"), (bind (slot (*this, &Editor::nudge_track), false, true))));
- nudge_items.push_back (MenuElem (_("Nudge track after edit cursor fwd"), (bind (slot (*this, &Editor::nudge_track), true, true))));
- nudge_items.push_back (MenuElem (_("Nudge entire track bwd"), (bind (slot (*this, &Editor::nudge_track), false, false))));
- nudge_items.push_back (MenuElem (_("Nudge track after edit cursor bwd"), (bind (slot (*this, &Editor::nudge_track), true, false))));
+ nudge_items.push_back (MenuElem (_("Nudge entire track fwd"), (bind (mem_fun(*this, &Editor::nudge_track), false, true))));
+ nudge_items.push_back (MenuElem (_("Nudge track after edit cursor fwd"), (bind (mem_fun(*this, &Editor::nudge_track), true, true))));
+ nudge_items.push_back (MenuElem (_("Nudge entire track bwd"), (bind (mem_fun(*this, &Editor::nudge_track), false, false))));
+ nudge_items.push_back (MenuElem (_("Nudge track after edit cursor bwd"), (bind (mem_fun(*this, &Editor::nudge_track), true, false))));
edit_items.push_back (MenuElem (_("Nudge"), *nudge_menu));
}
play_menu->set_name ("ArdourContextMenu");
play_items.push_back (MenuElem (_("Play from edit cursor")));
- play_items.push_back (MenuElem (_("Play from start"), slot (*this, &Editor::play_from_start)));
+ play_items.push_back (MenuElem (_("Play from start"), mem_fun(*this, &Editor::play_from_start)));
edit_items.push_back (MenuElem (_("Play"), *play_menu));
/* Selection */
MenuList& select_items = select_menu->items();
select_menu->set_name ("ArdourContextMenu");
- select_items.push_back (MenuElem (_("Select All in track"), bind (slot (*this, &Editor::select_all_in_track), false)));
- select_items.push_back (MenuElem (_("Select All"), bind (slot (*this, &Editor::select_all), false)));
- select_items.push_back (MenuElem (_("Invert in track"), slot (*this, &Editor::invert_selection_in_track)));
- select_items.push_back (MenuElem (_("Invert"), slot (*this, &Editor::invert_selection)));
+ select_items.push_back (MenuElem (_("Select All in track"), bind (mem_fun(*this, &Editor::select_all_in_track), false)));
+ select_items.push_back (MenuElem (_("Select All"), bind (mem_fun(*this, &Editor::select_all), false)));
+ select_items.push_back (MenuElem (_("Invert in track"), mem_fun(*this, &Editor::invert_selection_in_track)));
+ select_items.push_back (MenuElem (_("Invert"), mem_fun(*this, &Editor::invert_selection)));
select_items.push_back (SeparatorElem());
- select_items.push_back (MenuElem (_("Select loop range"), slot (*this, &Editor::set_selection_from_loop)));
- select_items.push_back (MenuElem (_("Select punch range"), slot (*this, &Editor::set_selection_from_punch)));
+ select_items.push_back (MenuElem (_("Select loop range"), mem_fun(*this, &Editor::set_selection_from_loop)));
+ select_items.push_back (MenuElem (_("Select punch range"), mem_fun(*this, &Editor::set_selection_from_punch)));
select_items.push_back (SeparatorElem());
edit_items.push_back (MenuElem (_("Select"), *select_menu));
MenuList& cutnpaste_items = cutnpaste_menu->items();
cutnpaste_menu->set_name ("ArdourContextMenu");
- cutnpaste_items.push_back (MenuElem (_("Cut"), slot (*this, &Editor::cut)));
- cutnpaste_items.push_back (MenuElem (_("Copy"), slot (*this, &Editor::copy)));
- cutnpaste_items.push_back (MenuElem (_("Paste"), bind (slot (*this, &Editor::paste), 1.0f)));
+ cutnpaste_items.push_back (MenuElem (_("Cut"), mem_fun(*this, &Editor::cut)));
+ cutnpaste_items.push_back (MenuElem (_("Copy"), mem_fun(*this, &Editor::copy)));
+ cutnpaste_items.push_back (MenuElem (_("Paste"), bind (mem_fun(*this, &Editor::paste), 1.0f)));
Menu *nudge_menu = manage (new Menu());
MenuList& nudge_items = nudge_menu->items();
nudge_menu->set_name ("ArdourContextMenu");
edit_items.push_back (SeparatorElem());
- nudge_items.push_back (MenuElem (_("Nudge entire track fwd"), (bind (slot (*this, &Editor::nudge_track), false, true))));
- nudge_items.push_back (MenuElem (_("Nudge track after edit cursor fwd"), (bind (slot (*this, &Editor::nudge_track), true, true))));
- nudge_items.push_back (MenuElem (_("Nudge entire track bwd"), (bind (slot (*this, &Editor::nudge_track), false, false))));
- nudge_items.push_back (MenuElem (_("Nudge track after edit cursor bwd"), (bind (slot (*this, &Editor::nudge_track), true, false))));
+ nudge_items.push_back (MenuElem (_("Nudge entire track fwd"), (bind (mem_fun(*this, &Editor::nudge_track), false, true))));
+ nudge_items.push_back (MenuElem (_("Nudge track after edit cursor fwd"), (bind (mem_fun(*this, &Editor::nudge_track), true, true))));
+ nudge_items.push_back (MenuElem (_("Nudge entire track bwd"), (bind (mem_fun(*this, &Editor::nudge_track), false, false))));
+ nudge_items.push_back (MenuElem (_("Nudge track after edit cursor bwd"), (bind (mem_fun(*this, &Editor::nudge_track), true, false))));
edit_items.push_back (MenuElem (_("Nudge"), *nudge_menu));
}
mouse_mode_tearoff = manage (new TearOff (mouse_mode_button_table));
mouse_mode_tearoff->set_name ("MouseModeBase");
- mouse_mode_tearoff->Detach.connect (bind (slot (*this, &Editor::detach_tearoff), static_cast<Gtk::Box*>(&toolbar_hbox),
+ mouse_mode_tearoff->Detach.connect (bind (mem_fun(*this, &Editor::detach_tearoff), static_cast<Gtk::Box*>(&toolbar_hbox),
static_cast<Gtk::Widget*>(&mouse_mode_button_table)));
- mouse_mode_tearoff->Attach.connect (bind (slot (*this, &Editor::reattach_tearoff), static_cast<Gtk::Box*> (&toolbar_hbox),
+ mouse_mode_tearoff->Attach.connect (bind (mem_fun(*this, &Editor::reattach_tearoff), static_cast<Gtk::Box*> (&toolbar_hbox),
static_cast<Gtk::Widget*> (&mouse_mode_button_table), 1));
mouse_move_button.set_name ("MouseModeButton");
mouse_timefx_button.unset_flags (Gtk::CAN_FOCUS);
mouse_audition_button.unset_flags (Gtk::CAN_FOCUS);
- mouse_select_button.toggled.connect (bind (slot (*this, &Editor::mouse_mode_toggled), Editing::MouseRange));
- mouse_select_button.button_release_event.connect (slot (*this, &Editor::mouse_select_button_release));
+ mouse_select_button.toggled.connect (bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseRange));
+ mouse_select_button.button_release_event.connect (mem_fun(*this, &Editor::mouse_select_button_release));
- mouse_move_button.toggled.connect (bind (slot (*this, &Editor::mouse_mode_toggled), Editing::MouseObject));
- mouse_gain_button.toggled.connect (bind (slot (*this, &Editor::mouse_mode_toggled), Editing::MouseGain));
- mouse_zoom_button.toggled.connect (bind (slot (*this, &Editor::mouse_mode_toggled), Editing::MouseZoom));
- mouse_timefx_button.toggled.connect (bind (slot (*this, &Editor::mouse_mode_toggled), Editing::MouseTimeFX));
- mouse_audition_button.toggled.connect (bind (slot (*this, &Editor::mouse_mode_toggled), Editing::MouseAudition));
+ mouse_move_button.toggled.connect (bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseObject));
+ mouse_gain_button.toggled.connect (bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseGain));
+ mouse_zoom_button.toggled.connect (bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseZoom));
+ mouse_timefx_button.toggled.connect (bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseTimeFX));
+ mouse_audition_button.toggled.connect (bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseAudition));
// mouse_move_button.set_active (true);
edit_mode_box.pack_start (edit_mode_label, false, false);
edit_mode_box.pack_start (edit_mode_selector, false, false);
- edit_mode_selector.get_popwin()->unmap_event.connect (slot (*this, &Editor::edit_mode_selection_done));
+ edit_mode_selector.get_popwin()->unmap_event.connect (mem_fun(*this, &Editor::edit_mode_selection_done));
/* Snap Type */
snap_type_box.pack_start (snap_type_label, false, false);
snap_type_box.pack_start (snap_type_selector, false, false);
- snap_type_selector.get_popwin()->unmap_event.connect (slot (*this, &Editor::snap_type_selection_done));
+ snap_type_selector.get_popwin()->unmap_event.connect (mem_fun(*this, &Editor::snap_type_selection_done));
/* Snap mode, not snap type */
snap_mode_box.pack_start (snap_mode_label, false, false);
snap_mode_box.pack_start (snap_mode_selector, false, false);
- snap_mode_selector.get_popwin()->unmap_event.connect (slot (*this, &Editor::snap_mode_selection_done));
+ snap_mode_selector.get_popwin()->unmap_event.connect (mem_fun(*this, &Editor::snap_mode_selection_done));
/* Zoom focus mode */
zoom_focus_box.pack_start (zoom_focus_label, false, false);
zoom_focus_box.pack_start (zoom_focus_selector, false, false);
- zoom_focus_selector.get_popwin()->unmap_event.connect (slot (*this, &Editor::zoom_focus_selection_done));
+ zoom_focus_selector.get_popwin()->unmap_event.connect (mem_fun(*this, &Editor::zoom_focus_selection_done));
/* selection/cursor clocks */
HBox *nbox = manage (new HBox);
- nudge_forward_button.signal_clicked().connect (bind (slot (*this, &Editor::nudge_forward), false));
- nudge_backward_button.signal_clicked().connect (bind (slot (*this, &Editor::nudge_backward), false));
+ nudge_forward_button.signal_clicked().connect (bind (mem_fun(*this, &Editor::nudge_forward), false));
+ nudge_backward_button.signal_clicked().connect (bind (mem_fun(*this, &Editor::nudge_backward), false));
nbox->pack_start (nudge_backward_button, false, false);
nbox->pack_start (nudge_forward_button, false, false);
tools_tearoff = new TearOff (*hbox);
tools_tearoff->set_name ("MouseModeBase");
- tools_tearoff->Detach.connect (bind (slot (*this, &Editor::detach_tearoff), static_cast<Gtk::Box*>(&toolbar_hbox),
+ tools_tearoff->Detach.connect (bind (mem_fun(*this, &Editor::detach_tearoff), static_cast<Gtk::Box*>(&toolbar_hbox),
static_cast<Gtk::Widget*>(hbox)));
- tools_tearoff->Attach.connect (bind (slot (*this, &Editor::reattach_tearoff), static_cast<Gtk::Box*> (&toolbar_hbox),
+ tools_tearoff->Attach.connect (bind (mem_fun(*this, &Editor::reattach_tearoff), static_cast<Gtk::Box*> (&toolbar_hbox),
static_cast<Gtk::Widget*> (hbox), 0));
toolbar_hbox.set_spacing (8);
void
Editor::map_transport_state ()
{
- ENSURE_GUI_THREAD (slot (*this, &Editor::map_transport_state));
+ ENSURE_GUI_THREAD (mem_fun(*this, &Editor::map_transport_state));
if (session->transport_stopped()) {
have_pending_keyboard_selection = false;
Editor::set_edit_menu (Menu& menu)
{
edit_menu = &menu;
- edit_menu->map_.connect (slot (*this, &Editor::edit_menu_map_handler));
+ edit_menu->map_.connect (mem_fun(*this, &Editor::edit_menu_map_handler));
}
void
label = compose(_("Undo (%1)"), session->next_undo());
}
- edit_items.push_back (MenuElem (label, bind (slot (*this, &Editor::undo), 1U)));
+ edit_items.push_back (MenuElem (label, bind (mem_fun(*this, &Editor::undo), 1U)));
if (session->undo_depth() == 0) {
edit_items.back()->set_sensitive (false);
label = compose(_("Redo (%1)"), session->next_redo());
}
- edit_items.push_back (MenuElem (label, bind (slot (*this, &Editor::redo), 1U)));
+ edit_items.push_back (MenuElem (label, bind (mem_fun(*this, &Editor::redo), 1U)));
if (session->redo_depth() == 0) {
edit_items.back()->set_sensitive (false);
}
vector<MenuItem*> mitems;
edit_items.push_back (SeparatorElem());
- edit_items.push_back (MenuElem (_("Cut"), slot (*this, &Editor::cut)));
+ edit_items.push_back (MenuElem (_("Cut"), mem_fun(*this, &Editor::cut)));
mitems.push_back (edit_items.back());
- edit_items.push_back (MenuElem (_("Copy"), slot (*this, &Editor::copy)));
+ edit_items.push_back (MenuElem (_("Copy"), mem_fun(*this, &Editor::copy)));
mitems.push_back (edit_items.back());
- edit_items.push_back (MenuElem (_("Paste"), bind (slot (*this, &Editor::paste), 1.0f)));
+ edit_items.push_back (MenuElem (_("Paste"), bind (mem_fun(*this, &Editor::paste), 1.0f)));
mitems.push_back (edit_items.back());
edit_items.push_back (SeparatorElem());
- edit_items.push_back (MenuElem (_("Align"), bind (slot (*this, &Editor::align), ARDOUR::SyncPoint)));
+ edit_items.push_back (MenuElem (_("Align"), bind (mem_fun(*this, &Editor::align), ARDOUR::SyncPoint)));
mitems.push_back (edit_items.back());
- edit_items.push_back (MenuElem (_("Align Relative"), bind (slot (*this, &Editor::align_relative), ARDOUR::SyncPoint)));
+ edit_items.push_back (MenuElem (_("Align Relative"), bind (mem_fun(*this, &Editor::align_relative), ARDOUR::SyncPoint)));
mitems.push_back (edit_items.back());
edit_items.push_back (SeparatorElem());
import_menu->set_name ("ArdourContextMenu");
MenuList& import_items = import_menu->items();
- import_items.push_back (MenuElem (_("... as new track"), bind (slot (*this, &Editor::import_audio), true)));
- import_items.push_back (MenuElem (_("... as new region"), bind (slot (*this, &Editor::import_audio), false)));
+ import_items.push_back (MenuElem (_("... as new track"), bind (mem_fun(*this, &Editor::import_audio), true)));
+ import_items.push_back (MenuElem (_("... as new region"), bind (mem_fun(*this, &Editor::import_audio), false)));
Menu* embed_menu = manage (new Menu());
embed_menu->set_name ("ArdourContextMenu");
MenuList& embed_items = embed_menu->items();
- embed_items.push_back (MenuElem (_("... as new track"), bind (slot (*this, &Editor::insert_sndfile), true)));
- embed_items.push_back (MenuElem (_("... as new region"), slot (*this, &Editor::embed_audio)));
+ embed_items.push_back (MenuElem (_("... as new track"), bind (mem_fun(*this, &Editor::insert_sndfile), true)));
+ embed_items.push_back (MenuElem (_("... as new region"), mem_fun(*this, &Editor::embed_audio)));
edit_items.push_back (MenuElem (_("Import audio (copy)"), *import_menu));
edit_items.push_back (MenuElem (_("Embed audio (link)"), *embed_menu));
edit_items.push_back (SeparatorElem());
- edit_items.push_back (MenuElem (_("Remove last capture"), slot (*this, &Editor::remove_last_capture)));
+ edit_items.push_back (MenuElem (_("Remove last capture"), mem_fun(*this, &Editor::remove_last_capture)));
if (!session->have_captured()) {
edit_items.back()->set_sensitive (false);
}
void
Editor::end_location_changed (Location* location)
{
- ENSURE_GUI_THREAD (bind (slot (*this, &Editor::end_location_changed), location));
+ ENSURE_GUI_THREAD (bind (mem_fun(*this, &Editor::end_location_changed), location));
track_canvas_scroller.get_hadjustment()->set_upper (location->end() / frames_per_unit);
}
edit_group_list_menu->set_name ("ArdourContextMenu");
MenuList& items = edit_group_list_menu->items();
- items.push_back (MenuElem (_("Show All"), slot (*this, &Editor::select_all_edit_groups)));
- items.push_back (MenuElem (_("Hide All"), slot (*this, &Editor::unselect_all_edit_groups)));
+ items.push_back (MenuElem (_("Show All"), mem_fun(*this, &Editor::select_all_edit_groups)));
+ items.push_back (MenuElem (_("Hide All"), mem_fun(*this, &Editor::unselect_all_edit_groups)));
}
void
edit_group_list.rows().back().set_data (group);
edit_group_list.rows().back().select();
- group->FlagsChanged.connect (bind (slot (*this, &Editor::group_flags_changed), group));
+ group->FlagsChanged.connect (bind (mem_fun(*this, &Editor::group_flags_changed), group));
}
void
FileSelection file_selector;
- file_selector.get_selection_entry()->activate.connect (bind (slot (*this, &Editor::finish_sub_event_loop), 1));
- file_selector.get_cancel_button()-.signal_clicked().connect (bind (slot (*this, &Editor::finish_sub_event_loop), -1));
- file_selector.get_ok_button()-.signal_clicked().connect (bind (slot (*this, &Editor::finish_sub_event_loop), 1));
- file_selector.delete_event.connect (bind (slot (*this, &Editor::finish_sub_event_loop_on_delete), -1));
+ file_selector.get_selection_entry()->activate.connect (bind (mem_fun(*this, &Editor::finish_sub_event_loop), 1));
+ file_selector.get_cancel_button()-.signal_clicked().connect (bind (mem_fun(*this, &Editor::finish_sub_event_loop), -1));
+ file_selector.get_ok_button()-.signal_clicked().connect (bind (mem_fun(*this, &Editor::finish_sub_event_loop), 1));
+ file_selector.delete_event.connect (bind (mem_fun(*this, &Editor::finish_sub_event_loop_on_delete), -1));
file_selector.show_all();
}
else
{
- Gtkmm2ext::UI::instance()->call_slot(bind(slot(*this, &Editor::handle_new_imageframe_time_axis_view),track_name, src)) ;
+ Gtkmm2ext::UI::instance()->call_slot(bind(mem_fun(*this, &Editor::handle_new_imageframe_time_axis_view),track_name, src)) ;
}
}
// Can we only bind 2 data Items?
// @todo we really want to bind the src attribute too, for the moment tracks can only be added remotely,
// so this is not too much of an issue, however will need to be looked at again
- Gtkmm2ext::UI::instance()->call_slot(SigC::bind(slot(*this, &Editor::handle_new_imageframe_marker_time_axis_view),track_name, marked_track)) ;
+ Gtkmm2ext::UI::instance()->call_slot(sigc::bind(mem_fun(*this, &Editor::handle_new_imageframe_marker_time_axis_view),track_name, marked_track)) ;
}
void
route_list.rows().push_back(rowdata) ;
route_list.rows().back().set_data(iftav) ;
route_list.rows().back().select() ;
- iftav->GoingAway.connect(bind(slot(*this, &Editor::remove_route), (TimeAxisView*)iftav)) ;
- iftav->gui_changed.connect(slot(*this, &Editor::handle_gui_changes)) ;
+ iftav->GoingAway.connect(bind(mem_fun(*this, &Editor::remove_route), (TimeAxisView*)iftav)) ;
+ iftav->gui_changed.connect(mem_fun(*this, &Editor::handle_gui_changes)) ;
}
void
route_list.rows().push_back(rowdata) ;
route_list.rows().back().set_data (mta) ;
route_list.rows().back().select() ;
- mta->GoingAway.connect(bind(slot (*this, &Editor::remove_route), (TimeAxisView*)mta)) ;
+ mta->GoingAway.connect(bind(mem_fun(*this, &Editor::remove_route), (TimeAxisView*)mta)) ;
}
#include "selection.h"
void
-Editor::kbd_driver (SigC::Slot1<void,GdkEvent*> theslot, bool use_track_canvas, bool use_time_canvas, bool can_select)
+Editor::kbd_driver (sigc::slot<void,GdkEvent*> theslot, bool use_track_canvas, bool use_time_canvas, bool can_select)
{
gint x, y;
double dx, dy;
void
Editor::kbd_set_playhead_cursor ()
{
- kbd_driver (slot (*this, &Editor::set_playhead_cursor), true, true, false);
+ kbd_driver (mem_fun(*this, &Editor::set_playhead_cursor), true, true, false);
}
void
Editor::kbd_set_edit_cursor ()
{
- kbd_driver (slot (*this, &Editor::set_edit_cursor), true, true, false);
+ kbd_driver (mem_fun(*this, &Editor::set_edit_cursor), true, true, false);
}
void
Editor::kbd_split ()
{
- kbd_driver (slot (*this, &Editor::kbd_do_split), true, true, false);
+ kbd_driver (mem_fun(*this, &Editor::kbd_do_split), true, true, false);
}
void
void
Editor::kbd_align (ARDOUR::RegionPoint what)
{
- kbd_driver (bind (slot (*this, &Editor::kbd_do_align), what));
+ kbd_driver (bind (mem_fun(*this, &Editor::kbd_do_align), what));
}
void
void
Editor::kbd_align_relative (ARDOUR::RegionPoint what)
{
- kbd_driver (bind (slot (*this, &Editor::kbd_do_align), what), true, true, false);
+ kbd_driver (bind (mem_fun(*this, &Editor::kbd_do_align), what), true, true, false);
}
void
void
Editor::kbd_brush ()
{
- kbd_driver (slot (*this, &Editor::kbd_do_brush), true, true, false);
+ kbd_driver (mem_fun(*this, &Editor::kbd_do_brush), true, true, false);
}
void
void
Editor::kbd_audition ()
{
- kbd_driver (slot (*this, &Editor::kbd_do_audition), true, false, true);
+ kbd_driver (mem_fun(*this, &Editor::kbd_do_audition), true, false, true);
}
{
/* add named actions for the editor */
- add_action ("toggle-xfades-active", slot (*this, &Editor::toggle_xfades_active));
+ add_action ("toggle-xfades-active", mem_fun(*this, &Editor::toggle_xfades_active));
- add_action ("playhead-to-next-region-start", bind (slot (*this, &Editor::cursor_to_next_region_point), playhead_cursor, RegionPoint (Start)));
- add_action ("playhead-to-next-region-end", bind (slot (*this, &Editor::cursor_to_next_region_point), playhead_cursor, RegionPoint (End)));
- add_action ("playhead-to-next-region-sync", bind (slot (*this, &Editor::cursor_to_next_region_point), playhead_cursor, RegionPoint (SyncPoint)));
+ add_action ("playhead-to-next-region-start", bind (mem_fun(*this, &Editor::cursor_to_next_region_point), playhead_cursor, RegionPoint (Start)));
+ add_action ("playhead-to-next-region-end", bind (mem_fun(*this, &Editor::cursor_to_next_region_point), playhead_cursor, RegionPoint (End)));
+ add_action ("playhead-to-next-region-sync", bind (mem_fun(*this, &Editor::cursor_to_next_region_point), playhead_cursor, RegionPoint (SyncPoint)));
- add_action ("playhead-to-previous-region-start", bind (slot (*this, &Editor::cursor_to_previous_region_point), playhead_cursor, RegionPoint (Start)));
- add_action ("playhead-to-previous-region-end", bind (slot (*this, &Editor::cursor_to_previous_region_point), playhead_cursor, RegionPoint (End)));
- add_action ("playhead-to-previous-region-sync", bind (slot (*this, &Editor::cursor_to_previous_region_point), playhead_cursor, RegionPoint (SyncPoint)));
+ add_action ("playhead-to-previous-region-start", bind (mem_fun(*this, &Editor::cursor_to_previous_region_point), playhead_cursor, RegionPoint (Start)));
+ add_action ("playhead-to-previous-region-end", bind (mem_fun(*this, &Editor::cursor_to_previous_region_point), playhead_cursor, RegionPoint (End)));
+ add_action ("playhead-to-previous-region-sync", bind (mem_fun(*this, &Editor::cursor_to_previous_region_point), playhead_cursor, RegionPoint (SyncPoint)));
- add_action ("edit-cursor-to-next-region-start", bind (slot (*this, &Editor::cursor_to_next_region_point), edit_cursor, RegionPoint (Start)));
- add_action ("edit-cursor-to-next-region-end", bind (slot (*this, &Editor::cursor_to_next_region_point), edit_cursor, RegionPoint (End)));
- add_action ("edit-cursor-to-next-region-sync", bind (slot (*this, &Editor::cursor_to_next_region_point), edit_cursor, RegionPoint (SyncPoint)));
+ add_action ("edit-cursor-to-next-region-start", bind (mem_fun(*this, &Editor::cursor_to_next_region_point), edit_cursor, RegionPoint (Start)));
+ add_action ("edit-cursor-to-next-region-end", bind (mem_fun(*this, &Editor::cursor_to_next_region_point), edit_cursor, RegionPoint (End)));
+ add_action ("edit-cursor-to-next-region-sync", bind (mem_fun(*this, &Editor::cursor_to_next_region_point), edit_cursor, RegionPoint (SyncPoint)));
- add_action ("edit-cursor-to-previous-region-start", bind (slot (*this, &Editor::cursor_to_previous_region_point), edit_cursor, RegionPoint (Start)));
- add_action ("edit-cursor-to-previous-region-end", bind (slot (*this, &Editor::cursor_to_previous_region_point), edit_cursor, RegionPoint (End)));
- add_action ("edit-cursor-to-previous-region-sync", bind (slot (*this, &Editor::cursor_to_previous_region_point), edit_cursor, RegionPoint (SyncPoint)));
+ add_action ("edit-cursor-to-previous-region-start", bind (mem_fun(*this, &Editor::cursor_to_previous_region_point), edit_cursor, RegionPoint (Start)));
+ add_action ("edit-cursor-to-previous-region-end", bind (mem_fun(*this, &Editor::cursor_to_previous_region_point), edit_cursor, RegionPoint (End)));
+ add_action ("edit-cursor-to-previous-region-sync", bind (mem_fun(*this, &Editor::cursor_to_previous_region_point), edit_cursor, RegionPoint (SyncPoint)));
- add_action ("playhead-to-range-start", bind (slot (*this, &Editor::cursor_to_selection_start), playhead_cursor));
- add_action ("playhead-to-range-end", bind (slot (*this, &Editor::cursor_to_selection_end), playhead_cursor));
+ add_action ("playhead-to-range-start", bind (mem_fun(*this, &Editor::cursor_to_selection_start), playhead_cursor));
+ add_action ("playhead-to-range-end", bind (mem_fun(*this, &Editor::cursor_to_selection_end), playhead_cursor));
- add_action ("edit-cursor-to-range-start", bind (slot (*this, &Editor::cursor_to_selection_start), edit_cursor));
- add_action ("edit-cursor-to-range-end", bind (slot (*this, &Editor::cursor_to_selection_end), edit_cursor));
+ add_action ("edit-cursor-to-range-start", bind (mem_fun(*this, &Editor::cursor_to_selection_start), edit_cursor));
+ add_action ("edit-cursor-to-range-end", bind (mem_fun(*this, &Editor::cursor_to_selection_end), edit_cursor));
- add_action ("jump-forward-to-mark", slot (*this, &Editor::jump_forward_to_mark));
- add_action ("jump-backward-to-mark", slot (*this, &Editor::jump_backward_to_mark));
- add_action ("add-location-from-playhead", slot (*this, &Editor::add_location_from_playhead_cursor));
+ add_action ("jump-forward-to-mark", mem_fun(*this, &Editor::jump_forward_to_mark));
+ add_action ("jump-backward-to-mark", mem_fun(*this, &Editor::jump_backward_to_mark));
+ add_action ("add-location-from-playhead", mem_fun(*this, &Editor::add_location_from_playhead_cursor));
- add_action ("nudge-forward", bind (slot (*this, &Editor::nudge_forward), false));
- add_action ("nudge-next-forward", bind (slot (*this, &Editor::nudge_forward), true));
- add_action ("nudge-backward", bind (slot (*this, &Editor::nudge_backward), false));
- add_action ("nudge-next-backward", bind (slot (*this, &Editor::nudge_backward), true));
+ add_action ("nudge-forward", bind (mem_fun(*this, &Editor::nudge_forward), false));
+ add_action ("nudge-next-forward", bind (mem_fun(*this, &Editor::nudge_forward), true));
+ add_action ("nudge-backward", bind (mem_fun(*this, &Editor::nudge_backward), false));
+ add_action ("nudge-next-backward", bind (mem_fun(*this, &Editor::nudge_backward), true));
- add_action ("toggle-playback", bind (slot (*this, &Editor::toggle_playback), false));
- add_action ("toggle-playback-forget-capture", bind (slot (*this, &Editor::toggle_playback), true));
+ add_action ("toggle-playback", bind (mem_fun(*this, &Editor::toggle_playback), false));
+ add_action ("toggle-playback-forget-capture", bind (mem_fun(*this, &Editor::toggle_playback), true));
- add_action ("toggle-loop-playback", slot (*this, &Editor::toggle_loop_playback));
+ add_action ("toggle-loop-playback", mem_fun(*this, &Editor::toggle_loop_playback));
- add_action ("temporal-zoom-out", bind (slot (*this, &Editor::temporal_zoom_step), true));
- add_action ("temporal-zoom-in", bind (slot (*this, &Editor::temporal_zoom_step), false));
- add_action ("zoom-to-session", slot (*this, &Editor::temporal_zoom_session));
-
- add_action ("scroll-tracks-up", slot (*this, &Editor::scroll_tracks_up));
- add_action ("scroll-tracks-down", slot (*this, &Editor::scroll_tracks_down));
- add_action ("step-tracks-up", slot (*this, &Editor::scroll_tracks_up_line));
- add_action ("step-tracks-down", slot (*this, &Editor::scroll_tracks_down_line));
-
- add_action ("scroll-backward", bind (slot (*this, &Editor::scroll_backward), 0.8f));
- add_action ("scroll-forward", bind (slot (*this, &Editor::scroll_forward), 0.8f));
- add_action ("goto", slot (*this, &Editor::goto_frame));
- add_action ("center-playhead", slot (*this, &Editor::center_playhead));
- add_action ("center-edit_cursor", slot (*this, &Editor::center_edit_cursor));
- add_action ("playhead-forward", slot (*this, &Editor::playhead_forward));
- add_action ("playhead-backward", slot (*this, &Editor::playhead_backward));
- add_action ("playhead-to-edit", bind (slot (*this, &Editor::cursor_align), true));
- add_action ("edit-to-playhead", bind (slot (*this, &Editor::cursor_align), false));
-
- add_action ("align-regions-start", bind (slot (*this, &Editor::align), ARDOUR::Start));
- add_action ("align-regions-start-relative", bind (slot (*this, &Editor::align_relative), ARDOUR::Start));
- add_action ("align-regions-end", bind (slot (*this, &Editor::align), ARDOUR::End));
- add_action ("align-regions-end-relative", bind (slot (*this, &Editor::align_relative), ARDOUR::End));
- add_action ("align-regions-sync", bind (slot (*this, &Editor::align), ARDOUR::SyncPoint));
- add_action ("align-regions-sync-relative", bind (slot (*this, &Editor::align_relative), ARDOUR::SyncPoint));
+ add_action ("temporal-zoom-out", bind (mem_fun(*this, &Editor::temporal_zoom_step), true));
+ add_action ("temporal-zoom-in", bind (mem_fun(*this, &Editor::temporal_zoom_step), false));
+ add_action ("zoom-to-session", mem_fun(*this, &Editor::temporal_zoom_session));
+
+ add_action ("scroll-tracks-up", mem_fun(*this, &Editor::scroll_tracks_up));
+ add_action ("scroll-tracks-down", mem_fun(*this, &Editor::scroll_tracks_down));
+ add_action ("step-tracks-up", mem_fun(*this, &Editor::scroll_tracks_up_line));
+ add_action ("step-tracks-down", mem_fun(*this, &Editor::scroll_tracks_down_line));
+
+ add_action ("scroll-backward", bind (mem_fun(*this, &Editor::scroll_backward), 0.8f));
+ add_action ("scroll-forward", bind (mem_fun(*this, &Editor::scroll_forward), 0.8f));
+ add_action ("goto", mem_fun(*this, &Editor::goto_frame));
+ add_action ("center-playhead", mem_fun(*this, &Editor::center_playhead));
+ add_action ("center-edit_cursor", mem_fun(*this, &Editor::center_edit_cursor));
+ add_action ("playhead-forward", mem_fun(*this, &Editor::playhead_forward));
+ add_action ("playhead-backward", mem_fun(*this, &Editor::playhead_backward));
+ add_action ("playhead-to-edit", bind (mem_fun(*this, &Editor::cursor_align), true));
+ add_action ("edit-to-playhead", bind (mem_fun(*this, &Editor::cursor_align), false));
+
+ add_action ("align-regions-start", bind (mem_fun(*this, &Editor::align), ARDOUR::Start));
+ add_action ("align-regions-start-relative", bind (mem_fun(*this, &Editor::align_relative), ARDOUR::Start));
+ add_action ("align-regions-end", bind (mem_fun(*this, &Editor::align), ARDOUR::End));
+ add_action ("align-regions-end-relative", bind (mem_fun(*this, &Editor::align_relative), ARDOUR::End));
+ add_action ("align-regions-sync", bind (mem_fun(*this, &Editor::align), ARDOUR::SyncPoint));
+ add_action ("align-regions-sync-relative", bind (mem_fun(*this, &Editor::align_relative), ARDOUR::SyncPoint));
- add_action ("set-playhead", slot (*this, &Editor::kbd_set_playhead_cursor));
- add_action ("set-edit-cursor", slot (*this, &Editor::kbd_set_edit_cursor));
-
- add_action ("set-mouse-mode-object", bind (slot (*this, &Editor::set_mouse_mode), Editing::MouseObject, false));
- add_action ("set-mouse-mode-range", bind (slot (*this, &Editor::set_mouse_mode), Editing::MouseRange, false));
- add_action ("set-mouse-mode-gain", bind (slot (*this, &Editor::set_mouse_mode), Editing::MouseGain, false));
- add_action ("set-mouse-mode-zoom", bind (slot (*this, &Editor::set_mouse_mode), Editing::MouseZoom, false));
- add_action ("set-mouse-mode-timefx", bind (slot (*this, &Editor::set_mouse_mode), Editing::MouseTimeFX, false));
-
- add_action ("set-undo", bind (slot (*this, &Editor::undo), 1U));
- add_action ("set-redo", bind (slot (*this, &Editor::redo), 1U));
-
- add_action ("export-session", slot (*this, &Editor::export_session));
- add_action ("export-range", slot (*this, &Editor::export_selection));
-
- add_action ("editor-cut", slot (*this, &Editor::cut));
- add_action ("editor-copy", slot (*this, &Editor::copy));
- add_action ("editor-paste", slot (*this, &Editor::keyboard_paste));
- add_action ("duplicate-region", slot (*this, &Editor::keyboard_duplicate_region));
- add_action ("duplicate-range", slot (*this, &Editor::keyboard_duplicate_selection));
- add_action ("insert-region", slot (*this, &Editor::keyboard_insert_region_list_selection));
- add_action ("reverse-region", slot (*this, &Editor::reverse_region));
- add_action ("normalize-region", slot (*this, &Editor::normalize_region));
- add_action ("editor-crop", slot (*this, &Editor::crop_region_to_selection));
- add_action ("insert-chunk", bind (slot (*this, &Editor::paste_named_selection), 1.0f));
-
- add_action ("split-at-edit-cursor", slot (*this, &Editor::split_region));
- add_action ("split-at-mouse", slot (*this, &Editor::kbd_split));
-
- add_action ("brush-at-mouse", slot (*this, &Editor::kbd_brush));
- add_action ("audition-at-mouse", slot (*this, &Editor::kbd_audition));
-
- add_action ("start-range", slot (*this, &Editor::keyboard_selection_begin));
- add_action ("finish-range", bind (slot (*this, &Editor::keyboard_selection_finish), false));
- add_action ("finish-add-range", bind (slot (*this, &Editor::keyboard_selection_finish), true));
-
- add_action ("extend-range-to-end-of-region", bind (slot (*this, &Editor::extend_selection_to_end_of_region), false));
- add_action ("extend-range-to-start-of-region", bind (slot (*this, &Editor::extend_selection_to_start_of_region), false));
-
- add_action ("zoom-focus-left", bind (slot (*this, &Editor::set_zoom_focus), Editing::ZoomFocusLeft));
- add_action ("zoom-focus-right", bind (slot (*this, &Editor::set_zoom_focus), Editing::ZoomFocusRight));
- add_action ("zoom-focus-center", bind (slot (*this, &Editor::set_zoom_focus), Editing::ZoomFocusCenter));
- add_action ("zoom-focus-playhead", bind (slot (*this, &Editor::set_zoom_focus), Editing::ZoomFocusPlayhead));
- add_action ("zoom-focus-edit", bind (slot (*this, &Editor::set_zoom_focus), Editing::ZoomFocusEdit));
-
- add_action ("toggle-follow-playhead", (slot (*this, &Editor::toggle_follow_playhead)));
- add_action ("remove-last-capture", (slot (*this, &Editor::remove_last_capture)));
-
- add_action ("snap-to-frame", (bind (slot (*this, &Editor::set_snap_to), Editing::SnapToFrame)));
- add_action ("snap-to-cd-frame", (bind (slot (*this, &Editor::set_snap_to), Editing::SnapToCDFrame)));
- add_action ("snap-to-smpte-frame", (bind (slot (*this, &Editor::set_snap_to), Editing::SnapToSMPTEFrame)));
- add_action ("snap-to-smpte-seconds", (bind (slot (*this, &Editor::set_snap_to), Editing::SnapToSMPTESeconds)));
- add_action ("snap-to-smpte-minutes", (bind (slot (*this, &Editor::set_snap_to), Editing::SnapToSMPTEMinutes)));
- add_action ("snap-to-seconds", (bind (slot (*this, &Editor::set_snap_to), Editing::SnapToSeconds)));
- add_action ("snap-to-minutes", (bind (slot (*this, &Editor::set_snap_to), Editing::SnapToMinutes)));
- add_action ("snap-to-thirtyseconds", (bind (slot (*this, &Editor::set_snap_to), Editing::SnapToAThirtysecondBeat)));
- add_action ("snap-to-asixteenthbeat", (bind (slot (*this, &Editor::set_snap_to), Editing::SnapToASixteenthBeat)));
- add_action ("snap-to-eighths", (bind (slot (*this, &Editor::set_snap_to), Editing::SnapToAEighthBeat)));
- add_action ("snap-to-quarters", (bind (slot (*this, &Editor::set_snap_to), Editing::SnapToAQuarterBeat)));
- add_action ("snap-to-thirds", (bind (slot (*this, &Editor::set_snap_to), Editing::SnapToAThirdBeat)));
- add_action ("snap-to-beat", (bind (slot (*this, &Editor::set_snap_to), Editing::SnapToBeat)));
- add_action ("snap-to-bar", (bind (slot (*this, &Editor::set_snap_to), Editing::SnapToBar)));
- add_action ("snap-to-mark", (bind (slot (*this, &Editor::set_snap_to), Editing::SnapToMark)));
- add_action ("snap-to-edit-cursor", (bind (slot (*this, &Editor::set_snap_to), Editing::SnapToEditCursor)));
- add_action ("snap-to-region-start", (bind (slot (*this, &Editor::set_snap_to), Editing::SnapToRegionStart)));
- add_action ("snap-to-region-end", (bind (slot (*this, &Editor::set_snap_to), Editing::SnapToRegionEnd)));
- add_action ("snap-to-region-sync", (bind (slot (*this, &Editor::set_snap_to), Editing::SnapToRegionSync)));
- add_action ("snap-to-region-boundary", (bind (slot (*this, &Editor::set_snap_to), Editing::SnapToRegionBoundary)));
+ add_action ("set-playhead", mem_fun(*this, &Editor::kbd_set_playhead_cursor));
+ add_action ("set-edit-cursor", mem_fun(*this, &Editor::kbd_set_edit_cursor));
+
+ add_action ("set-mouse-mode-object", bind (mem_fun(*this, &Editor::set_mouse_mode), Editing::MouseObject, false));
+ add_action ("set-mouse-mode-range", bind (mem_fun(*this, &Editor::set_mouse_mode), Editing::MouseRange, false));
+ add_action ("set-mouse-mode-gain", bind (mem_fun(*this, &Editor::set_mouse_mode), Editing::MouseGain, false));
+ add_action ("set-mouse-mode-zoom", bind (mem_fun(*this, &Editor::set_mouse_mode), Editing::MouseZoom, false));
+ add_action ("set-mouse-mode-timefx", bind (mem_fun(*this, &Editor::set_mouse_mode), Editing::MouseTimeFX, false));
+
+ add_action ("set-undo", bind (mem_fun(*this, &Editor::undo), 1U));
+ add_action ("set-redo", bind (mem_fun(*this, &Editor::redo), 1U));
+
+ add_action ("export-session", mem_fun(*this, &Editor::export_session));
+ add_action ("export-range", mem_fun(*this, &Editor::export_selection));
+
+ add_action ("editor-cut", mem_fun(*this, &Editor::cut));
+ add_action ("editor-copy", mem_fun(*this, &Editor::copy));
+ add_action ("editor-paste", mem_fun(*this, &Editor::keyboard_paste));
+ add_action ("duplicate-region", mem_fun(*this, &Editor::keyboard_duplicate_region));
+ add_action ("duplicate-range", mem_fun(*this, &Editor::keyboard_duplicate_selection));
+ add_action ("insert-region", mem_fun(*this, &Editor::keyboard_insert_region_list_selection));
+ add_action ("reverse-region", mem_fun(*this, &Editor::reverse_region));
+ add_action ("normalize-region", mem_fun(*this, &Editor::normalize_region));
+ add_action ("editor-crop", mem_fun(*this, &Editor::crop_region_to_selection));
+ add_action ("insert-chunk", bind (mem_fun(*this, &Editor::paste_named_selection), 1.0f));
+
+ add_action ("split-at-edit-cursor", mem_fun(*this, &Editor::split_region));
+ add_action ("split-at-mouse", mem_fun(*this, &Editor::kbd_split));
+
+ add_action ("brush-at-mouse", mem_fun(*this, &Editor::kbd_brush));
+ add_action ("audition-at-mouse", mem_fun(*this, &Editor::kbd_audition));
+
+ add_action ("start-range", mem_fun(*this, &Editor::keyboard_selection_begin));
+ add_action ("finish-range", bind (mem_fun(*this, &Editor::keyboard_selection_finish), false));
+ add_action ("finish-add-range", bind (mem_fun(*this, &Editor::keyboard_selection_finish), true));
+
+ add_action ("extend-range-to-end-of-region", bind (mem_fun(*this, &Editor::extend_selection_to_end_of_region), false));
+ add_action ("extend-range-to-start-of-region", bind (mem_fun(*this, &Editor::extend_selection_to_start_of_region), false));
+
+ add_action ("zoom-focus-left", bind (mem_fun(*this, &Editor::set_zoom_focus), Editing::ZoomFocusLeft));
+ add_action ("zoom-focus-right", bind (mem_fun(*this, &Editor::set_zoom_focus), Editing::ZoomFocusRight));
+ add_action ("zoom-focus-center", bind (mem_fun(*this, &Editor::set_zoom_focus), Editing::ZoomFocusCenter));
+ add_action ("zoom-focus-playhead", bind (mem_fun(*this, &Editor::set_zoom_focus), Editing::ZoomFocusPlayhead));
+ add_action ("zoom-focus-edit", bind (mem_fun(*this, &Editor::set_zoom_focus), Editing::ZoomFocusEdit));
+
+ add_action ("toggle-follow-playhead", (mem_fun(*this, &Editor::toggle_follow_playhead)));
+ add_action ("remove-last-capture", (mem_fun(*this, &Editor::remove_last_capture)));
+
+ add_action ("snap-to-frame", (bind (mem_fun(*this, &Editor::set_snap_to), Editing::SnapToFrame)));
+ add_action ("snap-to-cd-frame", (bind (mem_fun(*this, &Editor::set_snap_to), Editing::SnapToCDFrame)));
+ add_action ("snap-to-smpte-frame", (bind (mem_fun(*this, &Editor::set_snap_to), Editing::SnapToSMPTEFrame)));
+ add_action ("snap-to-smpte-seconds", (bind (mem_fun(*this, &Editor::set_snap_to), Editing::SnapToSMPTESeconds)));
+ add_action ("snap-to-smpte-minutes", (bind (mem_fun(*this, &Editor::set_snap_to), Editing::SnapToSMPTEMinutes)));
+ add_action ("snap-to-seconds", (bind (mem_fun(*this, &Editor::set_snap_to), Editing::SnapToSeconds)));
+ add_action ("snap-to-minutes", (bind (mem_fun(*this, &Editor::set_snap_to), Editing::SnapToMinutes)));
+ add_action ("snap-to-thirtyseconds", (bind (mem_fun(*this, &Editor::set_snap_to), Editing::SnapToAThirtysecondBeat)));
+ add_action ("snap-to-asixteenthbeat", (bind (mem_fun(*this, &Editor::set_snap_to), Editing::SnapToASixteenthBeat)));
+ add_action ("snap-to-eighths", (bind (mem_fun(*this, &Editor::set_snap_to), Editing::SnapToAEighthBeat)));
+ add_action ("snap-to-quarters", (bind (mem_fun(*this, &Editor::set_snap_to), Editing::SnapToAQuarterBeat)));
+ add_action ("snap-to-thirds", (bind (mem_fun(*this, &Editor::set_snap_to), Editing::SnapToAThirdBeat)));
+ add_action ("snap-to-beat", (bind (mem_fun(*this, &Editor::set_snap_to), Editing::SnapToBeat)));
+ add_action ("snap-to-bar", (bind (mem_fun(*this, &Editor::set_snap_to), Editing::SnapToBar)));
+ add_action ("snap-to-mark", (bind (mem_fun(*this, &Editor::set_snap_to), Editing::SnapToMark)));
+ add_action ("snap-to-edit-cursor", (bind (mem_fun(*this, &Editor::set_snap_to), Editing::SnapToEditCursor)));
+ add_action ("snap-to-region-start", (bind (mem_fun(*this, &Editor::set_snap_to), Editing::SnapToRegionStart)));
+ add_action ("snap-to-region-end", (bind (mem_fun(*this, &Editor::set_snap_to), Editing::SnapToRegionEnd)));
+ add_action ("snap-to-region-sync", (bind (mem_fun(*this, &Editor::set_snap_to), Editing::SnapToRegionSync)));
+ add_action ("snap-to-region-boundary", (bind (mem_fun(*this, &Editor::set_snap_to), Editing::SnapToRegionBoundary)));
}
void
lam->show ();
}
- location->start_changed.connect (slot (*this, &Editor::location_changed));
- location->end_changed.connect (slot (*this, &Editor::location_changed));
- location->changed.connect (slot (*this, &Editor::location_changed));
- location->name_changed.connect (slot (*this, &Editor::location_changed));
- location->FlagsChanged.connect (slot (*this, &Editor::location_flags_changed));
+ location->start_changed.connect (mem_fun(*this, &Editor::location_changed));
+ location->end_changed.connect (mem_fun(*this, &Editor::location_changed));
+ location->changed.connect (mem_fun(*this, &Editor::location_changed));
+ location->name_changed.connect (mem_fun(*this, &Editor::location_changed));
+ location->FlagsChanged.connect (mem_fun(*this, &Editor::location_flags_changed));
pair<Location*,LocationMarkers*> newpair;
void
Editor::location_changed (Location *location)
{
- ENSURE_GUI_THREAD (bind (slot (*this, &Editor::location_changed), location));
+ ENSURE_GUI_THREAD (bind (mem_fun(*this, &Editor::location_changed), location));
LocationMarkers *lam = find_location_markers (location);
void
Editor::location_flags_changed (Location *location, void *src)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &Editor::location_flags_changed), location, src));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &Editor::location_flags_changed), location, src));
LocationMarkers *lam = find_location_markers (location);
void
Editor::refresh_location_display ()
{
- ENSURE_GUI_THREAD(slot (*this, &Editor::refresh_location_display));
+ ENSURE_GUI_THREAD(mem_fun(*this, &Editor::refresh_location_display));
if (session) {
session->locations()->apply (*this, &Editor::refresh_location_display_internal);
void
Editor::refresh_location_display_s (Change ignored)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &Editor::refresh_location_display_s), ignored));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &Editor::refresh_location_display_s), ignored));
if (session) {
session->locations()->apply (*this, &Editor::refresh_location_display_internal);
loc->set_hidden (true, this);
}
else {
- Gtk::Main::idle.connect (bind (slot (*this, &Editor::really_remove_marker), loc));
+ Gtk::Main::idle.connect (bind (mem_fun(*this, &Editor::really_remove_marker), loc));
}
}
}
void
Editor::location_gone (Location *location)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &Editor::location_gone), location));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &Editor::location_gone), location));
LocationMarkerMap::iterator i;
MenuList& items = marker_menu->items();
marker_menu->set_name ("ArdourContextMenu");
- items.push_back (MenuElem (_("Locate to"), slot (*this, &Editor::marker_menu_set_playhead)));
- items.push_back (MenuElem (_("Play from"), slot (*this, &Editor::marker_menu_play_from)));
- items.push_back (MenuElem (_("Loop range"), slot (*this, &Editor::marker_menu_loop_range)));
- items.push_back (MenuElem (_("Set from playhead"), slot (*this, &Editor::marker_menu_set_from_playhead)));
- items.push_back (MenuElem (_("Set from range"), slot (*this, &Editor::marker_menu_set_from_selection)));
+ items.push_back (MenuElem (_("Locate to"), mem_fun(*this, &Editor::marker_menu_set_playhead)));
+ items.push_back (MenuElem (_("Play from"), mem_fun(*this, &Editor::marker_menu_play_from)));
+ items.push_back (MenuElem (_("Loop range"), mem_fun(*this, &Editor::marker_menu_loop_range)));
+ items.push_back (MenuElem (_("Set from playhead"), mem_fun(*this, &Editor::marker_menu_set_from_playhead)));
+ items.push_back (MenuElem (_("Set from range"), mem_fun(*this, &Editor::marker_menu_set_from_selection)));
items.push_back (SeparatorElem());
- items.push_back (MenuElem (_("Rename"), slot (*this, &Editor::marker_menu_rename)));
- items.push_back (MenuElem (_("Hide"), slot (*this, &Editor::marker_menu_hide)));
- items.push_back (MenuElem (_("Remove"), slot (*this, &Editor::marker_menu_remove)));
+ items.push_back (MenuElem (_("Rename"), mem_fun(*this, &Editor::marker_menu_rename)));
+ items.push_back (MenuElem (_("Hide"), mem_fun(*this, &Editor::marker_menu_hide)));
+ items.push_back (MenuElem (_("Remove"), mem_fun(*this, &Editor::marker_menu_remove)));
}
void
MenuList& items = tm_marker_menu->items();
tm_marker_menu->set_name ("ArdourContextMenu");
- items.push_back (MenuElem (_("Edit"), slot (*this, &Editor::marker_menu_edit)));
- items.push_back (MenuElem (_("Remove"), slot (*this, &Editor::marker_menu_remove)));
+ items.push_back (MenuElem (_("Edit"), mem_fun(*this, &Editor::marker_menu_edit)));
+ items.push_back (MenuElem (_("Remove"), mem_fun(*this, &Editor::marker_menu_remove)));
}
void
MenuList& items = new_transport_marker_menu->items();
new_transport_marker_menu->set_name ("ArdourContextMenu");
- items.push_back (MenuElem (_("Set Loop Range"), slot (*this, &Editor::new_transport_marker_menu_set_loop)));
- items.push_back (MenuElem (_("Set Punch Range"), slot (*this, &Editor::new_transport_marker_menu_set_punch)));
+ items.push_back (MenuElem (_("Set Loop Range"), mem_fun(*this, &Editor::new_transport_marker_menu_set_loop)));
+ items.push_back (MenuElem (_("Set Punch Range"), mem_fun(*this, &Editor::new_transport_marker_menu_set_punch)));
- new_transport_marker_menu->unmap_event.connect ( slot (*this, &Editor::new_transport_marker_menu_popdown));
+ new_transport_marker_menu->unmap_event.connect ( mem_fun(*this, &Editor::new_transport_marker_menu_popdown));
}
void
MenuList& items = transport_marker_menu->items();
transport_marker_menu->set_name ("ArdourContextMenu");
- items.push_back (MenuElem (_("Locate to"), slot (*this, &Editor::marker_menu_set_playhead)));
- items.push_back (MenuElem (_("Play from"), slot (*this, &Editor::marker_menu_play_from)));
- items.push_back (MenuElem (_("Set from playhead"), slot (*this, &Editor::marker_menu_set_from_playhead)));
- items.push_back (MenuElem (_("Set from range"), slot (*this, &Editor::marker_menu_set_from_selection)));
+ items.push_back (MenuElem (_("Locate to"), mem_fun(*this, &Editor::marker_menu_set_playhead)));
+ items.push_back (MenuElem (_("Play from"), mem_fun(*this, &Editor::marker_menu_play_from)));
+ items.push_back (MenuElem (_("Set from playhead"), mem_fun(*this, &Editor::marker_menu_set_from_playhead)));
+ items.push_back (MenuElem (_("Set from range"), mem_fun(*this, &Editor::marker_menu_set_from_selection)));
items.push_back (SeparatorElem());
- items.push_back (MenuElem (_("Hide"), slot (*this, &Editor::marker_menu_hide)));
+ items.push_back (MenuElem (_("Hide"), mem_fun(*this, &Editor::marker_menu_hide)));
}
void
ok_button.set_name ("EditorGTKButton");
cancel_button.set_name ("EditorGTKButton");
- entry.activate.connect (bind (slot (*this, &Editor::finish_sub_event_loop), 1));
- cancel_button.signal_clicked().connect (bind (slot (*this, &Editor::finish_sub_event_loop), -1));
- ok_button.signal_clicked().connect (bind (slot (*this, &Editor::finish_sub_event_loop), 1));
- dialog.delete_event.connect (bind (slot (*this, &Editor::finish_sub_event_loop_on_delete), -1));
+ entry.activate.connect (bind (mem_fun(*this, &Editor::finish_sub_event_loop), 1));
+ cancel_button.signal_clicked().connect (bind (mem_fun(*this, &Editor::finish_sub_event_loop), -1));
+ ok_button.signal_clicked().connect (bind (mem_fun(*this, &Editor::finish_sub_event_loop), 1));
+ dialog.delete_event.connect (bind (mem_fun(*this, &Editor::finish_sub_event_loop_on_delete), -1));
dialog.show_all ();
entry.grab_focus ();
session->add_redo_no_execute (session->locations()->get_memento());
}
else {
- session->add_undo (rettype<void>(bind (slot (*tll, &Location::set), tll->start(), tll->end())));
- session->add_redo (rettype<void>(bind (slot (*tll, &Location::set), temp_location->start(), temp_location->end())));
+ session->add_undo (rettype<void>(bind (mem_fun (*tll, &Location::set), tll->start(), tll->end())));
+ session->add_redo (rettype<void>(bind (mem_fun (*tll, &Location::set), temp_location->start(), temp_location->end())));
tll->set_hidden (false, this);
tll->set (temp_location->start(), temp_location->end());
}
session->set_auto_punch_location (tpl);
session->add_redo_no_execute (session->locations()->get_memento());
} else {
- session->add_undo (rettype<void>(bind (slot (*tpl, &Location::set), tpl->start(), tpl->end())));
- session->add_redo (rettype<void>(bind (slot (*tpl, &Location::set), temp_location->start(), temp_location->end())));
+ session->add_undo (rettype<void>(bind (mem_fun (*tpl, &Location::set), tpl->start(), tpl->end())));
+ session->add_redo (rettype<void>(bind (mem_fun (*tpl, &Location::set), temp_location->start(), temp_location->end())));
tpl->set_hidden(false, this);
tpl->set(temp_location->start(), temp_location->end());
}
*session,
atv->route(), false);
- current_mixer_strip->GoingAway.connect (slot (*this, &Editor::cms_deleted));
+ current_mixer_strip->GoingAway.connect (mem_fun(*this, &Editor::cms_deleted));
break;
}
}
current_mixer_strip = new MixerStrip (*ARDOUR_UI::instance()->the_mixer(),
*session,
atv->route(), false);
- current_mixer_strip->GoingAway.connect (slot (*this, &Editor::cms_deleted));
+ current_mixer_strip->GoingAway.connect (mem_fun(*this, &Editor::cms_deleted));
break;
}
}
if (current_mixer_strip->get_parent() == 0) {
current_mixer_strip->set_embedded (true);
- current_mixer_strip->Hiding.connect (slot (*this, &Editor::current_mixer_strip_hidden));
- current_mixer_strip->GoingAway.connect (slot (*this, &Editor::current_mixer_strip_removed));
+ 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 ();
current_mixer_strip = new MixerStrip (*ARDOUR_UI::instance()->the_mixer(),
*session,
at->route());
- current_mixer_strip->GoingAway.connect (slot (*this, &Editor::cms_deleted));
+ current_mixer_strip->GoingAway.connect (mem_fun(*this, &Editor::cms_deleted));
if (show) {
show_editor_mixer (true);
if (clicked_trackview) {
if (!current_stepping_trackview) {
TimeoutSig t;
- step_timeout = t.connect (slot (*this, &Editor::track_height_step_timeout), 500);
+ step_timeout = t.connect (mem_fun(*this, &Editor::track_height_step_timeout), 500);
current_stepping_trackview = clicked_trackview;
}
gettimeofday (&last_track_height_step_timestamp, 0);
if (clicked_trackview) {
if (!current_stepping_trackview) {
TimeoutSig t;
- step_timeout = t.connect (slot (*this, &Editor::track_height_step_timeout), 500);
+ step_timeout = t.connect (mem_fun(*this, &Editor::track_height_step_timeout), 500);
current_stepping_trackview = clicked_trackview;
}
gettimeofday (&last_track_height_step_timestamp, 0);
gdk_window_set_cursor (track_canvas_scroller.get_window(), current_canvas_cursor);
clear_entered_track = true;
- Main::idle.connect (slot (*this, &Editor::left_automation_track));
+ Main::idle.connect (mem_fun(*this, &Editor::left_automation_track));
}
break;
session->add_undo (to_playlist->get_memento ());
latest_regionview = 0;
- sigc::connection c = atv->view->AudioRegionViewAdded.connect (slot (*this, &Editor::collect_new_region_view));
+ sigc::connection c = atv->view->AudioRegionViewAdded.connect (mem_fun(*this, &Editor::collect_new_region_view));
/* create a new region with the same name.
*/
from_playlist->remove_region (&((*i)->region));
- sigc::connection c = atv2->view->AudioRegionViewAdded.connect (slot (*this, &Editor::collect_new_region_view));
+ sigc::connection c = atv2->view->AudioRegionViewAdded.connect (mem_fun(*this, &Editor::collect_new_region_view));
to_playlist->add_region (*new_region, where);
c.disconnect ();
*/
latest_regionview = 0;
- sigc::connection c = clicked_audio_trackview->view->AudioRegionViewAdded.connect (slot (*this, &Editor::collect_new_region_view));
+ sigc::connection c = clicked_audio_trackview->view->AudioRegionViewAdded.connect (mem_fun(*this, &Editor::collect_new_region_view));
/* A selection grab currently creates two undo/redo operations, one for
creating the new region and another for moving it.
// leftmost_after_zoom = min (leftmost_after_zoom, session->current_end_frame());
// begin_reversible_command (_("zoom"));
-// session->add_undo (bind (slot (*this, &Editor::reposition_and_zoom), current_leftmost, frames_per_unit));
-// session->add_redo (bind (slot (*this, &Editor::reposition_and_zoom), leftmost_after_zoom, nfpu));
+// session->add_undo (bind (mem_fun(*this, &Editor::reposition_and_zoom), current_leftmost, frames_per_unit));
+// session->add_redo (bind (mem_fun(*this, &Editor::reposition_and_zoom), leftmost_after_zoom, nfpu));
// commit_reversible_command ();
reposition_and_zoom (leftmost_after_zoom, nfpu);
if (new_leftmost > middle) new_leftmost = 0;
// begin_reversible_command (op);
-// session->add_undo (bind (slot (*this, &Editor::reposition_and_zoom), leftmost_frame, frames_per_unit));
-// session->add_redo (bind (slot (*this, &Editor::reposition_and_zoom), new_leftmost, new_fpu));
+// session->add_undo (bind (mem_fun(*this, &Editor::reposition_and_zoom), leftmost_frame, frames_per_unit));
+// session->add_redo (bind (mem_fun(*this, &Editor::reposition_and_zoom), new_leftmost, new_fpu));
// commit_reversible_command ();
reposition_and_zoom (new_leftmost, new_fpu);
if (new_leftmost > frame) new_leftmost = 0;
// begin_reversible_command (_("zoom to frame"));
-// session->add_undo (bind (slot (*this, &Editor::reposition_and_zoom), leftmost_frame, frames_per_unit));
-// session->add_redo (bind (slot (*this, &Editor::reposition_and_zoom), new_leftmost, new_fpu));
+// session->add_undo (bind (mem_fun(*this, &Editor::reposition_and_zoom), leftmost_frame, frames_per_unit));
+// session->add_redo (bind (mem_fun(*this, &Editor::reposition_and_zoom), new_leftmost, new_fpu));
// commit_reversible_command ();
reposition_and_zoom (new_leftmost, new_fpu);
region_renamed = false;
- entry.activate.connect (bind (slot (*this, &Editor::rename_region_finished), true));
- ok_button.signal_clicked().connect (bind (slot (*this, &Editor::rename_region_finished), true));
- cancel_button.signal_clicked().connect (bind (slot (*this, &Editor::rename_region_finished), false));
+ entry.activate.connect (bind (mem_fun(*this, &Editor::rename_region_finished), true));
+ ok_button.signal_clicked().connect (bind (mem_fun(*this, &Editor::rename_region_finished), true));
+ cancel_button.signal_clicked().connect (bind (mem_fun(*this, &Editor::rename_region_finished), false));
/* recurse */
interthread_cancel_button.add (interthread_cancel_label);
- interthread_cancel_button.signal_clicked().connect (slot (*this, &Editor::interthread_cancel_clicked));
+ interthread_cancel_button.signal_clicked().connect (mem_fun(*this, &Editor::interthread_cancel_clicked));
interthread_progress_window->set_modal (true);
interthread_progress_window->set_default_size (200, 100);
string str;
if (as_tracks) {
- c = sfdb.Action.connect (bind (slot (*this, &Editor::do_import), true));
+ c = sfdb.Action.connect (bind (mem_fun(*this, &Editor::do_import), true));
str =_("Import selected as tracks");
} else {
- c = sfdb.Action.connect (bind (slot (*this, &Editor::do_import), false));
+ c = sfdb.Action.connect (bind (mem_fun(*this, &Editor::do_import), false));
str = _("Import selected to region list");
}
interthread_cancel_label.set_text (_("Cancel Import"));
current_interthread_info = &import_status;
- c = session->AudioRegionAdded.connect (slot (*this, &Editor::catch_new_audio_region));
+ c = session->AudioRegionAdded.connect (mem_fun(*this, &Editor::catch_new_audio_region));
for (vector<string>::iterator i = paths.begin(); i != paths.end(); ++i ) {
import_status.done = 0.0;
interthread_progress_connection =
- Gtk::Main::timeout.connect (bind (slot (*this, &Editor::import_progress_timeout), (gpointer) 0), 100);
+ Gtk::Main::timeout.connect (bind (mem_fun(*this, &Editor::import_progress_timeout), (gpointer) 0), 100);
last_audio_region = 0;
}
SoundFileSelector& sfdb (ARDOUR_UI::instance()->get_sfdb_window());
- sigc::connection c = sfdb.Action.connect (slot (*this, &Editor::do_embed_sndfiles));
+ sigc::connection c = sfdb.Action.connect (mem_fun(*this, &Editor::do_embed_sndfiles));
sfdb.run (_("Add to External Region list"), true);
if (as_tracks) {
- c = sfdb.Action.connect (slot (*this, &Editor::insert_paths_as_new_tracks));
+ c = sfdb.Action.connect (mem_fun(*this, &Editor::insert_paths_as_new_tracks));
str = _("Insert selected as new tracks");
} else {
return;
}
- c = sfdb.Action.connect (bind (slot (*this, &Editor::do_insert_sndfile), pos));
+ c = sfdb.Action.connect (bind (mem_fun(*this, &Editor::do_insert_sndfile), pos));
str = _("Insert selected");
}
current_interthread_info = &itt;
interthread_progress_connection =
- Gtk::Main::timeout.connect (bind (slot (*this, &Editor::freeze_progress_timeout), (gpointer) 0), 100);
+ Gtk::Main::timeout.connect (bind (mem_fun(*this, &Editor::freeze_progress_timeout), (gpointer) 0), 100);
itt.done = false;
itt.cancel = false;
void
Editor::region_hidden (Region* r)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &Editor::region_hidden), r));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &Editor::region_hidden), r));
redisplay_regions ();
}
MenuList& items = region_list_menu->items();
region_list_menu->set_name ("ArdourContextMenu");
- items.push_back (MenuElem (_("Audition"), slot (*this, &Editor::audition_region_from_region_list)));
+ items.push_back (MenuElem (_("Audition"), mem_fun(*this, &Editor::audition_region_from_region_list)));
rl_context_menu_region_items.push_back (items.back());
- items.push_back (MenuElem (_("Hide"), slot (*this, &Editor::hide_region_from_region_list)));
+ items.push_back (MenuElem (_("Hide"), mem_fun(*this, &Editor::hide_region_from_region_list)));
rl_context_menu_region_items.push_back (items.back());
- items.push_back (MenuElem (_("Remove"), slot (*this, &Editor::remove_region_from_region_list)));
+ items.push_back (MenuElem (_("Remove"), mem_fun(*this, &Editor::remove_region_from_region_list)));
rl_context_menu_region_items.push_back (items.back());
// items.push_back (MenuElem (_("Find")));
- items.push_back (CheckMenuElem (_("Show all"), slot (*this, &Editor::toggle_full_region_list)));
+ items.push_back (CheckMenuElem (_("Show all"), mem_fun(*this, &Editor::toggle_full_region_list)));
toggle_full_region_list_item = static_cast<CheckMenuItem*> (items.back());
Gtk::Menu *sort_menu = manage (new Menu);
RadioMenuItem::Group sort_type_group;
sort_items.push_back (RadioMenuElem (sort_order_group, _("Ascending"),
- bind (slot (*this, &Editor::reset_region_list_sort_direction), true)));
+ bind (mem_fun(*this, &Editor::reset_region_list_sort_direction), true)));
sort_items.push_back (RadioMenuElem (sort_order_group, _("Descending"),
- bind (slot (*this, &Editor::reset_region_list_sort_direction), false)));
+ bind (mem_fun(*this, &Editor::reset_region_list_sort_direction), false)));
sort_items.push_back (SeparatorElem());
sort_items.push_back (RadioMenuElem (sort_type_group, _("By Region Name"),
- bind (slot (*this, &Editor::reset_region_list_sort_type), ByName)));
+ bind (mem_fun(*this, &Editor::reset_region_list_sort_type), ByName)));
sort_items.push_back (RadioMenuElem (sort_type_group, _("By Region Length"),
- bind (slot (*this, &Editor::reset_region_list_sort_type), ByLength)));
+ bind (mem_fun(*this, &Editor::reset_region_list_sort_type), ByLength)));
sort_items.push_back (RadioMenuElem (sort_type_group, _("By Region Position"),
- bind (slot (*this, &Editor::reset_region_list_sort_type), ByPosition)));
+ bind (mem_fun(*this, &Editor::reset_region_list_sort_type), ByPosition)));
sort_items.push_back (RadioMenuElem (sort_type_group, _("By Region Timestamp"),
- bind (slot (*this, &Editor::reset_region_list_sort_type), ByTimestamp)));
+ bind (mem_fun(*this, &Editor::reset_region_list_sort_type), ByTimestamp)));
sort_items.push_back (RadioMenuElem (sort_type_group, _("By Region Start in File"),
- bind (slot (*this, &Editor::reset_region_list_sort_type), ByStartInFile)));
+ bind (mem_fun(*this, &Editor::reset_region_list_sort_type), ByStartInFile)));
sort_items.push_back (RadioMenuElem (sort_type_group, _("By Region End in File"),
- bind (slot (*this, &Editor::reset_region_list_sort_type), ByEndInFile)));
+ bind (mem_fun(*this, &Editor::reset_region_list_sort_type), ByEndInFile)));
sort_items.push_back (RadioMenuElem (sort_type_group, _("By Source File Name"),
- bind (slot (*this, &Editor::reset_region_list_sort_type), BySourceFileName)));
+ bind (mem_fun(*this, &Editor::reset_region_list_sort_type), BySourceFileName)));
sort_items.push_back (RadioMenuElem (sort_type_group, _("By Source File Length"),
- bind (slot (*this, &Editor::reset_region_list_sort_type), BySourceFileLength)));
+ bind (mem_fun(*this, &Editor::reset_region_list_sort_type), BySourceFileLength)));
sort_items.push_back (RadioMenuElem (sort_type_group, _("By Source File Creation Date"),
- bind (slot (*this, &Editor::reset_region_list_sort_type), BySourceFileCreationDate)));
+ bind (mem_fun(*this, &Editor::reset_region_list_sort_type), BySourceFileCreationDate)));
sort_items.push_back (RadioMenuElem (sort_type_group, _("By Source Filesystem"),
- bind (slot (*this, &Editor::reset_region_list_sort_type), BySourceFileFS)));
+ bind (mem_fun(*this, &Editor::reset_region_list_sort_type), BySourceFileFS)));
items.push_back (MenuElem (_("Sorting"), *sort_menu));
items.push_back (SeparatorElem());
-// items.push_back (CheckMenuElem (_("Display Automatic Regions"), slot (*this, &Editor::toggle_show_auto_regions)));
+// items.push_back (CheckMenuElem (_("Display Automatic Regions"), mem_fun(*this, &Editor::toggle_show_auto_regions)));
// toggle_auto_regions_item = static_cast<CheckMenuItem*> (items.back());
// toggle_auto_regions_item->set_active (show_automatic_regions_in_region_list);
// items.push_back (SeparatorElem());
- items.push_back (MenuElem (_("Import audio (copy)"), bind (slot (*this, &Editor::import_audio), false)));
+ items.push_back (MenuElem (_("Import audio (copy)"), bind (mem_fun(*this, &Editor::import_audio), false)));
import_audio_item = items.back();
if (!session) {
import_audio_item->set_sensitive (false);
}
- items.push_back (MenuElem (_("Embed audio (link)"), slot (*this, &Editor::embed_audio)));
+ items.push_back (MenuElem (_("Embed audio (link)"), mem_fun(*this, &Editor::embed_audio)));
embed_audio_item = items.back();
if (!session) {
embed_audio_item->set_sensitive (false);
void
Editor::handle_new_route_p (Route* route)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &Editor::handle_new_route_p), route));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &Editor::handle_new_route_p), route));
handle_new_route (*route);
}
ignore_route_list_reorder = false;
- route.gui_changed.connect (slot (*this, &Editor::handle_gui_changes));
+ route.gui_changed.connect (mem_fun(*this, &Editor::handle_gui_changes));
- tv->GoingAway.connect (bind (slot (*this, &Editor::remove_route), tv));
+ tv->GoingAway.connect (bind (mem_fun(*this, &Editor::remove_route), tv));
editor_mixer_button.set_sensitive(true);
void
Editor::handle_gui_changes (string what, void *src)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &Editor::handle_gui_changes), what, src));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &Editor::handle_gui_changes), what, src));
if (what == "track_height") {
route_list_reordered ();
void
Editor::remove_route (TimeAxisView *tv)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &Editor::remove_route), tv));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &Editor::remove_route), tv));
TrackViewList::iterator i;
CList_Helpers::RowList::iterator ri;
is complete.
*/
- Main::idle.connect (slot (*this, &Editor::route_list_reordered));
+ Main::idle.connect (mem_fun(*this, &Editor::route_list_reordered));
}
void
MenuList& items = route_list_menu->items();
route_list_menu->set_name ("ArdourContextMenu");
- items.push_back (MenuElem (_("Show All"), slot (*this, &Editor::select_all_routes)));
- items.push_back (MenuElem (_("Hide All"), slot (*this, &Editor::unselect_all_routes)));
- items.push_back (MenuElem (_("Show All AbstractTracks"), slot (*this, &Editor::select_all_audiotracks)));
- items.push_back (MenuElem (_("Hide All AbstractTracks"), slot (*this, &Editor::unselect_all_audiotracks)));
- items.push_back (MenuElem (_("Show All AudioBus"), slot (*this, &Editor::select_all_audiobus)));
- items.push_back (MenuElem (_("Hide All AudioBus"), slot (*this, &Editor::unselect_all_audiobus)));
+ items.push_back (MenuElem (_("Show All"), mem_fun(*this, &Editor::select_all_routes)));
+ items.push_back (MenuElem (_("Hide All"), mem_fun(*this, &Editor::unselect_all_routes)));
+ items.push_back (MenuElem (_("Show All AbstractTracks"), mem_fun(*this, &Editor::select_all_audiotracks)));
+ items.push_back (MenuElem (_("Hide All AbstractTracks"), mem_fun(*this, &Editor::unselect_all_audiotracks)));
+ items.push_back (MenuElem (_("Show All AudioBus"), mem_fun(*this, &Editor::select_all_audiobus)));
+ items.push_back (MenuElem (_("Hide All AudioBus"), mem_fun(*this, &Editor::unselect_all_audiobus)));
}
frames_ruler->set_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
minsec_ruler->set_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
- smpte_ruler->button_release_event.connect (slot (*this, &Editor::ruler_button_release));
- bbt_ruler->button_release_event.connect (slot (*this, &Editor::ruler_button_release));
- frames_ruler->button_release_event.connect (slot (*this, &Editor::ruler_button_release));
- minsec_ruler->button_release_event.connect (slot (*this, &Editor::ruler_button_release));
-
- smpte_ruler->button_press_event.connect (slot (*this, &Editor::ruler_button_press));
- bbt_ruler->button_press_event.connect (slot (*this, &Editor::ruler_button_press));
- frames_ruler->button_press_event.connect (slot (*this, &Editor::ruler_button_press));
- minsec_ruler->button_press_event.connect (slot (*this, &Editor::ruler_button_press));
+ smpte_ruler->button_release_event.connect (mem_fun(*this, &Editor::ruler_button_release));
+ bbt_ruler->button_release_event.connect (mem_fun(*this, &Editor::ruler_button_release));
+ frames_ruler->button_release_event.connect (mem_fun(*this, &Editor::ruler_button_release));
+ minsec_ruler->button_release_event.connect (mem_fun(*this, &Editor::ruler_button_release));
+
+ smpte_ruler->button_press_event.connect (mem_fun(*this, &Editor::ruler_button_press));
+ bbt_ruler->button_press_event.connect (mem_fun(*this, &Editor::ruler_button_press));
+ frames_ruler->button_press_event.connect (mem_fun(*this, &Editor::ruler_button_press));
+ minsec_ruler->button_press_event.connect (mem_fun(*this, &Editor::ruler_button_press));
- smpte_ruler->motion_notify_event.connect (slot (*this, &Editor::ruler_mouse_motion));
- bbt_ruler->motion_notify_event.connect (slot (*this, &Editor::ruler_mouse_motion));
- frames_ruler->motion_notify_event.connect (slot (*this, &Editor::ruler_mouse_motion));
- minsec_ruler->motion_notify_event.connect (slot (*this, &Editor::ruler_mouse_motion));
+ smpte_ruler->motion_notify_event.connect (mem_fun(*this, &Editor::ruler_mouse_motion));
+ bbt_ruler->motion_notify_event.connect (mem_fun(*this, &Editor::ruler_mouse_motion));
+ frames_ruler->motion_notify_event.connect (mem_fun(*this, &Editor::ruler_mouse_motion));
+ minsec_ruler->motion_notify_event.connect (mem_fun(*this, &Editor::ruler_mouse_motion));
visible_timebars = 7; /* 4 here, 3 in time_canvas */
ruler_pressed_button = 0;
switch (t) {
case MarkerBarItem:
- ruler_items.push_back (MenuElem (_("New location marker"), bind ( slot (*this, &Editor::mouse_add_new_marker), where)));
- ruler_items.push_back (MenuElem (_("Clear all locations"), slot (*this, &Editor::clear_markers)));
+ ruler_items.push_back (MenuElem (_("New location marker"), bind ( mem_fun(*this, &Editor::mouse_add_new_marker), where)));
+ ruler_items.push_back (MenuElem (_("Clear all locations"), mem_fun(*this, &Editor::clear_markers)));
ruler_items.push_back (SeparatorElem ());
break;
case RangeMarkerBarItem:
//ruler_items.push_back (MenuElem (_("New Range")));
- ruler_items.push_back (MenuElem (_("Clear all ranges"), slot (*this, &Editor::clear_ranges)));
+ ruler_items.push_back (MenuElem (_("Clear all ranges"), mem_fun(*this, &Editor::clear_ranges)));
ruler_items.push_back (SeparatorElem ());
break;
break;
case TempoBarItem:
- ruler_items.push_back (MenuElem (_("New Tempo"), bind ( slot (*this, &Editor::mouse_add_new_tempo_event), where)));
+ ruler_items.push_back (MenuElem (_("New Tempo"), bind ( mem_fun(*this, &Editor::mouse_add_new_tempo_event), where)));
ruler_items.push_back (MenuElem (_("Clear tempo")));
ruler_items.push_back (SeparatorElem ());
break;
case MeterBarItem:
- ruler_items.push_back (MenuElem (_("New Meter"), bind ( slot (*this, &Editor::mouse_add_new_meter_event), where)));
+ ruler_items.push_back (MenuElem (_("New Meter"), bind ( mem_fun(*this, &Editor::mouse_add_new_meter_event), where)));
ruler_items.push_back (MenuElem (_("Clear meter")));
ruler_items.push_back (SeparatorElem ());
break;
break;
}
- ruler_items.push_back (CheckMenuElem (_("Min:Secs"), bind (slot (*this, &Editor::ruler_toggled), (int)ruler_metric_minsec)));
+ ruler_items.push_back (CheckMenuElem (_("Min:Secs"), bind (mem_fun(*this, &Editor::ruler_toggled), (int)ruler_metric_minsec)));
mitem = (CheckMenuItem *) ruler_items.back();
if (ruler_shown[ruler_metric_minsec]) {
mitem->set_active(true);
}
- ruler_items.push_back (CheckMenuElem (X_("SMPTE"), bind (slot (*this, &Editor::ruler_toggled), (int)ruler_metric_smpte)));
+ ruler_items.push_back (CheckMenuElem (X_("SMPTE"), bind (mem_fun(*this, &Editor::ruler_toggled), (int)ruler_metric_smpte)));
mitem = (CheckMenuItem *) ruler_items.back();
if (ruler_shown[ruler_metric_smpte]) {
mitem->set_active(true);
}
- ruler_items.push_back (CheckMenuElem (_("Frames"), bind (slot (*this, &Editor::ruler_toggled), (int)ruler_metric_frames)));
+ ruler_items.push_back (CheckMenuElem (_("Frames"), bind (mem_fun(*this, &Editor::ruler_toggled), (int)ruler_metric_frames)));
mitem = (CheckMenuItem *) ruler_items.back();
if (ruler_shown[ruler_metric_frames]) {
mitem->set_active(true);
}
- ruler_items.push_back (CheckMenuElem (_("Bars:Beats"), bind (slot (*this, &Editor::ruler_toggled), (int)ruler_metric_bbt)));
+ ruler_items.push_back (CheckMenuElem (_("Bars:Beats"), bind (mem_fun(*this, &Editor::ruler_toggled), (int)ruler_metric_bbt)));
mitem = (CheckMenuItem *) ruler_items.back();
if (ruler_shown[ruler_metric_bbt]) {
mitem->set_active(true);
ruler_items.push_back (SeparatorElem ());
- ruler_items.push_back (CheckMenuElem (_("Meter"), bind (slot (*this, &Editor::ruler_toggled), (int)ruler_time_meter)));
+ ruler_items.push_back (CheckMenuElem (_("Meter"), bind (mem_fun(*this, &Editor::ruler_toggled), (int)ruler_time_meter)));
mitem = (CheckMenuItem *) ruler_items.back();
if (ruler_shown[ruler_time_meter]) {
mitem->set_active(true);
}
- ruler_items.push_back (CheckMenuElem (_("Tempo"), bind (slot (*this, &Editor::ruler_toggled), (int)ruler_time_tempo)));
+ ruler_items.push_back (CheckMenuElem (_("Tempo"), bind (mem_fun(*this, &Editor::ruler_toggled), (int)ruler_time_tempo)));
mitem = (CheckMenuItem *) ruler_items.back();
if (ruler_shown[ruler_time_tempo]) {
mitem->set_active(true);
}
- ruler_items.push_back (CheckMenuElem (_("Location Markers"), bind (slot (*this, &Editor::ruler_toggled), (int)ruler_time_marker)));
+ ruler_items.push_back (CheckMenuElem (_("Location Markers"), bind (mem_fun(*this, &Editor::ruler_toggled), (int)ruler_time_marker)));
mitem = (CheckMenuItem *) ruler_items.back();
if (ruler_shown[ruler_time_marker]) {
mitem->set_active(true);
}
- ruler_items.push_back (CheckMenuElem (_("Range Markers"), bind (slot (*this, &Editor::ruler_toggled), (int)ruler_time_range_marker)));
+ ruler_items.push_back (CheckMenuElem (_("Range Markers"), bind (mem_fun(*this, &Editor::ruler_toggled), (int)ruler_time_range_marker)));
mitem = (CheckMenuItem *) ruler_items.back();
if (ruler_shown[ruler_time_range_marker]) {
mitem->set_active(true);
}
- ruler_items.push_back (CheckMenuElem (_("Loop/Punch Ranges"), bind (slot (*this, &Editor::ruler_toggled), (int)ruler_time_transport_marker)));
+ ruler_items.push_back (CheckMenuElem (_("Loop/Punch Ranges"), bind (mem_fun(*this, &Editor::ruler_toggled), (int)ruler_time_transport_marker)));
mitem = (CheckMenuItem *) ruler_items.back();
if (ruler_shown[ruler_time_transport_marker]) {
mitem->set_active(true);
frames_ruler->set_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
minsec_ruler->set_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
- smpte_ruler->button_release_event.connect (slot (*this, &Editor::ruler_button_release));
- bbt_ruler->button_release_event.connect (slot (*this, &Editor::ruler_button_release));
- frames_ruler->button_release_event.connect (slot (*this, &Editor::ruler_button_release));
- minsec_ruler->button_release_event.connect (slot (*this, &Editor::ruler_button_release));
+ smpte_ruler->button_release_event.connect (mem_fun(*this, &Editor::ruler_button_release));
+ bbt_ruler->button_release_event.connect (mem_fun(*this, &Editor::ruler_button_release));
+ frames_ruler->button_release_event.connect (mem_fun(*this, &Editor::ruler_button_release));
+ minsec_ruler->button_release_event.connect (mem_fun(*this, &Editor::ruler_button_release));
- smpte_ruler->button_press_event.connect (slot (*this, &Editor::ruler_button_press));
- bbt_ruler->button_press_event.connect (slot (*this, &Editor::ruler_button_press));
- frames_ruler->button_press_event.connect (slot (*this, &Editor::ruler_button_press));
- minsec_ruler->button_press_event.connect (slot (*this, &Editor::ruler_button_press));
+ smpte_ruler->button_press_event.connect (mem_fun(*this, &Editor::ruler_button_press));
+ bbt_ruler->button_press_event.connect (mem_fun(*this, &Editor::ruler_button_press));
+ frames_ruler->button_press_event.connect (mem_fun(*this, &Editor::ruler_button_press));
+ minsec_ruler->button_press_event.connect (mem_fun(*this, &Editor::ruler_button_press));
- smpte_ruler->motion_notify_event.connect (slot (*this, &Editor::ruler_mouse_motion));
- bbt_ruler->motion_notify_event.connect (slot (*this, &Editor::ruler_mouse_motion));
- frames_ruler->motion_notify_event.connect (slot (*this, &Editor::ruler_mouse_motion));
- minsec_ruler->motion_notify_event.connect (slot (*this, &Editor::ruler_mouse_motion));
+ smpte_ruler->motion_notify_event.connect (mem_fun(*this, &Editor::ruler_mouse_motion));
+ bbt_ruler->motion_notify_event.connect (mem_fun(*this, &Editor::ruler_mouse_motion));
+ frames_ruler->motion_notify_event.connect (mem_fun(*this, &Editor::ruler_mouse_motion));
+ minsec_ruler->motion_notify_event.connect (mem_fun(*this, &Editor::ruler_mouse_motion));
if (ruler_shown[ruler_metric_minsec]) {
void
Editor::update_just_smpte ()
{
- ENSURE_GUI_THREAD(slot (*this, &Editor::update_just_smpte));
+ ENSURE_GUI_THREAD(mem_fun(*this, &Editor::update_just_smpte));
if (session == 0) {
return;
void
Editor::handle_new_named_selection ()
{
- ARDOUR_UI::instance()->call_slot (slot (*this, &Editor::redisplay_named_selections));
+ ARDOUR_UI::instance()->call_slot (mem_fun(*this, &Editor::redisplay_named_selections));
}
void
ArdourPrompter p;
p.set_prompt (_("name for chunk:"));
- p.done.connect (slot (*this, &Editor::named_selection_name_chosen));
+ p.done.connect (mem_fun(*this, &Editor::named_selection_name_chosen));
p.change_labels (_("Create chunk"), _("Forget it"));
p.show_all ();
void
Editor::tempo_map_changed (Change ignored)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &Editor::tempo_map_changed), ignored));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &Editor::tempo_map_changed), ignored));
if (current_bbt_points) {
delete current_bbt_points;
}
if (tempo_marker->tempo().movable()) {
- Gtk::Main::idle.connect (bind (slot (*this, &Editor::real_remove_tempo_marker), &tempo_marker->tempo()));
+ Gtk::Main::idle.connect (bind (mem_fun(*this, &Editor::real_remove_tempo_marker), &tempo_marker->tempo()));
}
}
}
if (meter_marker->meter().movable()) {
- Gtk::Main::idle.connect (bind (slot (*this, &Editor::real_remove_meter_marker), &meter_marker->meter()));
+ Gtk::Main::idle.connect (bind (mem_fun(*this, &Editor::real_remove_meter_marker), &meter_marker->meter()));
}
}
antialias_button.set_name (N_("TimeStretchButton"));
progress_bar.set_name (N_("TimeStretchProgress"));
- action_button.signal_clicked().connect (bind (slot (*this, &ArdourDialog::stop), 1));
+ action_button.signal_clicked().connect (bind (mem_fun(*this, &ArdourDialog::stop), 1));
}
gint
}
current_timestretch->progress_bar.set_percentage (0.0f);
- current_timestretch->first_cancel = current_timestretch->cancel_button.signal_clicked().connect (bind (slot (*current_timestretch, &ArdourDialog::stop), -1));
- current_timestretch->first_delete = current_timestretch->delete_event.connect (slot (*current_timestretch, &ArdourDialog::wm_close_event));
+ current_timestretch->first_cancel = current_timestretch->cancel_button.signal_clicked().connect (bind (mem_fun (*current_timestretch, &ArdourDialog::stop), -1));
+ current_timestretch->first_delete = current_timestretch->delete_event.connect (mem_fun (*current_timestretch, &ArdourDialog::wm_close_event));
current_timestretch->run ();
current_timestretch->first_cancel.disconnect();
current_timestretch->first_delete.disconnect();
- current_timestretch->cancel_button.signal_clicked().connect (slot (current_timestretch, &TimeStretchDialog::cancel_timestretch_in_progress));
- current_timestretch->delete_event.connect (slot (current_timestretch, &TimeStretchDialog::delete_timestretch_in_progress));
+ current_timestretch->cancel_button.signal_clicked().connect (mem_fun (current_timestretch, &TimeStretchDialog::cancel_timestretch_in_progress));
+ current_timestretch->delete_event.connect (mem_fun (current_timestretch, &TimeStretchDialog::delete_timestretch_in_progress));
if (pthread_create_and_store ("timestretch", &thread, 0, timestretch_thread, current_timestretch)) {
current_timestretch->close ();
pthread_detach (thread);
- sigc::connection c = Main::timeout.connect (slot (current_timestretch, &TimeStretchDialog::update_progress), 100);
+ sigc::connection c = Main::timeout.connect (mem_fun (current_timestretch, &TimeStretchDialog::update_progress), 100);
while (current_timestretch->request.running) {
gtk_main_iteration ();
file_selector = 0;
spec.running = false;
- file_entry.signal_focus_in_event().connect (slot (ARDOUR_UI::generic_focus_in_event));
- file_entry.signal_focus_out_event().connect (slot (ARDOUR_UI::generic_focus_out_event));
+ file_entry.signal_focus_in_event().connect (ptr_fun (ARDOUR_UI::generic_focus_in_event));
+ file_entry.signal_focus_out_event().connect (ptr_fun (ARDOUR_UI::generic_focus_out_event));
file_entry.set_name ("ExportFileNameEntry");
master_selector.set_column_title (0, _("Output"));
master_selector.column_titles_show ();
master_selector.set_selection_mode (GTK_SELECTION_MULTIPLE);
- master_selector.button_press_event.connect (slot (*this, &ExportDialog::master_selector_button_press_event));
+ master_selector.button_press_event.connect (mem_fun(*this, &ExportDialog::master_selector_button_press_event));
track_selector.set_name ("ExportTrackSelector");
track_selector.set_size_request (-1, 130);
track_selector.set_column_title (0, _("Track"));
track_selector.column_titles_show ();
track_selector.set_selection_mode (GTK_SELECTION_MULTIPLE);
- track_selector.button_press_event.connect (slot (*this, &ExportDialog::track_selector_button_press_event));
+ track_selector.button_press_event.connect (mem_fun(*this, &ExportDialog::track_selector_button_press_event));
check_pixmap = gdk_pixmap_colormap_create_from_xpm_d (NULL,
gtk_widget_get_colormap(GTK_WIDGET(track_selector.gobj())),
vpacker.pack_start (hpacker, true, true);
track_selector_button.set_name ("EditorGTKButton");
- track_selector_button.signal_clicked().connect (slot (*this, &ExportDialog::track_selector_button_click));
+ track_selector_button.signal_clicked().connect (mem_fun(*this, &ExportDialog::track_selector_button_click));
vpacker.pack_start (button_box, false, false);
vpacker.pack_start (progress_bar, false, false);
cancel_button.set_name ("EditorGTKButton");
file_entry.set_name ("ExportFileDisplay");
- delete_event.connect (slot (*this, &ExportDialog::window_closed));
- ok_button.signal_clicked().connect (slot (*this, &ExportDialog::do_export));
- cancel_button.signal_clicked().connect (slot (*this, &ExportDialog::end_dialog));
+ delete_event.connect (mem_fun(*this, &ExportDialog::window_closed));
+ ok_button.signal_clicked().connect (mem_fun(*this, &ExportDialog::do_export));
+ cancel_button.signal_clicked().connect (mem_fun(*this, &ExportDialog::end_dialog));
file_browse_button.set_name ("EditorGTKButton");
- file_browse_button.signal_clicked().connect (slot (*this, &ExportDialog::initiate_browse));
+ file_browse_button.signal_clicked().connect (mem_fun(*this, &ExportDialog::initiate_browse));
- channel_count_combo.get_popwin()->unmap_event.connect (slot (*this, &ExportDialog::channels_chosen));
- bitdepth_format_combo.get_popwin()->unmap_event.connect (slot (*this, &ExportDialog::bitdepth_chosen));
- header_format_combo.get_popwin()->unmap_event.connect (slot (*this, &ExportDialog::header_chosen));
- sample_rate_combo.get_popwin()->unmap_event.connect (slot (*this, &ExportDialog::sample_rate_chosen));
- cue_file_combo.get_popwin()->unmap_event.connect (slot (*this, &ExportDialog::cue_file_type_chosen));
+ channel_count_combo.get_popwin()->unmap_event.connect (mem_fun(*this, &ExportDialog::channels_chosen));
+ bitdepth_format_combo.get_popwin()->unmap_event.connect (mem_fun(*this, &ExportDialog::bitdepth_chosen));
+ header_format_combo.get_popwin()->unmap_event.connect (mem_fun(*this, &ExportDialog::header_chosen));
+ sample_rate_combo.get_popwin()->unmap_event.connect (mem_fun(*this, &ExportDialog::sample_rate_chosen));
+ cue_file_combo.get_popwin()->unmap_event.connect (mem_fun(*this, &ExportDialog::cue_file_type_chosen));
}
ExportDialog::~ExportDialog()
ExportDialog::connect_to_session (Session *s)
{
session = s;
- session->going_away.connect (slot (*this, &Window::hide_all));
+ session->going_away.connect (mem_fun(*this, &Window::hide_all));
switch (session->frame_rate()) {
case 22050:
}
}
- progress_connection = Main::timeout.connect (slot (*this, &ExportDialog::progress_timeout), 100);
+ progress_connection = Main::timeout.connect (mem_fun(*this, &ExportDialog::progress_timeout), 100);
cancel_label.set_text (_("Stop Export"));
if (!audio_region) {
file_selector = new FileSelection;
file_selector->set_modal (true);
- file_selector->get_cancel_button()-.signal_clicked().connect (bind (slot (*this, &ExportDialog::finish_browse), -1));
- file_selector->get_ok_button()-.signal_clicked().connect (bind (slot (*this, &ExportDialog::finish_browse), 1));
- file_selector->map_event.connect (bind (slot (*this, &ExportDialog::change_focus_policy), true));
- file_selector->unmap_event.connect (bind (slot (*this, &ExportDialog::change_focus_policy), false));
+ file_selector->get_cancel_button()-.signal_clicked().connect (bind (mem_fun(*this, &ExportDialog::finish_browse), -1));
+ file_selector->get_ok_button()-.signal_clicked().connect (bind (mem_fun(*this, &ExportDialog::finish_browse), 1));
+ file_selector->map_event.connect (bind (mem_fun(*this, &ExportDialog::change_focus_policy), true));
+ file_selector->unmap_event.connect (bind (mem_fun(*this, &ExportDialog::change_focus_policy), false));
}
file_selector->show_all ();
}
#include <ardour/session_route.h>
#include <ardour/dB.h>
-#include <gtkmmext/utils.h>
-#include <gtkmmext/pix.h>
-#include <gtkmmext/fastmeter.h>
-#include <gtkmmext/stop_signal.h>
-#include <gtkmmext/barcontroller.h>
+#include <gtkmm2ext/utils.h>
+#include <gtkmm2ext/pix.h>
+#include <gtkmm2ext/fastmeter.h>
+#include <gtkmm2ext/stop_signal.h>
+#include <gtkmm2ext/barcontroller.h>
#include <midi++/manager.h>
#include <pbd/fastlog.h>
#include "misc_xpms"
using namespace ARDOUR;
-using namespace Gtkmmext;
+using namespace Gtkmm2ext;
using namespace Gtk;
-using namespace SigC;
+using namespace sigc;
Signal0<void> GainMeter::ResetAllPeakDisplays;
Signal1<void,RouteGroup*> GainMeter::ResetGroupPeakDisplays;
& _io.midi_gain_control(),
false));
- gain_slider->button_press_event.connect (slot (*this, &GainMeter::start_gain_touch));
- gain_slider->button_release_event.connect (slot (*this, &GainMeter::end_gain_touch));
+ gain_slider->button_press_event.connect (mem_fun(*this, &GainMeter::start_gain_touch));
+ gain_slider->button_release_event.connect (mem_fun(*this, &GainMeter::end_gain_touch));
gain_slider->set_name ("MixerGainMeter");
if (_session.midi_port()) {
}
gain_display.set_print_func (_gain_printer, this);
- set_usize_to_display_given_text (gain_display, "-86.0", 2, 2);
+ 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");
Route* r;
if ((r = dynamic_cast<Route*> (&_io)) != 0) {
- r->meter_change.connect (slot (*this, &GainMeter::meter_changed));
+ r->meter_change.connect (mem_fun(*this, &GainMeter::meter_changed));
meter_point_button.add (meter_point_label);
meter_point_button.set_name ("MixerStripMeterPreButton");
meter_point_label.set_name ("MixerStripMeterPreButton");
used to describe meter points. In english, its "input".
*/
- set_usize_to_display_given_text (meter_point_button, _("tupni"), 2, 2);
+ set_size_request_to_display_given_text (meter_point_button, _("tupni"), 2, 2);
- meter_point_button.button_press_event.connect (slot (*this, &GainMeter::meter_press));
- meter_point_button.button_release_event.connect (slot (*this, &GainMeter::meter_release));
+ meter_point_button.button_press_event.connect (mem_fun(*this, &GainMeter::meter_press));
+ meter_point_button.button_release_event.connect (mem_fun(*this, &GainMeter::meter_release));
top_table.attach (meter_point_button, 1, 2, 0, 1);
}
gain_display_box.set_spacing (2);
- gain_display_frame.set_shadow_type (GTK_SHADOW_IN);
+ 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);
peak_display.set_name ("MixerStripPeakDisplay");
- set_usize_to_display_given_text (peak_display, "-86.0", 2, 2);
+ set_size_request_to_display_given_text (peak_display, "-86.0", 2, 2);
peak_display.add (peak_display_label);
- peak_display_frame.set_shadow_type (GTK_SHADOW_IN);
+ 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();
gain_display_box.pack_start (peak_display_frame, false, false);
- meter_metric_area.set_usize (18, -1);
+ meter_metric_area.set_size_request (18, -1);
meter_metric_area.set_name ("MeterMetricsStrip");
meter_packer.show ();
show_all ();
- _io.gain_changed.connect (slot (*this, &GainMeter::gain_changed));
+ _io.gain_changed.connect (mem_fun(*this, &GainMeter::gain_changed));
- meter_metric_area.expose_event.connect (slot (*this, &GainMeter::meter_metrics_expose));
- gain_adjustment.value_changed.connect (slot (*this, &GainMeter::gain_adjusted));
- peak_display.button_release_event.connect (slot (*this, &GainMeter::peak_button_release));
+ meter_metric_area.expose_event.connect (mem_fun(*this, &GainMeter::meter_metrics_expose));
+ gain_adjustment.value_changed.connect (mem_fun(*this, &GainMeter::gain_adjusted));
+ peak_display.button_release_event.connect (mem_fun(*this, &GainMeter::peak_button_release));
- _session.MeterHoldChanged.connect (slot (*this, &GainMeter::meter_hold_changed));
+ _session.MeterHoldChanged.connect (mem_fun(*this, &GainMeter::meter_hold_changed));
gain_changed (0);
update_gain_sensitive ();
- ResetAllPeakDisplays.connect (slot (*this, &GainMeter::reset_peak_display));
- ResetGroupPeakDisplays.connect (slot (*this, &GainMeter::reset_group_peak_display));
+ ResetAllPeakDisplays.connect (mem_fun(*this, &GainMeter::reset_peak_display));
+ ResetGroupPeakDisplays.connect (mem_fun(*this, &GainMeter::reset_group_peak_display));
}
void
double fraction;
Gdk_Window win (meter_metric_area.get_window());
- Gdk_GC fg_gc (meter_metric_area.get_style()->get_fg_gc (GTK_STATE_NORMAL));
- Gdk_GC bg_gc (meter_metric_area.get_style()->get_bg_gc (GTK_STATE_NORMAL));
+ Gdk_GC fg_gc (meter_metric_area.get_style()->get_fg_gc (Gtk::STATE_NORMAL));
+ Gdk_GC bg_gc (meter_metric_area.get_style()->get_bg_gc (Gtk::STATE_NORMAL));
Gdk_Font font (meter_metric_area.get_style()->get_font());
gint x, y, width, height, depth;
gint pos;
void
GainMeter::meter_hold_changed()
{
- ENSURE_GUI_THREAD(slot (*this, &GainMeter::meter_hold_changed));
+ ENSURE_GUI_THREAD(mem_fun(*this, &GainMeter::meter_hold_changed));
vector<MeterInfo>::iterator i;
uint32_t n;
meters[n].meter = new FastMeter ((uint32_t) floor (_session.meter_hold()), width, FastMeter::Vertical);
meters[n].width = width;
- meters[n].meter->add_events (GDK_BUTTON_RELEASE_MASK);
+ meters[n].meter->add_events (Gdk::BUTTON_RELEASE_MASK);
meters[n].meter->button_release_event.connect
- (bind (slot (*this, &GainMeter::meter_button_release), n));
- meters[n].meter->button_release_event.connect_after (slot (do_not_propagate));
+ (bind (mem_fun(*this, &GainMeter::meter_button_release), n));
+ meters[n].meter->button_release_event.connect_after (ptr_fun (do_not_propagate));
}
meter_packer.pack_start (*meters[n].meter, false, false);
void
GainMeter::gain_changed (void *src)
{
- Gtkmmext::UI::instance()->call_slot (slot (*this, &GainMeter::effective_gain_display));
+ Gtkmm2ext::UI::instance()->call_slot (mem_fun(*this, &GainMeter::effective_gain_display));
}
gint
void
GainMeter::update_gain_sensitive ()
{
- static_cast<Gtkmmext::SliderController*>(gain_slider)->set_sensitive (!(_io.gain_automation_state() & Play));
+ static_cast<Gtkmm2ext::SliderController*>(gain_slider)->set_sensitive (!(_io.gain_automation_state() & Play));
}
{
Route* r;
- ENSURE_GUI_THREAD (bind (slot (*this, &GainMeter::meter_changed), src));
+ ENSURE_GUI_THREAD (bind (mem_fun(*this, &GainMeter::meter_changed), src));
if ((r = dynamic_cast<Route*> (&_io)) != 0) {
void
ImageFrameSocketHandler::send_imageframe_time_axis_renamed(std::string new_id, std::string old_id, void* src, ImageFrameTimeAxis* time_axis)
{
- // ENSURE_GUI_THREAD(SigC::bind (slot (*this, &ImageFrameSocketHandler::send_imageframe_time_axis_renamed), new_id, old_id, src, time_axis));
+ // ENSURE_GUI_THREAD(SigC::bind (mem_fun(*this, &ImageFrameSocketHandler::send_imageframe_time_axis_renamed), new_id, old_id, src, time_axis));
if(this == src || src == 0)
{
void
ImageFrameSocketHandler::send_marker_time_axis_renamed(std::string new_id, std::string old_id, void* src, MarkerTimeAxis* time_axis)
{
- // ENSURE_GUI_THREAD(bind (slot (*this, &ImageFrameSocketHandler::send_marker_time_axis_renamed), new_id, old_id, src, time_axis));
+ // ENSURE_GUI_THREAD(bind (mem_fun(*this, &ImageFrameSocketHandler::send_marker_time_axis_renamed), new_id, old_id, src, time_axis));
if(this == src || src == 0)
{
void
ImageFrameSocketHandler::send_imageframe_time_axis_group_renamed(std::string new_id, std::string old_id, void* src, ImageFrameTimeAxisGroup* group)
{
- // ENSURE_GUI_THREAD(bind (slot (*this, &ImageFrameSocketHandler::send_imageframe_time_axis_group_renamed), new_id, old_id, src, group));
+ // ENSURE_GUI_THREAD(bind (mem_fun(*this, &ImageFrameSocketHandler::send_imageframe_time_axis_group_renamed), new_id, old_id, src, group));
if(this == src || src == 0)
{
void
ImageFrameSocketHandler::send_imageframe_view_position_change(jack_nframes_t pos, void* src, ImageFrameView* item)
{
- // ENSURE_GUI_THREAD(bind (slot (*this, &ImageFrameSocketHandler::send_imageframe_view_position_change), pos, src, item));
+ // ENSURE_GUI_THREAD(bind (mem_fun(*this, &ImageFrameSocketHandler::send_imageframe_view_position_change), pos, src, item));
if(this == src || src == 0)
{
void
ImageFrameSocketHandler::send_imageframe_view_duration_change(jack_nframes_t dur, void* src, ImageFrameView* item)
{
- // ENSURE_GUI_THREAD(bind (slot (*this, &ImageFrameSocketHandler::send_imageframe_view_duration_change), dur, src, item));
+ // ENSURE_GUI_THREAD(bind (mem_fun(*this, &ImageFrameSocketHandler::send_imageframe_view_duration_change), dur, src, item));
if(this == src || src == 0)
{
if(new_tav)
{
ImageFrameTimeAxis* ifta = (ImageFrameTimeAxis*)new_tav ;
- ifta->VisualTimeAxisRemoved.connect(SigC::slot(*this, &ImageFrameSocketHandler::send_imageframe_time_axis_removed)) ;
- ifta->NameChanged.connect(SigC::bind(SigC::slot(*this, &ImageFrameSocketHandler::send_imageframe_time_axis_renamed), ifta)) ;
+ ifta->VisualTimeAxisRemoved.connect(sigc::mem_fun(*this, &ImageFrameSocketHandler::send_imageframe_time_axis_removed)) ;
+ ifta->NameChanged.connect(SigC::bind(sigc::mem_fun(*this, &ImageFrameSocketHandler::send_imageframe_time_axis_renamed), ifta)) ;
send_return_success() ;
}
if(mta)
{
added = true ;
- mta->VisualTimeAxisRemoved.connect(SigC::slot(*this, &ImageFrameSocketHandler::send_marker_time_axis_removed)) ;
- mta->NameChanged.connect(SigC::bind(SigC::slot(*this, &ImageFrameSocketHandler::send_marker_time_axis_renamed), mta)) ;
+ mta->VisualTimeAxisRemoved.connect(sigc::mem_fun(*this, &ImageFrameSocketHandler::send_marker_time_axis_removed)) ;
+ mta->NameChanged.connect(sigc::bind(sigc::mem_fun(*this, &ImageFrameSocketHandler::send_marker_time_axis_renamed), mta)) ;
}
}
}
else
{
- iftag->NameChanged.connect(SigC::bind(SigC::slot(*this, &ImageFrameSocketHandler::send_imageframe_time_axis_group_renamed), iftag)) ;
- iftag->GroupRemoved.connect(SigC::bind(SigC::slot(*this, &ImageFrameSocketHandler::send_imageframe_time_axis_group_removed), iftag)) ;
+ iftag->NameChanged.connect(sigc::bind(sigc::mem_fun(*this, &ImageFrameSocketHandler::send_imageframe_time_axis_group_renamed), iftag)) ;
+ iftag->GroupRemoved.connect(sigc::bind(sigc::mem_fun(*this, &ImageFrameSocketHandler::send_imageframe_time_axis_group_removed), iftag)) ;
send_return_success() ;
}
}
ImageFrameView* ifv = iftag->add_imageframe_item(image_id, start, duration, rgb_img_buf, (uint32_t)imgWidth, (uint32_t)imgHeight, (uint32_t)imgChannels, this) ;
if(ifv)
{
- ifv->PositionChanged.connect(SigC::bind(SigC::slot(*this, &ImageFrameSocketHandler::send_imageframe_view_position_change), ifv)) ;
- ifv->DurationChanged.connect(SigC::bind(SigC::slot(*this, &ImageFrameSocketHandler::send_imageframe_view_duration_change), ifv)) ;
- ifv->ItemRemoved.connect(SigC::bind(SigC::slot(*this, &ImageFrameSocketHandler::send_imageframe_view_removed), ifv)) ;
+ ifv->PositionChanged.connect(sigc::bind(sigc::mem_fun(*this, &ImageFrameSocketHandler::send_imageframe_view_position_change), ifv)) ;
+ ifv->DurationChanged.connect(sigc::bind(sigc::mem_fun(*this, &ImageFrameSocketHandler::send_imageframe_view_duration_change), ifv)) ;
+ ifv->ItemRemoved.connect(sigc::bind(sigc::mem_fun(*this, &ImageFrameSocketHandler::send_imageframe_view_removed), ifv)) ;
send_return_success() ;
}
MenuList& items = display_menu->items();
- items.push_back (MenuElem (_("Rename"), slot(*this, &ImageFrameTimeAxis::start_time_axis_rename)));
+ items.push_back (MenuElem (_("Rename"), mem_fun(*this, &ImageFrameTimeAxis::start_time_axis_rename)));
image_action_menu = new Menu() ;
image_action_menu->set_name ("ArdourContextMenu");
items.push_back (SeparatorElem());
items.push_back (MenuElem (_("Height"), *size_menu));
- items.push_back (MenuElem (_("Color"), slot(*this, &ImageFrameTimeAxis::select_track_color)));
+ items.push_back (MenuElem (_("Color"), mem_fun(*this, &ImageFrameTimeAxis::select_track_color)));
items.push_back (SeparatorElem());
- items.push_back (MenuElem (_("Remove"), bind(slot(*this, &VisualTimeAxis::remove_this_time_axis), (void*)this))) ;
+ items.push_back (MenuElem (_("Remove"), bind(mem_fun(*this, &VisualTimeAxis::remove_this_time_axis), (void*)this))) ;
}
/**
if(view)
{
- duration_items.push_back(MenuElem (_("0.5 seconds"), bind (slot (view, &ImageFrameTimeAxisView::set_imageframe_duration_sec), 0.5))) ;
- duration_items.push_back(MenuElem (_("1 seconds"), bind (slot (view, &ImageFrameTimeAxisView::set_imageframe_duration_sec), 1.0))) ;
- duration_items.push_back(MenuElem (_("1.5 seconds"), bind (slot (view, &ImageFrameTimeAxisView::set_imageframe_duration_sec), 1.5))) ;
- duration_items.push_back(MenuElem (_("2 seconds"), bind (slot (view, &ImageFrameTimeAxisView::set_imageframe_duration_sec), 2.0))) ;
- duration_items.push_back(MenuElem (_("2.5 seconds"), bind (slot (view, &ImageFrameTimeAxisView::set_imageframe_duration_sec), 2.5))) ;
- duration_items.push_back(MenuElem (_("3 seconds"), bind (slot (view, &ImageFrameTimeAxisView::set_imageframe_duration_sec), 3.0))) ;
+ duration_items.push_back(MenuElem (_("0.5 seconds"), bind (mem_fun (view, &ImageFrameTimeAxisView::set_imageframe_duration_sec), 0.5))) ;
+ duration_items.push_back(MenuElem (_("1 seconds"), bind (mem_fun (view, &ImageFrameTimeAxisView::set_imageframe_duration_sec), 1.0))) ;
+ duration_items.push_back(MenuElem (_("1.5 seconds"), bind (mem_fun (view, &ImageFrameTimeAxisView::set_imageframe_duration_sec), 1.5))) ;
+ duration_items.push_back(MenuElem (_("2 seconds"), bind (mem_fun (view, &ImageFrameTimeAxisView::set_imageframe_duration_sec), 2.0))) ;
+ duration_items.push_back(MenuElem (_("2.5 seconds"), bind (mem_fun (view, &ImageFrameTimeAxisView::set_imageframe_duration_sec), 2.5))) ;
+ duration_items.push_back(MenuElem (_("3 seconds"), bind (mem_fun (view, &ImageFrameTimeAxisView::set_imageframe_duration_sec), 3.0))) ;
//duration_items.push_back(SeparatorElem()) ;
- //duration_items.push_back(MenuElem (_("custom"), slot (*this, &ImageFrameTimeAxis::set_imageframe_duration_custom))) ;
+ //duration_items.push_back(MenuElem (_("custom"), mem_fun(*this, &ImageFrameTimeAxis::set_imageframe_duration_custom))) ;
}
imageframe_sub_items.push_back(MenuElem(_("Duration (sec)"), *duration_menu)) ;
imageframe_sub_items.push_back(SeparatorElem()) ;
if(view)
{
- imageframe_sub_items.push_back(MenuElem (_("Remove Frame"), bind(slot (view, &ImageFrameTimeAxisView::remove_selected_imageframe_item), (void*)this))) ;
+ imageframe_sub_items.push_back(MenuElem (_("Remove Frame"), bind(mem_fun (view, &ImageFrameTimeAxisView::remove_selected_imageframe_item), (void*)this))) ;
}
items.push_back(MenuElem(_("Image Frame"), *imageframe_item_menu)) ;
- items.push_back(MenuElem (_("Rename Track"), slot (*this,&ImageFrameTimeAxis::start_time_axis_rename))) ;
+ items.push_back(MenuElem (_("Rename Track"), mem_fun(*this,&ImageFrameTimeAxis::start_time_axis_rename))) ;
imageframe_menu->show_all() ;
}
else
{
marker_time_axis_list.push_back(marker_track) ;
- marker_track->GoingAway.connect(bind(slot(*this, &ImageFrameTimeAxis::remove_time_axis_view), marker_track, (void*)this));
+ marker_track->GoingAway.connect(bind(mem_fun(*this, &ImageFrameTimeAxis::remove_time_axis_view), marker_track, (void*)this));
MarkerTimeAxisAdded(marker_track, src) ; /* EMIT_SIGNAL */
ret = true ;
void
ImageFrameTimeAxis::remove_time_axis_view(MarkerTimeAxis* mta, void* src)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &ImageFrameTimeAxis::remove_time_axis_view), mta, src));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &ImageFrameTimeAxis::remove_time_axis_view), mta, src));
MarkerTimeAxisList::iterator i;
if((i = find (marker_time_axis_list.begin(), marker_time_axis_list.end(), mta)) != marker_time_axis_list.end())
imageframe_views.push_front(ifv) ;
- ifv->GoingAway.connect(bind(slot (*this,&ImageFrameTimeAxisGroup::remove_imageframe_item), (void*)this)) ;
+ ifv->GoingAway.connect(bind(mem_fun(*this,&ImageFrameTimeAxisGroup::remove_imageframe_item), (void*)this)) ;
ImageFrameAdded(ifv, src) ; /* EMIT_SIGNAL */
}
void
ImageFrameTimeAxisGroup::remove_imageframe_item(ImageFrameView* ifv, void* src)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &ImageFrameTimeAxisGroup::remove_imageframe_item), ifv, src));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &ImageFrameTimeAxisGroup::remove_imageframe_item), ifv, src));
ImageFrameViewList::iterator i;
if((i = find (imageframe_views.begin(), imageframe_views.end(), ifv)) != imageframe_views.end())
defer to idle loop, otherwise we'll delete this object
while we're still inside this function ...
*/
- Gtk::Main::idle.connect(bind(slot(&ImageFrameTimeAxisGroup::idle_remove_this_group), this, src));
+ Gtk::Main::idle.connect(bind(mem_fun(&ImageFrameTimeAxisGroup::idle_remove_this_group), this, src));
}
/**
_samples_per_unit = _trackview.editor.get_current_zoom() ;
- _trackview.editor.ZoomChanged.connect (slot (*this, &ImageFrameTimeAxisView::reset_samples_per_unit)) ;
+ _trackview.editor.ZoomChanged.connect (mem_fun(*this, &ImageFrameTimeAxisView::reset_samples_per_unit)) ;
selected_imageframe_group = 0 ;
selected_imageframe_view = 0 ;
imageframe_groups.push_front(iftag) ;
- iftag->GoingAway.connect(bind(slot (*this,&ImageFrameTimeAxisView::remove_imageframe_group), iftag, (void*)this)) ;
+ iftag->GoingAway.connect(bind(mem_fun(*this,&ImageFrameTimeAxisView::remove_imageframe_group), iftag, (void*)this)) ;
ImageFrameGroupAdded(iftag, src) ; /* EMIT_SIGNAL */
}
void
ImageFrameTimeAxisView::remove_imageframe_group(ImageFrameTimeAxisGroup* iftag, void* src)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &ImageFrameTimeAxisView::remove_imageframe_group), iftag, src));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &ImageFrameTimeAxisView::remove_imageframe_group), iftag, src));
ImageFrameGroupList::iterator i;
if((i = find (imageframe_groups.begin(), imageframe_groups.end(), iftag)) != imageframe_groups.end())
{
marker_view_list.push_back(item) ;
- item->GoingAway.connect(bind(slot(*this, &ImageFrameView::remove_marker_view_item), (void*)this));
+ item->GoingAway.connect(bind(mem_fun(*this, &ImageFrameView::remove_marker_view_item), (void*)this));
MarkerViewAdded(item, src) ; /* EMIT_SIGNAL */
}
void
ImageFrameView::remove_marker_view_item(MarkerView* mv, void* src)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &ImageFrameView::remove_marker_view_item), mv, src));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &ImageFrameView::remove_marker_view_item), mv, src));
MarkerViewList::iterator i ;
vbox.pack_start (_selector);
vbox.pack_start (button_box, false, false);
- ok_button.signal_clicked().connect (slot (*this, &IOSelectorWindow::accept));
- cancel_button.signal_clicked().connect (slot (*this, &IOSelectorWindow::cancel));
- rescan_button.signal_clicked().connect (slot (*this, &IOSelectorWindow::rescan));
+ ok_button.signal_clicked().connect (mem_fun(*this, &IOSelectorWindow::accept));
+ cancel_button.signal_clicked().connect (mem_fun(*this, &IOSelectorWindow::cancel));
+ rescan_button.signal_clicked().connect (mem_fun(*this, &IOSelectorWindow::rescan));
set_title (title);
set_position (Gtk::WIN_POS_MOUSE);
add (vbox);
- delete_event.connect (bind (slot (just_hide_it), reinterpret_cast<Window *> (this)));
+ delete_event.connect (bind (ptr_fun (just_hide_it), reinterpret_cast<Window *> (this)));
}
IOSelectorWindow::~IOSelectorWindow()
rescan();
display_ports ();
- clear_connections_button.signal_clicked().connect (slot (*this, &IOSelector::clear_connections));
+ clear_connections_button.signal_clicked().connect (mem_fun(*this, &IOSelector::clear_connections));
- add_port_button.signal_clicked().connect (slot (*this, &IOSelector::add_port));
- remove_port_button.signal_clicked().connect (slot (*this, &IOSelector::remove_port));
+ add_port_button.signal_clicked().connect (mem_fun(*this, &IOSelector::add_port));
+ remove_port_button.signal_clicked().connect (mem_fun(*this, &IOSelector::remove_port));
if (for_input) {
- io.input_changed.connect (slot (*this, &IOSelector::ports_changed));
+ io.input_changed.connect (mem_fun(*this, &IOSelector::ports_changed));
} else {
- io.output_changed.connect (slot (*this, &IOSelector::ports_changed));
+ io.output_changed.connect (mem_fun(*this, &IOSelector::ports_changed));
}
- io.name_changed.connect (slot (*this, &IOSelector::name_changed));
+ io.name_changed.connect (mem_fun(*this, &IOSelector::name_changed));
}
IOSelector::~IOSelector ()
void
IOSelector::name_changed (void* src)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &IOSelector::name_changed), src));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &IOSelector::name_changed), src));
display_ports ();
}
}
client_port_display->columns_autosize ();
- client_port_display->select_row.connect (bind (slot (*this, &IOSelector::port_selection_handler), client_port_display));
+ client_port_display->select_row.connect (bind (mem_fun(*this, &IOSelector::port_selection_handler), client_port_display));
Label *tab_label = manage (new Label);
}
notebook.set_page (current_page);
- notebook.show.connect (bind (slot (notebook, &Notebook::set_page), current_page));
+ notebook.show.connect (bind (mem_fun (notebook, &Notebook::set_page), current_page));
selector_box.show_all ();
}
}
B->button_release_event.connect
- (bind (slot (*this, &IOSelector::port_column_button_release), clist));
+ (bind (mem_fun(*this, &IOSelector::port_column_button_release), clist));
} else {
}
B->button_release_event.connect
- (bind (slot (*this, &IOSelector::port_column_button_release), clist));
+ (bind (mem_fun(*this, &IOSelector::port_column_button_release), clist));
}
clist->set_name ("IOSelectorPortList");
}
clist->columns_autosize ();
- clist->button_release_event.connect (bind (slot (*this, &IOSelector::connection_click), clist));
+ clist->button_release_event.connect (bind (mem_fun(*this, &IOSelector::connection_click), clist));
}
port_box.show_all ();
void
IOSelector::ports_changed (IOChange change, void *src)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &IOSelector::ports_changed), change, src));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &IOSelector::ports_changed), change, src));
display_ports ();
}
for whom we are handling an event. not good.
*/
- Gtk::Main::idle.connect (bind (slot (*this, &IOSelector::remove_port_when_idle), port));
+ Gtk::Main::idle.connect (bind (mem_fun(*this, &IOSelector::remove_port_when_idle), port));
} else {
select_clist(clist);
add (vbox);
- ok_button.signal_clicked().connect (slot (*this, &PortInsertWindow::accept));
- cancel_button.signal_clicked().connect (slot (*this, &PortInsertWindow::cancel));
- rescan_button.signal_clicked().connect (slot (*this, &PortInsertWindow::rescan));
+ ok_button.signal_clicked().connect (mem_fun(*this, &PortInsertWindow::accept));
+ cancel_button.signal_clicked().connect (mem_fun(*this, &PortInsertWindow::cancel));
+ rescan_button.signal_clicked().connect (mem_fun(*this, &PortInsertWindow::rescan));
- delete_event.connect (bind (slot (just_hide_it), reinterpret_cast<Window *> (this)));
- pi.GoingAway.connect (slot (*this, &PortInsertWindow::plugin_going_away));
+ delete_event.connect (bind (ptr_fun (just_hide_it), reinterpret_cast<Window *> (this)));
+ pi.GoingAway.connect (mem_fun(*this, &PortInsertWindow::plugin_going_away));
}
void
PortInsertWindow::plugin_going_away (ARDOUR::Redirect* ignored)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &PortInsertWindow::plugin_going_away), ignored));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &PortInsertWindow::plugin_going_away), ignored));
delete_when_idle (this);
}
/* some global key actions */
- KeyboardTarget::add_action ("close-dialog", slot (*this, &Keyboard::close_current_dialog));
+ KeyboardTarget::add_action ("close-dialog", mem_fun(*this, &Keyboard::close_current_dialog));
XMLNode* node = ARDOUR_UI::instance()->keyboard_settings();
set_state (*node);
return;
}
- kt->window().enter_notify_event.connect (bind (slot (*this, &Keyboard::enter_window), kt));
- kt->window().leave_notify_event.connect (slot (*this, &Keyboard::leave_window));
+ kt->window().enter_notify_event.connect (bind (mem_fun(*this, &Keyboard::enter_window), kt));
+ kt->window().leave_notify_event.connect (mem_fun(*this, &Keyboard::leave_window));
- kt->GoingAway.connect (bind (slot (*this, &Keyboard::maybe_unset_target), kt));
- kt->Hiding.connect (bind (slot (*this, &Keyboard::maybe_unset_target), kt));
+ kt->GoingAway.connect (bind (mem_fun(*this, &Keyboard::maybe_unset_target), kt));
+ kt->Hiding.connect (bind (mem_fun(*this, &Keyboard::maybe_unset_target), kt));
}
void
Keyboard::set_current_dialog (ArdourDialog* dialog)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &Keyboard::set_current_dialog), dialog));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &Keyboard::set_current_dialog), dialog));
current_dialog = dialog;
if (find (known_dialogs.begin(), known_dialogs.end(), dialog) == known_dialogs.end()) {
current_dialog->GoingAway.connect
- (bind (slot (*this, &Keyboard::set_current_dialog),
+ (bind (mem_fun(*this, &Keyboard::set_current_dialog),
reinterpret_cast<ArdourDialog *>(0)));
current_dialog->Hiding.connect
- (bind (slot (*this, &Keyboard::set_current_dialog),
+ (bind (mem_fun(*this, &Keyboard::set_current_dialog),
reinterpret_cast<ArdourDialog *>(0)));
- current_dialog->unmap_event.connect (slot (*this, &Keyboard::current_dialog_vanished));
+ current_dialog->unmap_event.connect (mem_fun(*this, &Keyboard::current_dialog_vanished));
known_dialogs.push_back (dialog);
}
split_channels.set_active(false);
split_channels.set_sensitive (false);
- delete_event.connect (slot (*this, &ArdourDialog::wm_close_event));
+ delete_event.connect (mem_fun(*this, &ArdourDialog::wm_close_event));
- import_btn.signal_clicked().connect (slot (*this, &SoundFileSelector::import_btn_clicked));
+ import_btn.signal_clicked().connect (mem_fun(*this, &SoundFileSelector::import_btn_clicked));
- sfdb_tree.group_selected.connect (slot(*this, &SoundFileSelector::sfdb_group_selected));
- sfdb_tree.member_selected.connect (bind (slot(*this, &SoundFileSelector::member_selected), true));
- sf_browser.member_selected.connect (bind (slot(*this, &SoundFileSelector::member_selected), false));
- sf_browser.member_deselected.connect (bind (slot(*this, &SoundFileSelector::member_deselected), false));
- sfdb_tree.deselected.connect (slot(*this, &SoundFileSelector::sfdb_deselected));
- sf_browser.group_selected.connect (slot(*this, &SoundFileSelector::browser_group_selected));
- notebook.switch_page.connect (slot(*this, &SoundFileSelector::page_switched));
+ sfdb_tree.group_selected.connect (mem_fun(*this, &SoundFileSelector::sfdb_group_selected));
+ sfdb_tree.member_selected.connect (bind (mem_fun(*this, &SoundFileSelector::member_selected), true));
+ sf_browser.member_selected.connect (bind (mem_fun(*this, &SoundFileSelector::member_selected), false));
+ sf_browser.member_deselected.connect (bind (mem_fun(*this, &SoundFileSelector::member_deselected), false));
+ sfdb_tree.deselected.connect (mem_fun(*this, &SoundFileSelector::sfdb_deselected));
+ sf_browser.group_selected.connect (mem_fun(*this, &SoundFileSelector::browser_group_selected));
+ notebook.switch_page.connect (mem_fun(*this, &SoundFileSelector::page_switched));
}
SoundFileSelector::~SoundFileSelector()
pack_start(*vbox, true, true);
- dir_list->select_row.connect(slot (*this, &SoundFileBrowser::dir_list_selected));
- file_list->select_row.connect(slot (*this, &SoundFileBrowser::file_list_selected));
- file_list->unselect_row.connect(slot (*this, &SoundFileBrowser::file_list_deselected));
+ dir_list->select_row.connect(mem_fun(*this, &SoundFileBrowser::dir_list_selected));
+ file_list->select_row.connect(mem_fun(*this, &SoundFileBrowser::file_list_selected));
+ file_list->unselect_row.connect(mem_fun(*this, &SoundFileBrowser::file_list_deselected));
dir_list->set_name("SoundFileBrowserList");
file_list->set_name("SoundFileBrowserList");
remove_btn.set_sensitive (false);
- add_btn.signal_clicked().connect (slot (*this, &LibraryTree::add_btn_clicked));
- folder_btn.signal_clicked().connect (slot(*this, &LibraryTree::folder_btn_clicked));
- remove_btn.signal_clicked().connect (slot(*this, &LibraryTree::remove_btn_clicked));
- find_btn.signal_clicked().connect (slot (*this, &LibraryTree::find_btn_clicked));
+ add_btn.signal_clicked().connect (mem_fun(*this, &LibraryTree::add_btn_clicked));
+ folder_btn.signal_clicked().connect (mem_fun(*this, &LibraryTree::folder_btn_clicked));
+ remove_btn.signal_clicked().connect (mem_fun(*this, &LibraryTree::remove_btn_clicked));
+ find_btn.signal_clicked().connect (mem_fun(*this, &LibraryTree::find_btn_clicked));
files_select.hide_fileop_buttons();
files_select.set_filename("/");
- files_select.get_ok_button()-.signal_clicked().connect (slot ( *this,
+ files_select.get_ok_button()-.signal_clicked().connect (mem_fun ( *this,
&LibraryTree::file_ok_clicked));
- files_select.get_cancel_button()-.signal_clicked().connect (slot ( *this,
+ files_select.get_cancel_button()-.signal_clicked().connect (mem_fun ( *this,
&LibraryTree::file_cancel_clicked));
- Library->added_group.connect (slot (*this, &LibraryTree::added_group));
- Library->removed_group.connect (slot (*this, &LibraryTree::removed_group));
- Library->added_member.connect (slot (*this, &LibraryTree::added_member));
- Library->removed_member.connect (slot (*this, &LibraryTree::removed_member));
+ Library->added_group.connect (mem_fun(*this, &LibraryTree::added_group));
+ Library->removed_group.connect (mem_fun(*this, &LibraryTree::removed_group));
+ Library->added_member.connect (mem_fun(*this, &LibraryTree::added_member));
+ Library->removed_member.connect (mem_fun(*this, &LibraryTree::removed_member));
current_group = "";
current_member = "";
LibraryTree::added_group (string group, string parent)
{
using namespace Gtk;
- ENSURE_GUI_THREAD(bind (slot (*this, &LibraryTree::added_group), group, parent));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &LibraryTree::added_group), group, parent));
Tree* parent_tree;
if (parent.length()) {
item->set_subtree (*subtree);
item->expand();
- item->select.connect (bind(slot(*this,&LibraryTree::cb_group_select), item, group));
+ item->select.connect (bind(mem_fun(*this,&LibraryTree::cb_group_select), item, group));
uri_mapping.insert(map<string, TreeItem*>::value_type(group, item));
uri_parent.insert(map<string,string>::value_type(group, parent));
void
LibraryTree::removed_group (string group)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &LibraryTree::removed_group), group));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &LibraryTree::removed_group), group));
Gtk::TreeItem* group_item = uri_mapping[group];
{
using namespace Gtk;
- ENSURE_GUI_THREAD(bind (slot (*this, &LibraryTree::added_member), member, parent));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &LibraryTree::added_member), member, parent));
Tree* parent_tree;
if (parent.length()) {
parent_tree->tree().insert (i, *item);
item->select.connect
- (bind(slot(*this,&LibraryTree::cb_member_select), item, member));
+ (bind(mem_fun(*this,&LibraryTree::cb_member_select), item, member));
item->deselect.connect
- (bind(slot(*this,&LibraryTree::cb_member_deselect), item, member));
+ (bind(mem_fun(*this,&LibraryTree::cb_member_deselect), item, member));
uri_mapping.insert(map<string, TreeItem*>::value_type(member, item));
uri_parent.insert(map<string,string>::value_type(member, parent));
void
LibraryTree::removed_member (string member)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &LibraryTree::removed_member), member));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &LibraryTree::removed_member), member));
Gtk::TreeItem* member_item = uri_mapping[member];
uri_parent.insert(map<string,string>::value_type(*i, group));
item->select.connect
- (bind(slot(*this,&LibraryTree::cb_group_select), item, *i));
+ (bind(mem_fun(*this,&LibraryTree::cb_group_select), item, *i));
subpopulate (subtree, *i);
subtree->show();
uri_parent.insert(map<string,string>::value_type(*i, group));
item->select.connect
- (bind(slot(*this,&LibraryTree::cb_member_select), item, *i));
+ (bind(mem_fun(*this,&LibraryTree::cb_member_select), item, *i));
item->deselect.connect
- (bind(slot(*this,&LibraryTree::cb_member_deselect), item, *i));
+ (bind(mem_fun(*this,&LibraryTree::cb_member_deselect), item, *i));
}
}
main_box->pack_start(*bar);
Gtk::Button* cancel_btn = manage(new Gtk::Button(_("Cancel")));
main_box->pack_start(*cancel_btn);
- cancel_btn-.signal_clicked().connect (slot (*this, &LibraryTree::cancel_import_clicked));
+ cancel_btn-.signal_clicked().connect (mem_fun(*this, &LibraryTree::cancel_import_clicked));
progress_win->show_all();
clone_ftw((void*)file);
{
SearchSounds* search = new SearchSounds ();
- search->file_chosen.connect(slot (*this, &LibraryTree::file_found));
+ search->file_chosen.connect(mem_fun(*this, &LibraryTree::file_found));
search->show_all();
}
bottom_box.pack_start(play_btn);
bottom_box.pack_start(stop_btn);
- play_btn.signal_clicked().connect (slot (*this, &SoundFileBox::play_btn_clicked));
- stop_btn.signal_clicked().connect (slot (*this, &SoundFileBox::stop_btn_clicked));
+ play_btn.signal_clicked().connect (mem_fun(*this, &SoundFileBox::play_btn_clicked));
+ stop_btn.signal_clicked().connect (mem_fun(*this, &SoundFileBox::stop_btn_clicked));
PublicEditor& edit = ARDOUR_UI::instance()->the_editor();
ARDOUR::Session* sess = edit.current_session();
if (!sess) {
play_btn.set_sensitive(false);
} else {
- sess->AuditionActive.connect(slot (*this, &SoundFileBox::audition_status_changed));
+ sess->AuditionActive.connect(mem_fun(*this, &SoundFileBox::audition_status_changed));
}
add_field_btn.signal_clicked().connect
- (slot (*this, &SoundFileBox::add_field_clicked));
+ (mem_fun(*this, &SoundFileBox::add_field_clicked));
remove_field_btn.signal_clicked().connect
- (slot (*this, &SoundFileBox::remove_field_clicked));
+ (mem_fun(*this, &SoundFileBox::remove_field_clicked));
- fields.selection_made.connect (slot (*this, &SoundFileBox::field_selected));
- fields.choice_made.connect (slot (*this, &SoundFileBox::field_chosen));
+ fields.selection_made.connect (mem_fun(*this, &SoundFileBox::field_selected));
+ fields.choice_made.connect (mem_fun(*this, &SoundFileBox::field_chosen));
- Library->fields_changed.connect (slot (*this, &SoundFileBox::setup_fields));
+ Library->fields_changed.connect (mem_fun(*this, &SoundFileBox::setup_fields));
if (setup_labels (uri)) {
throw failed_constructor();
path_entry.set_text (file);
path_entry.set_position (-1);
- path_entry.signal_focus_in_event().connect (slot (ARDOUR_UI::generic_focus_in_event));
- path_entry.signal_focus_out_event().connect (slot (ARDOUR_UI::generic_focus_out_event));
+ path_entry.signal_focus_in_event().connect (ptr_fun (ARDOUR_UI::generic_focus_in_event));
+ path_entry.signal_focus_out_event().connect (ptr_fun (ARDOUR_UI::generic_focus_out_event));
length.set_alignment (0.0f, 0.0f);
length.set_text (compose("Length: %1", length2string(sf_info->frames, sf_info->samplerate)));
SoundFileBox::audition_status_changed (bool active)
{
if (!active) {
- Gtkmm2ext::UI::instance()->call_slot( slot(*this, &SoundFileBox::stop_btn_clicked));
+ Gtkmm2ext::UI::instance()->call_slot( mem_fun(*this, &SoundFileBox::stop_btn_clicked));
}
}
void
SoundFileBox::setup_fields ()
{
- ENSURE_GUI_THREAD(slot (*this, &SoundFileBox::setup_fields));
+ ENSURE_GUI_THREAD(mem_fun(*this, &SoundFileBox::setup_fields));
fields.rescan();
}
main_box.pack_start(rbtn_box, false, false);
main_box.pack_start(bottom_box, false, false);
- delete_event.connect (slot (*this, &ArdourDialog::wm_doi_event));
+ delete_event.connect (mem_fun(*this, &ArdourDialog::wm_doi_event));
- find_btn.signal_clicked().connect (slot (*this, &SearchSounds::find_btn_clicked));
- fields.selection_made.connect (slot
+ find_btn.signal_clicked().connect (mem_fun(*this, &SearchSounds::find_btn_clicked));
+ fields.selection_made.connect (mem_fun
(*this, &SearchSounds::field_selected));
show_all();
results = new SearchResults(search_info, false);
}
- results->file_chosen.connect (slot (*this, &SearchSounds::file_found));
+ results->file_chosen.connect (mem_fun(*this, &SearchSounds::file_found));
results->show_all();
}
multichan_check.set_active(true);
multichan_check.set_sensitive(false);
- delete_event.connect (slot (*this, &ArdourDialog::wm_doi_event));
+ delete_event.connect (mem_fun(*this, &ArdourDialog::wm_doi_event));
- import_btn.signal_clicked().connect (slot (*this, &SearchResults::import_clicked));
+ import_btn.signal_clicked().connect (mem_fun(*this, &SearchResults::import_clicked));
- results.choice_made.connect (slot (*this, &SearchResults::result_chosen));
+ results.choice_made.connect (mem_fun(*this, &SearchResults::result_chosen));
show_all();
}
cd_track_details_hbox.pack_start (composer_label, false, false);
cd_track_details_hbox.pack_start (composer_entry, true, true);
- isrc_entry.changed.connect (slot (*this, &LocationEditRow::isrc_entry_changed));
- isrc_entry.signal_focus_in_event().connect (slot (*this, &LocationEditRow::entry_focus_event));
- isrc_entry.signal_focus_out_event().connect (slot (*this, &LocationEditRow::entry_focus_event));
+ isrc_entry.changed.connect (mem_fun(*this, &LocationEditRow::isrc_entry_changed));
+ isrc_entry.signal_focus_in_event().connect (mem_fun(*this, &LocationEditRow::entry_focus_event));
+ isrc_entry.signal_focus_out_event().connect (mem_fun(*this, &LocationEditRow::entry_focus_event));
- performer_entry.changed.connect (slot (*this, &LocationEditRow::performer_entry_changed));
- performer_entry.signal_focus_in_event().connect (slot (*this, &LocationEditRow::entry_focus_event));
- performer_entry.signal_focus_out_event().connect (slot (*this, &LocationEditRow::entry_focus_event));
+ performer_entry.changed.connect (mem_fun(*this, &LocationEditRow::performer_entry_changed));
+ performer_entry.signal_focus_in_event().connect (mem_fun(*this, &LocationEditRow::entry_focus_event));
+ performer_entry.signal_focus_out_event().connect (mem_fun(*this, &LocationEditRow::entry_focus_event));
- composer_entry.changed.connect (slot (*this, &LocationEditRow::composer_entry_changed));
- composer_entry.signal_focus_in_event().connect (slot (*this, &LocationEditRow::entry_focus_event));
- composer_entry.signal_focus_out_event().connect (slot (*this, &LocationEditRow::entry_focus_event));
+ composer_entry.changed.connect (mem_fun(*this, &LocationEditRow::composer_entry_changed));
+ composer_entry.signal_focus_in_event().connect (mem_fun(*this, &LocationEditRow::entry_focus_event));
+ composer_entry.signal_focus_out_event().connect (mem_fun(*this, &LocationEditRow::entry_focus_event));
- scms_check_button.toggled.connect(slot (*this, &LocationEditRow::scms_toggled));
- preemph_check_button.toggled.connect(slot (*this, &LocationEditRow::preemph_toggled));
+ scms_check_button.toggled.connect(mem_fun(*this, &LocationEditRow::scms_toggled));
+ preemph_check_button.toggled.connect(mem_fun(*this, &LocationEditRow::preemph_toggled));
set_session (sess);
item_table.attach (start_hbox, 2, 3, 0, 1, 0, 0, 4, 0);
- start_set_button.clicked.connect( bind ( slot (*this, &LocationEditRow::set_button_pressed), LocStart));
- start_go_button.clicked.connect( bind ( slot (*this, &LocationEditRow::go_button_pressed), LocStart));
- start_clock.ValueChanged.connect (bind ( slot (*this, &LocationEditRow::clock_changed), LocStart));
+ start_set_button.clicked.connect( bind ( mem_fun(*this, &LocationEditRow::set_button_pressed), LocStart));
+ start_go_button.clicked.connect( bind ( mem_fun(*this, &LocationEditRow::go_button_pressed), LocStart));
+ start_clock.ValueChanged.connect (bind ( mem_fun(*this, &LocationEditRow::clock_changed), LocStart));
end_hbox.pack_start (end_go_button, false, false);
//item_table.attach (end_hbox, 2, 3, 0, 1, 0, 0, 4, 0);
- end_set_button.clicked.connect( bind ( slot (*this, &LocationEditRow::set_button_pressed), LocEnd));
- end_go_button.clicked.connect( bind ( slot (*this, &LocationEditRow::go_button_pressed), LocEnd));
- end_clock.ValueChanged.connect (bind ( slot (*this, &LocationEditRow::clock_changed), LocEnd));
+ end_set_button.clicked.connect( bind ( mem_fun(*this, &LocationEditRow::set_button_pressed), LocEnd));
+ end_go_button.clicked.connect( bind ( mem_fun(*this, &LocationEditRow::go_button_pressed), LocEnd));
+ end_clock.ValueChanged.connect (bind ( mem_fun(*this, &LocationEditRow::clock_changed), LocEnd));
// item_table.attach (length_clock, 3, 4, 0, 1, 0, 0, 4, 0);
- length_clock.ValueChanged.connect (bind ( slot (*this, &LocationEditRow::clock_changed), LocLength));
+ length_clock.ValueChanged.connect (bind ( mem_fun(*this, &LocationEditRow::clock_changed), LocLength));
// item_table.attach (cd_check_button, 4, 5, 0, 1, 0, Gtk::FILL, 4, 0);
// item_table.attach (hide_check_button, 5, 6, 0, 1, 0, Gtk::FILL, 4, 0);
// item_table.attach (remove_button, 7, 8, 0, 1, 0, Gtk::FILL, 4, 0);
- cd_check_button.toggled.connect(slot (*this, &LocationEditRow::cd_toggled));
- hide_check_button.toggled.connect(slot (*this, &LocationEditRow::hide_toggled));
+ cd_check_button.toggled.connect(mem_fun(*this, &LocationEditRow::cd_toggled));
+ hide_check_button.toggled.connect(mem_fun(*this, &LocationEditRow::hide_toggled));
- remove_button.clicked.connect(slot (*this, &LocationEditRow::remove_button_pressed));
+ remove_button.clicked.connect(mem_fun(*this, &LocationEditRow::remove_button_pressed));
pack_start(item_table, true, true);
name_entry.set_text (location->name());
name_entry.set_size_request (100, -1);
name_entry.set_editable (true);
- name_entry.changed.connect (slot (*this, &LocationEditRow::name_entry_changed));
- name_entry.signal_focus_in_event().connect (slot (*this, &LocationEditRow::entry_focus_event));
- name_entry.signal_focus_out_event().connect (slot (*this, &LocationEditRow::entry_focus_event));
+ name_entry.changed.connect (mem_fun(*this, &LocationEditRow::name_entry_changed));
+ name_entry.signal_focus_in_event().connect (mem_fun(*this, &LocationEditRow::entry_focus_event));
+ name_entry.signal_focus_out_event().connect (mem_fun(*this, &LocationEditRow::entry_focus_event));
if (!name_entry.get_parent()) {
item_table.attach (name_entry, 1, 2, 0, 1, Gtk::FILL | Gtk::EXPAND, Gtk::FILL, 4, 0);
length_clock.hide();
}
- start_changed_connection = location->start_changed.connect (slot (*this, &LocationEditRow::start_changed));
- end_changed_connection = location->end_changed.connect (slot (*this, &LocationEditRow::end_changed));
- name_changed_connection = location->name_changed.connect (slot (*this, &LocationEditRow::name_changed));
- changed_connection = location->changed.connect (slot (*this, &LocationEditRow::location_changed));
- flags_changed_connection = location->FlagsChanged.connect (slot (*this, &LocationEditRow::flags_changed));
+ start_changed_connection = location->start_changed.connect (mem_fun(*this, &LocationEditRow::start_changed));
+ end_changed_connection = location->end_changed.connect (mem_fun(*this, &LocationEditRow::end_changed));
+ name_changed_connection = location->name_changed.connect (mem_fun(*this, &LocationEditRow::name_changed));
+ changed_connection = location->changed.connect (mem_fun(*this, &LocationEditRow::location_changed));
+ flags_changed_connection = location->FlagsChanged.connect (mem_fun(*this, &LocationEditRow::flags_changed));
}
void
LocationEditRow::name_entry_changed ()
{
- ENSURE_GUI_THREAD(slot (*this, &LocationEditRow::name_entry_changed));
+ ENSURE_GUI_THREAD(mem_fun(*this, &LocationEditRow::name_entry_changed));
if (i_am_the_modifier || !location) return;
location->set_name (name_entry.get_text());
void
LocationEditRow::isrc_entry_changed ()
{
- ENSURE_GUI_THREAD(slot (*this, &LocationEditRow::isrc_entry_changed));
+ ENSURE_GUI_THREAD(mem_fun(*this, &LocationEditRow::isrc_entry_changed));
if (i_am_the_modifier || !location) return;
void
LocationEditRow::performer_entry_changed ()
{
- ENSURE_GUI_THREAD(slot (*this, &LocationEditRow::performer_entry_changed));
+ ENSURE_GUI_THREAD(mem_fun(*this, &LocationEditRow::performer_entry_changed));
if (i_am_the_modifier || !location) return;
void
LocationEditRow::composer_entry_changed ()
{
- ENSURE_GUI_THREAD(slot (*this, &LocationEditRow::composer_entry_changed));
+ ENSURE_GUI_THREAD(mem_fun(*this, &LocationEditRow::composer_entry_changed));
if (i_am_the_modifier || !location) return;
void
LocationEditRow::end_changed (ARDOUR::Location *loc)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &LocationEditRow::end_changed), loc));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &LocationEditRow::end_changed), loc));
if (!location) return;
void
LocationEditRow::start_changed (ARDOUR::Location *loc)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &LocationEditRow::start_changed), loc));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &LocationEditRow::start_changed), loc));
if (!location) return;
void
LocationEditRow::name_changed (ARDOUR::Location *loc)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &LocationEditRow::name_changed), loc));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &LocationEditRow::name_changed), loc));
if (!location) return;
void
LocationEditRow::location_changed (ARDOUR::Location *loc)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &LocationEditRow::location_changed), loc));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &LocationEditRow::location_changed), loc));
if (!location) return;
void
LocationEditRow::flags_changed (ARDOUR::Location *loc, void *src)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &LocationEditRow::flags_changed), loc, src));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &LocationEditRow::flags_changed), loc, src));
if (!location) return;
set_wmclass(_("ardour_locations"), "Ardour");
set_name ("LocationWindow");
- delete_event.connect (bind (slot (just_hide_it), static_cast<Window*>(this)));
+ delete_event.connect (bind (ptr_fun (just_hide_it), static_cast<Window*>(this)));
add (location_hpacker);
location_hpacker.pack_start (location_vpacker, true, true);
- add_location_button.signal_clicked().connect (slot (*this, &LocationUI::add_new_location));
- add_range_button.signal_clicked().connect (slot (*this, &LocationUI::add_new_range));
+ add_location_button.signal_clicked().connect (mem_fun(*this, &LocationUI::add_new_location));
+ add_range_button.signal_clicked().connect (mem_fun(*this, &LocationUI::add_new_range));
//add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK|Gdk::BUTTON_RELEASE_MASK);
// must do this to prevent problems when destroying
// the effective sender of this event
- Main::idle.connect (bind (slot (*this, &LocationUI::do_location_remove), loc));
+ Main::idle.connect (bind (mem_fun(*this, &LocationUI::do_location_remove), loc));
}
void
LocationUI::location_added (Location* location)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &LocationUI::location_added), location));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &LocationUI::location_added), location));
if (location->is_auto_punch()) {
punch_edit_row.set_location(location);
void
LocationUI::location_removed (Location* location)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &LocationUI::location_removed), location));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &LocationUI::location_removed), location));
if (location->is_auto_punch()) {
punch_edit_row.set_location(0);
if (location->is_mark()) {
mark_n++;
erow = manage (new LocationEditRow(session, location, mark_n));
- erow->remove_requested.connect (slot (*this, &LocationUI::location_remove_requested));
- erow->redraw_ranges.connect (slot (*this, &LocationUI::location_redraw_ranges));
+ erow->remove_requested.connect (mem_fun(*this, &LocationUI::location_remove_requested));
+ erow->redraw_ranges.connect (mem_fun(*this, &LocationUI::location_redraw_ranges));
loc_children.push_back(Box_Helpers::Element(*erow, false, false, 1));
}
else if (location->is_auto_punch()) {
}
else {
erow = manage (new LocationEditRow(session, location));
- erow->remove_requested.connect (slot (*this, &LocationUI::location_remove_requested));
+ erow->remove_requested.connect (mem_fun(*this, &LocationUI::location_remove_requested));
range_children.push_back(Box_Helpers::Element(*erow, false, false, 1));
}
}
void
LocationUI::refresh_location_list_s (Change ignored)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &LocationUI::refresh_location_list_s), ignored));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &LocationUI::refresh_location_list_s), ignored));
refresh_location_list ();
}
void
LocationUI::refresh_location_list ()
{
- ENSURE_GUI_THREAD(slot (*this, &LocationUI::refresh_location_list));
+ ENSURE_GUI_THREAD(mem_fun(*this, &LocationUI::refresh_location_list));
using namespace Box_Helpers;
BoxList & loc_children = location_rows.children();
ArdourDialog::set_session (sess);
if (session) {
- session->locations()->changed.connect (slot (*this, &LocationUI::refresh_location_list));
- session->locations()->StateChanged.connect (slot (*this, &LocationUI::refresh_location_list_s));
- session->locations()->added.connect (slot (*this, &LocationUI::location_added));
- session->locations()->removed.connect (slot (*this, &LocationUI::location_removed));
- session->going_away.connect (slot (*this, &LocationUI::session_gone));
+ session->locations()->changed.connect (mem_fun(*this, &LocationUI::refresh_location_list));
+ session->locations()->StateChanged.connect (mem_fun(*this, &LocationUI::refresh_location_list_s));
+ session->locations()->added.connect (mem_fun(*this, &LocationUI::location_added));
+ session->locations()->removed.connect (mem_fun(*this, &LocationUI::location_removed));
+ session->going_away.connect (mem_fun(*this, &LocationUI::session_gone));
}
refresh_location_list ();
}
void
LocationUI::session_gone()
{
- ENSURE_GUI_THREAD(slot (*this, &LocationUI::session_gone));
+ ENSURE_GUI_THREAD(mem_fun(*this, &LocationUI::session_gone));
hide_all();
once everything else is OK.
*/
- Main::idle.connect (bind (slot (*ui, &ARDOUR_UI::cmdline_new_session), path));
+ Main::idle.connect (bind (mem_fun (*ui, &ARDOUR_UI::cmdline_new_session), path));
ui->set_will_create_new_session_automatically (true);
} else {
gtk_object_set_data (GTK_OBJECT(group), "marker", this);
gtk_signal_connect (GTK_OBJECT(group), "event", (GtkSignalFunc) callback, &editor);
- editor.ZoomChanged.connect (slot (*this, &Marker::reposition));
+ editor.ZoomChanged.connect (mem_fun(*this, &Marker::reposition));
}
Marker::~Marker ()
/* now fill it with our stuff */
MenuList& items = display_menu->items();
- items.push_back(MenuElem (_("Rename"), slot (*this, &VisualTimeAxis::start_time_axis_rename)));
+ items.push_back(MenuElem (_("Rename"), mem_fun(*this, &VisualTimeAxis::start_time_axis_rename)));
items.push_back(SeparatorElem()) ;
items.push_back(MenuElem (_("Height"), *size_menu));
- items.push_back(MenuElem (_("Color"), slot (*this, &MarkerTimeAxis::select_track_color)));
+ items.push_back(MenuElem (_("Color"), mem_fun(*this, &MarkerTimeAxis::select_track_color)));
items.push_back(SeparatorElem()) ;
- items.push_back(MenuElem (_("Remove"), bind(slot(*this, &MarkerTimeAxis::remove_this_time_axis), (void*)this)));
+ items.push_back(MenuElem (_("Remove"), bind(mem_fun(*this, &MarkerTimeAxis::remove_this_time_axis), (void*)this)));
}
/**
if(view)
{
- duration_items.push_back(MenuElem (_("1 seconds"), bind (slot (view, &MarkerTimeAxisView::set_marker_duration_sec), 1.0))) ;
- duration_items.push_back(MenuElem (_("1.5 seconds"), bind (slot (view, &MarkerTimeAxisView::set_marker_duration_sec), 1.5))) ;
- duration_items.push_back(MenuElem (_("2 seconds"), bind (slot (view, &MarkerTimeAxisView::set_marker_duration_sec), 2.0))) ;
- duration_items.push_back(MenuElem (_("2.5 seconds"), bind (slot (view, &MarkerTimeAxisView::set_marker_duration_sec), 2.5))) ;
- duration_items.push_back(MenuElem (_("3 seconds"), bind (slot (view, &MarkerTimeAxisView::set_marker_duration_sec), 3.0))) ;
+ duration_items.push_back(MenuElem (_("1 seconds"), bind (mem_fun (view, &MarkerTimeAxisView::set_marker_duration_sec), 1.0))) ;
+ duration_items.push_back(MenuElem (_("1.5 seconds"), bind (mem_fun (view, &MarkerTimeAxisView::set_marker_duration_sec), 1.5))) ;
+ duration_items.push_back(MenuElem (_("2 seconds"), bind (mem_fun (view, &MarkerTimeAxisView::set_marker_duration_sec), 2.0))) ;
+ duration_items.push_back(MenuElem (_("2.5 seconds"), bind (mem_fun (view, &MarkerTimeAxisView::set_marker_duration_sec), 2.5))) ;
+ duration_items.push_back(MenuElem (_("3 seconds"), bind (mem_fun (view, &MarkerTimeAxisView::set_marker_duration_sec), 3.0))) ;
}
//duration_items.push_back(SeparatorElem()) ;
- //duration_items.push_back(MenuElem (_("custom"), slot (*this, &ImageFrameTimeAxis::set_marker_duration_custom))) ;
+ //duration_items.push_back(MenuElem (_("custom"), mem_fun(*this, &ImageFrameTimeAxis::set_marker_duration_custom))) ;
marker_sub_items.push_back(MenuElem(_("Duration (sec)"), *duration_menu)) ;
marker_sub_items.push_back(SeparatorElem()) ;
- marker_sub_items.push_back(MenuElem (_("Remove Marker"), bind(slot(view, &MarkerTimeAxisView::remove_selected_marker_view),(void*)this))) ;
+ marker_sub_items.push_back(MenuElem (_("Remove Marker"), bind(mem_fun(view, &MarkerTimeAxisView::remove_selected_marker_view),(void*)this))) ;
items.push_back(MenuElem(_("Marker"), *marker_item_menu)) ;
- items.push_back(MenuElem (_("Rename Track"), slot (*this,&MarkerTimeAxis::start_time_axis_rename))) ;
+ items.push_back(MenuElem (_("Rename Track"), mem_fun(*this,&MarkerTimeAxis::start_time_axis_rename))) ;
marker_menu->show_all() ;
}
_samples_per_unit = _trackview.editor.get_current_zoom() ;
- _trackview.editor.ZoomChanged.connect (slot(*this, &MarkerTimeAxisView::reset_samples_per_unit));
+ _trackview.editor.ZoomChanged.connect (mem_fun(*this, &MarkerTimeAxisView::reset_samples_per_unit));
}
/**
ifv->add_marker_view_item(mv, src) ;
marker_view_list.push_front(mv) ;
- mv->GoingAway.connect(bind (slot (*this,&MarkerTimeAxisView::remove_marker_view), (void*)this)) ;
+ mv->GoingAway.connect(bind (mem_fun(*this,&MarkerTimeAxisView::remove_marker_view), (void*)this)) ;
MarkerViewAdded(mv,src) ; /* EMIT_SIGNAL */
void
MarkerTimeAxisView::remove_marker_view(MarkerView* mv, void* src)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &MarkerTimeAxisView::remove_marker_view), mv, src));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &MarkerTimeAxisView::remove_marker_view), mv, src));
MarkerViewList::iterator i;
set_wmclass (_("ardour_meter_bridge"), "Ardour");
// set_policy (false, false, false); // no user resizing of any kind
- delete_event.connect (bind (slot (just_hide_it), static_cast<Gtk::Window*>(this)));
+ delete_event.connect (bind (ptr_fun (just_hide_it), static_cast<Gtk::Window*>(this)));
metering = false;
// XXX this stuff has to be fixed if we ever use this code again
// (refs vs. ptrs)
// session->foreach_route (this, &MeterBridge::add_route);
- session->RouteAdded.connect (slot (*this, &MeterBridge::add_route));
- session->going_away.connect (slot (*this, &MeterBridge::session_gone));
+ session->RouteAdded.connect (mem_fun(*this, &MeterBridge::add_route));
+ session->going_away.connect (mem_fun(*this, &MeterBridge::session_gone));
start_metering ();
}
}
void
MeterBridge::session_gone ()
{
- ENSURE_GUI_THREAD(slot (*this, &MeterBridge::session_gone));
+ ENSURE_GUI_THREAD(mem_fun(*this, &MeterBridge::session_gone));
stop_metering ();
hide_all ();
void
MeterBridge::add_route (ARDOUR::Route* route)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &MeterBridge::add_route), route));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &MeterBridge::add_route), route));
uint32_t n;
char buf[32];
meter->meter_widget().show ();
meter->below_box().show_all ();
- route->GoingAway.connect (bind (slot (*this, &MeterBridge::remove_route), route));
+ route->GoingAway.connect (bind (mem_fun(*this, &MeterBridge::remove_route), route));
meters.insert (meters.begin(), meter);
set_default_size (30 + ((n+1) * packing_factor), 315);
meter->set_meter_on(true);
- session->going_away.connect (slot (*this, &MeterBridge::session_gone));
+ session->going_away.connect (mem_fun(*this, &MeterBridge::session_gone));
}
void
MeterBridge::remove_route (Route* route)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &MeterBridge::remove_route), route));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &MeterBridge::remove_route), route));
list<MeterBridgeStrip *>::iterator i;
for (i = meters.begin(); i != meters.end(); ++i) {
(*i)->set_meter_on (true);
}
metering_connection = ARDOUR_UI::instance()->RapidScreenUpdate.connect
- (slot (*this, &MeterBridge::update));
+ (mem_fun(*this, &MeterBridge::update));
metering = true;
}
label_ebox.set_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK);
label_ebox.add (label);
- label_ebox.button_release_event.connect (slot (*this, &MeterBridgeStrip::label_button_press_release));
+ label_ebox.button_release_event.connect (mem_fun(*this, &MeterBridgeStrip::label_button_press_release));
ARDOUR_UI::instance()->tooltips().set_tip (label_ebox, _route.name());
over_long_label.set_text ("0");
below_meter_vbox.pack_start (label_ebox);
- over_short_button.button_release_event.connect (slot (*this,&MeterBridgeStrip::gui_clear_overs));
- over_long_button.button_release_event.connect (slot (*this,&MeterBridgeStrip::gui_clear_overs));
+ over_short_button.button_release_event.connect (mem_fun(*this,&MeterBridgeStrip::gui_clear_overs));
+ over_long_button.button_release_event.connect (mem_fun(*this,&MeterBridgeStrip::gui_clear_overs));
last_over_short = 0;
last_over_long = 0;
using namespace Menu_Helpers;
gain_astate_menu.items().push_back (MenuElem (_("off"),
- bind (slot (_route, &IO::set_gain_automation_state), (AutoState) Off)));
+ bind (mem_fun (_route, &IO::set_gain_automation_state), (AutoState) Off)));
gain_astate_menu.items().push_back (MenuElem (_("play"),
- bind (slot (_route, &IO::set_gain_automation_state), (AutoState) Play)));
+ bind (mem_fun (_route, &IO::set_gain_automation_state), (AutoState) Play)));
gain_astate_menu.items().push_back (MenuElem (_("write"),
- bind (slot (_route, &IO::set_gain_automation_state), (AutoState) Write)));
+ bind (mem_fun (_route, &IO::set_gain_automation_state), (AutoState) Write)));
gain_astate_menu.items().push_back (MenuElem (_("touch"),
- bind (slot (_route, &IO::set_gain_automation_state), (AutoState) Touch)));
+ bind (mem_fun (_route, &IO::set_gain_automation_state), (AutoState) Touch)));
gain_astyle_menu.items().push_back (MenuElem (_("trim")));
gain_astyle_menu.items().push_back (MenuElem (_("abs")));
pan_astate_menu.items().push_back (MenuElem (_("off"),
- bind (slot (_route.panner(), &Panner::set_automation_state), (AutoState) Off)));
+ bind (mem_fun (_route.panner(), &Panner::set_automation_state), (AutoState) Off)));
pan_astate_menu.items().push_back (MenuElem (_("play"),
- bind (slot (_route.panner(), &Panner::set_automation_state), (AutoState) Play)));
+ bind (mem_fun (_route.panner(), &Panner::set_automation_state), (AutoState) Play)));
pan_astate_menu.items().push_back (MenuElem (_("write"),
- bind (slot (_route.panner(), &Panner::set_automation_state), (AutoState) Write)));
+ bind (mem_fun (_route.panner(), &Panner::set_automation_state), (AutoState) Write)));
pan_astate_menu.items().push_back (MenuElem (_("touch"),
- bind (slot (_route.panner(), &Panner::set_automation_state), (AutoState) Touch)));
+ bind (mem_fun (_route.panner(), &Panner::set_automation_state), (AutoState) Touch)));
pan_astyle_menu.items().push_back (MenuElem (_("trim")));
pan_astyle_menu.items().push_back (MenuElem (_("abs")));
AudioTrack* at = dynamic_cast<AudioTrack*>(&_route);
- at->FreezeChange.connect (slot (*this, &MixerStrip::map_frozen));
+ at->FreezeChange.connect (mem_fun(*this, &MixerStrip::map_frozen));
- speed_adjustment.value_changed.connect (slot (*this, &MixerStrip::speed_adjustment_changed));
+ speed_adjustment.value_changed.connect (mem_fun(*this, &MixerStrip::speed_adjustment_changed));
speed_frame.set_name ("BaseFrame");
speed_frame.set_shadow_type (Gtk::SHADOW_IN);
ARDOUR_UI::instance()->tooltips().set_tip (comment_button, _route.comment()=="" ?
_("click to add/edit comments"):
_route.comment());
- comment_button.signal_clicked().connect (slot (*this, &MixerStrip::comment_button_clicked));
+ comment_button.signal_clicked().connect (mem_fun(*this, &MixerStrip::comment_button_clicked));
global_vpacker.set_border_width (4);
global_vpacker.set_spacing (4);
width_button.set_name ("MixerWidthButton");
hide_button.set_name ("MixerHideButton");
- width_button.signal_clicked().connect (slot (*this, &MixerStrip::width_clicked));
- hide_button.signal_clicked().connect (slot (*this, &MixerStrip::hide_clicked));
+ width_button.signal_clicked().connect (mem_fun(*this, &MixerStrip::width_clicked));
+ hide_button.signal_clicked().connect (mem_fun(*this, &MixerStrip::hide_clicked));
width_hide_box.pack_start (width_button, false, true);
width_hide_box.pack_end (hide_button, false, true);
_packed = false;
_embedded = false;
- _route.input_changed.connect (slot (*this, &MixerStrip::input_changed));
- _route.output_changed.connect (slot (*this, &MixerStrip::output_changed));
- _route.mute_changed.connect (slot (*this, &RouteUI::mute_changed));
- _route.solo_changed.connect (slot (*this, &RouteUI::solo_changed));
- _route.solo_safe_changed.connect (slot (*this, &RouteUI::solo_changed));
- _route.mix_group_changed.connect (slot (*this, &MixerStrip::mix_group_changed));
- _route.gain_automation_curve().automation_state_changed.connect (slot (*this, &MixerStrip::gain_automation_state_changed));
- _route.gain_automation_curve().automation_style_changed.connect (slot (*this, &MixerStrip::gain_automation_style_changed));
- _route.panner().Changed.connect (slot (*this, &MixerStrip::connect_to_pan));
+ _route.input_changed.connect (mem_fun(*this, &MixerStrip::input_changed));
+ _route.output_changed.connect (mem_fun(*this, &MixerStrip::output_changed));
+ _route.mute_changed.connect (mem_fun(*this, &RouteUI::mute_changed));
+ _route.solo_changed.connect (mem_fun(*this, &RouteUI::solo_changed));
+ _route.solo_safe_changed.connect (mem_fun(*this, &RouteUI::solo_changed));
+ _route.mix_group_changed.connect (mem_fun(*this, &MixerStrip::mix_group_changed));
+ _route.gain_automation_curve().automation_state_changed.connect (mem_fun(*this, &MixerStrip::gain_automation_state_changed));
+ _route.gain_automation_curve().automation_style_changed.connect (mem_fun(*this, &MixerStrip::gain_automation_style_changed));
+ _route.panner().Changed.connect (mem_fun(*this, &MixerStrip::connect_to_pan));
if (is_audio_track()) {
- audio_track()->diskstream_changed.connect (slot (*this, &MixerStrip::diskstream_changed));
- get_diskstream()->speed_changed.connect (slot (*this, &MixerStrip::speed_changed));
+ audio_track()->diskstream_changed.connect (mem_fun(*this, &MixerStrip::diskstream_changed));
+ get_diskstream()->speed_changed.connect (mem_fun(*this, &MixerStrip::speed_changed));
}
- _route.name_changed.connect (slot (*this, &RouteUI::name_changed));
- _route.comment_changed.connect (slot (*this, &MixerStrip::comment_changed));
- _route.gui_changed.connect (slot (*this, &MixerStrip::route_gui_changed));
+ _route.name_changed.connect (mem_fun(*this, &RouteUI::name_changed));
+ _route.comment_changed.connect (mem_fun(*this, &MixerStrip::comment_changed));
+ _route.gui_changed.connect (mem_fun(*this, &MixerStrip::route_gui_changed));
- input_button.button_release_event.connect (slot (*this, &MixerStrip::input_press));
- output_button.button_release_event.connect (slot (*this, &MixerStrip::output_press));
+ input_button.button_release_event.connect (mem_fun(*this, &MixerStrip::input_press));
+ output_button.button_release_event.connect (mem_fun(*this, &MixerStrip::output_press));
- rec_enable_button->button_press_event.connect (slot (*this, &RouteUI::rec_enable_press));
- solo_button->button_press_event.connect (slot (*this, &RouteUI::solo_press));
- solo_button->button_release_event.connect (slot (*this, &RouteUI::solo_release));
- mute_button->button_press_event.connect (slot (*this, &RouteUI::mute_press));
- mute_button->button_release_event.connect (slot (*this, &RouteUI::mute_release));
+ rec_enable_button->button_press_event.connect (mem_fun(*this, &RouteUI::rec_enable_press));
+ solo_button->button_press_event.connect (mem_fun(*this, &RouteUI::solo_press));
+ solo_button->button_release_event.connect (mem_fun(*this, &RouteUI::solo_release));
+ mute_button->button_press_event.connect (mem_fun(*this, &RouteUI::mute_press));
+ mute_button->button_release_event.connect (mem_fun(*this, &RouteUI::mute_release));
- gain_automation_style_button.button_press_event.connect_after (slot (do_not_propagate));
- pan_automation_style_button.button_press_event.connect_after (slot (do_not_propagate));
- gain_automation_state_button.button_press_event.connect_after (slot (do_not_propagate));
- pan_automation_state_button.button_press_event.connect_after (slot (do_not_propagate));
+ gain_automation_style_button.button_press_event.connect_after (ptr_fun (do_not_propagate));
+ pan_automation_style_button.button_press_event.connect_after (ptr_fun (do_not_propagate));
+ gain_automation_state_button.button_press_event.connect_after (ptr_fun (do_not_propagate));
+ pan_automation_state_button.button_press_event.connect_after (ptr_fun (do_not_propagate));
- gain_automation_style_button.button_press_event.connect (slot (*this, &MixerStrip::gain_automation_style_button_event));
- gain_automation_style_button.button_release_event.connect (slot (*this, &MixerStrip::gain_automation_style_button_event));
- pan_automation_style_button.button_press_event.connect (slot (*this, &MixerStrip::pan_automation_style_button_event));
- pan_automation_style_button.button_release_event.connect (slot (*this, &MixerStrip::pan_automation_style_button_event));
+ gain_automation_style_button.button_press_event.connect (mem_fun(*this, &MixerStrip::gain_automation_style_button_event));
+ gain_automation_style_button.button_release_event.connect (mem_fun(*this, &MixerStrip::gain_automation_style_button_event));
+ pan_automation_style_button.button_press_event.connect (mem_fun(*this, &MixerStrip::pan_automation_style_button_event));
+ pan_automation_style_button.button_release_event.connect (mem_fun(*this, &MixerStrip::pan_automation_style_button_event));
- gain_automation_state_button.button_press_event.connect (slot (*this, &MixerStrip::gain_automation_state_button_event));
- gain_automation_state_button.button_release_event.connect (slot (*this, &MixerStrip::gain_automation_state_button_event));
- pan_automation_state_button.button_press_event.connect (slot (*this, &MixerStrip::pan_automation_state_button_event));
- pan_automation_state_button.button_release_event.connect (slot (*this, &MixerStrip::pan_automation_state_button_event));
+ gain_automation_state_button.button_press_event.connect (mem_fun(*this, &MixerStrip::gain_automation_state_button_event));
+ gain_automation_state_button.button_release_event.connect (mem_fun(*this, &MixerStrip::gain_automation_state_button_event));
+ pan_automation_state_button.button_press_event.connect (mem_fun(*this, &MixerStrip::pan_automation_state_button_event));
+ pan_automation_state_button.button_release_event.connect (mem_fun(*this, &MixerStrip::pan_automation_state_button_event));
- polarity_button.toggled.connect (slot (*this, &MixerStrip::polarity_toggled));
+ polarity_button.toggled.connect (mem_fun(*this, &MixerStrip::polarity_toggled));
- name_button.button_release_event.connect (slot (*this, &MixerStrip::name_button_button_release));
+ name_button.button_release_event.connect (mem_fun(*this, &MixerStrip::name_button_button_release));
- group_button.button_press_event.connect (slot (*this, &MixerStrip::select_mix_group));
+ group_button.button_press_event.connect (mem_fun(*this, &MixerStrip::select_mix_group));
_width = (Width) -1;
set_stuff_from_route ();
output_menu.set_name ("ArdourContextMenu");
citems.clear();
- citems.push_back (MenuElem (_("Edit"), slot (*this, &MixerStrip::edit_output_configuration)));
+ citems.push_back (MenuElem (_("Edit"), mem_fun(*this, &MixerStrip::edit_output_configuration)));
citems.push_back (SeparatorElem());
- citems.push_back (MenuElem (_("Disconnect"), slot (*(static_cast<RouteUI*>(this)), &RouteUI::disconnect_output)));
+ citems.push_back (MenuElem (_("Disconnect"), mem_fun (*(static_cast<RouteUI*>(this)), &RouteUI::disconnect_output)));
citems.push_back (SeparatorElem());
_session.foreach_connection (this, &MixerStrip::add_connection_to_output_menu);
#if ADVANCED_ROUTE_DISKSTREAM_CONNECTIVITY
if (is_audio_track()) {
- citems.push_back (MenuElem (_("Track"), slot (*this, &MixerStrip::select_stream_input)));
+ citems.push_back (MenuElem (_("Track"), mem_fun(*this, &MixerStrip::select_stream_input)));
}
#endif
- citems.push_back (MenuElem (_("Edit"), slot (*this, &MixerStrip::edit_input_configuration)));
+ citems.push_back (MenuElem (_("Edit"), mem_fun(*this, &MixerStrip::edit_input_configuration)));
citems.push_back (SeparatorElem());
- citems.push_back (MenuElem (_("Disconnect"), slot (*(static_cast<RouteUI*>(this)), &RouteUI::disconnect_input)));
+ citems.push_back (MenuElem (_("Disconnect"), mem_fun (*(static_cast<RouteUI*>(this)), &RouteUI::disconnect_input)));
citems.push_back (SeparatorElem());
_session.foreach_connection (this, &MixerStrip::add_connection_to_input_menu);
if (c->nports() == _route.n_inputs()) {
- citems.push_back (CheckMenuElem (c->name(), bind (slot (*this, &MixerStrip::connection_input_chosen), c)));
+ citems.push_back (CheckMenuElem (c->name(), bind (mem_fun(*this, &MixerStrip::connection_input_chosen), c)));
ARDOUR::Connection *current = _route.input_connection();
if (c->nports() == _route.n_outputs()) {
MenuList& citems = output_menu.items();
- citems.push_back (CheckMenuElem (c->name(), bind (slot (*this, &MixerStrip::connection_output_chosen), c)));
+ citems.push_back (CheckMenuElem (c->name(), bind (mem_fun(*this, &MixerStrip::connection_output_chosen), c)));
ARDOUR::Connection *current = _route.output_connection();
if (!(*i)->hidden()) {
- items.push_back (CheckMenuElem ((*i)->name(), bind (slot (*this, &MixerStrip::stream_input_chosen), *i)));
+ items.push_back (CheckMenuElem ((*i)->name(), bind (mem_fun(*this, &MixerStrip::stream_input_chosen), *i)));
if (get_diskstream() == *i) {
ignore_toggle = true;
void
MixerStrip::connect_to_pan ()
{
- ENSURE_GUI_THREAD(slot (*this, &MixerStrip::connect_to_pan));
+ ENSURE_GUI_THREAD(mem_fun(*this, &MixerStrip::connect_to_pan));
panstate_connection.disconnect ();
panstyle_connection.disconnect ();
if (!_route.panner().empty()) {
StreamPanner* sp = _route.panner().front();
- panstate_connection = sp->automation().automation_state_changed.connect (slot (*this, &MixerStrip::pan_automation_state_changed));
- panstyle_connection = sp->automation().automation_style_changed.connect (slot (*this, &MixerStrip::pan_automation_style_changed));
+ panstate_connection = sp->automation().automation_state_changed.connect (mem_fun(*this, &MixerStrip::pan_automation_state_changed));
+ panstyle_connection = sp->automation().automation_style_changed.connect (mem_fun(*this, &MixerStrip::pan_automation_style_changed));
}
panners.pan_changed (this);
void
MixerStrip::diskstream_changed (void *src)
{
- Gtkmm2ext::UI::instance()->call_slot (slot (*this, &MixerStrip::update_diskstream_display));
+ Gtkmm2ext::UI::instance()->call_slot (mem_fun(*this, &MixerStrip::update_diskstream_display));
}
void
void
MixerStrip::gain_automation_state_changed ()
{
- ENSURE_GUI_THREAD(slot (*this, &MixerStrip::gain_automation_state_changed));
+ ENSURE_GUI_THREAD(mem_fun(*this, &MixerStrip::gain_automation_state_changed));
bool x;
gain_watching.disconnect();
if (x) {
- gain_watching = ARDOUR_UI::RapidScreenUpdate.connect (slot (gpm, &GainMeter::effective_gain_display));
+ gain_watching = ARDOUR_UI::RapidScreenUpdate.connect (mem_fun (gpm, &GainMeter::effective_gain_display));
}
}
void
MixerStrip::pan_automation_style_changed ()
{
- ENSURE_GUI_THREAD(slot (*this, &MixerStrip::pan_automation_style_changed));
+ ENSURE_GUI_THREAD(mem_fun(*this, &MixerStrip::pan_automation_style_changed));
switch (_width) {
case Wide:
void
MixerStrip::pan_automation_state_changed ()
{
- ENSURE_GUI_THREAD(slot (*this, &MixerStrip::pan_automation_state_changed));
+ ENSURE_GUI_THREAD(mem_fun(*this, &MixerStrip::pan_automation_state_changed));
bool x;
pan_watching.disconnect();
if (x) {
- pan_watching = ARDOUR_UI::RapidScreenUpdate.connect (slot (panners, &PannerUI::effective_pan_display));
+ pan_watching = ARDOUR_UI::RapidScreenUpdate.connect (mem_fun (panners, &PannerUI::effective_pan_display));
}
}
void
MixerStrip::input_changed (IOChange change, void *src)
{
- Gtkmm2ext::UI::instance()->call_slot (slot (*this, &MixerStrip::update_input_display));
+ Gtkmm2ext::UI::instance()->call_slot (mem_fun(*this, &MixerStrip::update_input_display));
}
void
MixerStrip::output_changed (IOChange change, void *src)
{
- Gtkmm2ext::UI::instance()->call_slot (slot (*this, &MixerStrip::update_output_display));
+ Gtkmm2ext::UI::instance()->call_slot (mem_fun(*this, &MixerStrip::update_output_display));
}
void
comment_area.set_name ("MixerTrackCommentArea");
comment_area.set_editable (true);
- comment_area.signal_focus_in_event().connect (slot (ARDOUR_UI::generic_focus_in_event));
- comment_area.signal_focus_out_event().connect (slot (ARDOUR_UI::generic_focus_out_event));
- comment_area.changed.connect (slot (*this, &MixerStrip::comment_edited));
- comment_area.button_release_event.connect_after (slot (do_not_propagate));
+ comment_area.signal_focus_in_event().connect (ptr_fun (ARDOUR_UI::generic_focus_in_event));
+ comment_area.signal_focus_out_event().connect (ptr_fun (ARDOUR_UI::generic_focus_out_event));
+ comment_area.changed.connect (mem_fun(*this, &MixerStrip::comment_edited));
+ comment_area.button_release_event.connect_after (ptr_fun (do_not_propagate));
comment_area.show ();
comment_window->add (comment_area);
- comment_window->delete_event.connect (bind (slot (just_hide_it), comment_window));
+ comment_window->delete_event.connect (bind (ptr_fun (just_hide_it), comment_window));
}
void
MixerStrip::comment_changed (void *src)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &MixerStrip::comment_changed), src));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &MixerStrip::comment_changed), src));
if (src != this) {
ignore_comment_edit = true;
void
MixerStrip::comment_edited ()
{
- ENSURE_GUI_THREAD(slot (*this, &MixerStrip::comment_edited));
+ ENSURE_GUI_THREAD(mem_fun(*this, &MixerStrip::comment_edited));
if (!ignore_comment_edit) {
string str = comment_area.get_chars(0,-1);
using namespace Menu_Helpers;
MenuList& items = group_menu->items();
- items.push_back (MenuElem (rg->name(), bind (slot (*this, &MixerStrip::set_mix_group), rg)));
+ items.push_back (MenuElem (rg->name(), bind (mem_fun(*this, &MixerStrip::set_mix_group), rg)));
}
gint
group_menu->set_name ("ArdourContextMenu");
MenuList& items = group_menu->items();
- items.push_back (MenuElem (_("no group"), bind (slot (*this, &MixerStrip::set_mix_group), (RouteGroup *) 0)));
+ items.push_back (MenuElem (_("no group"), bind (mem_fun(*this, &MixerStrip::set_mix_group), (RouteGroup *) 0)));
_session.foreach_mix_group (this, &MixerStrip::add_mix_group_to_menu);
group_menu->popup (ev->button, 0);
void
MixerStrip::mix_group_changed (void *ignored)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &MixerStrip::mix_group_changed), ignored));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &MixerStrip::mix_group_changed), ignored));
RouteGroup *rg = _route.mix_group();
void
MixerStrip::route_gui_changed (string what_changed, void* ignored)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &MixerStrip::route_gui_changed), what_changed, ignored));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &MixerStrip::route_gui_changed), what_changed, ignored));
if (what_changed == "color") {
if (set_color_from_route () == 0) {
MenuList& items = route_ops_menu->items();
- items.push_back (MenuElem (_("Rename"), slot (*this, &RouteUI::route_rename)));
+ items.push_back (MenuElem (_("Rename"), mem_fun(*this, &RouteUI::route_rename)));
items.push_back (SeparatorElem());
- items.push_back (CheckMenuElem (_("Active"), slot (*this, &RouteUI::toggle_route_active)));
+ items.push_back (CheckMenuElem (_("Active"), mem_fun(*this, &RouteUI::toggle_route_active)));
route_active_menu_item = dynamic_cast<CheckMenuItem *> (items.back());
route_active_menu_item->set_active (_route.active());
items.push_back (SeparatorElem());
- items.push_back (MenuElem (_("Remove"), slot (*this, &RouteUI::remove_this_route)));
+ items.push_back (MenuElem (_("Remove"), mem_fun(*this, &RouteUI::remove_this_route)));
}
gint
void
MixerStrip::speed_changed ()
{
- Gtkmm2ext::UI::instance()->call_slot (slot (*this, &MixerStrip::update_speed_display));
+ Gtkmm2ext::UI::instance()->call_slot (mem_fun(*this, &MixerStrip::update_speed_display));
}
void
void
MixerStrip::map_frozen ()
{
- ENSURE_GUI_THREAD (slot (*this, &MixerStrip::map_frozen));
+ ENSURE_GUI_THREAD (mem_fun(*this, &MixerStrip::map_frozen));
AudioTrack* at = dynamic_cast<AudioTrack*>(&_route);
scroller_base.add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
scroller_base.set_name ("MixerWindow");
- scroller_base.button_release_event.connect (slot (*this, &Mixer_UI::strip_scroller_button_release));
+ scroller_base.button_release_event.connect (mem_fun(*this, &Mixer_UI::strip_scroller_button_release));
// add as last item of strip packer
strip_packer.pack_end (scroller_base, true, true);
list_hpane.add1(list_vpacker);
list_hpane.add2(global_hpacker);
- rhs_pane1.size_allocate.connect_after (bind (slot (*this, &Mixer_UI::pane_allocation_handler),
+ rhs_pane1.size_allocate.connect_after (bind (mem_fun(*this, &Mixer_UI::pane_allocation_handler),
static_cast<Gtk::Paned*> (&rhs_pane1)));
- rhs_pane2.size_allocate.connect_after (bind (slot (*this, &Mixer_UI::pane_allocation_handler),
+ rhs_pane2.size_allocate.connect_after (bind (mem_fun(*this, &Mixer_UI::pane_allocation_handler),
static_cast<Gtk::Paned*> (&rhs_pane2)));
- list_hpane.size_allocate.connect_after (bind (slot (*this, &Mixer_UI::pane_allocation_handler),
+ list_hpane.size_allocate.connect_after (bind (mem_fun(*this, &Mixer_UI::pane_allocation_handler),
static_cast<Gtk::Paned*> (&list_hpane)));
rhs_pane2.set_data ("collapse-direction", (gpointer) 0);
list_hpane.set_data ("collapse-direction", (gpointer) 1);
- rhs_pane1.button_release_event.connect (bind (
slot (pane_handler), static_cast<Paned*>(&rhs_pane1)));
- rhs_pane2.button_release_event.connect (bind (
slot (pane_handler), static_cast<Paned*>(&rhs_pane2)));
- list_hpane.button_release_event.connect (bind (
slot (pane_handler), static_cast<Paned*>(&list_hpane)));
+ rhs_pane1.button_release_event.connect (bind (
ptr_fun (pane_handler), static_cast<Paned*>(&rhs_pane1)));
+ rhs_pane2.button_release_event.connect (bind (
ptr_fun (pane_handler), static_cast<Paned*>(&rhs_pane2)));
+ list_hpane.button_release_event.connect (bind (
ptr_fun (pane_handler), static_cast<Paned*>(&list_hpane)));
global_vpacker.pack_start (list_hpane, true, true);
set_title (_("ardour: mixer"));
set_wmclass (_("ardour_mixer"), "Ardour");
- delete_event.connect (bind (slot (just_hide_it),
+ delete_event.connect (bind (ptr_fun (just_hide_it),
static_cast<Gtk::Window *>(this)));
add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK);
- snapshot_display.select_row.connect (slot (*this, &Mixer_UI::snapshot_display_selected));
+ snapshot_display.select_row.connect (mem_fun(*this, &Mixer_UI::snapshot_display_selected));
- track_display_list.select_row.connect (slot (*this, &Mixer_UI::track_display_selected));
- track_display_list.unselect_row.connect (slot (*this, &Mixer_UI::track_display_unselected));
- track_display_list.row_move.connect (slot (*this, &Mixer_UI::queue_track_display_reordered));
- track_display_list.click_column.connect (slot (*this, &Mixer_UI::track_column_click));
+ track_display_list.select_row.connect (mem_fun(*this, &Mixer_UI::track_display_selected));
+ track_display_list.unselect_row.connect (mem_fun(*this, &Mixer_UI::track_display_unselected));
+ track_display_list.row_move.connect (mem_fun(*this, &Mixer_UI::queue_track_display_reordered));
+ track_display_list.click_column.connect (mem_fun(*this, &Mixer_UI::track_column_click));
- group_list_button.signal_clicked().connect (slot (*this, &Mixer_UI::group_list_button_clicked));
- group_list.button_press_event.connect (slot (*this, &Mixer_UI::group_list_button_press_event));
- group_list.select_row.connect (slot (*this, &Mixer_UI::group_selected));
- group_list.unselect_row.connect (slot (*this, &Mixer_UI::group_unselected));
+ group_list_button.signal_clicked().connect (mem_fun(*this, &Mixer_UI::group_list_button_clicked));
+ group_list.button_press_event.connect (mem_fun(*this, &Mixer_UI::group_list_button_press_event));
+ group_list.select_row.connect (mem_fun(*this, &Mixer_UI::group_selected));
+ group_list.unselect_row.connect (mem_fun(*this, &Mixer_UI::group_unselected));
_plugin_selector = new PluginSelector (PluginManager::the_manager());
- _plugin_selector->delete_event.connect (bind (slot (just_hide_it),
+ _plugin_selector->delete_event.connect (bind (ptr_fun (just_hide_it),
static_cast<Window *> (_plugin_selector)));
- configure_event.connect (slot (*ARDOUR_UI::instance(), &ARDOUR_UI::configure_handler));
+ configure_event.connect (mem_fun (*ARDOUR_UI::instance(), &ARDOUR_UI::configure_handler));
- _selection.RoutesChanged.connect (slot (*this, &Mixer_UI::follow_strip_selection));
+ _selection.RoutesChanged.connect (mem_fun(*this, &Mixer_UI::follow_strip_selection));
}
Mixer_UI::~Mixer_UI ()
void
Mixer_UI::add_strip (Route* route)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &Mixer_UI::add_strip), route));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &Mixer_UI::add_strip), route));
MixerStrip* strip;
track_display_list.rows().back().select ();
}
- route->name_changed.connect (bind (slot (*this, &Mixer_UI::strip_name_changed), strip));
- strip->GoingAway.connect (bind (slot (*this, &Mixer_UI::remove_strip), strip));
+ route->name_changed.connect (bind (mem_fun(*this, &Mixer_UI::strip_name_changed), strip));
+ strip->GoingAway.connect (bind (mem_fun(*this, &Mixer_UI::remove_strip), strip));
- strip->button_release_event.connect (bind (slot (*this, &Mixer_UI::strip_button_release_event), strip));
+ strip->button_release_event.connect (bind (mem_fun(*this, &Mixer_UI::strip_button_release_event), strip));
// if (width() < gdk_screen_width()) {
// set_size_request (width() + (_strip_width == Wide ? 75 : 50), height());
void
Mixer_UI::remove_strip (MixerStrip* strip)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &Mixer_UI::remove_strip), strip));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &Mixer_UI::remove_strip), strip));
CList_Helpers::RowList::iterator ri;
list<MixerStrip *>::iterator i;
track_display_list.thaw ();
- session->going_away.connect (slot (*this, &Mixer_UI::disconnect_from_session));
- session->RouteAdded.connect (slot (*this, &Mixer_UI::add_strip));
- session->mix_group_added.connect (slot (*this, &Mixer_UI::add_mix_group));
+ session->going_away.connect (mem_fun(*this, &Mixer_UI::disconnect_from_session));
+ session->RouteAdded.connect (mem_fun(*this, &Mixer_UI::add_strip));
+ session->mix_group_added.connect (mem_fun(*this, &Mixer_UI::add_mix_group));
session->foreach_mix_group(this, &Mixer_UI::add_mix_group);
- session->StateSaved.connect (slot (*this, &Mixer_UI::session_state_saved));
+ session->StateSaved.connect (mem_fun(*this, &Mixer_UI::session_state_saved));
redisplay_snapshots ();
_plugin_selector->set_session (session);
void
Mixer_UI::disconnect_from_session ()
{
- ENSURE_GUI_THREAD(slot (*this, &Mixer_UI::disconnect_from_session));
+ ENSURE_GUI_THREAD(mem_fun(*this, &Mixer_UI::disconnect_from_session));
group_list.clear ();
set_title (_("ardour: mixer"));
gint
Mixer_UI::start_updating ()
{
- screen_update_connection = ARDOUR_UI::instance()->RapidScreenUpdate.connect (slot (*this, &Mixer_UI::update_strips));
- fast_screen_update_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect (slot (*this, &Mixer_UI::fast_update_strips));
+ screen_update_connection = ARDOUR_UI::instance()->RapidScreenUpdate.connect (mem_fun(*this, &Mixer_UI::update_strips));
+ fast_screen_update_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect (mem_fun(*this, &Mixer_UI::fast_update_strips));
return 0;
}
is complete.
*/
- Main::idle.connect (slot (*this, &Mixer_UI::track_display_reordered));
+ Main::idle.connect (mem_fun(*this, &Mixer_UI::track_display_reordered));
}
int
MenuList& items = track_menu->items();
track_menu->set_name ("ArdourContextMenu");
- items.push_back (MenuElem (_("Show All"), slot (*this, &Mixer_UI::select_all_strips)));
- items.push_back (MenuElem (_("Hide All"), slot (*this, &Mixer_UI::unselect_all_strips)));
- items.push_back (MenuElem (_("Show All AudioTrack MixerStrips"), slot (*this, &Mixer_UI::select_all_audiotrack_strips)));
- items.push_back (MenuElem (_("Hide All AudioTrack MixerStrips"), slot (*this, &Mixer_UI::unselect_all_audiotrack_strips)));
- items.push_back (MenuElem (_("Show All AudioBus MixerStrips"), slot (*this, &Mixer_UI::select_all_audiobus_strips)));
- items.push_back (MenuElem (_("Hide All AudioBus MixerStrips"), slot (*this, &Mixer_UI::unselect_all_audiobus_strips)));
+ items.push_back (MenuElem (_("Show All"), mem_fun(*this, &Mixer_UI::select_all_strips)));
+ items.push_back (MenuElem (_("Hide All"), mem_fun(*this, &Mixer_UI::unselect_all_strips)));
+ items.push_back (MenuElem (_("Show All AudioTrack MixerStrips"), mem_fun(*this, &Mixer_UI::select_all_audiotrack_strips)));
+ items.push_back (MenuElem (_("Hide All AudioTrack MixerStrips"), mem_fun(*this, &Mixer_UI::unselect_all_audiotrack_strips)));
+ items.push_back (MenuElem (_("Show All AudioBus MixerStrips"), mem_fun(*this, &Mixer_UI::select_all_audiobus_strips)));
+ items.push_back (MenuElem (_("Hide All AudioBus MixerStrips"), mem_fun(*this, &Mixer_UI::unselect_all_audiobus_strips)));
}
void
Mixer_UI::strip_name_changed (void* src, MixerStrip* mx)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &Mixer_UI::strip_name_changed), src, mx));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &Mixer_UI::strip_name_changed), src, mx));
CList_Helpers::RowList::iterator i;
void
Mixer_UI::group_flags_changed (void* src, RouteGroup* group)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &Mixer_UI::group_flags_changed), src, group));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &Mixer_UI::group_flags_changed), src, group));
if (src != this) {
// select row
Mixer_UI::add_mix_group (RouteGroup* group)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &Mixer_UI::add_mix_group), group));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &Mixer_UI::add_mix_group), group));
list<string> names;
group_flags_changed (0, group);
- group->FlagsChanged.connect (bind (slot (*this, &Mixer_UI::group_flags_changed), group));
+ group->FlagsChanged.connect (bind (mem_fun(*this, &Mixer_UI::group_flags_changed), group));
}
void
void
Mixer_UI::session_state_saved (string snap_name)
{
- ENSURE_GUI_THREAD (bind (slot (*this, &Mixer_UI::session_state_saved), snap_name));
+ ENSURE_GUI_THREAD (bind (mem_fun(*this, &Mixer_UI::session_state_saved), snap_name));
redisplay_snapshots ();
}
if (startup) {
show_again.set_active(true);
- show_again.toggled.connect (slot (*this, &NewSessionDialog::show_again_toggled));
+ show_again.toggled.connect (mem_fun(*this, &NewSessionDialog::show_again_toggled));
file_selector.button_box.pack_end(show_again, false, false);
}
add (main_vbox);
// template_selector.shift_made.connect (
-// slot (*this, &NewSessionDialog::mix_template_shift));
+// mem_fun(*this, &NewSessionDialog::mix_template_shift));
// template_selector.control_made.connect (
-// slot (*this, &NewSessionDialog::mix_template_control));
+// mem_fun(*this, &NewSessionDialog::mix_template_control));
- file_selector.cancel_button.signal_clicked().connect (bind (slot (*this, &ArdourDialog::stop), -1));
- file_selector.op_button.signal_clicked().connect (bind (slot (*this, &ArdourDialog::stop), 0));
- file_selector.Expanded.connect (slot (*this, &NewSessionDialog::file_selector_expansion));
+ file_selector.cancel_button.signal_clicked().connect (bind (mem_fun(*this, &ArdourDialog::stop), -1));
+ file_selector.op_button.signal_clicked().connect (bind (mem_fun(*this, &ArdourDialog::stop), 0));
+ file_selector.Expanded.connect (mem_fun(*this, &NewSessionDialog::file_selector_expansion));
- delete_event.connect (slot (*this, &ArdourDialog::wm_close_event));
- show.connect (slot (*this, &NewSessionDialog::fixup_at_show));
+ delete_event.connect (mem_fun(*this, &ArdourDialog::wm_close_event));
+ show.connect (mem_fun(*this, &NewSessionDialog::fixup_at_show));
file_selector.entry_label.set_name ("NewSessionMainLabel");
file_selector.where_label.set_name ("NewSessionMainLabel");
} else {
file_selector.set_path (given_path, true);
notebook.set_page (-1);
- notebook.show.connect (bind (slot (notebook, &Notebook::set_page), -1));
+ notebook.show.connect (bind (mem_fun (notebook, &Notebook::set_page), -1));
}
set_default_size(531, 358);
vbox->set_spacing (4);
vbox->pack_start(notebook);
- delete_event.connect (slot (*this, &OptionEditor::wm_close));
+ delete_event.connect (mem_fun(*this, &OptionEditor::wm_close));
notebook.set_show_tabs (true);
notebook.set_show_border (true);
session_control_changed (Session::SlaveType);
session_control_changed (Session::AlignChoice);
- session->ControlChanged.connect (slot (*this, &OptionEditor::queue_session_control_changed));
+ session->ControlChanged.connect (mem_fun(*this, &OptionEditor::queue_session_control_changed));
}
OptionEditor::~OptionEditor ()
session_raid_entry.set_name ("OptionsEntry");
- session_raid_entry.activate.connect (slot (*this, &OptionEditor::raid_path_changed));
+ session_raid_entry.activate.connect (mem_fun(*this, &OptionEditor::raid_path_changed));
- session_raid_entry.signal_focus_in_event().connect (slot (Keyboard::the_keyboard(), &Keyboard::focus_in_handler));
- session_raid_entry.signal_focus_out_event().connect (bind (slot (*this, &OptionEditor::focus_out_event_handler), &OptionEditor::raid_path_changed));
+ session_raid_entry.signal_focus_in_event().connect (mem_fun (Keyboard::the_keyboard(), &Keyboard::focus_in_handler));
+ session_raid_entry.signal_focus_out_event().connect (bind (mem_fun(*this, &OptionEditor::focus_out_event_handler), &OptionEditor::raid_path_changed));
label = manage(new Label(_("session RAID path")));
label->set_name ("OptionsLabel");
native_format_combo.get_entry()->set_editable (false);
native_format_combo.get_entry()->set_name ("OptionsEntry");
native_format_combo.set_use_arrows_always (true);
- native_format_combo.get_popwin()->unmap_event.connect (slot (*this, &OptionEditor::native_format_chosen));
+ native_format_combo.get_popwin()->unmap_event.connect (mem_fun(*this, &OptionEditor::native_format_chosen));
fixup_combo_size (native_format_combo, nfstrings);
layer_mode_combo.set_value_in_list (true, false);
layer_mode_combo.get_entry()->set_editable (false);
layer_mode_combo.get_entry()->set_name ("OptionsEntry");
- layer_mode_combo.get_popwin()->unmap_event.connect (slot (*this, &OptionEditor::layer_mode_chosen));
+ layer_mode_combo.get_popwin()->unmap_event.connect (mem_fun(*this, &OptionEditor::layer_mode_chosen));
fixup_combo_size (layer_mode_combo, layer_mode_strings);
xfade_model_combo.set_value_in_list (true, false);
xfade_model_combo.get_entry()->set_editable (false);
xfade_model_combo.get_entry()->set_name ("OptionsEntry");
- xfade_model_combo.get_popwin()->unmap_event.connect (slot (*this, &OptionEditor::xfade_model_chosen));
+ xfade_model_combo.get_popwin()->unmap_event.connect (mem_fun(*this, &OptionEditor::xfade_model_chosen));
fixup_combo_size (xfade_model_combo, xfade_model_strings);
auto_xfade_button.set_active (Config->get_auto_xfade());
/* xfade and layer mode active requires session */
- auto_xfade_button.signal_clicked().connect (slot (*this, &OptionEditor::auto_xfade_clicked));
- xfade_active_button.signal_clicked().connect (slot (*this, &OptionEditor::xfade_active_clicked));
+ auto_xfade_button.signal_clicked().connect (mem_fun(*this, &OptionEditor::auto_xfade_clicked));
+ xfade_active_button.signal_clicked().connect (mem_fun(*this, &OptionEditor::xfade_active_clicked));
Label* short_xfade_label = manage (new Label (_("Short crossfade length (msecs)")));
short_xfade_label->set_name ("OptionsLabel");
hbox->pack_start (short_xfade_slider, true, true);
fade_packer.pack_start (*hbox, false, false);
- short_xfade_adjustment.value_changed.connect (slot (*this, &OptionEditor::short_xfade_adjustment_changed));
+ short_xfade_adjustment.value_changed.connect (mem_fun(*this, &OptionEditor::short_xfade_adjustment_changed));
fade_packer.show_all ();
}
solo_packer.pack_start (*hbox, false, false);
solo_via_bus_button.signal_clicked().connect
- (slot (*this, &OptionEditor::solo_via_bus_clicked));
+ (mem_fun(*this, &OptionEditor::solo_via_bus_clicked));
solo_latched_button.signal_clicked().connect
- (slot (*this, &OptionEditor::solo_latched_clicked));
+ (mem_fun(*this, &OptionEditor::solo_latched_clicked));
solo_packer.show_all ();
}
meter_hold_combo.set_value_in_list (true, false);
meter_hold_combo.get_entry()->set_editable (false);
meter_hold_combo.get_entry()->set_name ("OptionsEntry");
- meter_hold_combo.get_popwin()->unmap_event.connect (slot (*this, &OptionEditor::meter_hold_chosen));
+ meter_hold_combo.get_popwin()->unmap_event.connect (mem_fun(*this, &OptionEditor::meter_hold_chosen));
hbox = manage (new HBox);
hbox->set_border_width (8);
hbox->set_spacing (8);
meter_falloff_combo.set_value_in_list (true, false);
meter_falloff_combo.get_entry()->set_editable (false);
meter_falloff_combo.get_entry()->set_name ("OptionsEntry");
- meter_falloff_combo.get_popwin()->unmap_event.connect (slot (*this, &OptionEditor::meter_falloff_chosen));
+ meter_falloff_combo.get_popwin()->unmap_event.connect (mem_fun(*this, &OptionEditor::meter_falloff_chosen));
hbox = manage (new HBox);
hbox->set_border_width (8);
hbox->set_spacing (8);
display_packer.pack_start (*hbox, false, false);
- show_waveforms_button.signal_clicked().connect (slot (*this, &OptionEditor::show_waveforms_clicked));
- show_waveforms_recording_button.signal_clicked().connect (slot (*this, &OptionEditor::show_waveforms_recording_clicked));
- show_measures_button.signal_clicked().connect (slot (*this, &OptionEditor::show_measures_clicked));
- mixer_strip_width_button.signal_clicked().connect (slot (*this, &OptionEditor::strip_width_clicked));
- follow_playhead_button.signal_clicked().connect (slot (*this, &OptionEditor::follow_playhead_clicked));
+ show_waveforms_button.signal_clicked().connect (mem_fun(*this, &OptionEditor::show_waveforms_clicked));
+ show_waveforms_recording_button.signal_clicked().connect (mem_fun(*this, &OptionEditor::show_waveforms_recording_clicked));
+ show_measures_button.signal_clicked().connect (mem_fun(*this, &OptionEditor::show_measures_clicked));
+ mixer_strip_width_button.signal_clicked().connect (mem_fun(*this, &OptionEditor::strip_width_clicked));
+ follow_playhead_button.signal_clicked().connect (mem_fun(*this, &OptionEditor::follow_playhead_clicked));
- editor.DisplayControlChanged.connect (slot (*this, &OptionEditor::display_control_changed));
+ editor.DisplayControlChanged.connect (mem_fun(*this, &OptionEditor::display_control_changed));
show_measures_button.set_active (editor.show_measures());
show_waveforms_button.set_active (editor.show_waveforms());
slave_type_combo.set_value_in_list (true, false);
slave_type_combo.get_entry()->set_editable (false);
slave_type_combo.get_entry()->set_name ("OptionsEntry");
- slave_type_combo.get_popwin()->unmap_event.connect (slot (*this, &OptionEditor::slave_type_chosen));
+ slave_type_combo.get_popwin()->unmap_event.connect (mem_fun(*this, &OptionEditor::slave_type_chosen));
dumb.clear ();
dumb.push_back (X_("24 FPS"));
smpte_fps_combo.set_value_in_list (true, false);
smpte_fps_combo.get_entry()->set_editable (false);
smpte_fps_combo.get_entry()->set_name ("OptionsEntry");
- smpte_fps_combo.get_popwin()->unmap_event.connect (slot (*this, &OptionEditor::smpte_fps_chosen));
+ smpte_fps_combo.get_popwin()->unmap_event.connect (mem_fun(*this, &OptionEditor::smpte_fps_chosen));
smpte_offset_clock.set_mode (AudioClock::SMPTE);
- smpte_offset_clock.ValueChanged.connect (slot (*this, &OptionEditor::smpte_offset_chosen));
+ smpte_offset_clock.ValueChanged.connect (mem_fun(*this, &OptionEditor::smpte_offset_chosen));
send_mtc_button.set_name ("OptionEditorToggleButton");
jack_time_master_button.set_name ("OptionEditorToggleButton");
jack_time_master_button.set_active (Config->get_jack_time_master());
- send_mtc_button.button_press_event.connect (bind (slot (*this, &OptionEditor::send_mtc_toggled), &send_mtc_button));
- jack_time_master_button.signal_clicked().connect (slot (*this, &OptionEditor::jack_time_master_clicked));
- smpte_offset_negative_button.signal_clicked().connect (slot (*this, &OptionEditor::smpte_offset_negative_clicked));
+ send_mtc_button.button_press_event.connect (bind (mem_fun(*this, &OptionEditor::send_mtc_toggled), &send_mtc_button));
+ jack_time_master_button.signal_clicked().connect (mem_fun(*this, &OptionEditor::jack_time_master_clicked));
+ smpte_offset_negative_button.signal_clicked().connect (mem_fun(*this, &OptionEditor::smpte_offset_negative_clicked));
}
void
}
tb->set_active (!(*i).second->input()->offline());
- tb->button_press_event.connect (bind (slot (*this, &OptionEditor::port_online_toggled), (*i).second, tb));
- (*i).second->input()->OfflineStatusChanged.connect (bind (slot (*this, &OptionEditor::map_port_online), (*i).second, tb));
+ tb->button_press_event.connect (bind (mem_fun(*this, &OptionEditor::port_online_toggled), (*i).second, tb));
+ (*i).second->input()->OfflineStatusChanged.connect (bind (mem_fun(*this, &OptionEditor::map_port_online), (*i).second, tb));
table->attach (*tb, 1, 2, n+2, n+3, 0, 0);
tb = manage (new ToggleButton ());
tb->set_name ("OptionEditorToggleButton");
- tb->button_press_event.connect (bind (slot (*this, &OptionEditor::port_trace_in_toggled), (*i).second, tb));
+ tb->button_press_event.connect (bind (mem_fun(*this, &OptionEditor::port_trace_in_toggled), (*i).second, tb));
tb->set_size_request (10, 10);
table->attach (*tb, 2, 3, n+2, n+3, 0, 0);
tb = manage (new ToggleButton ());
tb->set_name ("OptionEditorToggleButton");
- tb->button_press_event.connect (bind (slot (*this, &OptionEditor::port_trace_out_toggled), (*i).second, tb));
+ tb->button_press_event.connect (bind (mem_fun(*this, &OptionEditor::port_trace_out_toggled), (*i).second, tb));
tb->set_size_request (10, 10);
table->attach (*tb, 3, 4, n+2, n+3, 0, 0);
rb->set_group (first_mtc_button->group());
}
table->attach (*rb, 4, 5, n+2, n+3, 0, 0);
- rb->button_press_event.connect (bind (slot (*this, &OptionEditor::mtc_port_chosen), (*i).second, rb));
+ rb->button_press_event.connect (bind (mem_fun(*this, &OptionEditor::mtc_port_chosen), (*i).second, rb));
if (Config->get_mtc_port_name() == i->first) {
rb->set_active (true);
rb->set_group (first_mmc_button->group());
}
table->attach (*rb, 6, 7, n+2, n+3, 0, 0);
- rb->button_press_event.connect (bind (slot (*this, &OptionEditor::mmc_port_chosen), (*i).second, rb));
+ rb->button_press_event.connect (bind (mem_fun(*this, &OptionEditor::mmc_port_chosen), (*i).second, rb));
if (Config->get_mmc_port_name() == i->first) {
rb->set_active (true);
rb->set_group (first_midi_button->group());
}
table->attach (*rb, 8, 9, n+2, n+3, 0, 0);
- rb->button_press_event.connect (bind (slot (*this, &OptionEditor::midi_port_chosen), (*i).second, rb));
+ rb->button_press_event.connect (bind (mem_fun(*this, &OptionEditor::midi_port_chosen), (*i).second, rb));
if (Config->get_midi_port_name() == i->first) {
rb->set_active (true);
midi_packer.pack_start (*mmcbuttonbox, false, false);
- mmc_control_button.toggled.connect (bind (slot (*this, &OptionEditor::mmc_control_toggled), &mmc_control_button));
- midi_control_button.toggled.connect (bind (slot (*this, &OptionEditor::midi_control_toggled), &midi_control_button));
- send_mmc_button.toggled.connect (bind (slot (*this, &OptionEditor::send_mmc_toggled), &send_mmc_button));
- midi_feedback_button.toggled.connect (bind (slot (*this, &OptionEditor::midi_feedback_toggled), &midi_feedback_button));
+ mmc_control_button.toggled.connect (bind (mem_fun(*this, &OptionEditor::mmc_control_toggled), &mmc_control_button));
+ midi_control_button.toggled.connect (bind (mem_fun(*this, &OptionEditor::midi_control_toggled), &midi_control_button));
+ send_mmc_button.toggled.connect (bind (mem_fun(*this, &OptionEditor::send_mmc_toggled), &send_mmc_button));
+ midi_feedback_button.toggled.connect (bind (mem_fun(*this, &OptionEditor::midi_feedback_toggled), &midi_feedback_button));
}
gint
OptionEditor::click_browse_clicked ()
{
SoundFileSelector& sfdb (ARDOUR_UI::instance()->get_sfdb_window());
- sigc::connection c = sfdb.Action.connect (slot (*this, &OptionEditor::click_chosen));
+ sigc::connection c = sfdb.Action.connect (mem_fun(*this, &OptionEditor::click_chosen));
sfdb.run (_("Use as click"), false, true);
c.disconnect ();
OptionEditor::click_emphasis_browse_clicked ()
{
SoundFileSelector& sfdb (ARDOUR_UI::instance()->get_sfdb_window());
- sigc::connection c = sfdb.Action.connect (slot (*this, &OptionEditor::click_emphasis_chosen));
+ sigc::connection c = sfdb.Action.connect (mem_fun(*this, &OptionEditor::click_emphasis_chosen));
sfdb.run (_("Use as click emphasis"), false, true);
c.disconnect ();
void
OptionEditor::queue_session_control_changed (Session::ControlType t)
{
- ui.call_slot (bind (slot (*this, &OptionEditor::session_control_changed), t));
+ ui.call_slot (bind (mem_fun(*this, &OptionEditor::session_control_changed), t));
}
void
click_path_entry.set_name ("OptionsEntry");
click_emphasis_path_entry.set_name ("OptionsEntry");
- click_path_entry.activate.connect (slot (*this, &OptionEditor::click_sound_changed));
- click_emphasis_path_entry.activate.connect (slot (*this, &OptionEditor::click_emphasis_sound_changed));
+ click_path_entry.activate.connect (mem_fun(*this, &OptionEditor::click_sound_changed));
+ click_emphasis_path_entry.activate.connect (mem_fun(*this, &OptionEditor::click_emphasis_sound_changed));
- click_path_entry.signal_focus_in_event().connect (slot (Keyboard::the_keyboard(), &Keyboard::focus_in_handler));
- click_path_entry.signal_focus_out_event().connect (bind (slot (*this, &OptionEditor::focus_out_event_handler), &OptionEditor::click_sound_changed));
- click_emphasis_path_entry.signal_focus_in_event().connect (slot (Keyboard::the_keyboard(), &Keyboard::focus_in_handler));
- click_emphasis_path_entry.signal_focus_out_event().connect (bind (slot (*this, &OptionEditor::focus_out_event_handler), &OptionEditor::click_emphasis_sound_changed));
+ click_path_entry.signal_focus_in_event().connect (mem_fun (Keyboard::the_keyboard(), &Keyboard::focus_in_handler));
+ click_path_entry.signal_focus_out_event().connect (bind (mem_fun(*this, &OptionEditor::focus_out_event_handler), &OptionEditor::click_sound_changed));
+ click_emphasis_path_entry.signal_focus_in_event().connect (mem_fun (Keyboard::the_keyboard(), &Keyboard::focus_in_handler));
+ click_emphasis_path_entry.signal_focus_out_event().connect (bind (mem_fun(*this, &OptionEditor::focus_out_event_handler), &OptionEditor::click_emphasis_sound_changed));
click_browse_button.set_name ("EditorGTKButton");
click_emphasis_browse_button.set_name ("EditorGTKButton");
- click_browse_button.signal_clicked().connect (slot (*this, &OptionEditor::click_browse_clicked));
- click_emphasis_browse_button.signal_clicked().connect (slot (*this, &OptionEditor::click_emphasis_browse_clicked));
+ click_browse_button.signal_clicked().connect (mem_fun(*this, &OptionEditor::click_browse_clicked));
+ click_emphasis_browse_button.signal_clicked().connect (mem_fun(*this, &OptionEditor::click_emphasis_browse_clicked));
click_packer.set_border_width (12);
click_packer.set_spacing (5);
debug_keyboard_button.set_active (false);
speed_quieten_button.set_active (Config->get_quieten_at_speed() != 1.0f);
- hw_monitor_button.signal_clicked().connect (slot (*this, &OptionEditor::hw_monitor_clicked));
- sw_monitor_button.signal_clicked().connect (slot (*this, &OptionEditor::sw_monitor_clicked));
- plugins_stop_button.signal_clicked().connect (slot (*this, &OptionEditor::plugins_stop_with_transport_clicked));
- plugins_on_rec_button.signal_clicked().connect (slot (*this, &OptionEditor::plugins_on_while_recording_clicked));
- verify_remove_last_capture_button.signal_clicked().connect (slot (*this, &OptionEditor::verify_remove_last_capture_clicked));
- auto_connect_inputs_button.signal_clicked().connect (slot (*this, &OptionEditor::auto_connect_inputs_clicked));
- auto_connect_output_physical_button.signal_clicked().connect (slot (*this, &OptionEditor::auto_connect_output_physical_clicked));
- auto_connect_output_master_button.signal_clicked().connect (slot (*this, &OptionEditor::auto_connect_output_master_clicked));
- auto_connect_output_manual_button.signal_clicked().connect (slot (*this, &OptionEditor::auto_connect_output_manual_clicked));
- stop_rec_on_xrun_button.signal_clicked().connect (slot (*this, &OptionEditor::stop_rec_on_xrun_clicked));
- stop_at_end_button.signal_clicked().connect (slot (*this, &OptionEditor::stop_at_end_clicked));
- debug_keyboard_button.signal_clicked().connect (slot (*this, &OptionEditor::debug_keyboard_clicked));
- speed_quieten_button.signal_clicked().connect (slot (*this, &OptionEditor::speed_quieten_clicked));
+ hw_monitor_button.signal_clicked().connect (mem_fun(*this, &OptionEditor::hw_monitor_clicked));
+ sw_monitor_button.signal_clicked().connect (mem_fun(*this, &OptionEditor::sw_monitor_clicked));
+ plugins_stop_button.signal_clicked().connect (mem_fun(*this, &OptionEditor::plugins_stop_with_transport_clicked));
+ plugins_on_rec_button.signal_clicked().connect (mem_fun(*this, &OptionEditor::plugins_on_while_recording_clicked));
+ verify_remove_last_capture_button.signal_clicked().connect (mem_fun(*this, &OptionEditor::verify_remove_last_capture_clicked));
+ auto_connect_inputs_button.signal_clicked().connect (mem_fun(*this, &OptionEditor::auto_connect_inputs_clicked));
+ auto_connect_output_physical_button.signal_clicked().connect (mem_fun(*this, &OptionEditor::auto_connect_output_physical_clicked));
+ auto_connect_output_master_button.signal_clicked().connect (mem_fun(*this, &OptionEditor::auto_connect_output_master_clicked));
+ auto_connect_output_manual_button.signal_clicked().connect (mem_fun(*this, &OptionEditor::auto_connect_output_manual_clicked));
+ stop_rec_on_xrun_button.signal_clicked().connect (mem_fun(*this, &OptionEditor::stop_rec_on_xrun_clicked));
+ stop_at_end_button.signal_clicked().connect (mem_fun(*this, &OptionEditor::stop_at_end_clicked));
+ debug_keyboard_button.signal_clicked().connect (mem_fun(*this, &OptionEditor::debug_keyboard_clicked));
+ speed_quieten_button.signal_clicked().connect (mem_fun(*this, &OptionEditor::speed_quieten_clicked));
}
void
edit_modifier_combo.get_entry()->set_editable (false);
edit_modifier_combo.get_entry()->set_name ("OptionsEntry");
edit_modifier_combo.set_use_arrows_always (true);
- edit_modifier_combo.get_popwin()->unmap_event.connect (slot (*this, &OptionEditor::edit_modifier_chosen));
+ edit_modifier_combo.get_popwin()->unmap_event.connect (mem_fun(*this, &OptionEditor::edit_modifier_chosen));
for (int x = 0; modifiers[x].name; ++x) {
if (modifiers[x].modifier == Keyboard::edit_modifier ()) {
edit_button_spin.set_name ("OptionsEntry");
edit_button_adjustment.set_value (Keyboard::edit_button());
- edit_button_adjustment.value_changed.connect (slot (*this, &OptionEditor::edit_button_changed));
+ edit_button_adjustment.value_changed.connect (mem_fun(*this, &OptionEditor::edit_button_changed));
delete_modifier_combo.set_popdown_strings (dumb);
delete_modifier_combo.get_entry()->set_editable (false);
delete_modifier_combo.get_entry()->set_name ("OptionsEntry");
delete_modifier_combo.set_use_arrows_always (true);
- delete_modifier_combo.get_popwin()->unmap_event.connect (slot (*this, &OptionEditor::delete_modifier_chosen));
+ delete_modifier_combo.get_popwin()->unmap_event.connect (mem_fun(*this, &OptionEditor::delete_modifier_chosen));
for (int x = 0; modifiers[x].name; ++x) {
if (modifiers[x].modifier == Keyboard::delete_modifier ()) {
delete_button_spin.set_name ("OptionsEntry");
delete_button_adjustment.set_value (Keyboard::delete_button());
- delete_button_adjustment.value_changed.connect (slot (*this, &OptionEditor::delete_button_changed));
+ delete_button_adjustment.value_changed.connect (mem_fun(*this, &OptionEditor::delete_button_changed));
snap_modifier_combo.set_popdown_strings (dumb);
snap_modifier_combo.get_entry()->set_editable (false);
snap_modifier_combo.get_entry()->set_name ("OptionsEntry");
snap_modifier_combo.set_use_arrows_always (true);
- snap_modifier_combo.get_popwin()->unmap_event.connect (slot (*this, &OptionEditor::snap_modifier_chosen));
+ snap_modifier_combo.get_popwin()->unmap_event.connect (mem_fun(*this, &OptionEditor::snap_modifier_chosen));
for (int x = 0; modifiers[x].name; ++x) {
if (modifiers[x].modifier == (guint) Keyboard::snap_modifier ()) {
allow_y = false;
allow_target = false;
- panner.StateChanged.connect (slot (*this, &Panner2d::handle_state_change));
+ panner.StateChanged.connect (mem_fun(*this, &Panner2d::handle_state_change));
drag_target = 0;
set_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::POINTER_MOTION_MASK);
void
Panner2d::handle_state_change ()
{
- ENSURE_GUI_THREAD(slot (*this, &Panner2d::handle_state_change));
+ ENSURE_GUI_THREAD(mem_fun(*this, &Panner2d::handle_state_change));
queue_draw ();
}
items.push_back (CheckMenuElem (_("Bypass")));
bypass_menu_item = static_cast<CheckMenuItem*> (items.back());
- bypass_menu_item->toggled.connect (slot (*this, &Panner2d::toggle_bypass));
+ bypass_menu_item->toggled.connect (mem_fun(*this, &Panner2d::toggle_bypass));
}
panning_link_direction_button.add (*(manage (new Pixmap (forwdblarrow_xpm))));
panning_link_direction_button.clicked.connect
- (slot (*this, &PannerUI::panning_link_direction_clicked));
+ (mem_fun(*this, &PannerUI::panning_link_direction_clicked));
panning_link_button.button_press_event.connect
- (slot (*this, &PannerUI::panning_link_button_press));
+ (mem_fun(*this, &PannerUI::panning_link_button_press));
panning_link_button.button_release_event.connect
- (slot (*this, &PannerUI::panning_link_button_release));
+ (mem_fun(*this, &PannerUI::panning_link_button_release));
panning_up.set_border_width (3);
panning_down.set_border_width (3);
panner = 0;
- _io.panner().Changed.connect (slot (*this, &PannerUI::panner_changed));
- _io.panner().LinkStateChanged.connect (slot (*this, &PannerUI::update_pan_linkage));
- _io.panner().StateChanged.connect (slot (*this, &PannerUI::update_pan_state));
+ _io.panner().Changed.connect (mem_fun(*this, &PannerUI::panner_changed));
+ _io.panner().LinkStateChanged.connect (mem_fun(*this, &PannerUI::update_pan_linkage));
+ _io.panner().StateChanged.connect (mem_fun(*this, &PannerUI::update_pan_state));
pan_changed (0);
update_pan_sensitive ();
void
PannerUI::update_pan_linkage ()
{
- ENSURE_GUI_THREAD(slot (*this, &PannerUI::update_pan_linkage));
+ ENSURE_GUI_THREAD(mem_fun(*this, &PannerUI::update_pan_linkage));
bool x = _io.panner().linked();
bool bx = panning_link_button.get_active();
void
PannerUI::panner_changed ()
{
- ENSURE_GUI_THREAD (slot (*this, &PannerUI::panner_changed));
+ ENSURE_GUI_THREAD (mem_fun(*this, &PannerUI::panner_changed));
setup_pan ();
}
PannerUI::update_pan_state ()
{
/* currently nothing to do */
- // ENSURE_GUI_THREAD (slot (*this, &PannerUI::update_panner_state));
+ // ENSURE_GUI_THREAD (mem_fun(*this, &PannerUI::update_panner_state));
}
void
_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 (slot (*this, &PannerUI::pan_adjustment_changed), (uint32_t) asz));
+ pan_adjustments.back()->value_changed.connect (bind (mem_fun(*this, &PannerUI::pan_adjustment_changed), (uint32_t) asz));
- _io.panner()[asz]->Changed.connect (bind (slot (*this, &PannerUI::pan_value_changed), (uint32_t) asz));
+ _io.panner()[asz]->Changed.connect (bind (mem_fun(*this, &PannerUI::pan_value_changed), (uint32_t) asz));
bc = new BarController (*pan_adjustments[asz],
&_io.panner()[asz]->midi_control(),
- bind (slot (*this, &PannerUI::pan_printer), pan_adjustments[asz]));
+ bind (mem_fun(*this, &PannerUI::pan_printer), pan_adjustments[asz]));
if (_session.midi_port()) {
_io.panner()[asz]->reset_midi_control (_session.midi_port(), true);
bc->set_name ("PanSlider");
bc->set_shadow_type (GTK_SHADOW_NONE);
bc->set_style (BarController::Line);
- bc->get_spin_button().signal_focus_in_event().connect (slot (*this, &PannerUI::entry_focus_event));
- bc->get_spin_button().signal_focus_out_event().connect (slot (*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 (slot (_io, &IO::start_pan_touch), (uint32_t) asz));
- bc->StopGesture.connect (bind (slot (_io, &IO::end_pan_touch), (uint32_t) asz));
+ 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));
char buf[64];
snprintf (buf, sizeof (buf), _("panner for channel %u"), asz + 1);
ARDOUR_UI::instance()->tooltips().set_tip (bc->event_widget(), buf);
bc->event_widget().button_release_event.connect
- (bind (slot (*this, &PannerUI::pan_button_event), (uint32_t) asz));
+ (bind (mem_fun(*this, &PannerUI::pan_button_event), (uint32_t) asz));
pan_bars.push_back (bc);
switch (_width) {
(dynamic_cast<CheckMenuItem*> (items.back()))->set_active (_io.panner()[which]->muted());
(dynamic_cast<CheckMenuItem*> (items.back()))->toggled.connect
- (bind (slot (*this, &PannerUI::pan_mute), which));
+ (bind (mem_fun(*this, &PannerUI::pan_mute), which));
- items.push_back (CheckMenuElem (_("Bypass"), slot (*this, &PannerUI::pan_bypass_toggle)));
+ items.push_back (CheckMenuElem (_("Bypass"), mem_fun(*this, &PannerUI::pan_bypass_toggle)));
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 (slot (*this, &PannerUI::pan_bypass_toggle));
+ bypass_menu_item->toggled.connect (mem_fun(*this, &PannerUI::pan_bypass_toggle));
- items.push_back (MenuElem (_("Reset"), slot (*this, &PannerUI::pan_reset)));
+ items.push_back (MenuElem (_("Reset"), mem_fun(*this, &PannerUI::pan_reset)));
items.push_back (SeparatorElem());
items.push_back (MenuElem (_("Reset all")));
}
void
PannerUI::pan_value_changed (uint32_t which)
{
- ENSURE_GUI_THREAD (bind (slot (*this, &PannerUI::pan_value_changed), which));
+ ENSURE_GUI_THREAD (bind (mem_fun(*this, &PannerUI::pan_value_changed), which));
if (which < _io.panner().size()) {
float xpos;
scroller.add_with_viewport (tree);
scroller.set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
- close_button.signal_clicked().connect (slot (*this, &PlaylistSelector::close_button_click));
+ close_button.signal_clicked().connect (mem_fun(*this, &PlaylistSelector::close_button_click));
vpacker.set_border_width (6);
vpacker.set_spacing (12);
}
show_all ();
- select_connection = tree.tree_select_row.connect (slot (*this, &PlaylistSelector::row_selected));
+ select_connection = tree.tree_select_row.connect (mem_fun(*this, &PlaylistSelector::row_selected));
}
void
void
PlaylistSelector::set_session (Session* s)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &PlaylistSelector::set_session), s));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &PlaylistSelector::set_session), s));
session = s;
if (session) {
- session->going_away.connect (bind (slot (*this, &PlaylistSelector::set_session), static_cast<Session*> (0)));
+ session->going_away.connect (bind (mem_fun(*this, &PlaylistSelector::set_session), static_cast<Session*> (0)));
}
}
ladspa_display.clist().column(1).set_auto_resize (true);
o_selector.clist().column(0).set_auto_resize (true);
- ladspa_display.selection_made.connect (slot(*this, &PluginSelector::i_plugin_selected));
- ladspa_display.choice_made.connect(slot(*this, &PluginSelector::i_plugin_chosen));
- ladspa_display.clist().click_column.connect(bind (slot(*this, &PluginSelector::column_clicked), ladspa_display.clist().gobj()));
+ ladspa_display.selection_made.connect (mem_fun(*this, &PluginSelector::i_plugin_selected));
+ ladspa_display.choice_made.connect(mem_fun(*this, &PluginSelector::i_plugin_chosen));
+ ladspa_display.clist().click_column.connect(bind (mem_fun(*this, &PluginSelector::column_clicked), ladspa_display.clist().gobj()));
#ifdef VST_SUPPORT
if (Config->get_use_vst()) {
- vst_display.selection_made.connect (slot(*this, &PluginSelector::i_plugin_selected));
- vst_display.choice_made.connect(slot(*this, &PluginSelector::i_plugin_chosen));
- vst_display.clist().click_column.connect(bind (slot(*this, &PluginSelector::column_clicked), vst_display.clist().gobj()));
+ vst_display.selection_made.connect (mem_fun(*this, &PluginSelector::i_plugin_selected));
+ vst_display.choice_made.connect(mem_fun(*this, &PluginSelector::i_plugin_chosen));
+ vst_display.clist().click_column.connect(bind (mem_fun(*this, &PluginSelector::column_clicked), vst_display.clist().gobj()));
}
#endif
- o_selector.selection_made.connect(slot(*this, &PluginSelector::o_plugin_selected));
- o_selector.choice_made.connect(slot(*this,&PluginSelector::o_plugin_chosen));
- btn_update-.signal_clicked().connect (slot(*this, &PluginSelector::btn_update_clicked));
- btn_add->clicked.connect(slot(*this, &PluginSelector::btn_add_clicked));
- btn_remove->clicked.connect(slot(*this, &PluginSelector::btn_remove_clicked));
- btn_ok->clicked.connect(slot(*this, &PluginSelector::btn_ok_clicked));
- btn_cancel->clicked.connect(slot(*this,&PluginSelector::btn_cancel_clicked));
- delete_event.connect (slot (*this, &PluginSelector::wm_close));
+ o_selector.selection_made.connect(mem_fun(*this, &PluginSelector::o_plugin_selected));
+ o_selector.choice_made.connect(mem_fun(*this,&PluginSelector::o_plugin_chosen));
+ btn_update-.signal_clicked().connect (mem_fun(*this, &PluginSelector::btn_update_clicked));
+ btn_add->clicked.connect(mem_fun(*this, &PluginSelector::btn_add_clicked));
+ btn_remove->clicked.connect(mem_fun(*this, &PluginSelector::btn_remove_clicked));
+ btn_ok->clicked.connect(mem_fun(*this, &PluginSelector::btn_ok_clicked));
+ btn_cancel->clicked.connect(mem_fun(*this,&PluginSelector::btn_cancel_clicked));
+ delete_event.connect (mem_fun(*this, &PluginSelector::wm_close));
}
void
PluginSelector::set_session (Session* s)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &PluginSelector::set_session), s));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &PluginSelector::set_session), s));
session = s;
if (session) {
- session->going_away.connect (bind (slot (*this, &PluginSelector::set_session), static_cast<Session*> (0)));
+ session->going_away.connect (bind (mem_fun(*this, &PluginSelector::set_session), static_cast<Session*> (0)));
}
}
_pluginui = pu;
add (*pu);
- map_event.connect (slot (*pu, &PluginUI::start_updating));
- unmap_event.connect (slot (*pu, &PluginUI::stop_updating));
+ map_event.connect (mem_fun (*pu, &PluginUI::start_updating));
+ unmap_event.connect (mem_fun (*pu, &PluginUI::stop_updating));
}
set_position (Gtk::WIN_POS_MOUSE);
set_name ("PluginEditor");
add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK);
- delete_event.connect (bind (slot (just_hide_it), reinterpret_cast<Window*> (this)));
- insert.GoingAway.connect (slot (*this, &PluginUIWindow::plugin_going_away));
+ delete_event.connect (bind (ptr_fun (just_hide_it), reinterpret_cast<Window*> (this)));
+ insert.GoingAway.connect (mem_fun(*this, &PluginUIWindow::plugin_going_away));
if (scrollable) {
gint h = _pluginui->get_preferred_height ();
name_ebox.set_name ("PluginNameBox");
}
- insert.active_changed.connect (slot (*this, &PluginUI::redirect_active_changed));
+ insert.active_changed.connect (mem_fun(*this, &PluginUI::redirect_active_changed));
bypass_button.set_active (!insert.active());
build (engine);
control_ui->combo = new Gtk::Combo;
control_ui->combo->set_value_in_list(true, false);
control_ui->combo->set_popdown_strings(setup_scale_values(port_index, control_ui));
- control_ui->combo->get_popwin()->unmap_event.connect(bind (slot (*this, &PluginUI::control_combo_changed), control_ui));
- plugin.ParameterChanged.connect (bind (slot (*this, &PluginUI::parameter_changed), control_ui));
+ control_ui->combo->get_popwin()->unmap_event.connect(bind (mem_fun(*this, &PluginUI::control_combo_changed), control_ui));
+ plugin.ParameterChanged.connect (bind (mem_fun(*this, &PluginUI::parameter_changed), control_ui));
control_ui->pack_start(control_ui->label, true, true);
control_ui->pack_start(*control_ui->combo, false, true);
control_ui->pack_start (*control_ui->button, false, true);
control_ui->pack_start (control_ui->automate_button, false, false);
- control_ui->button-.signal_clicked().connect (bind (slot (*this, &PluginUI::control_port_toggled), control_ui));
+ control_ui->button-.signal_clicked().connect (bind (mem_fun(*this, &PluginUI::control_port_toggled), control_ui));
if(plugin.get_parameter (port_index) == 1){
control_ui->button->set_active(true);
// control_ui->adjustment,
// mcontrol);
- sigc::slot<void,char*,uint32_t> pslot = sigc::bind (slot (*this, &PluginUI::print_parameter), (uint32_t) port_index);
+ sigc::slot<void,char*,uint32_t> pslot = sigc::bind (mem_fun(*this, &PluginUI::print_parameter), (uint32_t) port_index);
control_ui->control = new BarController (*control_ui->adjustment, mcontrol, pslot);
control_ui->control->set_size_request (200, 15);
control_ui->control->set_style (BarController::LeftToRight);
control_ui->control->set_use_parent (true);
- control_ui->control->get_spin_button().signal_focus_in_event().connect (slot (*this, &PluginUI::entry_focus_event));
- control_ui->control->get_spin_button().signal_focus_out_event().connect (slot (*this, &PluginUI::entry_focus_event));
+ control_ui->control->get_spin_button().signal_focus_in_event().connect (mem_fun(*this, &PluginUI::entry_focus_event));
+ control_ui->control->get_spin_button().signal_focus_out_event().connect (mem_fun(*this, &PluginUI::entry_focus_event));
- control_ui->control->StartGesture.connect (bind (slot (*this, &PluginUI::start_touch), control_ui));
- control_ui->control->StopGesture.connect (bind (slot (*this, &PluginUI::stop_touch), control_ui));
+ control_ui->control->StartGesture.connect (bind (mem_fun(*this, &PluginUI::start_touch), control_ui));
+ control_ui->control->StopGesture.connect (bind (mem_fun(*this, &PluginUI::stop_touch), control_ui));
}
}
control_ui->pack_start (control_ui->automate_button, false, false);
- control_ui->adjustment->value_changed.connect (bind (slot (*this, &PluginUI::control_adjustment_changed), control_ui));
- control_ui->automate_button.signal_clicked().connect (bind (slot (*this, &PluginUI::astate_clicked), control_ui, (uint32_t) port_index));
+ control_ui->adjustment->value_changed.connect (bind (mem_fun(*this, &PluginUI::control_adjustment_changed), control_ui));
+ control_ui->automate_button.signal_clicked().connect (bind (mem_fun(*this, &PluginUI::astate_clicked), control_ui, (uint32_t) port_index));
automation_state_changed (control_ui);
- plugin.ParameterChanged.connect (bind (slot (*this, &PluginUI::parameter_changed), control_ui));
+ plugin.ParameterChanged.connect (bind (mem_fun(*this, &PluginUI::parameter_changed), control_ui));
insert.automation_list (port_index).automation_state_changed.connect
- (bind (slot (*this, &PluginUI::automation_state_changed), control_ui));
+ (bind (mem_fun(*this, &PluginUI::automation_state_changed), control_ui));
} else if (plugin.parameter_is_output (port_index)) {
output_controls.push_back (control_ui);
}
- plugin.ParameterChanged.connect (bind (slot (*this, &PluginUI::parameter_changed), control_ui));
+ plugin.ParameterChanged.connect (bind (mem_fun(*this, &PluginUI::parameter_changed), control_ui));
return control_ui;
}
items.clear ();
items.push_back (MenuElem (_("off"),
- bind (slot (*this, &PluginUI::set_automation_state), (AutoState) Off, cui)));
+ bind (mem_fun(*this, &PluginUI::set_automation_state), (AutoState) Off, cui)));
items.push_back (MenuElem (_("play"),
- bind (slot (*this, &PluginUI::set_automation_state), (AutoState) Play, cui)));
+ bind (mem_fun(*this, &PluginUI::set_automation_state), (AutoState) Play, cui)));
items.push_back (MenuElem (_("write"),
- bind (slot (*this, &PluginUI::set_automation_state), (AutoState) Write, cui)));
+ bind (mem_fun(*this, &PluginUI::set_automation_state), (AutoState) Write, cui)));
items.push_back (MenuElem (_("touch"),
- bind (slot (*this, &PluginUI::set_automation_state), (AutoState) Touch, cui)));
+ bind (mem_fun(*this, &PluginUI::set_automation_state), (AutoState) Touch, cui)));
automation_menu->popup (1, 0);
}
if (cui->port_index == abs_port_id) {
if (!cui->update_pending) {
cui->update_pending = true;
- Gtkmm2ext::UI::instance()->call_slot (bind (slot (*this, &PluginUI::update_control_display), cui));
+ Gtkmm2ext::UI::instance()->call_slot (bind (mem_fun(*this, &PluginUI::update_control_display), cui));
}
}
}
void
PluginUIWindow::plugin_going_away (ARDOUR::Redirect* ignored)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &PluginUIWindow::plugin_going_away), ignored));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &PluginUIWindow::plugin_going_away), ignored));
_pluginui->stop_updating(0);
delete_when_idle (this);
void
PluginUI::redirect_active_changed (Redirect* r, void* src)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &PluginUI::redirect_active_changed), r, src));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &PluginUI::redirect_active_changed), r, src));
bypass_button.set_active (!r->active());
}
if (output_controls.size() > 0 ) {
screen_update_connection.disconnect();
screen_update_connection = ARDOUR_UI::instance()->RapidScreenUpdate.connect
- (slot (*this, &PluginUI::output_update));
+ (mem_fun(*this, &PluginUI::output_update));
}
return FALSE;
}
combo.set_use_arrows_always(true);
combo.set_popdown_strings(plugin.get_presets());
combo.get_entry()->set_text("");
- combo.get_popwin()->unmap_event.connect(slot (*this, &PlugUIBase::setting_selected));
+ combo.get_popwin()->unmap_event.connect(mem_fun(*this, &PlugUIBase::setting_selected));
save_button.set_name ("PluginSaveButton");
- save_button.clicked.connect(slot (*this, &PlugUIBase::save_plugin_setting));
+ save_button.clicked.connect(mem_fun(*this, &PlugUIBase::save_plugin_setting));
bypass_button.set_name ("PluginBypassButton");
- bypass_button.toggled.connect (slot (*this, &PlugUIBase::bypass_toggled));
+ bypass_button.toggled.connect (mem_fun(*this, &PlugUIBase::bypass_toggled));
}
gint
ArdourPrompter::ArdourPrompter (bool modal)
: Gtkmm2ext::Prompter (modal)
{
- the_entry().signal_focus_in_event().connect (slot (ARDOUR_UI::generic_focus_in_event));
- the_entry().signal_focus_out_event().connect (slot (ARDOUR_UI::generic_focus_out_event));
+ the_entry().signal_focus_in_event().connect (ptr_fun (ARDOUR_UI::generic_focus_in_event));
+ the_entry().signal_focus_out_event().connect (ptr_fun (ARDOUR_UI::generic_focus_out_event));
}
redirect_display.set_button_actions (1, 0);
redirect_display.set_button_actions (2, 0);
redirect_display.set_button_actions (3, 0);
- redirect_display.drag_begin.connect (slot (*this, &RedirectBox::redirect_drag_begin));
- redirect_display.drag_end.connect (slot (*this, &RedirectBox::redirect_drag_end));
+ redirect_display.drag_begin.connect (mem_fun(*this, &RedirectBox::redirect_drag_begin));
+ redirect_display.drag_end.connect (mem_fun(*this, &RedirectBox::redirect_drag_end));
redirect_display.set_size_request (-1, 48);
redirect_display.set_selection_mode (GTK_SELECTION_MULTIPLE);
redirect_display.set_shadow_type (Gtk::SHADOW_IN);
- redirect_display.row_move.connect (slot (*this, &RedirectBox::redirects_reordered));
+ redirect_display.row_move.connect (mem_fun(*this, &RedirectBox::redirects_reordered));
redirect_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
redirect_eventbox.show ();
show_all ();
- _route.redirects_changed.connect (slot (*this, &RedirectBox::redirects_changed));
+ _route.redirects_changed.connect (mem_fun(*this, &RedirectBox::redirects_changed));
- redirect_display.button_press_event.connect (slot (*this, &RedirectBox::redirect_button));
- redirect_display.button_release_event.connect (slot (*this, &RedirectBox::redirect_button));
+ redirect_display.button_press_event.connect (mem_fun(*this, &RedirectBox::redirect_button));
+ redirect_display.button_release_event.connect (mem_fun(*this, &RedirectBox::redirect_button));
- redirect_display.button_release_event.connect_after (slot (do_not_propagate));
- _plugin_selector.hide.connect(slot(*this,&RedirectBox::disconnect_newplug));
+ redirect_display.button_release_event.connect_after (ptr_fun (do_not_propagate));
+ _plugin_selector.hide.connect(mem_fun(*this,&RedirectBox::disconnect_newplug));
- redirect_display.click_column.connect (slot (*this, &RedirectBox::show_redirect_menu));
+ redirect_display.click_column.connect (mem_fun(*this, &RedirectBox::show_redirect_menu));
set_stuff_from_route ();
send_action_menu->set_name ("ArdourContextMenu");
MenuList& items = send_action_menu->items();
- items.push_back (MenuElem (_("New send"), slot (*this, &RedirectBox::new_send)));
- items.push_back (MenuElem (_("Show send controls"), slot (*this, &RedirectBox::show_send_controls)));
+ items.push_back (MenuElem (_("New send"), mem_fun(*this, &RedirectBox::new_send)));
+ items.push_back (MenuElem (_("Show send controls"), mem_fun(*this, &RedirectBox::show_send_controls)));
}
void
if (redirect && Keyboard::is_delete_event (ev)) {
- Gtk::Main::idle.connect (bind (slot (*this, &RedirectBox::idle_delete_redirect), redirect));
+ Gtk::Main::idle.connect (bind (mem_fun(*this, &RedirectBox::idle_delete_redirect), redirect));
return TRUE;
} else if (redirect && (Keyboard::is_edit_event (ev) || ev->type == GDK_2BUTTON_PRESS)) {
/* new stuff */
- items.push_back (MenuElem (_("New Plugin ..."), slot (*this, &RedirectBox::choose_plugin)));
- items.push_back (MenuElem (_("New Insert"), slot (*this, &RedirectBox::choose_insert)));
- items.push_back (MenuElem (_("New Send ..."), slot (*this, &RedirectBox::choose_send)));
+ items.push_back (MenuElem (_("New Plugin ..."), mem_fun(*this, &RedirectBox::choose_plugin)));
+ items.push_back (MenuElem (_("New Insert"), mem_fun(*this, &RedirectBox::choose_insert)));
+ items.push_back (MenuElem (_("New Send ..."), mem_fun(*this, &RedirectBox::choose_send)));
items.push_back (SeparatorElem());
- items.push_back (MenuElem (_("Clear"), slot (*this, &RedirectBox::clear_redirects)));
+ items.push_back (MenuElem (_("Clear"), mem_fun(*this, &RedirectBox::clear_redirects)));
items.push_back (SeparatorElem());
/* standard editing stuff */
- items.push_back (MenuElem (_("Cut"), slot (*this, &RedirectBox::cut_redirects)));
+ items.push_back (MenuElem (_("Cut"), mem_fun(*this, &RedirectBox::cut_redirects)));
selection_dependent_items.push_back (items.back());
- items.push_back (MenuElem (_("Copy"), slot (*this, &RedirectBox::copy_redirects)));
+ items.push_back (MenuElem (_("Copy"), mem_fun(*this, &RedirectBox::copy_redirects)));
selection_dependent_items.push_back (items.back());
- items.push_back (MenuElem (_("Paste"), slot (*this, &RedirectBox::paste_redirects)));
+ items.push_back (MenuElem (_("Paste"), mem_fun(*this, &RedirectBox::paste_redirects)));
redirect_paste_item = items.back();
items.push_back (SeparatorElem());
- items.push_back (MenuElem (_("Rename"), slot (*this, &RedirectBox::rename_redirects)));
+ items.push_back (MenuElem (_("Rename"), mem_fun(*this, &RedirectBox::rename_redirects)));
items.push_back (SeparatorElem());
- items.push_back (MenuElem (_("Select all"), slot (*this, &RedirectBox::select_all_redirects)));
- items.push_back (MenuElem (_("Deselect all"), slot (*this, &RedirectBox::deselect_all_redirects)));
+ items.push_back (MenuElem (_("Select all"), mem_fun(*this, &RedirectBox::select_all_redirects)));
+ items.push_back (MenuElem (_("Deselect all"), mem_fun(*this, &RedirectBox::deselect_all_redirects)));
#if LATER
Menu *select_sub_menu = manage (new Menu);
/* activation */
items.push_back (SeparatorElem());
- items.push_back (MenuElem (_("Activate"), bind (slot (*this, &RedirectBox::for_selected_redirects),
+ items.push_back (MenuElem (_("Activate"), bind (mem_fun(*this, &RedirectBox::for_selected_redirects),
&RedirectBox::activate_redirect)));
selection_dependent_items.push_back (items.back());
- items.push_back (MenuElem (_("Deactivate"), bind (slot (*this, &RedirectBox::for_selected_redirects),
+ items.push_back (MenuElem (_("Deactivate"), bind (mem_fun(*this, &RedirectBox::for_selected_redirects),
&RedirectBox::deactivate_redirect)));
selection_dependent_items.push_back (items.back());
items.push_back (SeparatorElem());
- items.push_back (MenuElem (_("Activate All"), bind (slot (*this, &RedirectBox::all_redirects_active), true)));
- items.push_back (MenuElem (_("Deactivate All"), bind (slot (*this, &RedirectBox::all_redirects_active), false)));
+ items.push_back (MenuElem (_("Activate All"), bind (mem_fun(*this, &RedirectBox::all_redirects_active), true)));
+ items.push_back (MenuElem (_("Deactivate All"), bind (mem_fun(*this, &RedirectBox::all_redirects_active), false)));
/* show editors */
items.push_back (SeparatorElem());
- items.push_back (MenuElem (_("Edit"), bind (slot (*this, &RedirectBox::for_selected_redirects),
+ items.push_back (MenuElem (_("Edit"), bind (mem_fun(*this, &RedirectBox::for_selected_redirects),
&RedirectBox::edit_redirect)));
selection_dependent_items.push_back (items.back());
- menu->map_event.connect (slot (*this, &RedirectBox::redirect_menu_map_handler));
+ menu->map_event.connect (mem_fun(*this, &RedirectBox::redirect_menu_map_handler));
return menu;
}
Redirect *redirect = new PluginInsert (_session, *plugin, _placement);
- redirect->active_changed.connect (slot (*this, &RedirectBox::show_redirect_active));
+ redirect->active_changed.connect (mem_fun(*this, &RedirectBox::show_redirect_active));
uint32_t err_streams;
vpacker.pack_start (label);
vpacker.pack_start (button_box);
- button.signal_clicked().connect (bind (slot (dialog, &ArdourDialog::stop), 0));
+ button.signal_clicked().connect (bind (mem_fun (dialog, &ArdourDialog::stop), 0));
dialog.add (vpacker);
dialog.set_name (X_("PluginIODialog"));
RedirectBox::choose_insert ()
{
Redirect *redirect = new PortInsert (_session, _placement);
- redirect->active_changed.connect (slot (*this, &RedirectBox::show_redirect_active));
+ redirect->active_changed.connect (mem_fun(*this, &RedirectBox::show_redirect_active));
_route.add_redirect (redirect, this);
}
IOSelectorWindow *ios = new IOSelectorWindow (_session, *send, false, true);
ios->show_all ();
- ios->selector().Finished.connect (bind (slot (*this, &RedirectBox::send_io_finished), static_cast<Redirect*>(send), ios));
+ ios->selector().Finished.connect (bind (mem_fun(*this, &RedirectBox::send_io_finished), static_cast<Redirect*>(send), ios));
}
void
void
RedirectBox::show_plugin_selector ()
{
- newplug_connection = _plugin_selector.PluginCreated.connect (slot (*this,&RedirectBox::insert_plugin_chosen));
+ newplug_connection = _plugin_selector.PluginCreated.connect (mem_fun(*this,&RedirectBox::insert_plugin_chosen));
_plugin_selector.show_all ();
}
void
RedirectBox::redirects_changed (void *src)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &RedirectBox::redirects_changed), src));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &RedirectBox::redirects_changed), src));
redirect_display.freeze ();
redirect_display.clear ();
show_redirect_active (redirect, this);
redirect_active_connections.push_back
- (redirect->active_changed.connect (slot (*this, &RedirectBox::show_redirect_active)));
+ (redirect->active_changed.connect (mem_fun(*this, &RedirectBox::show_redirect_active)));
redirect_name_connections.push_back
- (redirect->name_changed.connect (bind (slot (*this, &RedirectBox::show_redirect_name), redirect)));
+ (redirect->name_changed.connect (bind (mem_fun(*this, &RedirectBox::show_redirect_name), redirect)));
}
string
void
RedirectBox::show_redirect_name (void* src, Redirect *redirect)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &RedirectBox::show_redirect_name), src, redirect));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &RedirectBox::show_redirect_name), src, redirect));
show_redirect_active (redirect, src);
}
void
RedirectBox::show_redirect_active (Redirect *redirect, void *src)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &RedirectBox::show_redirect_active), redirect, src));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &RedirectBox::show_redirect_active), redirect, src));
CList_Helpers::RowIterator ri;
CList *clist;
something for idle time.
*/
- Gtk::Main::idle.connect (slot (*this, &RedirectBox::compute_redirect_sort_keys));
+ Gtk::Main::idle.connect (mem_fun(*this, &RedirectBox::compute_redirect_sort_keys));
}
gint
vpacker.pack_start (label);
vpacker.pack_start (button_box);
- button.signal_clicked().connect (bind (slot (dialog, &ArdourDialog::stop), 0));
+ button.signal_clicked().connect (bind (mem_fun (dialog, &ArdourDialog::stop), 0));
dialog.add (vpacker);
dialog.set_name (X_("PluginIODialog"));
ok_button.set_name ("EditorGTKButton");
cancel_button.set_name ("EditorGTKButton");
- entry.activate.connect (bind (slot (dialog, &ArdourDialog::stop), 1));
- cancel_button.signal_clicked().connect (bind (slot (dialog, &ArdourDialog::stop), -1));
- ok_button.signal_clicked().connect (bind (slot (dialog, &ArdourDialog::stop), 1));
+ entry.activate.connect (bind (mem_fun (dialog, &ArdourDialog::stop), 1));
+ cancel_button.signal_clicked().connect (bind (mem_fun (dialog, &ArdourDialog::stop), -1));
+ ok_button.signal_clicked().connect (bind (mem_fun (dialog, &ArdourDialog::stop), 1));
/* recurse */
name_entry.set_name ("AudioRegionEditorEntry");
name_label.set_name ("AudioRegionEditorLabel");
- name_entry.signal_focus_in_event().connect (slot (*this, &AudioRegionEditor::focus_change));
- name_entry.signal_focus_out_event().connect (slot (*this, &AudioRegionEditor::focus_change));
+ name_entry.signal_focus_in_event().connect (mem_fun(*this, &AudioRegionEditor::focus_change));
+ name_entry.signal_focus_out_event().connect (mem_fun(*this, &AudioRegionEditor::focus_change));
name_hbox.set_spacing (5);
name_hbox.pack_start (name_label, false, false);
fade_in_length_spinner.set_digits (3);
- fade_in_length_spinner.signal_focus_in_event().connect (slot (*this, &AudioRegionEditor::focus_change));
- fade_in_length_spinner.signal_focus_out_event().connect (slot (*this, &AudioRegionEditor::focus_change));
- fade_in_length_spinner.activate.connect (slot (*this, &AudioRegionEditor::activation));
+ fade_in_length_spinner.signal_focus_in_event().connect (mem_fun(*this, &AudioRegionEditor::focus_change));
+ fade_in_length_spinner.signal_focus_out_event().connect (mem_fun(*this, &AudioRegionEditor::focus_change));
+ fade_in_length_spinner.activate.connect (mem_fun(*this, &AudioRegionEditor::activation));
Gtkmm2ext::set_size_request_to_display_given_text (fade_in_length_spinner, "500g", 20, -1);
fade_out_length_spinner.set_digits (3);
- fade_out_length_spinner.signal_focus_in_event().connect (slot (*this, &AudioRegionEditor::focus_change));
- fade_out_length_spinner.signal_focus_out_event().connect (slot (*this, &AudioRegionEditor::focus_change));
- fade_out_length_spinner.activate.connect (slot (*this, &AudioRegionEditor::activation));
+ fade_out_length_spinner.signal_focus_in_event().connect (mem_fun(*this, &AudioRegionEditor::focus_change));
+ fade_out_length_spinner.signal_focus_out_event().connect (mem_fun(*this, &AudioRegionEditor::focus_change));
+ fade_out_length_spinner.activate.connect (mem_fun(*this, &AudioRegionEditor::activation));
Gtkmm2ext::set_size_request_to_display_given_text (fade_out_length_spinner, "500g", 20, -1);
set_name ("AudioRegionEditorWindow");
add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK);
- delete_event.connect (bind (slot (just_hide_it), static_cast<Window *> (this)));
+ delete_event.connect (bind (ptr_fun (just_hide_it), static_cast<Window *> (this)));
string title = _("ardour: region ");
title += _region.name();
envelope_view_button.set_active (false);
}
- _region.StateChanged.connect (slot (*this, &AudioRegionEditor::region_changed));
+ _region.StateChanged.connect (mem_fun(*this, &AudioRegionEditor::region_changed));
spin_arrow_grab = false;
void
AudioRegionEditor::connect_editor_events ()
{
- name_entry.changed.connect (slot (*this, &AudioRegionEditor::name_entry_changed));
+ name_entry.changed.connect (mem_fun(*this, &AudioRegionEditor::name_entry_changed));
- start_clock.ValueChanged.connect (slot (*this, &AudioRegionEditor::start_clock_changed));
- end_clock.ValueChanged.connect (slot (*this, &AudioRegionEditor::end_clock_changed));
- length_clock.ValueChanged.connect (slot (*this, &AudioRegionEditor::length_clock_changed));
+ start_clock.ValueChanged.connect (mem_fun(*this, &AudioRegionEditor::start_clock_changed));
+ end_clock.ValueChanged.connect (mem_fun(*this, &AudioRegionEditor::end_clock_changed));
+ length_clock.ValueChanged.connect (mem_fun(*this, &AudioRegionEditor::length_clock_changed));
- fade_in_length_spinner.button_press_event.connect (bind (slot (*this, &AudioRegionEditor::bpressed), &fade_in_length_spinner,
+ fade_in_length_spinner.button_press_event.connect (bind (mem_fun(*this, &AudioRegionEditor::bpressed), &fade_in_length_spinner,
&AudioRegionEditor::start_editing_fade_in));
- fade_in_length_spinner.button_release_event.connect (bind (slot (this, &AudioRegionEditor::breleased), &fade_in_length_spinner,
+ fade_in_length_spinner.button_release_event.connect (bind (mem_fun (*this, &AudioRegionEditor::breleased), &fade_in_length_spinner,
&AudioRegionEditor::stop_editing_fade_in));
- fade_out_length_spinner.button_press_event.connect (bind (slot (*this, &AudioRegionEditor::bpressed), &fade_out_length_spinner,
+ fade_out_length_spinner.button_press_event.connect (bind (mem_fun(*this, &AudioRegionEditor::bpressed), &fade_out_length_spinner,
&AudioRegionEditor::start_editing_fade_out));
- fade_out_length_spinner.button_release_event.connect (bind (slot (this, &AudioRegionEditor::breleased), &fade_out_length_spinner,
+ fade_out_length_spinner.button_release_event.connect (bind (mem_fun (*this, &AudioRegionEditor::breleased), &fade_out_length_spinner,
&AudioRegionEditor::stop_editing_fade_out));
- fade_in_length_adjustment.value_changed.connect (slot (*this, &AudioRegionEditor::fade_in_length_adjustment_changed));
- fade_out_length_adjustment.value_changed.connect (slot (*this, &AudioRegionEditor::fade_out_length_adjustment_changed));
-
- fade_in_active_button.toggled.connect (slot (*this, &AudioRegionEditor::fade_in_active_toggled));
- fade_out_active_button.toggled.connect (slot (*this, &AudioRegionEditor::fade_out_active_toggled));
-
- envelope_active_button.button_press_event.connect (slot (*this, &AudioRegionEditor::envelope_active_button_press));
- envelope_active_button.button_release_event.connect (slot (*this, &AudioRegionEditor::envelope_active_button_release));
- audition_button.toggled.connect (slot (*this, &AudioRegionEditor::audition_button_toggled));
- envelope_view_button.toggled.connect (slot (*this, &AudioRegionEditor::envelope_view_button_toggled));
- lock_button.signal_clicked().connect (slot (*this, &AudioRegionEditor::lock_button_clicked));
- mute_button.signal_clicked().connect (slot (*this, &AudioRegionEditor::mute_button_clicked));
- opaque_button.signal_clicked().connect (slot (*this, &AudioRegionEditor::opaque_button_clicked));
- raise_button.signal_clicked().connect (slot (*this, &AudioRegionEditor::raise_button_clicked));
- lower_button.signal_clicked().connect (slot (*this, &AudioRegionEditor::lower_button_clicked));
+ fade_in_length_adjustment.value_changed.connect (mem_fun(*this, &AudioRegionEditor::fade_in_length_adjustment_changed));
+ fade_out_length_adjustment.value_changed.connect (mem_fun(*this, &AudioRegionEditor::fade_out_length_adjustment_changed));
+
+ fade_in_active_button.toggled.connect (mem_fun(*this, &AudioRegionEditor::fade_in_active_toggled));
+ fade_out_active_button.toggled.connect (mem_fun(*this, &AudioRegionEditor::fade_out_active_toggled));
+
+ envelope_active_button.button_press_event.connect (mem_fun(*this, &AudioRegionEditor::envelope_active_button_press));
+ envelope_active_button.button_release_event.connect (mem_fun(*this, &AudioRegionEditor::envelope_active_button_release));
+ audition_button.toggled.connect (mem_fun(*this, &AudioRegionEditor::audition_button_toggled));
+ envelope_view_button.toggled.connect (mem_fun(*this, &AudioRegionEditor::envelope_view_button_toggled));
+ lock_button.signal_clicked().connect (mem_fun(*this, &AudioRegionEditor::lock_button_clicked));
+ mute_button.signal_clicked().connect (mem_fun(*this, &AudioRegionEditor::mute_button_clicked));
+ opaque_button.signal_clicked().connect (mem_fun(*this, &AudioRegionEditor::opaque_button_clicked));
+ raise_button.signal_clicked().connect (mem_fun(*this, &AudioRegionEditor::raise_button_clicked));
+ lower_button.signal_clicked().connect (mem_fun(*this, &AudioRegionEditor::lower_button_clicked));
}
void
{
AutomationLine::start_drag(cp,fraction);
if (!rv.region.envelope_active()) {
- trackview.session().add_undo( bind( slot(rv.region, &AudioRegion::set_envelope_active), false) );
+ trackview.session().add_undo( bind( mem_fun(rv.region, &AudioRegion::set_envelope_active), false) );
}
}
trackview.editor.current_session()->add_undo (get_memento());
if (!rv.region.envelope_active()) {
- trackview.session().add_undo( bind( slot(rv.region, &AudioRegion::set_envelope_active), false) );
- trackview.session().add_redo( bind( slot(rv.region, &AudioRegion::set_envelope_active), true) );
+ trackview.session().add_undo( bind( mem_fun(rv.region, &AudioRegion::set_envelope_active), false) );
+ trackview.session().add_redo( bind( mem_fun(rv.region, &AudioRegion::set_envelope_active), true) );
rv.region.set_envelope_active(true);
}
AudioRegionGainLine::end_drag (ControlPoint* cp)
{
if (!rv.region.envelope_active()) {
- trackview.session().add_redo( bind( slot(rv.region, &AudioRegion::set_envelope_active), true) );
+ trackview.session().add_redo( bind( mem_fun(rv.region, &AudioRegion::set_envelope_active), true) );
rv.region.set_envelope_active(true);
}
AutomationLine::end_drag(cp);
return;
}
- rv->AudioRegionViewGoingAway.connect (slot (*this, &AudioRegionSelection::remove_it));
+ rv->AudioRegionViewGoingAway.connect (mem_fun(*this, &AudioRegionSelection::remove_it));
if (rv->region.first_frame() < _current_start || empty()) {
_current_start = rv->region.first_frame();
fade_in_active_changed ();
fade_out_active_changed ();
- region.StateChanged.connect (slot (*this, &AudioRegionView::region_changed));
+ region.StateChanged.connect (mem_fun(*this, &AudioRegionView::region_changed));
gtk_signal_connect (GTK_OBJECT(group), "event",
(GtkSignalFunc) PublicEditor::canvas_region_view_event,
void
AudioRegionView::region_changed (Change what_changed)
{
- ENSURE_GUI_THREAD (bind (slot (*this, &AudioRegionView::region_changed), what_changed));
+ ENSURE_GUI_THREAD (bind (mem_fun(*this, &AudioRegionView::region_changed), what_changed));
if (what_changed & BoundsChanged) {
region_resized (what_changed);
void
AudioRegionView::region_scale_amplitude_changed ()
{
- ENSURE_GUI_THREAD (slot (*this, &AudioRegionView::region_scale_amplitude_changed));
+ ENSURE_GUI_THREAD (mem_fun(*this, &AudioRegionView::region_scale_amplitude_changed));
for (uint32_t n = 0; n < waves.size(); ++n) {
// force a reload of the cache
wave_caches.push_back (gtk_canvas_waveview_cache_new ());
if (wait_for_waves) {
- if (region.source(n).peaks_ready (bind (slot (*this, &AudioRegionView::peaks_ready_handler), n))) {
+ if (region.source(n).peaks_ready (bind (mem_fun(*this, &AudioRegionView::peaks_ready_handler), n))) {
create_one_wave (n, true);
} else {
create_zero_line = false;
void
AudioRegionView::peaks_ready_handler (uint32_t which)
{
- Gtkmm2ext::UI::instance()->call_slot (bind (slot (*this, &AudioRegionView::create_one_wave), which, false));
+ Gtkmm2ext::UI::instance()->call_slot (bind (mem_fun(*this, &AudioRegionView::create_one_wave), which, false));
}
void
if (!region.envelope_active()) {
- trackview.session().add_undo( bind( slot(region, &AudioRegion::set_envelope_active), false) );
+ trackview.session().add_undo( bind( mem_fun(region, &AudioRegion::set_envelope_active), false) );
region.set_envelope_active(true);
- trackview.session().add_redo( bind( slot(region, &AudioRegion::set_envelope_active), true) );
+ trackview.session().add_redo( bind( mem_fun(region, &AudioRegion::set_envelope_active), true) );
}
region.envelope().add (fx, y);
ghost->set_duration (region.length() / samples_per_unit);
ghosts.push_back (ghost);
- ghost->GoingAway.connect (slot (*this, &AudioRegionView::remove_ghost));
+ ghost->GoingAway.connect (mem_fun(*this, &AudioRegionView::remove_ghost));
return ghost;
}
set_wmclass (_("ardour_route_parameters"), "Ardour");
// events
- route_select_list.select_row.connect (slot (*this, &RouteParams_UI::route_selected));
- route_select_list.unselect_row.connect (slot (*this, &RouteParams_UI::route_unselected));
- route_select_list.click_column.connect (slot (*this, &RouteParams_UI::show_track_menu));
+ route_select_list.select_row.connect (mem_fun(*this, &RouteParams_UI::route_selected));
+ route_select_list.unselect_row.connect (mem_fun(*this, &RouteParams_UI::route_unselected));
+ route_select_list.click_column.connect (mem_fun(*this, &RouteParams_UI::show_track_menu));
add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK|Gdk::BUTTON_RELEASE_MASK);
_plugin_selector = new PluginSelector (PluginManager::the_manager());
- _plugin_selector->delete_event.connect (bind (slot (just_hide_it),
+ _plugin_selector->delete_event.connect (bind (ptr_fun (just_hide_it),
static_cast<Window *> (_plugin_selector)));
- delete_event.connect (bind (slot (just_hide_it), static_cast<Gtk::Window*> (this)));
+ delete_event.connect (bind (ptr_fun (just_hide_it), static_cast<Gtk::Window*> (this)));
}
RouteParams_UI::~RouteParams_UI ()
void
RouteParams_UI::add_route (Route* route)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &RouteParams_UI::add_route), route));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &RouteParams_UI::add_route), route));
if (route->hidden()) {
return;
route_select_list.rows().back().set_data (route);
//route_select_list.rows().back().select ();
- route->name_changed.connect (bind (slot (*this, &RouteParams_UI::route_name_changed), route));
- route->GoingAway.connect (bind (slot (*this, &RouteParams_UI::route_removed), route));
+ route->name_changed.connect (bind (mem_fun(*this, &RouteParams_UI::route_name_changed), route));
+ route->GoingAway.connect (bind (mem_fun(*this, &RouteParams_UI::route_removed), route));
}
void
RouteParams_UI::route_name_changed (void *src, Route *route)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &RouteParams_UI::route_name_changed), src, route));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &RouteParams_UI::route_name_changed), src, route));
CList_Helpers::RowList::iterator i;
pre_redir_hpane.add1 (*pre_redirect_box);
post_redir_hpane.add1 (*post_redirect_box);
- pre_redirect_box->RedirectSelected.connect (bind (slot (*this, &RouteParams_UI::redirect_selected), PreFader));
- pre_redirect_box->RedirectUnselected.connect (bind (slot (*this, &RouteParams_UI::redirect_selected), PreFader));
- post_redirect_box->RedirectSelected.connect (bind (slot (*this, &RouteParams_UI::redirect_selected), PostFader));
- post_redirect_box->RedirectUnselected.connect (bind (slot (*this, &RouteParams_UI::redirect_selected), PostFader));
+ pre_redirect_box->RedirectSelected.connect (bind (mem_fun(*this, &RouteParams_UI::redirect_selected), PreFader));
+ pre_redirect_box->RedirectUnselected.connect (bind (mem_fun(*this, &RouteParams_UI::redirect_selected), PreFader));
+ post_redirect_box->RedirectSelected.connect (bind (mem_fun(*this, &RouteParams_UI::redirect_selected), PostFader));
+ post_redirect_box->RedirectUnselected.connect (bind (mem_fun(*this, &RouteParams_UI::redirect_selected), PostFader));
}
void
RouteParams_UI::route_removed (Route *route)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &RouteParams_UI::route_removed), route));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &RouteParams_UI::route_removed), route));
/*
route_select_list.freeze ();
route_select_list.clear ();
if (session) {
session->foreach_route (this, &RouteParams_UI::add_route);
- session->going_away.connect (slot (*this, &ArdourDialog::session_gone));
- session->RouteAdded.connect (slot (*this, &RouteParams_UI::add_route));
+ session->going_away.connect (mem_fun(*this, &ArdourDialog::session_gone));
+ session->RouteAdded.connect (mem_fun(*this, &RouteParams_UI::add_route));
start_updating ();
} else {
stop_updating ();
setup_redirect_boxes();
// bind to redirects changed event for this route
- _route_conn = route->redirects_changed.connect (slot (*this, &RouteParams_UI::redirects_changed));
+ _route_conn = route->redirects_changed.connect (mem_fun(*this, &RouteParams_UI::redirects_changed));
track_input_label.set_text (_route->name());
RouteParams_UI::redirects_changed (void *src)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &RouteParams_UI::redirects_changed), src));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &RouteParams_UI::redirects_changed), src));
// pre_redirect_list.freeze ();
// pre_redirect_list.clear ();
track_menu->set_name ("ArdourContextMenu");
track_menu->items().push_back
(MenuElem (_("Add Track/Bus"),
- slot (*(ARDOUR_UI::instance()), &ARDOUR_UI::add_route)));
+ mem_fun (*(ARDOUR_UI::instance()), &ARDOUR_UI::add_route)));
}
track_menu->popup (1, 0);
}
if (place == PreFader) {
cleanup_pre_view();
- _pre_plugin_conn = send->GoingAway.connect (slot (*this, &RouteParams_UI::redirect_going_away));
+ _pre_plugin_conn = send->GoingAway.connect (mem_fun(*this, &RouteParams_UI::redirect_going_away));
_active_pre_view = send_ui;
pre_redir_hpane.add2 (*_active_pre_view);
}
else {
cleanup_post_view();
- _post_plugin_conn = send->GoingAway.connect (slot (*this, &RouteParams_UI::redirect_going_away));
+ _post_plugin_conn = send->GoingAway.connect (mem_fun(*this, &RouteParams_UI::redirect_going_away));
_active_post_view = send_ui;
post_redir_hpane.add2 (*_active_post_view);
if (place == PreFader) {
cleanup_pre_view();
- _pre_plugin_conn = plugin_insert->plugin().GoingAway.connect (bind (slot (*this, &RouteParams_UI::plugin_going_away), PreFader));
+ _pre_plugin_conn = plugin_insert->plugin().GoingAway.connect (bind (mem_fun(*this, &RouteParams_UI::plugin_going_away), PreFader));
plugin_ui->start_updating (0);
_active_pre_view = plugin_ui;
pre_redir_hpane.add2 (*_active_pre_view);
}
else {
cleanup_post_view();
- _post_plugin_conn = plugin_insert->plugin().GoingAway.connect (bind (slot (*this, &RouteParams_UI::plugin_going_away), PostFader));
+ _post_plugin_conn = plugin_insert->plugin().GoingAway.connect (bind (mem_fun(*this, &RouteParams_UI::plugin_going_away), PostFader));
plugin_ui->start_updating (0);
_active_post_view = plugin_ui;
post_redir_hpane.add2 (*_active_post_view);
if (place == PreFader) {
cleanup_pre_view();
- _pre_plugin_conn = port_insert->GoingAway.connect (slot (*this, &RouteParams_UI::redirect_going_away));
+ _pre_plugin_conn = port_insert->GoingAway.connect (mem_fun(*this, &RouteParams_UI::redirect_going_away));
_active_pre_view = portinsert_ui;
pre_redir_hpane.add2 (*_active_pre_view);
portinsert_ui->redisplay();
}
else {
cleanup_post_view();
- _post_plugin_conn = port_insert->GoingAway.connect (slot (*this, &RouteParams_UI::redirect_going_away));
+ _post_plugin_conn = port_insert->GoingAway.connect (mem_fun(*this, &RouteParams_UI::redirect_going_away));
_active_post_view = portinsert_ui;
post_redir_hpane.add2 (*_active_post_view);
portinsert_ui->redisplay();
void
RouteParams_UI::plugin_going_away (Plugin *plugin, Placement place)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &RouteParams_UI::plugin_going_away), plugin, place));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &RouteParams_UI::plugin_going_away), plugin, place));
// delete the current view without calling finish
RouteParams_UI::redirect_going_away (ARDOUR::Redirect *plugin)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &RouteParams_UI::redirect_going_away), plugin));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &RouteParams_UI::redirect_going_away), plugin));
printf ("redirect going away\n");
// delete the current view without calling finish
RouteParams_UI::start_updating ()
{
update_connection = ARDOUR_UI::instance()->RapidScreenUpdate.connect
- (slot (*this, &RouteParams_UI::update_views));
+ (mem_fun(*this, &RouteParams_UI::update_views));
}
void
redirects.push_back (r);
void (RouteRedirectSelection::*pmf)(Redirect*) = &RouteRedirectSelection::remove;
- r->GoingAway.connect (slot (*this, pmf));
+ r->GoingAway.connect (mem_fun(*this, pmf));
RedirectsChanged();
}
redirects.push_back (*i);
void (RouteRedirectSelection::*pmf)(Redirect*) = &RouteRedirectSelection::remove;
- (*i)->GoingAway.connect (slot (*this, pmf));
+ (*i)->GoingAway.connect (mem_fun(*this, pmf));
changed = true;
}
}
routes.push_back (r);
void (RouteRedirectSelection::*pmf)(Route*) = &RouteRedirectSelection::remove;
- r->GoingAway.connect (bind (slot (*this, pmf), r));
+ r->GoingAway.connect (bind (mem_fun(*this, pmf), r));
RoutesChanged();
}
set_color (unique_random_color());
}
- _route.GoingAway.connect (slot (*this, &RouteUI::route_removed));
- _route.active_changed.connect (slot (*this, &RouteUI::route_active_changed));
+ _route.GoingAway.connect (mem_fun (*this, &RouteUI::route_removed));
+ _route.active_changed.connect (mem_fun (*this, &RouteUI::route_active_changed));
mute_button = manage (new BindableToggleButton (& _route.midi_mute_control(), m_name ));
mute_button->set_bind_button_state (2, GDK_CONTROL_MASK);
if (is_audio_track()) {
AudioTrack* at = dynamic_cast<AudioTrack*>(&_route);
- get_diskstream()->record_enable_changed.connect (slot (*this, &RouteUI::route_rec_enable_changed));
+ get_diskstream()->record_enable_changed.connect (mem_fun (*this, &RouteUI::route_rec_enable_changed));
- _session.RecordEnabled.connect (slot (*this, &RouteUI::session_rec_enable_changed));
- _session.RecordDisabled.connect (slot (*this, &RouteUI::session_rec_enable_changed));
+ _session.RecordEnabled.connect (mem_fun (*this, &RouteUI::session_rec_enable_changed));
+ _session.RecordDisabled.connect (mem_fun (*this, &RouteUI::session_rec_enable_changed));
rec_enable_button = manage (new BindableToggleButton (& at->midi_rec_enable_control(), r_name ));
rec_enable_button->set_bind_button_state (2, GDK_CONTROL_MASK);
void
RouteUI::solo_changed(void* src)
{
- Gtkmm2ext::UI::instance()->call_slot (slot (*this, &RouteUI::update_solo_display));
+ Gtkmm2ext::UI::instance()->call_slot (mem_fun (*this, &RouteUI::update_solo_display));
}
void
void
RouteUI::mute_changed(void* src)
{
- Gtkmm2ext::UI::instance()->call_slot (slot (*this, &RouteUI::update_mute_display));
+ Gtkmm2ext::UI::instance()->call_slot (mem_fun (*this, &RouteUI::update_mute_display));
}
void
void
RouteUI::route_rec_enable_changed (void *src)
{
- Gtkmm2ext::UI::instance()->call_slot (slot (*this, &RouteUI::update_rec_display));
+ Gtkmm2ext::UI::instance()->call_slot (mem_fun (*this, &RouteUI::update_rec_display));
}
void
RouteUI::session_rec_enable_changed ()
{
- Gtkmm2ext::UI::instance()->call_slot (slot (*this, &RouteUI::update_rec_display));
+ Gtkmm2ext::UI::instance()->call_slot (mem_fun (*this, &RouteUI::update_rec_display));
}
void
check = new CheckMenuItem(_("Solo-safe"));
check->set_active (_route.solo_safe());
- check->toggled.connect (bind (slot (*this, &RouteUI::toggle_solo_safe), check));
- _route.solo_safe_changed.connect(bind (slot (*this, &RouteUI::solo_safe_toggle), check));
+ check->toggled.connect (bind (mem_fun (*this, &RouteUI::toggle_solo_safe), check));
+ _route.solo_safe_changed.connect(bind (mem_fun (*this, &RouteUI::solo_safe_toggle), check));
items.push_back (CheckMenuElem(*check));
check->show_all();
items.push_back (SeparatorElem());
- items.push_back (MenuElem (_("MIDI Bind"), slot (*mute_button, &BindableToggleButton::midi_learn)));
+ items.push_back (MenuElem (_("MIDI Bind"), mem_fun (*mute_button, &BindableToggleButton::midi_learn)));
}
check = new CheckMenuItem(_("Pre Fader"));
init_mute_menu(PRE_FADER, check);
- check->toggled.connect(bind (slot (*this, &RouteUI::toggle_mute_menu), PRE_FADER, check));
- _route.pre_fader_changed.connect(bind (slot (*this, &RouteUI::pre_fader_toggle), check));
+ check->toggled.connect(bind (mem_fun (*this, &RouteUI::toggle_mute_menu), PRE_FADER, check));
+ _route.pre_fader_changed.connect(bind (mem_fun (*this, &RouteUI::pre_fader_toggle), check));
items.push_back (CheckMenuElem(*check));
check->show_all();
check = new CheckMenuItem(_("Post Fader"));
init_mute_menu(POST_FADER, check);
- check->toggled.connect(bind (slot (*this, &RouteUI::toggle_mute_menu), POST_FADER, check));
- _route.post_fader_changed.connect(bind (slot (*this, &RouteUI::post_fader_toggle), check));
+ check->toggled.connect(bind (mem_fun (*this, &RouteUI::toggle_mute_menu), POST_FADER, check));
+ _route.post_fader_changed.connect(bind (mem_fun (*this, &RouteUI::post_fader_toggle), check));
items.push_back (CheckMenuElem(*check));
check->show_all();
check = new CheckMenuItem(_("Control Outs"));
init_mute_menu(CONTROL_OUTS, check);
- check->toggled.connect(bind (slot (*this, &RouteUI::toggle_mute_menu), CONTROL_OUTS, check));
- _route.control_outs_changed.connect(bind (slot (*this, &RouteUI::control_outs_toggle), check));
+ check->toggled.connect(bind (mem_fun (*this, &RouteUI::toggle_mute_menu), CONTROL_OUTS, check));
+ _route.control_outs_changed.connect(bind (mem_fun (*this, &RouteUI::control_outs_toggle), check));
items.push_back (CheckMenuElem(*check));
check->show_all();
check = new CheckMenuItem(_("Main Outs"));
init_mute_menu(MAIN_OUTS, check);
- check->toggled.connect(bind (slot (*this, &RouteUI::toggle_mute_menu), MAIN_OUTS, check));
- _route.main_outs_changed.connect(bind (slot (*this, &RouteUI::main_outs_toggle), check));
+ check->toggled.connect(bind (mem_fun (*this, &RouteUI::toggle_mute_menu), MAIN_OUTS, check));
+ _route.main_outs_changed.connect(bind (mem_fun (*this, &RouteUI::main_outs_toggle), check));
items.push_back (CheckMenuElem(*check));
check->show_all();
items.push_back (SeparatorElem());
- items.push_back (MenuElem (_("MIDI Bind"), slot (*mute_button, &BindableToggleButton::midi_learn)));
+ items.push_back (MenuElem (_("MIDI Bind"), mem_fun (*mute_button, &BindableToggleButton::midi_learn)));
}
void
RouteUI::reversibly_apply_route_boolean (string name, void (Route::*func)(bool, void *), bool yn, void *arg)
{
_session.begin_reversible_command (name);
- _session.add_undo (bind (slot (_route, func), !yn, (void *) arg));
- _session.add_redo (bind (slot (_route, func), yn, (void *) arg));
+ _session.add_undo (bind (mem_fun (_route, func), !yn, (void *) arg));
+ _session.add_redo (bind (mem_fun (_route, func), yn, (void *) arg));
_session.commit_reversible_command ();
}
RouteUI::reversibly_apply_audio_track_boolean (string name, void (AudioTrack::*func)(bool, void *), bool yn, void *arg)
{
_session.begin_reversible_command (name);
- _session.add_undo (bind (slot (*audio_track(), func), !yn, (void *) arg));
- _session.add_redo (bind (slot (*audio_track(), func), yn, (void *) arg));
+ _session.add_undo (bind (mem_fun (*audio_track(), func), !yn, (void *) arg));
+ _session.add_redo (bind (mem_fun (*audio_track(), func), yn, (void *) arg));
_session.commit_reversible_command ();
}
Gtk::Main::run ();
if (prompter.get_choice() == 0) {
- Main::idle.connect (bind (slot (&RouteUI::idle_remove_this_route), this));
+ Main::idle.connect (bind (mem_fun (&RouteUI::idle_remove_this_route), this));
}
}
void
RouteUI::route_removed ()
{
- ENSURE_GUI_THREAD(slot (*this, &RouteUI::route_removed));
+ ENSURE_GUI_THREAD(mem_fun (*this, &RouteUI::route_removed));
delete this;
}
void
RouteUI::name_changed (void *src)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &RouteUI::name_changed), src));
+ ENSURE_GUI_THREAD(bind (mem_fun (*this, &RouteUI::name_changed), src));
name_label.set_text (_route.name());
}
RouteUI::route_active_changed ()
{
if (route_active_menu_item) {
- Gtkmm2ext::UI::instance()->call_slot (bind (slot (*route_active_menu_item, &CheckMenuItem::set_active), _route.active()));
+ Gtkmm2ext::UI::instance()->call_slot (bind (mem_fun (*route_active_menu_item, &CheckMenuItem::set_active), _route.active()));
}
}
void
RouteUI::pre_fader_toggle(void* src, Gtk::CheckMenuItem* check)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &RouteUI::pre_fader_toggle), src, check));
+ ENSURE_GUI_THREAD(bind (mem_fun (*this, &RouteUI::pre_fader_toggle), src, check));
bool yn = _route.get_mute_config(PRE_FADER);
if (check->get_active() != yn) {
void
RouteUI::post_fader_toggle(void* src, Gtk::CheckMenuItem* check)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &RouteUI::post_fader_toggle), src, check));
+ ENSURE_GUI_THREAD(bind (mem_fun (*this, &RouteUI::post_fader_toggle), src, check));
bool yn = _route.get_mute_config(POST_FADER);
if (check->get_active() != yn) {
void
RouteUI::control_outs_toggle(void* src, Gtk::CheckMenuItem* check)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &RouteUI::control_outs_toggle), src, check));
+ ENSURE_GUI_THREAD(bind (mem_fun (*this, &RouteUI::control_outs_toggle), src, check));
bool yn = _route.get_mute_config(CONTROL_OUTS);
if (check->get_active() != yn) {
void
RouteUI::main_outs_toggle(void* src, Gtk::CheckMenuItem* check)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &RouteUI::main_outs_toggle), src, check));
+ ENSURE_GUI_THREAD(bind (mem_fun (*this, &RouteUI::main_outs_toggle), src, check));
bool yn = _route.get_mute_config(MAIN_OUTS);
if (check->get_active() != yn) {
void
RouteUI::map_frozen ()
{
- ENSURE_GUI_THREAD (slot (*this, &RouteUI::map_frozen));
+ ENSURE_GUI_THREAD (mem_fun (*this, &RouteUI::map_frozen));
AudioTrack* at = dynamic_cast<AudioTrack*>(&_route);
_send.set_metering (true);
- _send.output_changed.connect (slot (*this, &SendUI::ins_changed));
- _send.output_changed.connect (slot (*this, &SendUI::outs_changed));
+ _send.output_changed.connect (mem_fun (*this, &SendUI::ins_changed));
+ _send.output_changed.connect (mem_fun (*this, &SendUI::outs_changed));
panners.set_width (Wide);
panners.setup_pan ();
gpm.setup_meters ();
gpm.set_fader_name ("SendUIFrame");
- screen_update_connection = ARDOUR_UI::instance()->RapidScreenUpdate.connect (slot (*this, &SendUI::update));
- fast_screen_update_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect (slot (*this, &SendUI::fast_update));
+ screen_update_connection = ARDOUR_UI::instance()->RapidScreenUpdate.connect (mem_fun (*this, &SendUI::update));
+ fast_screen_update_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect (mem_fun (*this, &SendUI::fast_update));
}
SendUI::~SendUI ()
void
SendUI::ins_changed (IOChange change, void* ignored)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &SendUI::ins_changed), change, ignored));
+ ENSURE_GUI_THREAD(bind (mem_fun (*this, &SendUI::ins_changed), change, ignored));
if (change & ConfigurationChanged) {
panners.setup_pan ();
}
void
SendUI::outs_changed (IOChange change, void* ignored)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &SendUI::outs_changed), change, ignored));
+ ENSURE_GUI_THREAD(bind (mem_fun (*this, &SendUI::outs_changed), change, ignored));
if (change & ConfigurationChanged) {
panners.setup_pan ();
gpm.setup_meters ();
void
SendUI::send_going_away (Redirect *ignored)
{
- ENSURE_GUI_THREAD (bind (slot (*this, &SendUI::send_going_away), ignored));
+ ENSURE_GUI_THREAD (bind (mem_fun (*this, &SendUI::send_going_away), ignored));
delete this;
}
add (vpacker);
set_name ("SendUIWindow");
- s.GoingAway.connect (slot (*this, &SendUIWindow::send_going_away));
+ s.GoingAway.connect (mem_fun (*this, &SendUIWindow::send_going_away));
- delete_event.connect (bind (slot (just_hide_it), reinterpret_cast<Window *> (this)));
+ delete_event.connect (bind (ptr_fun (just_hide_it), reinterpret_cast<Window *> (this)));
}
void
SendUIWindow::send_going_away (Redirect *ignored)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &SendUIWindow::send_going_away), ignored));
+ ENSURE_GUI_THREAD(bind (mem_fun (*this, &SendUIWindow::send_going_away), ignored));
delete this;
}
_amplitude_above_axis = 1.0;
if (_trackview.is_audio_track()) {
- _trackview.audio_track()->diskstream_changed.connect (slot (*this, &StreamView::diskstream_changed));
- _trackview.session().TransportStateChange.connect (slot (*this, &StreamView::transport_changed));
- _trackview.get_diskstream()->record_enable_changed.connect (slot (*this, &StreamView::rec_enable_changed));
- _trackview.session().RecordEnabled.connect (slot (*this, &StreamView::sess_rec_enable_changed));
- _trackview.session().RecordDisabled.connect (slot (*this, &StreamView::sess_rec_enable_changed));
+ _trackview.audio_track()->diskstream_changed.connect (mem_fun (*this, &StreamView::diskstream_changed));
+ _trackview.session().TransportStateChange.connect (mem_fun (*this, &StreamView::transport_changed));
+ _trackview.get_diskstream()->record_enable_changed.connect (mem_fun (*this, &StreamView::rec_enable_changed));
+ _trackview.session().RecordEnabled.connect (mem_fun (*this, &StreamView::sess_rec_enable_changed));
+ _trackview.session().RecordDisabled.connect (mem_fun (*this, &StreamView::sess_rec_enable_changed));
}
rec_updating = false;
void
StreamView::add_region_view_internal (Region *r, bool wait_for_waves)
{
- ENSURE_GUI_THREAD (bind (slot (*this, &StreamView::add_region_view), r));
+ ENSURE_GUI_THREAD (bind (mem_fun (*this, &StreamView::add_region_view), r));
AudioRegion* region = dynamic_cast<AudioRegion*> (r);
/* catch regionview going away */
- region->GoingAway.connect (slot (*this, &StreamView::remove_region_view));
+ region->GoingAway.connect (mem_fun (*this, &StreamView::remove_region_view));
AudioRegionViewAdded (region_view);
}
void
StreamView::remove_region_view (Region *r)
{
- ENSURE_GUI_THREAD (bind (slot (*this, &StreamView::remove_region_view), r));
+ ENSURE_GUI_THREAD (bind (mem_fun (*this, &StreamView::remove_region_view), r));
AudioRegion* ar = dynamic_cast<AudioRegion*> (r);
void
StreamView::remove_rec_region (Region *r)
{
- ENSURE_GUI_THREAD(bind (slot (*this, &StreamView::remove_rec_region), r));
+ ENSURE_GUI_THREAD(bind (mem_fun (*this, &StreamView::remove_rec_region), r));
if (!Gtkmm2ext::UI::instance()->caller_is_gui_thread()) {
fatal << "region deleted from non-GUI thread!" << endmsg;
{
playlist_change_connection.disconnect();
playlist_changed (ds);
- playlist_change_connection = ds->PlaylistChanged.connect (bind (slot (*this, &StreamView::playlist_changed), ds));
+ playlist_change_connection = ds->PlaylistChanged.connect (bind (mem_fun (*this, &StreamView::playlist_changed), ds));
}
void
StreamView::playlist_modified ()
{
- ENSURE_GUI_THREAD (slot (*this, &StreamView::playlist_modified));
+ ENSURE_GUI_THREAD (mem_fun (*this, &StreamView::playlist_modified));
/* if the playlist is modified, make sure xfades are on top and all the regionviews are stacked
correctly.
void
StreamView::playlist_changed (DiskStream *ds)
{
- ENSURE_GUI_THREAD (bind (slot (*this, &StreamView::playlist_changed), ds));
+ ENSURE_GUI_THREAD (bind (mem_fun (*this, &StreamView::playlist_changed), ds));
/* disconnect from old playlist */
/* catch changes */
- playlist_connections.push_back (ds->playlist()->RegionAdded.connect (slot (*this, &StreamView::add_region_view)));
- playlist_connections.push_back (ds->playlist()->RegionRemoved.connect (slot (*this, &StreamView::remove_region_view)));
- playlist_connections.push_back (ds->playlist()->StateChanged.connect (slot (*this, &StreamView::playlist_state_changed)));
- playlist_connections.push_back (ds->playlist()->Modified.connect (slot (*this, &StreamView::playlist_modified)));
- playlist_connections.push_back (ds->playlist()->NewCrossfade.connect (slot (*this, &StreamView::add_crossfade)));
+ playlist_connections.push_back (ds->playlist()->RegionAdded.connect (mem_fun (*this, &StreamView::add_region_view)));
+ playlist_connections.push_back (ds->playlist()->RegionRemoved.connect (mem_fun (*this, &StreamView::remove_region_view)));
+ playlist_connections.push_back (ds->playlist()->StateChanged.connect (mem_fun (*this, &StreamView::playlist_state_changed)));
+ playlist_connections.push_back (ds->playlist()->Modified.connect (mem_fun (*this, &StreamView::playlist_modified)));
+ playlist_connections.push_back (ds->playlist()->NewCrossfade.connect (mem_fun (*this, &StreamView::add_crossfade)));
}
void
AudioRegionView* lview = 0;
AudioRegionView* rview = 0;
- ENSURE_GUI_THREAD (bind (slot (*this, &StreamView::add_crossfade), crossfade));
+ ENSURE_GUI_THREAD (bind (mem_fun (*this, &StreamView::add_crossfade), crossfade));
/* first see if we already have a CrossfadeView for this Crossfade */
region_color,
*lview, *rview);
- crossfade->Invalidated.connect (slot (*this, &StreamView::remove_crossfade));
+ crossfade->Invalidated.connect (mem_fun (*this, &StreamView::remove_crossfade));
crossfade_views.push_back (cv);
if (!crossfades_visible) {
void
StreamView::remove_crossfade (Crossfade *xfade)
{
- ENSURE_GUI_THREAD (bind (slot (*this, &StreamView::remove_crossfade), xfade));
+ ENSURE_GUI_THREAD (bind (mem_fun (*this, &StreamView::remove_crossfade), xfade));
for (list<CrossfadeView*>::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) {
if (&(*i)->crossfade == xfade) {
void
StreamView::playlist_state_changed (Change ignored)
{
- ENSURE_GUI_THREAD (bind (slot (*this, &StreamView::playlist_state_changed), ignored));
+ ENSURE_GUI_THREAD (bind (mem_fun (*this, &StreamView::playlist_state_changed), ignored));
redisplay_diskstream ();
}
if ((at = _trackview.audio_track()) != 0) {
DiskStream& ds = at->disk_stream();
/* XXX grrr: when will SigC++ allow me to bind references? */
- Gtkmm2ext::UI::instance()->call_slot (bind (slot (*this, &StreamView::display_diskstream), &ds));
+ Gtkmm2ext::UI::instance()->call_slot (bind (mem_fun (*this, &StreamView::display_diskstream), &ds));
} else {
- Gtkmm2ext::UI::instance()->call_slot (slot (*this, &StreamView::undisplay_diskstream));
+ Gtkmm2ext::UI::instance()->call_slot (mem_fun (*this, &StreamView::undisplay_diskstream));
}
}
void
StreamView::rec_enable_changed (void *src)
{
- Gtkmm2ext::UI::instance()->call_slot (slot (*this, &StreamView::setup_rec_box));
+ Gtkmm2ext::UI::instance()->call_slot (mem_fun (*this, &StreamView::setup_rec_box));
}
void
StreamView::sess_rec_enable_changed ()
{
- Gtkmm2ext::UI::instance()->call_slot (slot (*this, &StreamView::setup_rec_box));
+ Gtkmm2ext::UI::instance()->call_slot (mem_fun (*this, &StreamView::setup_rec_box));
}
void
StreamView::transport_changed()
{
- Gtkmm2ext::UI::instance()->call_slot (slot (*this, &StreamView::setup_rec_box));
+ Gtkmm2ext::UI::instance()->call_slot (mem_fun (*this, &StreamView::setup_rec_box));
}
void
Source *src = (Source *) _trackview.get_diskstream()->write_source (n);
if (src) {
sources.push_back (src);
- peak_ready_connections.push_back (src->PeakRangeReady.connect (bind (slot (*this, &StreamView::rec_peak_range_ready), src)));
+ peak_ready_connections.push_back (src->PeakRangeReady.connect (bind (mem_fun (*this, &StreamView::rec_peak_range_ready), src)));
}
}
region->set_position (_trackview.session().transport_frame(), this);
rec_regions.push_back (region);
/* catch it if it goes away */
- region->GoingAway.connect (slot (*this, &StreamView::remove_rec_region));
+ region->GoingAway.connect (mem_fun (*this, &StreamView::remove_rec_region));
/* we add the region later */
}
rec_rects.push_back (recbox);
screen_update_connection.disconnect();
- screen_update_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect (slot (*this, &StreamView::update_rec_box));
+ screen_update_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect (mem_fun (*this, &StreamView::update_rec_box));
rec_updating = true;
rec_active = true;
{
// this is called from the peak building thread
- ENSURE_GUI_THREAD(bind (slot (*this, &StreamView::rec_peak_range_ready), start, cnt, src));
+ ENSURE_GUI_THREAD(bind (mem_fun (*this, &StreamView::rec_peak_range_ready), start, cnt, src));
if (rec_peak_ready_map.size() == 0 || start+cnt > last_rec_peak_frame) {
last_rec_peak_frame = start + cnt;
*/
name_entry.set_name ("EditorTrackNameDisplay");
- name_entry.button_release_event.connect (slot (*this, &TimeAxisView::name_entry_button_release));
- name_entry.button_press_event.connect (slot (*this, &TimeAxisView::name_entry_button_press));
+ name_entry.button_release_event.connect (mem_fun (*this, &TimeAxisView::name_entry_button_release));
+ name_entry.button_press_event.connect (mem_fun (*this, &TimeAxisView::name_entry_button_press));
- name_entry.signal_focus_in_event().connect (slot (ARDOUR_UI::generic_focus_in_event));
- name_entry.signal_focus_out_event().connect (slot (ARDOUR_UI::generic_focus_out_event));
+ name_entry.signal_focus_in_event().connect (ptr_fun (ARDOUR_UI::generic_focus_in_event));
+ name_entry.signal_focus_out_event().connect (ptr_fun (ARDOUR_UI::generic_focus_out_event));
Gtkmm2ext::set_size_request_to_display_given_text (name_entry, N_("gTortnam"), 10, 10); // just represents a short name
controls_ebox.add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
controls_ebox.set_flags (Gtk::CAN_FOCUS);
- controls_ebox.button_release_event.connect (slot (*this, &TimeAxisView::controls_ebox_button_release));
+ controls_ebox.button_release_event.connect (mem_fun (*this, &TimeAxisView::controls_ebox_button_release));
controls_lhs_pad.set_name ("TimeAxisViewControlsPadding");
controls_hbox.pack_start (controls_lhs_pad,false,false);
size_menu->set_name ("ArdourContextMenu");
MenuList& items = size_menu->items();
- items.push_back (MenuElem (_("Largest"), bind (slot (*this, &TimeAxisView::set_height), Largest)));
- items.push_back (MenuElem (_("Large"), bind (slot (*this, &TimeAxisView::set_height), Large)));
- items.push_back (MenuElem (_("Larger"), bind (slot (*this, &TimeAxisView::set_height), Larger)));
- items.push_back (MenuElem (_("Normal"), bind (slot (*this, &TimeAxisView::set_height), Normal)));
- items.push_back (MenuElem (_("Smaller"), bind (slot (*this, &TimeAxisView::set_height), Smaller)));
- items.push_back (MenuElem (_("Small"), bind (slot (*this, &TimeAxisView::set_height), Small)));
+ items.push_back (MenuElem (_("Largest"), bind (mem_fun (*this, &TimeAxisView::set_height), Largest)));
+ items.push_back (MenuElem (_("Large"), bind (mem_fun (*this, &TimeAxisView::set_height), Large)));
+ items.push_back (MenuElem (_("Larger"), bind (mem_fun (*this, &TimeAxisView::set_height), Larger)));
+ items.push_back (MenuElem (_("Normal"), bind (mem_fun (*this, &TimeAxisView::set_height), Normal)));
+ items.push_back (MenuElem (_("Smaller"), bind (mem_fun (*this, &TimeAxisView::set_height), Smaller)));
+ items.push_back (MenuElem (_("Small"), bind (mem_fun (*this, &TimeAxisView::set_height), Small)));
}
void
defer to idle loop, otherwise we'll delete this object
while we're still inside this function ...
*/
- Gtk::Main::idle.connect(bind(slot(&TimeAxisViewItem::idle_remove_this_item), this, src));
+ Gtk::Main::idle.connect(bind(mem_fun(&TimeAxisViewItem::idle_remove_this_item), this, src));
}
/**
_color = unique_random_color() ;
_marked_for_display = true;
- name_entry.activate.connect(slot(*this, &VisualTimeAxis::name_entry_changed)) ;
- name_entry.focus_out_event.connect(slot(*this, &VisualTimeAxis::name_entry_focus_out_handler)) ;
- name_entry.button_press_event.connect(slot(*this, &VisualTimeAxis::name_entry_button_press_handler)) ;
- name_entry.button_release_event.connect(slot(*this, &VisualTimeAxis::name_entry_button_release_handler)) ;
- name_entry.key_release_event.connect(slot(*this, &VisualTimeAxis::name_entry_key_release_handler)) ;
+ name_entry.activate.connect(mem_fun(*this, &VisualTimeAxis::name_entry_changed)) ;
+ name_entry.focus_out_event.connect(mem_fun(*this, &VisualTimeAxis::name_entry_focus_out_handler)) ;
+ name_entry.button_press_event.connect(mem_fun(*this, &VisualTimeAxis::name_entry_button_press_handler)) ;
+ name_entry.button_release_event.connect(mem_fun(*this, &VisualTimeAxis::name_entry_button_release_handler)) ;
+ name_entry.key_release_event.connect(mem_fun(*this, &VisualTimeAxis::name_entry_key_release_handler)) ;
size_button.set_name("TrackSizeButton") ;
visual_button.set_name("TrackVisualButton") ;
hide_button.set_name("TrackRemoveButton") ;
hide_button.add(*(Gtk::manage(new Gtk::Image(small_x_xpm)))) ;
- size_button.button_release_event.connect (slot (*this, &VisualTimeAxis::size_click)) ;
- visual_button.signal_clicked().connect (slot (*this, &VisualTimeAxis::visual_click)) ;
- hide_button.signal_clicked().connect (slot (*this, &VisualTimeAxis::hide_click)) ;
+ size_button.button_release_event.connect (mem_fun (*this, &VisualTimeAxis::size_click)) ;
+ visual_button.signal_clicked().connect (mem_fun (*this, &VisualTimeAxis::visual_click)) ;
+ hide_button.signal_clicked().connect (mem_fun (*this, &VisualTimeAxis::hide_click)) ;
ARDOUR_UI::instance()->tooltips().set_tip(size_button,_("Display Height")) ;
ARDOUR_UI::instance()->tooltips().set_tip(visual_button, _("Visual options")) ;
ARDOUR_UI::instance()->tooltips().set_tip(hide_button, _("Hide this track")) ;
defer to idle loop, otherwise we'll delete this object
while we're still inside this function ...
*/
- Gtk::Main::idle.connect(bind(slot(&VisualTimeAxis::idle_remove_this_time_axis), this, src));
+ Gtk::Main::idle.connect(bind(mem_fun(&VisualTimeAxis::idle_remove_this_time_axis), this, src));
}
}
name_prompter->set_prompt (_("new name: ")) ;
ARDOUR_UI::instance()->allow_focus(true) ;
- name_prompter->done.connect (slot(*this, &VisualTimeAxis::finish_time_axis_rename)) ;
+ name_prompter->done.connect (mem_fun(*this, &VisualTimeAxis::finish_time_axis_rename)) ;
name_prompter->show_all() ;
}
/* forward configure events to plugin window */
- win.configure_event.connect (bind (slot (*this, &VSTPluginUI::configure_handler), socket.gobj()));
+ win.configure_event.connect (bind (mem_fun (*this, &VSTPluginUI::configure_handler), socket.gobj()));
/* XXX in GTK2, use add_id() instead of steal, although add_id()
assumes that the window's owner understands the XEmbed protocol.
projects / ardour.git / commitdiff