smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 23:05:04 +01:00
Code Issues Projects Releases Wiki Activity

continuing fixes to get this shibboleth to compile

Browse source 
git-svn-id: svn://localhost/trunk/ardour2@43 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2005-09-26 18:24:59 +00:00
parent 08d33fcb0d
commit 4b23361226
45 changed files with 511 additions and 555 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gtk2_ardour/ardour_ui.cc
View file

@ -1815,7 +1815,7 @@ ARDOUR_UI::build_session_selector ()
session_selector_window->set_name ("SessionSelectorWindow"); session_selector_window->set_name ("SessionSelectorWindow");
session_selector_window->set_size_request (200, 400); session_selector_window->set_size_request (200, 400);
session_selector_window->signal_delete_event.connect (bind (ptr_fun (just_hide_it), static_cast<Gtk::Window*>(session_selector_window))); session_selector_window->signal_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)); 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)); session_selector.tree_select_row.connect (mem_fun(*this, &ARDOUR_UI::session_selection));
} }
@ -1844,7 +1844,7 @@ ARDOUR_UI::open_session ()
open_session_selector = new Gtk::FileSelection(_("open session")); open_session_selector = new Gtk::FileSelection(_("open session"));
open_session_selector->get_ok_button()-.signal_clicked().connect (mem_fun(*this, &ARDOUR_UI::open_ok_clicked)); 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->get_cancel_button()-.signal_clicked().connect (bind (mem_fun(*this, &ARDOUR_UI::fs_cancel_clicked), open_session_selector));
open_session_selector->signal_delete_event.connect (bind (mem_fun(*this, &ARDOUR_UI::fs_delete_event), open_session_selector)); open_session_selector->signal_delete_event().connect (bind (mem_fun(*this, &ARDOUR_UI::fs_delete_event), open_session_selector));
} }
open_session_selector->show_all (); open_session_selector->show_all ();

54
gtk2_ardour/ardour_ui2.cc
View file

@ -231,7 +231,7 @@ ARDOUR_UI::setup_transport ()
ARDOUR_UI::instance()->tooltips().set_tip (speed_display_box, _("Current transport speed")); ARDOUR_UI::instance()->tooltips().set_tip (speed_display_box, _("Current transport speed"));
shuttle_box.set_flags (Gtk::CAN_FOCUS); shuttle_box.set_flags (Gtk::CAN_FOCUS);
shuttle_box.signal_set_events (shuttle_box.signal_get_events() | GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::BUTTON_PRESS_MASK|Gdk::POINTER_MOTION_MASK); shuttle_box.signal_set_event()s (shuttle_box.signal_get_event()s() | GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::BUTTON_PRESS_MASK|Gdk::POINTER_MOTION_MASK);
shuttle_box.set_size_request (100, 15); shuttle_box.set_size_request (100, 15);
shuttle_box.set_name ("TransportButton"); shuttle_box.set_name ("TransportButton");
@ -265,35 +265,35 @@ ARDOUR_UI::setup_transport ()
click_button.unset_flags (Gtk::CAN_FOCUS); click_button.unset_flags (Gtk::CAN_FOCUS);
follow_button.unset_flags (Gtk::CAN_FOCUS); follow_button.unset_flags (Gtk::CAN_FOCUS);
goto_start_button.signal_set_events (goto_start_button.signal_get_events() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK)); goto_start_button.signal_set_event()s (goto_start_button.signal_get_event()s() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK));
goto_end_button.signal_set_events (goto_end_button.signal_get_events() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK)); goto_end_button.signal_set_event()s (goto_end_button.signal_get_event()s() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK));
roll_button.signal_set_events (roll_button.signal_get_events() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK)); roll_button.signal_set_event()s (roll_button.signal_get_event()s() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK));
stop_button.signal_set_events (stop_button.signal_get_events() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK)); stop_button.signal_set_event()s (stop_button.signal_get_event()s() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK));
play_selection_button.signal_set_events (play_selection_button.signal_get_events() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK)); play_selection_button.signal_set_event()s (play_selection_button.signal_get_event()s() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK));
rec_button.signal_set_events (rec_button.signal_get_events() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK)); rec_button.signal_set_event()s (rec_button.signal_get_event()s() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK));
auto_loop_button.signal_set_events (auto_loop_button.signal_get_events() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK)); auto_loop_button.signal_set_event()s (auto_loop_button.signal_get_event()s() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK));
auto_return_button.signal_set_events (auto_return_button.signal_get_events() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK)); auto_return_button.signal_set_event()s (auto_return_button.signal_get_event()s() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK));
auto_play_button.signal_set_events (auto_play_button.signal_get_events() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK)); auto_play_button.signal_set_event()s (auto_play_button.signal_get_event()s() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK));
auto_input_button.signal_set_events (auto_input_button.signal_get_events() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK)); auto_input_button.signal_set_event()s (auto_input_button.signal_get_event()s() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK));
click_button.signal_set_events (click_button.signal_get_events() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK)); click_button.signal_set_event()s (click_button.signal_get_event()s() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK));
follow_button.signal_set_events (click_button.signal_get_events() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK)); follow_button.signal_set_event()s (click_button.signal_get_event()s() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK));
punch_in_button.signal_set_events (punch_in_button.signal_get_events() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK)); punch_in_button.signal_set_event()s (punch_in_button.signal_get_event()s() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK));
punch_out_button.signal_set_events (punch_out_button.signal_get_events() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK)); punch_out_button.signal_set_event()s (punch_out_button.signal_get_event()s() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK));
goto_start_button.signal_clicked().connect (mem_fun(*this,&ARDOUR_UI::transport_goto_start)); 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)); goto_end_button.signal_clicked().connect (mem_fun(*this,&ARDOUR_UI::transport_goto_end));
roll_button.signal_button_release_event.connect (mem_fun(*this,&ARDOUR_UI::mouse_transport_roll)); roll_button.signal_button_release_event().connect (mem_fun(*this,&ARDOUR_UI::mouse_transport_roll));
play_selection_button.signal_button_release_event.connect (mem_fun(*this,&ARDOUR_UI::mouse_transport_play_selection)); play_selection_button.signal_button_release_event().connect (mem_fun(*this,&ARDOUR_UI::mouse_transport_play_selection));
auto_loop_button.signal_button_release_event.connect (mem_fun(*this,&ARDOUR_UI::mouse_transport_loop)); auto_loop_button.signal_button_release_event().connect (mem_fun(*this,&ARDOUR_UI::mouse_transport_loop));
stop_button.signal_button_release_event.connect (mem_fun(*this,&ARDOUR_UI::mouse_transport_stop)); stop_button.signal_button_release_event().connect (mem_fun(*this,&ARDOUR_UI::mouse_transport_stop));
rec_button.signal_button_release_event.connect (mem_fun(*this,&ARDOUR_UI::mouse_transport_record)); rec_button.signal_button_release_event().connect (mem_fun(*this,&ARDOUR_UI::mouse_transport_record));
shuttle_box.signal_signal_button_press_event.connect (mem_fun(*this, &ARDOUR_UI::shuttle_box_button_press)); shuttle_box.signal_button_press_event().connect (mem_fun(*this, &ARDOUR_UI::shuttle_box_button_press));
shuttle_box.signal_signal_button_release_event.connect (mem_fun(*this, &ARDOUR_UI::shuttle_box_button_release)); shuttle_box.signal_button_release_event().connect (mem_fun(*this, &ARDOUR_UI::shuttle_box_button_release));
shuttle_box.signal_signal_motion_notify_event.connect (mem_fun(*this, &ARDOUR_UI::shuttle_box_motion)); shuttle_box.signal_motion_notify_event().connect (mem_fun(*this, &ARDOUR_UI::shuttle_box_motion));
shuttle_box.signal_signal_expose_event.connect (mem_fun(*this, &ARDOUR_UI::shuttle_box_expose)); shuttle_box.signal_expose_event().connect (mem_fun(*this, &ARDOUR_UI::shuttle_box_expose));
/* clocks, etc. */ /* clocks, etc. */
@ -323,11 +323,11 @@ ARDOUR_UI::setup_transport ()
punch_out_button.toggled.connect (mem_fun(*this,&ARDOUR_UI::toggle_punch_out)); punch_out_button.toggled.connect (mem_fun(*this,&ARDOUR_UI::toggle_punch_out));
preroll_button.unset_flags (Gtk::CAN_FOCUS); preroll_button.unset_flags (Gtk::CAN_FOCUS);
preroll_button.signal_set_events (preroll_button.signal_get_events() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK)); preroll_button.signal_set_event()s (preroll_button.signal_get_event()s() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK));
preroll_button.set_name ("TransportButton"); preroll_button.set_name ("TransportButton");
postroll_button.unset_flags (Gtk::CAN_FOCUS); postroll_button.unset_flags (Gtk::CAN_FOCUS);
postroll_button.signal_set_events (postroll_button.signal_get_events() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK)); postroll_button.signal_set_event()s (postroll_button.signal_get_event()s() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK));
postroll_button.set_name ("TransportButton"); postroll_button.set_name ("TransportButton");
preroll_clock.set_mode (AudioClock::MinSec); preroll_clock.set_mode (AudioClock::MinSec);
@ -430,7 +430,7 @@ ARDOUR_UI::setup_clock ()
big_clock_window->add (big_clock); big_clock_window->add (big_clock);
big_clock_window->set_title (_("ardour: clock")); big_clock_window->set_title (_("ardour: clock"));
big_clock_window->signal_delete_event.connect (bind (ptr_fun (just_hide_it), static_cast<Gtk::Window*>(big_clock_window))); big_clock_window->signal_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->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->size_allocate.connect (mem_fun(*this, &ARDOUR_UI::big_clock_size_event));

183
gtk2_ardour/audio_clock.cc
View file

@ -25,6 +25,7 @@
#include <ardour/ardour.h> #include <ardour/ardour.h>
#include <ardour/session.h> #include <ardour/session.h>
#include <ardour/tempo.h> #include <ardour/tempo.h>
#include <sigc++/bind.h>
#include "ardour_ui.h" #include "ardour_ui.h"
#include "audio_clock.h" #include "audio_clock.h"
@ -185,8 +186,8 @@ AudioClock::AudioClock (const string& name, bool allow_edit, bool duration, bool
stays disabled. stays disabled.
*/ */
clock_base.signal_add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); clock_base.add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
clock_base.signal_button_release_event.connect (bind (mem_fun(*this, &AudioClock::field_button_release_event), SMPTE_Hours)); clock_base.signal_button_release_event().connect (bind (mem_fun (*this, &AudioClock::field_button_release_event), SMPTE_Hours));
if (editable) { if (editable) {
setup_events (); setup_events ();
@ -200,17 +201,17 @@ AudioClock::setup_events ()
{ {
clock_base.set_flags (Gtk::CAN_FOCUS); clock_base.set_flags (Gtk::CAN_FOCUS);
hours_ebox.signal_add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK|Gdk::FOCUS_CHANGE_MASK|Gdk::POINTER_MOTION_MASK); hours_ebox.add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK|Gdk::FOCUS_CHANGE_MASK|Gdk::POINTER_MOTION_MASK);
minutes_ebox.signal_add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK|Gdk::FOCUS_CHANGE_MASK|Gdk::POINTER_MOTION_MASK); minutes_ebox.add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK|Gdk::FOCUS_CHANGE_MASK|Gdk::POINTER_MOTION_MASK);
seconds_ebox.signal_add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK|Gdk::FOCUS_CHANGE_MASK|Gdk::POINTER_MOTION_MASK); seconds_ebox.add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK|Gdk::FOCUS_CHANGE_MASK|Gdk::POINTER_MOTION_MASK);
frames_ebox.signal_add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK|Gdk::FOCUS_CHANGE_MASK|Gdk::POINTER_MOTION_MASK); frames_ebox.add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK|Gdk::FOCUS_CHANGE_MASK|Gdk::POINTER_MOTION_MASK);
bars_ebox.signal_add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK|Gdk::FOCUS_CHANGE_MASK|Gdk::POINTER_MOTION_MASK); bars_ebox.add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK|Gdk::FOCUS_CHANGE_MASK|Gdk::POINTER_MOTION_MASK);
beats_ebox.signal_add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK|Gdk::FOCUS_CHANGE_MASK|Gdk::POINTER_MOTION_MASK); beats_ebox.add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK|Gdk::FOCUS_CHANGE_MASK|Gdk::POINTER_MOTION_MASK);
ticks_ebox.signal_add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK|Gdk::FOCUS_CHANGE_MASK|Gdk::POINTER_MOTION_MASK); ticks_ebox.add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK|Gdk::FOCUS_CHANGE_MASK|Gdk::POINTER_MOTION_MASK);
ms_hours_ebox.signal_add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK|Gdk::FOCUS_CHANGE_MASK|Gdk::POINTER_MOTION_MASK); ms_hours_ebox.add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK|Gdk::FOCUS_CHANGE_MASK|Gdk::POINTER_MOTION_MASK);
ms_minutes_ebox.signal_add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK|Gdk::FOCUS_CHANGE_MASK|Gdk::POINTER_MOTION_MASK); ms_minutes_ebox.add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK|Gdk::FOCUS_CHANGE_MASK|Gdk::POINTER_MOTION_MASK);
ms_seconds_ebox.signal_add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK|Gdk::FOCUS_CHANGE_MASK|Gdk::POINTER_MOTION_MASK); ms_seconds_ebox.add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK|Gdk::FOCUS_CHANGE_MASK|Gdk::POINTER_MOTION_MASK);
audio_frames_ebox.signal_add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK|Gdk::FOCUS_CHANGE_MASK|Gdk::POINTER_MOTION_MASK); audio_frames_ebox.add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK|Gdk::FOCUS_CHANGE_MASK|Gdk::POINTER_MOTION_MASK);
hours_ebox.set_flags (Gtk::CAN_FOCUS); hours_ebox.set_flags (Gtk::CAN_FOCUS);
minutes_ebox.set_flags (Gtk::CAN_FOCUS); minutes_ebox.set_flags (Gtk::CAN_FOCUS);
@ -224,77 +225,77 @@ AudioClock::setup_events ()
ms_minutes_ebox.set_flags (Gtk::CAN_FOCUS); ms_minutes_ebox.set_flags (Gtk::CAN_FOCUS);
ms_seconds_ebox.set_flags (Gtk::CAN_FOCUS); ms_seconds_ebox.set_flags (Gtk::CAN_FOCUS);
hours_ebox.signal_motion_notify_event.connect (bind (mem_fun(*this, &AudioClock::field_motion_notify_event), SMPTE_Hours)); hours_ebox.signal_motion_notify_event().connect (bind (mem_fun(*this, &AudioClock::field_motion_notify_event), SMPTE_Hours));
minutes_ebox.signal_motion_notify_event.connect (bind (mem_fun(*this, &AudioClock::field_motion_notify_event), SMPTE_Minutes)); minutes_ebox.signal_motion_notify_event().connect (bind (mem_fun(*this, &AudioClock::field_motion_notify_event), SMPTE_Minutes));
seconds_ebox.signal_motion_notify_event.connect (bind (mem_fun(*this, &AudioClock::field_motion_notify_event), SMPTE_Seconds)); seconds_ebox.signal_motion_notify_event().connect (bind (mem_fun(*this, &AudioClock::field_motion_notify_event), SMPTE_Seconds));
frames_ebox.signal_motion_notify_event.connect (bind (mem_fun(*this, &AudioClock::field_motion_notify_event), SMPTE_Frames)); frames_ebox.signal_motion_notify_event().connect (bind (mem_fun(*this, &AudioClock::field_motion_notify_event), SMPTE_Frames));
audio_frames_ebox.signal_motion_notify_event.connect (bind (mem_fun(*this, &AudioClock::field_motion_notify_event), AudioFrames)); audio_frames_ebox.signal_motion_notify_event().connect (bind (mem_fun(*this, &AudioClock::field_motion_notify_event), AudioFrames));
bars_ebox.signal_motion_notify_event.connect (bind (mem_fun(*this, &AudioClock::field_motion_notify_event), Bars)); bars_ebox.signal_motion_notify_event().connect (bind (mem_fun(*this, &AudioClock::field_motion_notify_event), Bars));
beats_ebox.signal_motion_notify_event.connect (bind (mem_fun(*this, &AudioClock::field_motion_notify_event), Beats)); beats_ebox.signal_motion_notify_event().connect (bind (mem_fun(*this, &AudioClock::field_motion_notify_event), Beats));
ticks_ebox.signal_motion_notify_event.connect (bind (mem_fun(*this, &AudioClock::field_motion_notify_event), Ticks)); ticks_ebox.signal_motion_notify_event().connect (bind (mem_fun(*this, &AudioClock::field_motion_notify_event), Ticks));
ms_hours_ebox.signal_motion_notify_event.connect (bind (mem_fun(*this, &AudioClock::field_motion_notify_event), MS_Hours)); ms_hours_ebox.signal_motion_notify_event().connect (bind (mem_fun(*this, &AudioClock::field_motion_notify_event), MS_Hours));
ms_minutes_ebox.signal_motion_notify_event.connect (bind (mem_fun(*this, &AudioClock::field_motion_notify_event), MS_Minutes)); ms_minutes_ebox.signal_motion_notify_event().connect (bind (mem_fun(*this, &AudioClock::field_motion_notify_event), MS_Minutes));
ms_seconds_ebox.signal_motion_notify_event.connect (bind (mem_fun(*this, &AudioClock::field_motion_notify_event), MS_Seconds)); ms_seconds_ebox.signal_motion_notify_event().connect (bind (mem_fun(*this, &AudioClock::field_motion_notify_event), MS_Seconds));
hours_ebox.signal_button_press_event.connect (bind (mem_fun(*this, &AudioClock::field_button_press_event), SMPTE_Hours)); hours_ebox.signal_button_press_event().connect (bind (mem_fun(*this, &AudioClock::field_button_press_event), SMPTE_Hours));
minutes_ebox.signal_button_press_event.connect (bind (mem_fun(*this, &AudioClock::field_button_press_event), SMPTE_Minutes)); minutes_ebox.signal_button_press_event().connect (bind (mem_fun(*this, &AudioClock::field_button_press_event), SMPTE_Minutes));
seconds_ebox.signal_button_press_event.connect (bind (mem_fun(*this, &AudioClock::field_button_press_event), SMPTE_Seconds)); seconds_ebox.signal_button_press_event().connect (bind (mem_fun(*this, &AudioClock::field_button_press_event), SMPTE_Seconds));
frames_ebox.signal_button_press_event.connect (bind (mem_fun(*this, &AudioClock::field_button_press_event), SMPTE_Frames)); frames_ebox.signal_button_press_event().connect (bind (mem_fun(*this, &AudioClock::field_button_press_event), SMPTE_Frames));
audio_frames_ebox.signal_button_press_event.connect (bind (mem_fun(*this, &AudioClock::field_button_press_event), AudioFrames)); audio_frames_ebox.signal_button_press_event().connect (bind (mem_fun(*this, &AudioClock::field_button_press_event), AudioFrames));
bars_ebox.signal_button_press_event.connect (bind (mem_fun(*this, &AudioClock::field_button_press_event), Bars)); bars_ebox.signal_button_press_event().connect (bind (mem_fun(*this, &AudioClock::field_button_press_event), Bars));
beats_ebox.signal_button_press_event.connect (bind (mem_fun(*this, &AudioClock::field_button_press_event), Beats)); beats_ebox.signal_button_press_event().connect (bind (mem_fun(*this, &AudioClock::field_button_press_event), Beats));
ticks_ebox.signal_button_press_event.connect (bind (mem_fun(*this, &AudioClock::field_button_press_event), Ticks)); ticks_ebox.signal_button_press_event().connect (bind (mem_fun(*this, &AudioClock::field_button_press_event), Ticks));
ms_hours_ebox.signal_button_press_event.connect (bind (mem_fun(*this, &AudioClock::field_button_press_event), MS_Hours)); ms_hours_ebox.signal_button_press_event().connect (bind (mem_fun(*this, &AudioClock::field_button_press_event), MS_Hours));
ms_minutes_ebox.signal_button_press_event.connect (bind (mem_fun(*this, &AudioClock::field_button_press_event), MS_Minutes)); ms_minutes_ebox.signal_button_press_event().connect (bind (mem_fun(*this, &AudioClock::field_button_press_event), MS_Minutes));
ms_seconds_ebox.signal_button_press_event.connect (bind (mem_fun(*this, &AudioClock::field_button_press_event), MS_Seconds)); ms_seconds_ebox.signal_button_press_event().connect (bind (mem_fun(*this, &AudioClock::field_button_press_event), MS_Seconds));
hours_ebox.signal_button_release_event.connect (bind (mem_fun(*this, &AudioClock::field_button_release_event), SMPTE_Hours)); hours_ebox.signal_button_release_event().connect (bind (mem_fun(*this, &AudioClock::field_button_release_event), SMPTE_Hours));
minutes_ebox.signal_button_release_event.connect (bind (mem_fun(*this, &AudioClock::field_button_release_event), SMPTE_Minutes)); minutes_ebox.signal_button_release_event().connect (bind (mem_fun(*this, &AudioClock::field_button_release_event), SMPTE_Minutes));
seconds_ebox.signal_button_release_event.connect (bind (mem_fun(*this, &AudioClock::field_button_release_event), SMPTE_Seconds)); seconds_ebox.signal_button_release_event().connect (bind (mem_fun(*this, &AudioClock::field_button_release_event), SMPTE_Seconds));
frames_ebox.signal_button_release_event.connect (bind (mem_fun(*this, &AudioClock::field_button_release_event), SMPTE_Frames)); frames_ebox.signal_button_release_event().connect (bind (mem_fun(*this, &AudioClock::field_button_release_event), SMPTE_Frames));
audio_frames_ebox.signal_button_release_event.connect (bind (mem_fun(*this, &AudioClock::field_button_release_event), AudioFrames)); audio_frames_ebox.signal_button_release_event().connect (bind (mem_fun(*this, &AudioClock::field_button_release_event), AudioFrames));
bars_ebox.signal_button_release_event.connect (bind (mem_fun(*this, &AudioClock::field_button_release_event), Bars)); bars_ebox.signal_button_release_event().connect (bind (mem_fun(*this, &AudioClock::field_button_release_event), Bars));
beats_ebox.signal_button_release_event.connect (bind (mem_fun(*this, &AudioClock::field_button_release_event), Beats)); beats_ebox.signal_button_release_event().connect (bind (mem_fun(*this, &AudioClock::field_button_release_event), Beats));
ticks_ebox.signal_button_release_event.connect (bind (mem_fun(*this, &AudioClock::field_button_release_event), Ticks)); ticks_ebox.signal_button_release_event().connect (bind (mem_fun(*this, &AudioClock::field_button_release_event), Ticks));
ms_hours_ebox.signal_button_release_event.connect (bind (mem_fun(*this, &AudioClock::field_button_release_event), MS_Hours)); ms_hours_ebox.signal_button_release_event().connect (bind (mem_fun(*this, &AudioClock::field_button_release_event), MS_Hours));
ms_minutes_ebox.signal_button_release_event.connect (bind (mem_fun(*this, &AudioClock::field_button_release_event), MS_Minutes)); ms_minutes_ebox.signal_button_release_event().connect (bind (mem_fun(*this, &AudioClock::field_button_release_event), MS_Minutes));
ms_seconds_ebox.signal_button_release_event.connect (bind (mem_fun(*this, &AudioClock::field_button_release_event), MS_Seconds)); ms_seconds_ebox.signal_button_release_event().connect (bind (mem_fun(*this, &AudioClock::field_button_release_event), MS_Seconds));
hours_ebox.signal_key_release_event.connect (bind (mem_fun(*this, &AudioClock::field_key_release_event), SMPTE_Hours)); hours_ebox.signal_key_release_event().connect (bind (mem_fun(*this, &AudioClock::field_key_release_event), SMPTE_Hours));
minutes_ebox.signal_key_release_event.connect (bind (mem_fun(*this, &AudioClock::field_key_release_event), SMPTE_Minutes)); minutes_ebox.signal_key_release_event().connect (bind (mem_fun(*this, &AudioClock::field_key_release_event), SMPTE_Minutes));
seconds_ebox.signal_key_release_event.connect (bind (mem_fun(*this, &AudioClock::field_key_release_event), SMPTE_Seconds)); seconds_ebox.signal_key_release_event().connect (bind (mem_fun(*this, &AudioClock::field_key_release_event), SMPTE_Seconds));
frames_ebox.signal_key_release_event.connect (bind (mem_fun(*this, &AudioClock::field_key_release_event), SMPTE_Frames)); frames_ebox.signal_key_release_event().connect (bind (mem_fun(*this, &AudioClock::field_key_release_event), SMPTE_Frames));
audio_frames_ebox.signal_key_release_event.connect (bind (mem_fun(*this, &AudioClock::field_key_release_event), AudioFrames)); audio_frames_ebox.signal_key_release_event().connect (bind (mem_fun(*this, &AudioClock::field_key_release_event), AudioFrames));
bars_ebox.signal_key_release_event.connect (bind (mem_fun(*this, &AudioClock::field_key_release_event), Bars)); bars_ebox.signal_key_release_event().connect (bind (mem_fun(*this, &AudioClock::field_key_release_event), Bars));
beats_ebox.signal_key_release_event.connect (bind (mem_fun(*this, &AudioClock::field_key_release_event), Beats)); beats_ebox.signal_key_release_event().connect (bind (mem_fun(*this, &AudioClock::field_key_release_event), Beats));
ticks_ebox.signal_key_release_event.connect (bind (mem_fun(*this, &AudioClock::field_key_release_event), Ticks)); ticks_ebox.signal_key_release_event().connect (bind (mem_fun(*this, &AudioClock::field_key_release_event), Ticks));
ms_hours_ebox.signal_key_release_event.connect (bind (mem_fun(*this, &AudioClock::field_key_release_event), MS_Hours)); ms_hours_ebox.signal_key_release_event().connect (bind (mem_fun(*this, &AudioClock::field_key_release_event), MS_Hours));
ms_minutes_ebox.signal_key_release_event.connect (bind (mem_fun(*this, &AudioClock::field_key_release_event), MS_Minutes)); ms_minutes_ebox.signal_key_release_event().connect (bind (mem_fun(*this, &AudioClock::field_key_release_event), MS_Minutes));
ms_seconds_ebox.signal_key_release_event.connect (bind (mem_fun(*this, &AudioClock::field_key_release_event), MS_Seconds)); ms_seconds_ebox.signal_key_release_event().connect (bind (mem_fun(*this, &AudioClock::field_key_release_event), MS_Seconds));
hours_ebox.signal_signal_focus_in_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_in_event), SMPTE_Hours)); hours_ebox.signal_focus_in_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_in_event), SMPTE_Hours));
minutes_ebox.signal_signal_focus_in_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_in_event), SMPTE_Minutes)); minutes_ebox.signal_focus_in_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_in_event), SMPTE_Minutes));
seconds_ebox.signal_signal_focus_in_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_in_event), SMPTE_Seconds)); seconds_ebox.signal_focus_in_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_in_event), SMPTE_Seconds));
frames_ebox.signal_signal_focus_in_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_in_event), SMPTE_Frames)); frames_ebox.signal_focus_in_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_in_event), SMPTE_Frames));
audio_frames_ebox.signal_signal_focus_in_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_in_event), AudioFrames)); audio_frames_ebox.signal_focus_in_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_in_event), AudioFrames));
bars_ebox.signal_signal_focus_in_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_in_event), Bars)); bars_ebox.signal_focus_in_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_in_event), Bars));
beats_ebox.signal_signal_focus_in_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_in_event), Beats)); beats_ebox.signal_focus_in_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_in_event), Beats));
ticks_ebox.signal_signal_focus_in_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_in_event), Ticks)); ticks_ebox.signal_focus_in_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_in_event), Ticks));
ms_hours_ebox.signal_signal_focus_in_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_in_event), MS_Hours)); ms_hours_ebox.signal_focus_in_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_in_event), MS_Hours));
ms_minutes_ebox.signal_signal_focus_in_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_in_event), MS_Minutes)); ms_minutes_ebox.signal_focus_in_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_in_event), MS_Minutes));
ms_seconds_ebox.signal_signal_focus_in_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_in_event), MS_Seconds)); ms_seconds_ebox.signal_focus_in_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_in_event), MS_Seconds));
hours_ebox.signal_signal_focus_out_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_out_event), SMPTE_Hours)); hours_ebox.signal_focus_out_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_out_event), SMPTE_Hours));
minutes_ebox.signal_signal_focus_out_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_out_event), SMPTE_Minutes)); minutes_ebox.signal_focus_out_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_out_event), SMPTE_Minutes));
seconds_ebox.signal_signal_focus_out_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_out_event), SMPTE_Seconds)); seconds_ebox.signal_focus_out_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_out_event), SMPTE_Seconds));
frames_ebox.signal_signal_focus_out_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_out_event), SMPTE_Frames)); frames_ebox.signal_focus_out_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_out_event), SMPTE_Frames));
audio_frames_ebox.signal_signal_focus_out_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_out_event), AudioFrames)); audio_frames_ebox.signal_focus_out_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_out_event), AudioFrames));
bars_ebox.signal_signal_focus_out_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_out_event), Bars)); bars_ebox.signal_focus_out_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_out_event), Bars));
beats_ebox.signal_signal_focus_out_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_out_event), Beats)); beats_ebox.signal_focus_out_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_out_event), Beats));
ticks_ebox.signal_signal_focus_out_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_out_event), Ticks)); ticks_ebox.signal_focus_out_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_out_event), Ticks));
ms_hours_ebox.signal_signal_focus_out_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_out_event), MS_Hours)); ms_hours_ebox.signal_focus_out_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_out_event), MS_Hours));
ms_minutes_ebox.signal_signal_focus_out_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_out_event), MS_Minutes)); ms_minutes_ebox.signal_focus_out_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_out_event), MS_Minutes));
ms_seconds_ebox.signal_signal_focus_out_event().connect (bind (mem_fun(*this, &AudioClock::field_focus_out_event), MS_Seconds)); 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 (hours_label, "-88", 0, 2);
Gtkmm2ext::set_size_request_to_display_given_text (minutes_label, "88", 0, 2); Gtkmm2ext::set_size_request_to_display_given_text (minutes_label, "88", 0, 2);
@ -309,7 +310,7 @@ AudioClock::setup_events ()
} }
void void
AudioClock:on_realize () AudioClock::on_realize ()
{ {
HBox::on_realize (); HBox::on_realize ();
} }
@ -702,49 +703,49 @@ AudioClock::field_focus_in_event (GdkEventFocus *ev, Field field)
switch (field) { switch (field) {
case SMPTE_Hours: case SMPTE_Hours:
hours_ebox.set_flags (Gtk::HAS_FOCUS); hours_ebox.set_flags (Gtk::HAS_FOCUS);
hours_ebox.set_state (GTK_STATE_ACTIVE); hours_ebox.set_state (Gtk::STATE_ACTIVE);
break; break;
case SMPTE_Minutes: case SMPTE_Minutes:
minutes_ebox.set_flags (Gtk::HAS_FOCUS); minutes_ebox.set_flags (Gtk::HAS_FOCUS);
minutes_ebox.set_state (GTK_STATE_ACTIVE); minutes_ebox.set_state (Gtk::STATE_ACTIVE);
break; break;
case SMPTE_Seconds: case SMPTE_Seconds:
seconds_ebox.set_flags (Gtk::HAS_FOCUS); seconds_ebox.set_flags (Gtk::HAS_FOCUS);
seconds_ebox.set_state (GTK_STATE_ACTIVE); seconds_ebox.set_state (Gtk::STATE_ACTIVE);
break; break;
case SMPTE_Frames: case SMPTE_Frames:
frames_ebox.set_flags (Gtk::HAS_FOCUS); frames_ebox.set_flags (Gtk::HAS_FOCUS);
frames_ebox.set_state (GTK_STATE_ACTIVE); frames_ebox.set_state (Gtk::STATE_ACTIVE);
break; break;
case AudioFrames: case AudioFrames:
audio_frames_ebox.set_flags (Gtk::HAS_FOCUS); audio_frames_ebox.set_flags (Gtk::HAS_FOCUS);
audio_frames_ebox.set_state (GTK_STATE_ACTIVE); audio_frames_ebox.set_state (Gtk::STATE_ACTIVE);
break; break;
case MS_Hours: case MS_Hours:
ms_hours_ebox.set_flags (Gtk::HAS_FOCUS); ms_hours_ebox.set_flags (Gtk::HAS_FOCUS);
ms_hours_ebox.set_state (GTK_STATE_ACTIVE); ms_hours_ebox.set_state (Gtk::STATE_ACTIVE);
break; break;
case MS_Minutes: case MS_Minutes:
ms_minutes_ebox.set_flags (Gtk::HAS_FOCUS); ms_minutes_ebox.set_flags (Gtk::HAS_FOCUS);
ms_minutes_ebox.set_state (GTK_STATE_ACTIVE); ms_minutes_ebox.set_state (Gtk::STATE_ACTIVE);
break; break;
case MS_Seconds: case MS_Seconds:
ms_seconds_ebox.set_flags (Gtk::HAS_FOCUS); ms_seconds_ebox.set_flags (Gtk::HAS_FOCUS);
ms_seconds_ebox.set_state (GTK_STATE_ACTIVE); ms_seconds_ebox.set_state (Gtk::STATE_ACTIVE);
break; break;
case Bars: case Bars:
bars_ebox.set_flags (Gtk::HAS_FOCUS); bars_ebox.set_flags (Gtk::HAS_FOCUS);
bars_ebox.set_state (GTK_STATE_ACTIVE); bars_ebox.set_state (Gtk::STATE_ACTIVE);
break; break;
case Beats: case Beats:
beats_ebox.set_flags (Gtk::HAS_FOCUS); beats_ebox.set_flags (Gtk::HAS_FOCUS);
beats_ebox.set_state (GTK_STATE_ACTIVE); beats_ebox.set_state (Gtk::STATE_ACTIVE);
break; break;
case Ticks: case Ticks:
ticks_ebox.set_flags (Gtk::HAS_FOCUS); ticks_ebox.set_flags (Gtk::HAS_FOCUS);
ticks_ebox.set_state (GTK_STATE_ACTIVE); ticks_ebox.set_state (Gtk::STATE_ACTIVE);
break; break;
} }

6
gtk2_ardour/audio_clock.h
View file

@ -21,7 +21,11 @@
#ifndef __audio_clock_h__ #ifndef __audio_clock_h__
#define __audio_clock_h__ #define __audio_clock_h__
#include <gtkmm.h> #include <gtkmm/box.h>
#include <gtkmm/menu.h>
#include <gtkmm/eventbox.h>
#include <gtkmm/label.h>
#include <gtkmm/frame.h>
#include <ardour/ardour.h> #include <ardour/ardour.h>
namespace ARDOUR { namespace ARDOUR {

22
gtk2_ardour/audio_time_axis.cc
View file

@ -156,23 +156,23 @@ AudioTimeAxisView::AudioTimeAxisView (PublicEditor& ed, Session& sess, Route& rt
_route.panner().Changed.connect (mem_fun(*this, &AudioTimeAxisView::update_pans)); _route.panner().Changed.connect (mem_fun(*this, &AudioTimeAxisView::update_pans));
solo_button->signal_signal_button_press_event.connect (mem_fun(*this, &RouteUI::solo_press)); solo_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::solo_press));
solo_button->signal_signal_button_release_event.connect (mem_fun(*this, &RouteUI::solo_release)); solo_button->signal_button_release_event().connect (mem_fun(*this, &RouteUI::solo_release));
mute_button->signal_signal_button_press_event.connect (mem_fun(*this, &RouteUI::mute_press)); mute_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::mute_press));
mute_button->signal_signal_button_release_event.connect (mem_fun(*this, &RouteUI::mute_release)); mute_button->signal_button_release_event().connect (mem_fun(*this, &RouteUI::mute_release));
rec_enable_button->signal_signal_button_press_event.connect (mem_fun(*this, &RouteUI::rec_enable_press)); rec_enable_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::rec_enable_press));
edit_group_button.signal_button_release_event.connect (mem_fun(*this, &AudioTimeAxisView::edit_click)); edit_group_button.signal_button_release_event().connect (mem_fun(*this, &AudioTimeAxisView::edit_click));
playlist_button.signal_clicked().connect (mem_fun(*this, &AudioTimeAxisView::playlist_click)); playlist_button.signal_clicked().connect (mem_fun(*this, &AudioTimeAxisView::playlist_click));
automation_button.signal_clicked().connect (mem_fun(*this, &AudioTimeAxisView::automation_click)); automation_button.signal_clicked().connect (mem_fun(*this, &AudioTimeAxisView::automation_click));
size_button.signal_button_release_event.connect (mem_fun(*this, &AudioTimeAxisView::size_click)); size_button.signal_button_release_event().connect (mem_fun(*this, &AudioTimeAxisView::size_click));
visual_button.signal_clicked().connect (mem_fun(*this, &AudioTimeAxisView::visual_click)); visual_button.signal_clicked().connect (mem_fun(*this, &AudioTimeAxisView::visual_click));
hide_button.signal_clicked().connect (mem_fun(*this, &AudioTimeAxisView::hide_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.activate.connect (mem_fun(*this, &AudioTimeAxisView::name_entry_activated));
name_entry.signal_signal_focus_out_event().connect (mem_fun(*this, &AudioTimeAxisView::name_entry_focus_out_handler)); name_entry.signal_focus_out_event()().connect (mem_fun(*this, &AudioTimeAxisView::name_entry_focus_out_handler));
name_entry.signal_button_press_event.connect (mem_fun(*this, &AudioTimeAxisView::name_entry_button_press_handler)); name_entry.signal_button_press_event().connect (mem_fun(*this, &AudioTimeAxisView::name_entry_button_press_handler));
name_entry.signal_button_release_event.connect (mem_fun(*this, &AudioTimeAxisView::name_entry_button_release_handler)); name_entry.signal_button_release_event().connect (mem_fun(*this, &AudioTimeAxisView::name_entry_button_release_handler));
name_entry.signal_key_release_event.connect (mem_fun(*this, &AudioTimeAxisView::name_entry_key_release_handler)); name_entry.signal_key_release_event().connect (mem_fun(*this, &AudioTimeAxisView::name_entry_key_release_handler));
if (is_audio_track()) { 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 (*rec_enable_button, 6, 7, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);

4
gtk2_ardour/axis_view.h
View file

@ -42,7 +42,7 @@ class AxisView : public sigc::trackable
* *
* @return the current Track Color * @return the current Track Color
*/ */
Gdk_Color color() const { return _color; } Gdk::Color color() const { return _color; }
ARDOUR::Session& session() const { return _session; } ARDOUR::Session& session() const { return _session; }
@ -81,7 +81,7 @@ class AxisView : public sigc::trackable
ARDOUR::Session& _session; ARDOUR::Session& _session;
Gdk_Color _color; Gdk::Color _color;
static list<GdkColor> used_colors; static list<GdkColor> used_colors;

2
gtk2_ardour/connection_editor.cc
View file

@ -546,7 +546,7 @@ ConnectionEditor::display_connection_state (bool for_input)
} }
clist->columns_autosize (); clist->columns_autosize ();
clist->signal_button_release_event.connect (bind (mem_fun(*this, &ConnectionEditor::port_button_event), clist)); clist->signal_button_release_event().connect (bind (mem_fun(*this, &ConnectionEditor::port_button_event), clist));
} }
port_box.show_all (); port_box.show_all ();

6
gtk2_ardour/crossfade_edit.cc
View file

@ -419,7 +419,7 @@ gint
CrossfadeEditor::_canvas_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) CrossfadeEditor::_canvas_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data)
{ {
CrossfadeEditor* ed = static_cast<CrossfadeEditor*> (data); CrossfadeEditor* ed = static_cast<CrossfadeEditor*> (data);
return ed->signal_canvas_event (item, event); return ed->signal_canvas_event() (item, event);
} }
gint gint
@ -626,7 +626,7 @@ gint
CrossfadeEditor::_point_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) CrossfadeEditor::_point_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data)
{ {
CrossfadeEditor* ed = static_cast<CrossfadeEditor*> (data); CrossfadeEditor* ed = static_cast<CrossfadeEditor*> (data);
return ed->signal_point_event (item, event); return ed->signal_point_event() (item, event);
} }
gint gint
@ -681,7 +681,7 @@ gint
CrossfadeEditor::_curve_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) CrossfadeEditor::_curve_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data)
{ {
CrossfadeEditor* ed = static_cast<CrossfadeEditor*> (data); CrossfadeEditor* ed = static_cast<CrossfadeEditor*> (data);
return ed->signal_curve_event (item, event); return ed->signal_curve_event() (item, event);
} }
gint gint

68
gtk2_ardour/editor.cc
View file

@ -387,8 +387,8 @@ Editor::Editor (AudioEngine& eng)
edit_vscrollbar.set_adjustment(track_canvas_scroller.get_vadjustment()); edit_vscrollbar.set_adjustment(track_canvas_scroller.get_vadjustment());
edit_hscrollbar.set_adjustment(track_canvas_scroller.get_hadjustment()); edit_hscrollbar.set_adjustment(track_canvas_scroller.get_hadjustment());
edit_hscrollbar.signal_button_press_event.connect (mem_fun(*this, &Editor::hscroll_slider_button_press)); edit_hscrollbar.signal_button_press_event().connect (mem_fun(*this, &Editor::hscroll_slider_button_press));
edit_hscrollbar.signal_button_release_event.connect (mem_fun(*this, &Editor::hscroll_slider_button_release)); edit_hscrollbar.signal_button_release_event().connect (mem_fun(*this, &Editor::hscroll_slider_button_release));
edit_hscrollbar.size_allocate.connect (mem_fun(*this, &Editor::hscroll_slider_allocate)); edit_hscrollbar.size_allocate.connect (mem_fun(*this, &Editor::hscroll_slider_allocate));
time_canvas_scroller.add (*time_canvas); time_canvas_scroller.add (*time_canvas);
@ -406,8 +406,8 @@ Editor::Editor (AudioEngine& eng)
viewport->set_shadow_type (GTK_SHADOW_NONE); viewport->set_shadow_type (GTK_SHADOW_NONE);
viewport->set_name ("EditControlsBase"); viewport->set_name ("EditControlsBase");
viewport->signal_add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK); viewport->signal_add_event()s (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK);
viewport->signal_button_release_event.connect (mem_fun(*this, &Editor::edit_controls_button_release)); viewport->signal_button_release_event().connect (mem_fun(*this, &Editor::edit_controls_button_release));
build_cursors (); build_cursors ();
setup_toolbar (); setup_toolbar ();
@ -471,9 +471,9 @@ Editor::Editor (AudioEngine& eng)
time_button_event_box.add (time_button_vbox); time_button_event_box.add (time_button_vbox);
time_button_event_box.signal_set_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); time_button_event_box.signal_set_event()s (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
time_button_event_box.set_name ("TimebarLabelBase"); time_button_event_box.set_name ("TimebarLabelBase");
time_button_event_box.signal_button_release_event.connect (mem_fun(*this, &Editor::ruler_label_button_release)); time_button_event_box.signal_button_release_event().connect (mem_fun(*this, &Editor::ruler_label_button_release));
/* these enable us to have a dedicated window (for cursor setting, etc.) /* these enable us to have a dedicated window (for cursor setting, etc.)
for the canvas areas. for the canvas areas.
@ -482,7 +482,7 @@ Editor::Editor (AudioEngine& eng)
track_canvas_event_box.add (track_canvas_scroller); track_canvas_event_box.add (track_canvas_scroller);
time_canvas_event_box.add (time_canvas_vbox); time_canvas_event_box.add (time_canvas_vbox);
time_canvas_event_box.signal_set_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::POINTER_MOTION_MASK); time_canvas_event_box.signal_set_event()s (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::POINTER_MOTION_MASK);
edit_packer.set_col_spacings (0); edit_packer.set_col_spacings (0);
@ -581,7 +581,7 @@ Editor::Editor (AudioEngine& eng)
edit_group_list_scroller.set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC); edit_group_list_scroller.set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
edit_group_list_button.signal_clicked().connect (mem_fun(*this, &Editor::edit_group_list_button_clicked)); edit_group_list_button.signal_clicked().connect (mem_fun(*this, &Editor::edit_group_list_button_clicked));
edit_group_list.signal_button_press_event.connect (mem_fun(*this, &Editor::edit_group_list_button_press_event)); edit_group_list.signal_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.select_row.connect (mem_fun(*this, &Editor::edit_group_selected));
edit_group_list.unselect_row.connect (mem_fun(*this, &Editor::edit_group_unselected)); edit_group_list.unselect_row.connect (mem_fun(*this, &Editor::edit_group_unselected));
@ -612,7 +612,7 @@ Editor::Editor (AudioEngine& eng)
region_list_hidden_node = region_list_display.rows().end(); region_list_hidden_node = region_list_display.rows().end();
region_list_display.signal_add_events (GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK|Gdk::POINTER_MOTION_MASK); region_list_display.signal_add_event()s (GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK|Gdk::POINTER_MOTION_MASK);
region_list_display.drag_dest_set (GTK_DEST_DEFAULT_ALL, region_list_display.drag_dest_set (GTK_DEST_DEFAULT_ALL,
target_table, n_targets - 1, target_table, n_targets - 1,
@ -634,13 +634,13 @@ Editor::Editor (AudioEngine& eng)
region_list_display.set_flags (Gtk::CAN_FOCUS); region_list_display.set_flags (Gtk::CAN_FOCUS);
region_list_display.signal_key_press_event.connect (mem_fun(*this, &Editor::region_list_display_key_press)); region_list_display.signal_key_press_event().connect (mem_fun(*this, &Editor::region_list_display_key_press));
region_list_display.signal_key_release_event.connect (mem_fun(*this, &Editor::region_list_display_key_release)); region_list_display.signal_key_release_event().connect (mem_fun(*this, &Editor::region_list_display_key_release));
region_list_display.signal_button_press_event.connect (mem_fun(*this, &Editor::region_list_display_button_press)); region_list_display.signal_button_press_event().connect (mem_fun(*this, &Editor::region_list_display_button_press));
region_list_display.signal_button_release_event.connect (mem_fun(*this, &Editor::region_list_display_button_release)); region_list_display.signal_button_release_event().connect (mem_fun(*this, &Editor::region_list_display_button_release));
region_list_display.signal_motion_notify_event.connect (mem_fun(*this, &Editor::region_list_display_motion)); region_list_display.signal_motion_notify_event().connect (mem_fun(*this, &Editor::region_list_display_motion));
region_list_display.signal_enter_notify_event.connect (mem_fun(*this, &Editor::region_list_display_enter_notify)); region_list_display.signal_enter_notify_event().connect (mem_fun(*this, &Editor::region_list_display_enter_notify));
region_list_display.signal_leave_notify_event.connect (mem_fun(*this, &Editor::region_list_display_leave_notify)); region_list_display.signal_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.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.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)); region_list_display.click_column.connect (mem_fun(*this, &Editor::region_list_column_click));
@ -653,7 +653,7 @@ Editor::Editor (AudioEngine& eng)
named_selection_display.column_titles_active (); named_selection_display.column_titles_active ();
named_selection_display.set_selection_mode (GTK_SELECTION_SINGLE); named_selection_display.set_selection_mode (GTK_SELECTION_SINGLE);
named_selection_display.signal_button_press_event.connect (mem_fun(*this, &Editor::named_selection_display_button_press)); named_selection_display.signal_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.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)); named_selection_display.unselect_row.connect (mem_fun(*this, &Editor::named_selection_display_unselected));
@ -686,10 +686,10 @@ Editor::Editor (AudioEngine& eng)
canvas_region_list_pane.set_data ("collapse-direction", (gpointer) 0); canvas_region_list_pane.set_data ("collapse-direction", (gpointer) 0);
track_list_canvas_pane.set_data ("collapse-direction", (gpointer) 1); track_list_canvas_pane.set_data ("collapse-direction", (gpointer) 1);
route_group_vpane.signal_button_release_event.connect (bind (ptr_fun (pane_handler), static_cast<Paned*> (&route_group_vpane))); route_group_vpane.signal_button_release_event().connect (bind (ptr_fun (pane_handler), static_cast<Paned*> (&route_group_vpane)));
region_selection_vpane.signal_button_release_event.connect (bind (ptr_fun (pane_handler), static_cast<Paned*> (&region_selection_vpane))); region_selection_vpane.signal_button_release_event().connect (bind (ptr_fun (pane_handler), static_cast<Paned*> (&region_selection_vpane)));
canvas_region_list_pane.signal_button_release_event.connect (bind (ptr_fun (pane_handler), static_cast<Paned*> (&canvas_region_list_pane))); canvas_region_list_pane.signal_button_release_event().connect (bind (ptr_fun (pane_handler), static_cast<Paned*> (&canvas_region_list_pane)));
track_list_canvas_pane.signal_button_release_event.connect (bind (ptr_fun (pane_handler), static_cast<Paned*> (&track_list_canvas_pane))); track_list_canvas_pane.signal_button_release_event().connect (bind (ptr_fun (pane_handler), static_cast<Paned*> (&track_list_canvas_pane)));
top_hbox.pack_start (toolbar_frame, true, true); top_hbox.pack_start (toolbar_frame, true, true);
@ -706,7 +706,7 @@ Editor::Editor (AudioEngine& eng)
vpacker.pack_end (global_hpacker, true, true); vpacker.pack_end (global_hpacker, true, true);
_playlist_selector = new PlaylistSelector(); _playlist_selector = new PlaylistSelector();
_playlist_selector->signal_delete_event.connect (bind (ptr_fun (just_hide_it), static_cast<Window *> (_playlist_selector))); _playlist_selector->signal_delete_event().connect (bind (ptr_fun (just_hide_it), static_cast<Window *> (_playlist_selector)));
AudioRegionView::AudioRegionViewGoingAway.connect (mem_fun(*this, &Editor::catch_vanishing_audio_regionview)); AudioRegionView::AudioRegionViewGoingAway.connect (mem_fun(*this, &Editor::catch_vanishing_audio_regionview));
@ -830,9 +830,9 @@ Editor::initialize_canvas ()
track_canvas = wrap (track_gnome_canvas); track_canvas = wrap (track_gnome_canvas);
track_canvas->set_name ("EditorMainCanvas"); track_canvas->set_name ("EditorMainCanvas");
track_canvas->signal_add_events (Gdk::POINTER_MOTION_HINT_MASK); track_canvas->signal_add_event()s (Gdk::POINTER_MOTION_HINT_MASK);
track_canvas->signal_leave_notify_event.connect (mem_fun(*this, &Editor::left_track_canvas)); track_canvas->signal_leave_notify_event().connect (mem_fun(*this, &Editor::left_track_canvas));
/* set up drag-n-drop */ /* set up drag-n-drop */
@ -871,7 +871,7 @@ Editor::initialize_canvas ()
time_canvas = wrap (time_gnome_canvas); time_canvas = wrap (time_gnome_canvas);
time_canvas->set_name ("EditorTimeCanvas"); time_canvas->set_name ("EditorTimeCanvas");
time_canvas->signal_add_events (Gdk::POINTER_MOTION_HINT_MASK); time_canvas->signal_add_event()s (Gdk::POINTER_MOTION_HINT_MASK);
meter_group = gnome_canvas_item_new (gnome_canvas_root(GNOME_CANVAS(time_gnome_canvas)), meter_group = gnome_canvas_item_new (gnome_canvas_root(GNOME_CANVAS(time_gnome_canvas)),
gnome_canvas_group_get_type(), gnome_canvas_group_get_type(),
@ -2298,7 +2298,7 @@ Editor::add_region_context_items (StreamView* sv, Region* region, Menu_Helpers::
become selected. become selected.
*/ */
region_menu->signal_map_event.connect (bind (mem_fun(*this, &Editor::set_selected_regionview_from_map_event), sv, region)); region_menu->signal_map_event().connect (bind (mem_fun(*this, &Editor::set_selected_regionview_from_map_event), sv, region));
items.push_back (MenuElem (_("Popup region editor"), mem_fun(*this, &Editor::edit_region))); 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 (_("Raise to top layer"), mem_fun(*this, &Editor::raise_region_to_top)));
@ -3096,7 +3096,7 @@ Editor::setup_toolbar ()
mouse_audition_button.unset_flags (Gtk::CAN_FOCUS); mouse_audition_button.unset_flags (Gtk::CAN_FOCUS);
mouse_select_button.toggled.connect (bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseRange)); mouse_select_button.toggled.connect (bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseRange));
mouse_select_button.signal_button_release_event.connect (mem_fun(*this, &Editor::mouse_select_button_release)); mouse_select_button.signal_button_release_event().connect (mem_fun(*this, &Editor::mouse_select_button_release));
mouse_move_button.toggled.connect (bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseObject)); 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_gain_button.toggled.connect (bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseGain));
@ -3135,7 +3135,7 @@ Editor::setup_toolbar ()
edit_mode_box.pack_start (edit_mode_label, false, false); edit_mode_box.pack_start (edit_mode_label, false, false);
edit_mode_box.pack_start (edit_mode_selector, false, false); edit_mode_box.pack_start (edit_mode_selector, false, false);
edit_mode_selector.get_popwin()->signal_unmap_event.connect (mem_fun(*this, &Editor::edit_mode_selection_done)); edit_mode_selector.get_popwin()->signal_unmap_event().connect (mem_fun(*this, &Editor::edit_mode_selection_done));
/* Snap Type */ /* Snap Type */
@ -3157,7 +3157,7 @@ Editor::setup_toolbar ()
snap_type_box.pack_start (snap_type_label, false, false); snap_type_box.pack_start (snap_type_label, false, false);
snap_type_box.pack_start (snap_type_selector, false, false); snap_type_box.pack_start (snap_type_selector, false, false);
snap_type_selector.get_popwin()->signal_unmap_event.connect (mem_fun(*this, &Editor::snap_type_selection_done)); snap_type_selector.get_popwin()->signal_unmap_event().connect (mem_fun(*this, &Editor::snap_type_selection_done));
/* Snap mode, not snap type */ /* Snap mode, not snap type */
@ -3176,7 +3176,7 @@ Editor::setup_toolbar ()
snap_mode_box.pack_start (snap_mode_label, false, false); snap_mode_box.pack_start (snap_mode_label, false, false);
snap_mode_box.pack_start (snap_mode_selector, false, false); snap_mode_box.pack_start (snap_mode_selector, false, false);
snap_mode_selector.get_popwin()->signal_unmap_event.connect (mem_fun(*this, &Editor::snap_mode_selection_done)); snap_mode_selector.get_popwin()->signal_unmap_event().connect (mem_fun(*this, &Editor::snap_mode_selection_done));
/* Zoom focus mode */ /* Zoom focus mode */
@ -3197,7 +3197,7 @@ Editor::setup_toolbar ()
zoom_focus_box.pack_start (zoom_focus_label, false, false); zoom_focus_box.pack_start (zoom_focus_label, false, false);
zoom_focus_box.pack_start (zoom_focus_selector, false, false); zoom_focus_box.pack_start (zoom_focus_selector, false, false);
zoom_focus_selector.get_popwin()->signal_unmap_event.connect (mem_fun(*this, &Editor::zoom_focus_selection_done)); zoom_focus_selector.get_popwin()->signal_unmap_event().connect (mem_fun(*this, &Editor::zoom_focus_selection_done));
/* selection/cursor clocks */ /* selection/cursor clocks */
@ -3997,8 +3997,8 @@ Editor::duplicate_dialog (bool dup_region)
entry.activate.connect (bind (slot (win, &ArdourDialog::stop), 0)); entry.activate.connect (bind (slot (win, &ArdourDialog::stop), 0));
cancel_button.signal_clicked().connect (bind (slot (win, &ArdourDialog::stop), 1)); cancel_button.signal_clicked().connect (bind (slot (win, &ArdourDialog::stop), 1));
entry.signal_signal_focus_in_event().connect (slot (ARDOUR_UI::generic_focus_in_event)); entry.signal_focus_in_event()().connect (slot (ARDOUR_UI::generic_focus_in_event));
entry.signal_signal_focus_out_event().connect (slot (ARDOUR_UI::generic_focus_out_event)); entry.signal_focus_out_event()().connect (slot (ARDOUR_UI::generic_focus_out_event));
entry.set_text ("1"); entry.set_text ("1");
set_size_request_to_display_given_text (entry, X_("12345678"), 20, 15); set_size_request_to_display_given_text (entry, X_("12345678"), 20, 15);
@ -4505,7 +4505,7 @@ Editor::edit_xfade (Crossfade* xfade)
cew.ok_button.signal_clicked().connect (bind (slot (cew, &ArdourDialog::stop), 1)); cew.ok_button.signal_clicked().connect (bind (slot (cew, &ArdourDialog::stop), 1));
cew.cancel_button.signal_clicked().connect (bind (slot (cew, &ArdourDialog::stop), 0)); cew.cancel_button.signal_clicked().connect (bind (slot (cew, &ArdourDialog::stop), 0));
cew.signal_delete_event.connect (slot (cew, &ArdourDialog::wm_doi_event_stop)); cew.signal_delete_event().connect (slot (cew, &ArdourDialog::wm_doi_event_stop));
cew.run (); cew.run ();

56
gtk2_ardour/editor_canvas_events.cc
View file

@ -48,7 +48,7 @@ gint
Editor::_canvas_copy_region_event (GnomeCanvasItem *item, GdkEvent *event, gpointer data) Editor::_canvas_copy_region_event (GnomeCanvasItem *item, GdkEvent *event, gpointer data)
{ {
Editor* editor = (Editor*)data; Editor* editor = (Editor*)data;
return editor->signal_canvas_copy_region_event (item, event); return editor->signal_canvas_copy_region_event() (item, event);
} }
gint gint
@ -56,7 +56,7 @@ Editor::_canvas_crossfade_view_event (GnomeCanvasItem *item, GdkEvent *event, gp
{ {
CrossfadeView* xfv = static_cast<CrossfadeView*> (data); CrossfadeView* xfv = static_cast<CrossfadeView*> (data);
Editor* editor = dynamic_cast<Editor*>(&xfv->get_time_axis_view().editor); Editor* editor = dynamic_cast<Editor*>(&xfv->get_time_axis_view().editor);
return editor->signal_canvas_crossfade_view_event (item, event, xfv); return editor->signal_canvas_crossfade_view_event() (item, event, xfv);
} }
gint gint
@ -64,7 +64,7 @@ Editor::_canvas_fade_in_event (GnomeCanvasItem *item, GdkEvent *event, gpointer
{ {
AudioRegionView* rv = static_cast<AudioRegionView*> (data); AudioRegionView* rv = static_cast<AudioRegionView*> (data);
Editor* editor = dynamic_cast<Editor*>(&rv->get_time_axis_view().editor); Editor* editor = dynamic_cast<Editor*>(&rv->get_time_axis_view().editor);
return editor->signal_canvas_fade_in_event (item, event, rv); return editor->signal_canvas_fade_in_event() (item, event, rv);
} }
gint gint
@ -72,7 +72,7 @@ Editor::_canvas_fade_in_handle_event (GnomeCanvasItem *item, GdkEvent *event, gp
{ {
AudioRegionView* rv = static_cast<AudioRegionView*> (data); AudioRegionView* rv = static_cast<AudioRegionView*> (data);
Editor* editor = dynamic_cast<Editor*>(&rv->get_time_axis_view().editor); Editor* editor = dynamic_cast<Editor*>(&rv->get_time_axis_view().editor);
return editor->signal_canvas_fade_in_handle_event (item, event, rv); return editor->signal_canvas_fade_in_handle_event() (item, event, rv);
} }
gint gint
@ -80,7 +80,7 @@ Editor::_canvas_fade_out_event (GnomeCanvasItem *item, GdkEvent *event, gpointer
{ {
AudioRegionView* rv = static_cast<AudioRegionView*> (data); AudioRegionView* rv = static_cast<AudioRegionView*> (data);
Editor* editor = dynamic_cast<Editor*>(&rv->get_time_axis_view().editor); Editor* editor = dynamic_cast<Editor*>(&rv->get_time_axis_view().editor);
return editor->signal_canvas_fade_out_event (item, event, rv); return editor->signal_canvas_fade_out_event() (item, event, rv);
} }
gint gint
@ -88,7 +88,7 @@ Editor::_canvas_fade_out_handle_event (GnomeCanvasItem *item, GdkEvent *event, g
{ {
AudioRegionView* rv = static_cast<AudioRegionView*> (data); AudioRegionView* rv = static_cast<AudioRegionView*> (data);
Editor* editor = dynamic_cast<Editor*>(&rv->get_time_axis_view().editor); Editor* editor = dynamic_cast<Editor*>(&rv->get_time_axis_view().editor);
return editor->signal_canvas_fade_out_handle_event (item, event, rv); return editor->signal_canvas_fade_out_handle_event() (item, event, rv);
} }
gint gint
@ -97,7 +97,7 @@ Editor::_canvas_region_view_event (GnomeCanvasItem *item, GdkEvent *event, gpoin
AudioRegionView *rv = reinterpret_cast<AudioRegionView *>(data); AudioRegionView *rv = reinterpret_cast<AudioRegionView *>(data);
Editor* editor = dynamic_cast<Editor*>(&rv->get_time_axis_view().editor); Editor* editor = dynamic_cast<Editor*>(&rv->get_time_axis_view().editor);
return editor->signal_canvas_region_view_event (item, event, rv); return editor->signal_canvas_region_view_event() (item, event, rv);
} }
gint gint
@ -106,7 +106,7 @@ Editor::_canvas_region_view_name_highlight_event (GnomeCanvasItem *item, GdkEven
AudioRegionView *rv = reinterpret_cast<AudioRegionView *> (data); AudioRegionView *rv = reinterpret_cast<AudioRegionView *> (data);
Editor* editor = dynamic_cast<Editor*>(&rv->get_time_axis_view().editor); Editor* editor = dynamic_cast<Editor*>(&rv->get_time_axis_view().editor);
return editor->signal_canvas_region_view_name_highlight_event (item, event); return editor->signal_canvas_region_view_name_highlight_event() (item, event);
} }
gint gint
@ -115,7 +115,7 @@ Editor::_canvas_region_view_name_event (GnomeCanvasItem *item, GdkEvent *event,
AudioRegionView *rv = reinterpret_cast<AudioRegionView *> (data); AudioRegionView *rv = reinterpret_cast<AudioRegionView *> (data);
Editor* editor = dynamic_cast<Editor*>(&rv->get_time_axis_view().editor); Editor* editor = dynamic_cast<Editor*>(&rv->get_time_axis_view().editor);
return editor->signal_canvas_region_view_name_event (item, event); return editor->signal_canvas_region_view_name_event() (item, event);
} }
gint gint
@ -126,7 +126,7 @@ Editor::_canvas_stream_view_event (GnomeCanvasItem *item, GdkEvent *event, gpoin
AudioTimeAxisView *tv = (AudioTimeAxisView *) data; AudioTimeAxisView *tv = (AudioTimeAxisView *) data;
Editor* editor = dynamic_cast<Editor*>(&tv->editor); Editor* editor = dynamic_cast<Editor*>(&tv->editor);
return editor->signal_canvas_stream_view_event (item, event, tv); return editor->signal_canvas_stream_view_event() (item, event, tv);
} }
gint gint
@ -135,7 +135,7 @@ Editor::_canvas_automation_track_event (GnomeCanvasItem *item, GdkEvent *event,
AutomationTimeAxisView* atv = (AutomationTimeAxisView*) data; AutomationTimeAxisView* atv = (AutomationTimeAxisView*) data;
Editor* editor = dynamic_cast<Editor*>(&atv->editor); Editor* editor = dynamic_cast<Editor*>(&atv->editor);
return editor->signal_canvas_automation_track_event (item, event, atv); return editor->signal_canvas_automation_track_event() (item, event, atv);
} }
gint gint
@ -158,7 +158,7 @@ Editor::_canvas_control_point_event (GnomeCanvasItem *item, GdkEvent *event, gpo
break; break;
} }
return editor->signal_canvas_control_point_event (item, event); return editor->signal_canvas_control_point_event() (item, event);
} }
gint gint
@ -167,21 +167,21 @@ Editor::_canvas_line_event (GnomeCanvasItem *item, GdkEvent *event, gpointer dat
AutomationLine *line = reinterpret_cast<AutomationLine*> (data); AutomationLine *line = reinterpret_cast<AutomationLine*> (data);
Editor* editor = dynamic_cast<Editor*>(&line->trackview.editor); Editor* editor = dynamic_cast<Editor*>(&line->trackview.editor);
return editor->signal_canvas_line_event (item, event); return editor->signal_canvas_line_event() (item, event);
} }
gint gint
Editor::_canvas_tempo_marker_event (GnomeCanvasItem *item, GdkEvent *event, gpointer data) Editor::_canvas_tempo_marker_event (GnomeCanvasItem *item, GdkEvent *event, gpointer data)
{ {
Editor* editor = dynamic_cast<Editor*>((PublicEditor*) data); Editor* editor = dynamic_cast<Editor*>((PublicEditor*) data);
return editor->signal_canvas_tempo_marker_event (item, event); return editor->signal_canvas_tempo_marker_event() (item, event);
} }
gint gint
Editor::_canvas_meter_marker_event (GnomeCanvasItem *item, GdkEvent *event, gpointer data) Editor::_canvas_meter_marker_event (GnomeCanvasItem *item, GdkEvent *event, gpointer data)
{ {
Editor* editor = dynamic_cast<Editor*>((PublicEditor *) data); Editor* editor = dynamic_cast<Editor*>((PublicEditor *) data);
return editor->signal_canvas_meter_marker_event (item, event); return editor->signal_canvas_meter_marker_event() (item, event);
} }
gint gint
@ -189,7 +189,7 @@ Editor::_canvas_tempo_bar_event (GnomeCanvasItem *item, GdkEvent *event, gpointe
{ {
/* XXX NO CAST */ /* XXX NO CAST */
Editor* editor = (Editor*) data; Editor* editor = (Editor*) data;
return editor->signal_canvas_tempo_bar_event (item, event); return editor->signal_canvas_tempo_bar_event() (item, event);
} }
gint gint
@ -197,14 +197,14 @@ Editor::_canvas_meter_bar_event (GnomeCanvasItem *item, GdkEvent *event, gpointe
{ {
/* XXX NO CAST */ /* XXX NO CAST */
Editor* editor = (Editor*) data; Editor* editor = (Editor*) data;
return editor->signal_canvas_meter_bar_event (item, event); return editor->signal_canvas_meter_bar_event() (item, event);
} }
gint gint
Editor::_canvas_marker_event (GnomeCanvasItem *item, GdkEvent *event, gpointer data) Editor::_canvas_marker_event (GnomeCanvasItem *item, GdkEvent *event, gpointer data)
{ {
Editor* editor = dynamic_cast<Editor*>((PublicEditor*) data); Editor* editor = dynamic_cast<Editor*>((PublicEditor*) data);
return editor->signal_canvas_marker_event (item, event); return editor->signal_canvas_marker_event() (item, event);
} }
gint gint
@ -212,7 +212,7 @@ Editor::_canvas_marker_bar_event (GnomeCanvasItem *item, GdkEvent *event, gpoint
{ {
/* NO CAST */ /* NO CAST */
Editor* editor = (Editor*) data; Editor* editor = (Editor*) data;
return editor->signal_canvas_marker_bar_event (item, event); return editor->signal_canvas_marker_bar_event() (item, event);
} }
gint gint
@ -220,7 +220,7 @@ Editor::_canvas_range_marker_bar_event (GnomeCanvasItem *item, GdkEvent *event,
{ {
/* NO CAST */ /* NO CAST */
Editor* editor = (Editor*) data; Editor* editor = (Editor*) data;
return editor->signal_canvas_range_marker_bar_event (item, event); return editor->signal_canvas_range_marker_bar_event() (item, event);
} }
gint gint
@ -228,7 +228,7 @@ Editor::_canvas_transport_marker_bar_event (GnomeCanvasItem *item, GdkEvent *eve
{ {
/* NO CAST */ /* NO CAST */
Editor* editor = (Editor*) data; Editor* editor = (Editor*) data;
return editor->signal_canvas_transport_marker_bar_event (item, event); return editor->signal_canvas_transport_marker_bar_event() (item, event);
} }
gint gint
@ -236,7 +236,7 @@ Editor::_canvas_playhead_cursor_event (GnomeCanvasItem *item, GdkEvent *event, g
{ {
/* NO CAST */ /* NO CAST */
Editor* editor = (Editor*) data; Editor* editor = (Editor*) data;
return editor->signal_canvas_playhead_cursor_event (item, event); return editor->signal_canvas_playhead_cursor_event() (item, event);
} }
gint gint
@ -244,35 +244,35 @@ Editor::_canvas_edit_cursor_event (GnomeCanvasItem *item, GdkEvent *event, gpoin
{ {
/* NO CAST */ /* NO CAST */
Editor* editor = (Editor*) data; Editor* editor = (Editor*) data;
return editor->signal_canvas_edit_cursor_event (item, event); return editor->signal_canvas_edit_cursor_event() (item, event);
} }
gint gint
Editor::_canvas_zoom_rect_event (GnomeCanvasItem *item, GdkEvent *event, gpointer data) Editor::_canvas_zoom_rect_event (GnomeCanvasItem *item, GdkEvent *event, gpointer data)
{ {
Editor* editor = dynamic_cast<Editor*>((PublicEditor*) data); Editor* editor = dynamic_cast<Editor*>((PublicEditor*) data);
return editor->signal_canvas_zoom_rect_event (item, event); return editor->signal_canvas_zoom_rect_event() (item, event);
} }
gint gint
Editor::_canvas_selection_rect_event (GnomeCanvasItem *item, GdkEvent *event, gpointer data) Editor::_canvas_selection_rect_event (GnomeCanvasItem *item, GdkEvent *event, gpointer data)
{ {
Editor* editor = dynamic_cast<Editor*>((PublicEditor*) data); Editor* editor = dynamic_cast<Editor*>((PublicEditor*) data);
return editor->signal_canvas_selection_rect_event (item, event); return editor->signal_canvas_selection_rect_event() (item, event);
} }
gint gint
Editor::_canvas_selection_start_trim_event (GnomeCanvasItem *item, GdkEvent *event, gpointer data) Editor::_canvas_selection_start_trim_event (GnomeCanvasItem *item, GdkEvent *event, gpointer data)
{ {
Editor* editor = dynamic_cast<Editor*>((PublicEditor*) data); Editor* editor = dynamic_cast<Editor*>((PublicEditor*) data);
return editor->signal_canvas_selection_start_trim_event (item, event); return editor->signal_canvas_selection_start_trim_event() (item, event);
} }
gint gint
Editor::_canvas_selection_end_trim_event (GnomeCanvasItem *item, GdkEvent *event, gpointer data) Editor::_canvas_selection_end_trim_event (GnomeCanvasItem *item, GdkEvent *event, gpointer data)
{ {
Editor* editor = dynamic_cast<Editor*>((PublicEditor*) data); Editor* editor = dynamic_cast<Editor*>((PublicEditor*) data);
return editor->signal_canvas_selection_end_trim_event (item, event); return editor->signal_canvas_selection_end_trim_event() (item, event);
} }
gint gint
@ -281,7 +281,7 @@ Editor::_track_canvas_event (GnomeCanvasItem *item, GdkEvent *event, gpointer da
/* NO CAST */ /* NO CAST */
Editor* editor = (Editor*) data; Editor* editor = (Editor*) data;
return editor->signal_track_canvas_event (item, event); return editor->signal_track_canvas_event() (item, event);
} }
/********** END OF.TATIC EVENT HANDLERS */ /********** END OF.TATIC EVENT HANDLERS */

2
gtk2_ardour/editor_export_audio.cc
View file

@ -106,7 +106,7 @@ Editor::write_a_region ()
file_selector.get_selection_entry()->activate.connect (bind (mem_fun(*this, &Editor::finish_sub_event_loop), 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_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.get_ok_button()-.signal_clicked().connect (bind (mem_fun(*this, &Editor::finish_sub_event_loop), 1));
file_selector.signal_delete_event.connect (bind (mem_fun(*this, &Editor::finish_sub_event_loop_on_delete), -1)); file_selector.signal_delete_event().connect (bind (mem_fun(*this, &Editor::finish_sub_event_loop_on_delete), -1));
file_selector.show_all(); file_selector.show_all();

16
gtk2_ardour/editor_imageframe.cc
View file

@ -162,7 +162,7 @@ Editor::_canvas_imageframe_start_handle_event(GnomeCanvasItem *item, GdkEvent *e
{ {
ImageFrameView* ifv = (ImageFrameView*) data ; ImageFrameView* ifv = (ImageFrameView*) data ;
Editor* editor = dynamic_cast<Editor*> (&ifv->get_time_axis_view().editor); Editor* editor = dynamic_cast<Editor*> (&ifv->get_time_axis_view().editor);
return editor->signal_canvas_imageframe_start_handle_event(item,event,ifv); return editor->signal_canvas_imageframe_start_handle_event()(item,event,ifv);
} }
gint gint
@ -170,7 +170,7 @@ Editor::_canvas_imageframe_end_handle_event(GnomeCanvasItem *item, GdkEvent *eve
{ {
ImageFrameView* ifv = (ImageFrameView*) data ; ImageFrameView* ifv = (ImageFrameView*) data ;
Editor* editor = dynamic_cast<Editor*> (&ifv->get_time_axis_view().editor); Editor* editor = dynamic_cast<Editor*> (&ifv->get_time_axis_view().editor);
return editor->signal_canvas_imageframe_end_handle_event(item,event,ifv); return editor->signal_canvas_imageframe_end_handle_event()(item,event,ifv);
} }
@ -179,7 +179,7 @@ Editor::_canvas_imageframe_item_view_event(GnomeCanvasItem *item, GdkEvent* even
{ {
ImageFrameView *ifv = (ImageFrameView *) data ; ImageFrameView *ifv = (ImageFrameView *) data ;
Editor* editor = dynamic_cast<Editor*> (&ifv->get_time_axis_view().editor); Editor* editor = dynamic_cast<Editor*> (&ifv->get_time_axis_view().editor);
return editor->signal_canvas_imageframe_item_view_event (item, event, ifv) ; return editor->signal_canvas_imageframe_item_view_event() (item, event, ifv) ;
} }
gint gint
@ -187,7 +187,7 @@ Editor::_canvas_imageframe_view_event(GnomeCanvasItem *item, GdkEvent* event, gp
{ {
ImageFrameTimeAxis *ifta = (ImageFrameTimeAxis*) data ; ImageFrameTimeAxis *ifta = (ImageFrameTimeAxis*) data ;
Editor* editor = dynamic_cast<Editor*> (&ifta->editor); Editor* editor = dynamic_cast<Editor*> (&ifta->editor);
return editor->signal_canvas_imageframe_view_event (item, event, ifta); return editor->signal_canvas_imageframe_view_event() (item, event, ifta);
} }
gint gint
@ -195,7 +195,7 @@ Editor::_canvas_marker_time_axis_view_event(GnomeCanvasItem* item, GdkEvent* eve
{ {
MarkerTimeAxis* mta = (MarkerTimeAxis*)data ; MarkerTimeAxis* mta = (MarkerTimeAxis*)data ;
Editor* editor = dynamic_cast<Editor*> (&mta->editor); Editor* editor = dynamic_cast<Editor*> (&mta->editor);
return editor->signal_canvas_marker_time_axis_view_event(item,event,mta); return editor->signal_canvas_marker_time_axis_view_event()(item,event,mta);
} }
gint gint
@ -203,7 +203,7 @@ Editor::_canvas_markerview_item_view_event(GnomeCanvasItem *item, GdkEvent* even
{ {
MarkerView* mv = (MarkerView*) data ; MarkerView* mv = (MarkerView*) data ;
Editor* editor = dynamic_cast<Editor*> (&mv->get_time_axis_view().editor); Editor* editor = dynamic_cast<Editor*> (&mv->get_time_axis_view().editor);
return editor->signal_canvas_markerview_item_view_event(item,event,mv); return editor->signal_canvas_markerview_item_view_event()(item,event,mv);
} }
gint gint
@ -211,7 +211,7 @@ Editor::_canvas_markerview_start_handle_event(GnomeCanvasItem* item, GdkEvent* e
{ {
MarkerView* mv = (MarkerView*)data ; MarkerView* mv = (MarkerView*)data ;
Editor* editor = dynamic_cast<Editor*> (&mv->get_time_axis_view().editor); Editor* editor = dynamic_cast<Editor*> (&mv->get_time_axis_view().editor);
return editor->signal_canvas_markerview_start_handle_event(item,event,mv); return editor->signal_canvas_markerview_start_handle_event()(item,event,mv);
} }
gint gint
@ -219,7 +219,7 @@ Editor::_canvas_markerview_end_handle_event(GnomeCanvasItem* item, GdkEvent* eve
{ {
MarkerView* mv = (MarkerView*)data ; MarkerView* mv = (MarkerView*)data ;
Editor* editor = dynamic_cast<Editor*> (&mv->get_time_axis_view().editor); Editor* editor = dynamic_cast<Editor*> (&mv->get_time_axis_view().editor);
return editor->signal_canvas_markerview_end_handle_event(item,event,mv); return editor->signal_canvas_markerview_end_handle_event()(item,event,mv);
} }
/** /**

4
gtk2_ardour/editor_markers.cc
View file

@ -479,7 +479,7 @@ Editor::build_new_transport_marker_menu ()
items.push_back (MenuElem (_("Set Loop Range"), mem_fun(*this, &Editor::new_transport_marker_menu_set_loop))); 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))); items.push_back (MenuElem (_("Set Punch Range"), mem_fun(*this, &Editor::new_transport_marker_menu_set_punch)));
new_transport_marker_menu->signal_unmap_event.connect ( mem_fun(*this, &Editor::new_transport_marker_menu_popdown)); new_transport_marker_menu->signal_unmap_event().connect ( mem_fun(*this, &Editor::new_transport_marker_menu_popdown));
} }
void void
@ -756,7 +756,7 @@ Editor::marker_menu_rename ()
entry.activate.connect (bind (mem_fun(*this, &Editor::finish_sub_event_loop), 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)); 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)); ok_button.signal_clicked().connect (bind (mem_fun(*this, &Editor::finish_sub_event_loop), 1));
dialog.signal_delete_event.connect (bind (mem_fun(*this, &Editor::finish_sub_event_loop_on_delete), -1)); dialog.signal_delete_event().connect (bind (mem_fun(*this, &Editor::finish_sub_event_loop_on_delete), -1));
dialog.show_all (); dialog.show_all ();
entry.grab_focus (); entry.grab_focus ();

4
gtk2_ardour/editor_mouse.cc
View file

@ -999,7 +999,7 @@ Editor::button_release_handler (GnomeCanvasItem* item, GdkEvent* event, ItemType
case MouseObject: case MouseObject:
switch (item_type) { switch (item_type) {
case AutomationTrackItem: case AutomationTrackItem:
dynamic_cast<AutomationTimeAxisView*>(clicked_trackview)->signal_add_automation_event dynamic_cast<AutomationTimeAxisView*>(clicked_trackview)->signal_add_automation_event()
(item, (item,
event, event,
where, where,
@ -1015,7 +1015,7 @@ Editor::button_release_handler (GnomeCanvasItem* item, GdkEvent* event, ItemType
case MouseGain: case MouseGain:
switch (item_type) { switch (item_type) {
case RegionItem: case RegionItem:
clicked_regionview->signal_add_gain_point_event (item, event); clicked_regionview->signal_add_gain_point_event() (item, event);
return TRUE; return TRUE;
break; break;

64
gtk2_ardour/editor_rulers.cc
View file

@ -89,25 +89,25 @@ Editor::initialize_rulers ()
ruler_shown[ruler_metric_frames] = false; ruler_shown[ruler_metric_frames] = false;
ruler_shown[ruler_metric_minsec] = false; ruler_shown[ruler_metric_minsec] = false;
smpte_ruler->signal_set_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); smpte_ruler->signal_set_event()s (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
bbt_ruler->signal_set_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); bbt_ruler->signal_set_event()s (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
frames_ruler->signal_set_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); frames_ruler->signal_set_event()s (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
minsec_ruler->signal_set_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); minsec_ruler->signal_set_event()s (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
smpte_ruler->signal_button_release_event.connect (mem_fun(*this, &Editor::ruler_button_release)); smpte_ruler->signal_button_release_event().connect (mem_fun(*this, &Editor::ruler_button_release));
bbt_ruler->signal_button_release_event.connect (mem_fun(*this, &Editor::ruler_button_release)); bbt_ruler->signal_button_release_event().connect (mem_fun(*this, &Editor::ruler_button_release));
frames_ruler->signal_button_release_event.connect (mem_fun(*this, &Editor::ruler_button_release)); frames_ruler->signal_button_release_event().connect (mem_fun(*this, &Editor::ruler_button_release));
minsec_ruler->signal_button_release_event.connect (mem_fun(*this, &Editor::ruler_button_release)); minsec_ruler->signal_button_release_event().connect (mem_fun(*this, &Editor::ruler_button_release));
smpte_ruler->signal_button_press_event.connect (mem_fun(*this, &Editor::ruler_button_press)); smpte_ruler->signal_button_press_event().connect (mem_fun(*this, &Editor::ruler_button_press));
bbt_ruler->signal_button_press_event.connect (mem_fun(*this, &Editor::ruler_button_press)); bbt_ruler->signal_button_press_event().connect (mem_fun(*this, &Editor::ruler_button_press));
frames_ruler->signal_button_press_event.connect (mem_fun(*this, &Editor::ruler_button_press)); frames_ruler->signal_button_press_event().connect (mem_fun(*this, &Editor::ruler_button_press));
minsec_ruler->signal_button_press_event.connect (mem_fun(*this, &Editor::ruler_button_press)); minsec_ruler->signal_button_press_event().connect (mem_fun(*this, &Editor::ruler_button_press));
smpte_ruler->signal_motion_notify_event.connect (mem_fun(*this, &Editor::ruler_mouse_motion)); smpte_ruler->signal_motion_notify_event().connect (mem_fun(*this, &Editor::ruler_mouse_motion));
bbt_ruler->signal_motion_notify_event.connect (mem_fun(*this, &Editor::ruler_mouse_motion)); bbt_ruler->signal_motion_notify_event().connect (mem_fun(*this, &Editor::ruler_mouse_motion));
frames_ruler->signal_motion_notify_event.connect (mem_fun(*this, &Editor::ruler_mouse_motion)); frames_ruler->signal_motion_notify_event().connect (mem_fun(*this, &Editor::ruler_mouse_motion));
minsec_ruler->signal_motion_notify_event.connect (mem_fun(*this, &Editor::ruler_mouse_motion)); minsec_ruler->signal_motion_notify_event().connect (mem_fun(*this, &Editor::ruler_mouse_motion));
visible_timebars = 7; /* 4 here, 3 in time_canvas */ visible_timebars = 7; /* 4 here, 3 in time_canvas */
ruler_pressed_button = 0; ruler_pressed_button = 0;
@ -552,25 +552,25 @@ Editor::update_ruler_visibility ()
gtk_custom_ruler_set_metric (GTK_CUSTOM_RULER(_minsec_ruler), &ruler_metrics[ruler_metric_minsec]); gtk_custom_ruler_set_metric (GTK_CUSTOM_RULER(_minsec_ruler), &ruler_metrics[ruler_metric_minsec]);
smpte_ruler->signal_set_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); smpte_ruler->signal_set_event()s (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
bbt_ruler->signal_set_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); bbt_ruler->signal_set_event()s (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
frames_ruler->signal_set_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); frames_ruler->signal_set_event()s (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
minsec_ruler->signal_set_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); minsec_ruler->signal_set_event()s (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
smpte_ruler->signal_button_release_event.connect (mem_fun(*this, &Editor::ruler_button_release)); smpte_ruler->signal_button_release_event().connect (mem_fun(*this, &Editor::ruler_button_release));
bbt_ruler->signal_button_release_event.connect (mem_fun(*this, &Editor::ruler_button_release)); bbt_ruler->signal_button_release_event().connect (mem_fun(*this, &Editor::ruler_button_release));
frames_ruler->signal_button_release_event.connect (mem_fun(*this, &Editor::ruler_button_release)); frames_ruler->signal_button_release_event().connect (mem_fun(*this, &Editor::ruler_button_release));
minsec_ruler->signal_button_release_event.connect (mem_fun(*this, &Editor::ruler_button_release)); minsec_ruler->signal_button_release_event().connect (mem_fun(*this, &Editor::ruler_button_release));
smpte_ruler->signal_button_press_event.connect (mem_fun(*this, &Editor::ruler_button_press)); smpte_ruler->signal_button_press_event().connect (mem_fun(*this, &Editor::ruler_button_press));
bbt_ruler->signal_button_press_event.connect (mem_fun(*this, &Editor::ruler_button_press)); bbt_ruler->signal_button_press_event().connect (mem_fun(*this, &Editor::ruler_button_press));
frames_ruler->signal_button_press_event.connect (mem_fun(*this, &Editor::ruler_button_press)); frames_ruler->signal_button_press_event().connect (mem_fun(*this, &Editor::ruler_button_press));
minsec_ruler->signal_button_press_event.connect (mem_fun(*this, &Editor::ruler_button_press)); minsec_ruler->signal_button_press_event().connect (mem_fun(*this, &Editor::ruler_button_press));
smpte_ruler->signal_motion_notify_event.connect (mem_fun(*this, &Editor::ruler_mouse_motion)); smpte_ruler->signal_motion_notify_event().connect (mem_fun(*this, &Editor::ruler_mouse_motion));
bbt_ruler->signal_motion_notify_event.connect (mem_fun(*this, &Editor::ruler_mouse_motion)); bbt_ruler->signal_motion_notify_event().connect (mem_fun(*this, &Editor::ruler_mouse_motion));
frames_ruler->signal_motion_notify_event.connect (mem_fun(*this, &Editor::ruler_mouse_motion)); frames_ruler->signal_motion_notify_event().connect (mem_fun(*this, &Editor::ruler_mouse_motion));
minsec_ruler->signal_motion_notify_event.connect (mem_fun(*this, &Editor::ruler_mouse_motion)); minsec_ruler->signal_motion_notify_event().connect (mem_fun(*this, &Editor::ruler_mouse_motion));
if (ruler_shown[ruler_metric_minsec]) { if (ruler_shown[ruler_metric_minsec]) {

4
gtk2_ardour/editor_timefx.cc
View file

@ -121,7 +121,7 @@ Editor::run_timestretch (AudioRegionSelection& regions, float fraction)
current_timestretch->progress_bar.set_percentage (0.0f); current_timestretch->progress_bar.set_percentage (0.0f);
current_timestretch->first_cancel = current_timestretch->cancel_button.signal_clicked().connect (bind (mem_fun (*current_timestretch, &ArdourDialog::stop), -1)); 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->signal_delete_event.connect (mem_fun (*current_timestretch, &ArdourDialog::wm_close_event)); current_timestretch->first_delete = current_timestretch->signal_delete_event().connect (mem_fun (*current_timestretch, &ArdourDialog::wm_close_event));
current_timestretch->run (); current_timestretch->run ();
@ -144,7 +144,7 @@ Editor::run_timestretch (AudioRegionSelection& regions, float fraction)
current_timestretch->first_delete.disconnect(); current_timestretch->first_delete.disconnect();
current_timestretch->cancel_button.signal_clicked().connect (mem_fun (current_timestretch, &TimeStretchDialog::cancel_timestretch_in_progress)); current_timestretch->cancel_button.signal_clicked().connect (mem_fun (current_timestretch, &TimeStretchDialog::cancel_timestretch_in_progress));
current_timestretch->signal_delete_event.connect (mem_fun (current_timestretch, &TimeStretchDialog::delete_timestretch_in_progress)); current_timestretch->signal_delete_event().connect (mem_fun (current_timestretch, &TimeStretchDialog::delete_timestretch_in_progress));
if (pthread_create_and_store ("timestretch", &thread, 0, timestretch_thread, current_timestretch)) { if (pthread_create_and_store ("timestretch", &thread, 0, timestretch_thread, current_timestretch)) {
current_timestretch->close (); current_timestretch->close ();

22
gtk2_ardour/export_dialog.cc
View file

@ -141,8 +141,8 @@ ExportDialog::ExportDialog(PublicEditor& e, AudioRegion* r)
file_selector = 0; file_selector = 0;
spec.running = false; spec.running = false;
file_entry.signal_signal_focus_in_event().connect (ptr_fun (ARDOUR_UI::generic_focus_in_event)); file_entry.signal_focus_in_event()().connect (ptr_fun (ARDOUR_UI::generic_focus_in_event));
file_entry.signal_signal_focus_out_event().connect (ptr_fun (ARDOUR_UI::generic_focus_out_event)); file_entry.signal_focus_out_event()().connect (ptr_fun (ARDOUR_UI::generic_focus_out_event));
file_entry.set_name ("ExportFileNameEntry"); file_entry.set_name ("ExportFileNameEntry");
@ -156,7 +156,7 @@ ExportDialog::ExportDialog(PublicEditor& e, AudioRegion* r)
master_selector.set_column_title (0, _("Output")); master_selector.set_column_title (0, _("Output"));
master_selector.column_titles_show (); master_selector.column_titles_show ();
master_selector.set_selection_mode (GTK_SELECTION_MULTIPLE); master_selector.set_selection_mode (GTK_SELECTION_MULTIPLE);
master_selector.signal_button_press_event.connect (mem_fun(*this, &ExportDialog::master_selector_button_press_event)); master_selector.signal_button_press_event().connect (mem_fun(*this, &ExportDialog::master_selector_button_press_event));
track_selector.set_name ("ExportTrackSelector"); track_selector.set_name ("ExportTrackSelector");
track_selector.set_size_request (-1, 130); track_selector.set_size_request (-1, 130);
@ -168,7 +168,7 @@ ExportDialog::ExportDialog(PublicEditor& e, AudioRegion* r)
track_selector.set_column_title (0, _("Track")); track_selector.set_column_title (0, _("Track"));
track_selector.column_titles_show (); track_selector.column_titles_show ();
track_selector.set_selection_mode (GTK_SELECTION_MULTIPLE); track_selector.set_selection_mode (GTK_SELECTION_MULTIPLE);
track_selector.signal_button_press_event.connect (mem_fun(*this, &ExportDialog::track_selector_button_press_event)); track_selector.signal_button_press_event().connect (mem_fun(*this, &ExportDialog::track_selector_button_press_event));
check_pixmap = gdk_pixmap_colormap_create_from_xpm_d (NULL, check_pixmap = gdk_pixmap_colormap_create_from_xpm_d (NULL,
gtk_widget_get_colormap(GTK_WIDGET(track_selector.gobj())), gtk_widget_get_colormap(GTK_WIDGET(track_selector.gobj())),
@ -385,11 +385,11 @@ ExportDialog::ExportDialog(PublicEditor& e, AudioRegion* r)
file_browse_button.set_name ("EditorGTKButton"); file_browse_button.set_name ("EditorGTKButton");
file_browse_button.signal_clicked().connect (mem_fun(*this, &ExportDialog::initiate_browse)); file_browse_button.signal_clicked().connect (mem_fun(*this, &ExportDialog::initiate_browse));
channel_count_combo.get_popwin()->signal_unmap_event.connect (mem_fun(*this, &ExportDialog::channels_chosen)); channel_count_combo.get_popwin()->signal_unmap_event().connect (mem_fun(*this, &ExportDialog::channels_chosen));
bitdepth_format_combo.get_popwin()->signal_unmap_event.connect (mem_fun(*this, &ExportDialog::bitdepth_chosen)); bitdepth_format_combo.get_popwin()->signal_unmap_event().connect (mem_fun(*this, &ExportDialog::bitdepth_chosen));
header_format_combo.get_popwin()->signal_unmap_event.connect (mem_fun(*this, &ExportDialog::header_chosen)); header_format_combo.get_popwin()->signal_unmap_event().connect (mem_fun(*this, &ExportDialog::header_chosen));
sample_rate_combo.get_popwin()->signal_unmap_event.connect (mem_fun(*this, &ExportDialog::sample_rate_chosen)); sample_rate_combo.get_popwin()->signal_unmap_event().connect (mem_fun(*this, &ExportDialog::sample_rate_chosen));
cue_file_combo.get_popwin()->signal_unmap_event.connect (mem_fun(*this, &ExportDialog::cue_file_type_chosen)); cue_file_combo.get_popwin()->signal_unmap_event().connect (mem_fun(*this, &ExportDialog::cue_file_type_chosen));
} }
ExportDialog::~ExportDialog() ExportDialog::~ExportDialog()
@ -1352,8 +1352,8 @@ ExportDialog::initiate_browse ()
file_selector->get_cancel_button()-.signal_clicked().connect (bind (mem_fun(*this, &ExportDialog::finish_browse), -1)); 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->get_ok_button()-.signal_clicked().connect (bind (mem_fun(*this, &ExportDialog::finish_browse), 1));
file_selector->signal_map_event.connect (bind (mem_fun(*this, &ExportDialog::change_focus_policy), true)); file_selector->signal_map_event().connect (bind (mem_fun(*this, &ExportDialog::change_focus_policy), true));
file_selector->signal_unmap_event.connect (bind (mem_fun(*this, &ExportDialog::change_focus_policy), false)); file_selector->signal_unmap_event().connect (bind (mem_fun(*this, &ExportDialog::change_focus_policy), false));
} }
file_selector->show_all (); file_selector->show_all ();
} }

18
gtk2_ardour/gain_meter.cc
View file

@ -97,8 +97,8 @@ GainMeter::GainMeter (IO& io, Session& s)
& _io.midi_gain_control(), & _io.midi_gain_control(),
false)); false));
gain_slider->signal_button_press_event.connect (mem_fun(*this, &GainMeter::start_gain_touch)); gain_slider->signal_button_press_event().connect (mem_fun(*this, &GainMeter::start_gain_touch));
gain_slider->signal_button_release_event.connect (mem_fun(*this, &GainMeter::end_gain_touch)); gain_slider->signal_button_release_event().connect (mem_fun(*this, &GainMeter::end_gain_touch));
gain_slider->set_name ("MixerGainMeter"); gain_slider->set_name ("MixerGainMeter");
if (_session.midi_port()) { if (_session.midi_port()) {
@ -145,8 +145,8 @@ GainMeter::GainMeter (IO& io, Session& s)
set_size_request_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.signal_button_press_event.connect (mem_fun(*this, &GainMeter::meter_press)); meter_point_button.signal_button_press_event().connect (mem_fun(*this, &GainMeter::meter_press));
meter_point_button.signal_button_release_event.connect (mem_fun(*this, &GainMeter::meter_release)); meter_point_button.signal_button_release_event().connect (mem_fun(*this, &GainMeter::meter_release));
top_table.attach (meter_point_button, 1, 2, 0, 1); top_table.attach (meter_point_button, 1, 2, 0, 1);
} }
@ -193,9 +193,9 @@ GainMeter::GainMeter (IO& io, Session& s)
_io.gain_changed.connect (mem_fun(*this, &GainMeter::gain_changed)); _io.gain_changed.connect (mem_fun(*this, &GainMeter::gain_changed));
meter_metric_area.signal_expose_event.connect (mem_fun(*this, &GainMeter::meter_metrics_expose)); meter_metric_area.signal_expose_event().connect (mem_fun(*this, &GainMeter::meter_metrics_expose));
gain_adjustment.value_changed.connect (mem_fun(*this, &GainMeter::gain_adjusted)); gain_adjustment.value_changed.connect (mem_fun(*this, &GainMeter::gain_adjusted));
peak_display.signal_button_release_event.connect (mem_fun(*this, &GainMeter::peak_button_release)); peak_display.signal_button_release_event().connect (mem_fun(*this, &GainMeter::peak_button_release));
_session.MeterHoldChanged.connect (mem_fun(*this, &GainMeter::meter_hold_changed)); _session.MeterHoldChanged.connect (mem_fun(*this, &GainMeter::meter_hold_changed));
@ -433,10 +433,10 @@ GainMeter::setup_meters ()
meters[n].meter = new FastMeter ((uint32_t) floor (_session.meter_hold()), width, FastMeter::Vertical); meters[n].meter = new FastMeter ((uint32_t) floor (_session.meter_hold()), width, FastMeter::Vertical);
meters[n].width = width; meters[n].width = width;
meters[n].meter->signal_add_events (Gdk::BUTTON_RELEASE_MASK); meters[n].meter->signal_add_event()s (Gdk::BUTTON_RELEASE_MASK);
meters[n].meter->signal_button_release_event.connect meters[n].meter->signal_button_release_event().connect
(bind (mem_fun(*this, &GainMeter::meter_button_release), n)); (bind (mem_fun(*this, &GainMeter::meter_button_release), n));
meters[n].meter->signal_button_release_event.connect_after (ptr_fun (do_not_propagate)); meters[n].meter->signal_button_release_event().connect_after (ptr_fun (do_not_propagate));
} }
meter_packer.pack_start (*meters[n].meter, false, false); meter_packer.pack_start (*meters[n].meter, false, false);

10
gtk2_ardour/gtk-custom-hruler.c
View file

@ -141,12 +141,12 @@ gtk_custom_hruler_draw_ticks (GtkCustomRuler * ruler)
widget = GTK_WIDGET (ruler); widget = GTK_WIDGET (ruler);
gc = widget->style->fg_gc[Gtk::STATE_NORMAL]; gc = widget->style->fg_gc[GTK_STATE_NORMAL];
bg_gc = widget->style->bg_gc[Gtk::STATE_NORMAL]; bg_gc = widget->style->bg_gc[GTK_STATE_NORMAL];
font = gtk_style_get_font(widget->style); font = gtk_style_get_font(widget->style);
gtk_paint_box (widget->style, ruler->backing_store, gtk_paint_box (widget->style, ruler->backing_store,
Gtk::STATE_NORMAL, GTK_SHADOW_NONE, GTK_STATE_NORMAL, GTK_SHADOW_NONE,
NULL, widget, "custom_hruler", 0, 0, widget->allocation.width, widget->allocation.height); NULL, widget, "custom_hruler", 0, 0, widget->allocation.width, widget->allocation.height);
gdk_draw_line (ruler->backing_store, gc, 0, widget->allocation.height - 1, gdk_draw_line (ruler->backing_store, gc, 0, widget->allocation.height - 1,
@ -207,7 +207,7 @@ gtk_custom_hruler_draw_pos (GtkCustomRuler * ruler)
g_return_if_fail (GTK_IS_CUSTOM_HRULER (ruler)); g_return_if_fail (GTK_IS_CUSTOM_HRULER (ruler));
if (GTK_WIDGET_DRAWABLE (ruler) && (ruler->upper - ruler->lower) > 0) { if (GTK_WIDGET_DRAWABLE (ruler) && (ruler->upper - ruler->lower) > 0) {
widget = GTK_WIDGET (ruler); widget = GTK_WIDGET (ruler);
gc = widget->style->fg_gc[Gtk::STATE_NORMAL]; gc = widget->style->fg_gc[GTK_STATE_NORMAL];
xthickness = widget->style->xthickness; xthickness = widget->style->xthickness;
ythickness = widget->style->ythickness; ythickness = widget->style->ythickness;
width = widget->allocation.width; width = widget->allocation.width;

2
gtk2_ardour/gtk-custom-ruler.c
View file

@ -255,7 +255,7 @@ gtk_custom_ruler_realize (GtkWidget * widget)
attributes.visual = gtk_widget_get_visual (widget); attributes.visual = gtk_widget_get_visual (widget);
attributes.colormap = gtk_widget_get_colormap (widget); attributes.colormap = gtk_widget_get_colormap (widget);
attributes.event_mask = gtk_widget_get_events (widget); attributes.event_mask = gtk_widget_get_events (widget);
attributes.event_mask |= (GDK_EXPOSURE_MASK | Gdk::POINTER_MOTION_MASK | Gdk::POINTER_MOTION_HINT_MASK); attributes.event_mask |= (GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK);
attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP; attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;

16
gtk2_ardour/gtkscrolledwindow.c
View file

@ -619,7 +619,7 @@ gtk_scrolled_window_size_request (GtkWidget *widget,
gtk_widget_size_request (bin->child, &child_requisition); gtk_widget_size_request (bin->child, &child_requisition);
if (scrolled_window->hscrollbar_policy == Gtk::POLICY_NEVER) if (scrolled_window->hscrollbar_policy == GTK_POLICY_NEVER)
requisition->width += child_requisition.width; requisition->width += child_requisition.width;
else else
{ {
@ -635,7 +635,7 @@ gtk_scrolled_window_size_request (GtkWidget *widget,
requisition->width += vscrollbar_requisition.width; requisition->width += vscrollbar_requisition.width;
} }
// if (scrolled_window->vscrollbar_policy == Gtk::POLICY_NEVER) // if (scrolled_window->vscrollbar_policy == GTK_POLICY_NEVER)
// requisition->height += child_requisition.height; // requisition->height += child_requisition.height;
// else // else
{ {
@ -652,7 +652,7 @@ gtk_scrolled_window_size_request (GtkWidget *widget,
} }
} }
if (scrolled_window->hscrollbar_policy == Gtk::POLICY_AUTOMATIC || if (scrolled_window->hscrollbar_policy == GTK_POLICY_AUTOMATIC ||
scrolled_window->hscrollbar_policy == GTK_POLICY_ALWAYS) scrolled_window->hscrollbar_policy == GTK_POLICY_ALWAYS)
{ {
requisition->width = MAX (requisition->width, hscrollbar_requisition.width); requisition->width = MAX (requisition->width, hscrollbar_requisition.width);
@ -660,7 +660,7 @@ gtk_scrolled_window_size_request (GtkWidget *widget,
extra_height = SCROLLBAR_SPACING (scrolled_window) + hscrollbar_requisition.height; extra_height = SCROLLBAR_SPACING (scrolled_window) + hscrollbar_requisition.height;
} }
if (scrolled_window->vscrollbar_policy == Gtk::POLICY_AUTOMATIC || if (scrolled_window->vscrollbar_policy == GTK_POLICY_AUTOMATIC ||
scrolled_window->vscrollbar_policy == GTK_POLICY_ALWAYS) scrolled_window->vscrollbar_policy == GTK_POLICY_ALWAYS)
{ {
requisition->height = MAX (requisition->height, vscrollbar_requisition.height); requisition->height = MAX (requisition->height, vscrollbar_requisition.height);
@ -740,11 +740,11 @@ gtk_scrolled_window_size_allocate (GtkWidget *widget,
if (scrolled_window->hscrollbar_policy == GTK_POLICY_ALWAYS) if (scrolled_window->hscrollbar_policy == GTK_POLICY_ALWAYS)
scrolled_window->hscrollbar_visible = TRUE; scrolled_window->hscrollbar_visible = TRUE;
else if (scrolled_window->hscrollbar_policy == Gtk::POLICY_NEVER) else if (scrolled_window->hscrollbar_policy == GTK_POLICY_NEVER)
scrolled_window->hscrollbar_visible = FALSE; scrolled_window->hscrollbar_visible = FALSE;
if (scrolled_window->vscrollbar_policy == GTK_POLICY_ALWAYS) if (scrolled_window->vscrollbar_policy == GTK_POLICY_ALWAYS)
scrolled_window->vscrollbar_visible = TRUE; scrolled_window->vscrollbar_visible = TRUE;
else if (scrolled_window->vscrollbar_policy == Gtk::POLICY_NEVER) else if (scrolled_window->vscrollbar_policy == GTK_POLICY_NEVER)
scrolled_window->vscrollbar_visible = FALSE; scrolled_window->vscrollbar_visible = FALSE;
if (bin->child && GTK_WIDGET_VISIBLE (bin->child)) if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
@ -862,7 +862,7 @@ gtk_scrolled_window_adjustment_changed (GtkAdjustment *adjustment,
if (adjustment == gtk_range_get_adjustment (GTK_RANGE (scrolled_win->hscrollbar))) if (adjustment == gtk_range_get_adjustment (GTK_RANGE (scrolled_win->hscrollbar)))
{ {
if (scrolled_win->hscrollbar_policy == Gtk::POLICY_AUTOMATIC) if (scrolled_win->hscrollbar_policy == GTK_POLICY_AUTOMATIC)
{ {
gboolean visible; gboolean visible;
@ -875,7 +875,7 @@ gtk_scrolled_window_adjustment_changed (GtkAdjustment *adjustment,
} }
else if (adjustment == gtk_range_get_adjustment (GTK_RANGE (scrolled_win->vscrollbar))) else if (adjustment == gtk_range_get_adjustment (GTK_RANGE (scrolled_win->vscrollbar)))
{ {
if (scrolled_win->vscrollbar_policy == Gtk::POLICY_AUTOMATIC) if (scrolled_win->vscrollbar_policy == GTK_POLICY_AUTOMATIC)
{ {
gboolean visible; gboolean visible;

6
gtk2_ardour/io_selector.cc
View file

@ -446,7 +446,7 @@ IOSelector::display_ports ()
} }
} }
B->signal_button_release_event.connect B->signal_button_release_event().connect
(bind (mem_fun(*this, &IOSelector::port_column_button_release), clist)); (bind (mem_fun(*this, &IOSelector::port_column_button_release), clist));
} else { } else {
@ -460,7 +460,7 @@ IOSelector::display_ports ()
} }
} }
B->signal_button_release_event.connect B->signal_button_release_event().connect
(bind (mem_fun(*this, &IOSelector::port_column_button_release), clist)); (bind (mem_fun(*this, &IOSelector::port_column_button_release), clist));
} }
@ -488,7 +488,7 @@ IOSelector::display_ports ()
} }
clist->columns_autosize (); clist->columns_autosize ();
clist->signal_button_release_event.connect (bind (mem_fun(*this, &IOSelector::connection_click), clist)); clist->signal_button_release_event().connect (bind (mem_fun(*this, &IOSelector::connection_click), clist));
} }
port_box.show_all (); port_box.show_all ();

14
gtk2_ardour/keyboard.cc
View file

@ -261,7 +261,7 @@ Keyboard::snooper (GtkWidget *widget, GdkEventKey *event)
cerr << "PRESS: delivering to target " << target << endl; cerr << "PRESS: delivering to target " << target << endl;
} }
#endif #endif
target->signal_key_press_event (event, state, handled); target->key_press_event (event, state, handled);
} }
if (!handled && default_target) { if (!handled && default_target) {
@ -270,7 +270,7 @@ Keyboard::snooper (GtkWidget *widget, GdkEventKey *event)
cerr << "PRESS: not handled, delivering to default target " << default_target << endl; cerr << "PRESS: not handled, delivering to default target " << default_target << endl;
} }
#endif #endif
default_target->signal_key_press_event (event, state, handled); default_target->key_press_event (event, state, handled);
} }
#if KBD_DEBUG #if KBD_DEBUG
@ -307,7 +307,7 @@ Keyboard::snooper (GtkWidget *widget, GdkEventKey *event)
cerr << "RELEASE: delivering to target " << target << endl; cerr << "RELEASE: delivering to target " << target << endl;
} }
#endif #endif
target->signal_key_release_event (event, state); target->key_release_event (event, state);
} }
if (default_target) { if (default_target) {
@ -316,7 +316,7 @@ Keyboard::snooper (GtkWidget *widget, GdkEventKey *event)
cerr << "RELEASE: delivering to default target " << default_target << endl; cerr << "RELEASE: delivering to default target " << default_target << endl;
} }
#endif #endif
default_target->signal_key_release_event (event, state); default_target->key_release_event (event, state);
} }
} }
@ -849,8 +849,8 @@ Keyboard::register_target (KeyboardTarget *kt)
return; return;
} }
kt->window().signal_enter_notify_event.connect (bind (mem_fun(*this, &Keyboard::enter_window), kt)); kt->window().signal_enter_notify_event().connect (bind (mem_fun(*this, &Keyboard::enter_window), kt));
kt->window().signal_leave_notify_event.connect (mem_fun(*this, &Keyboard::leave_window)); kt->window().signal_leave_notify_event().connect (mem_fun(*this, &Keyboard::leave_window));
kt->GoingAway.connect (bind (mem_fun(*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)); kt->Hiding.connect (bind (mem_fun(*this, &Keyboard::maybe_unset_target), kt));
@ -874,7 +874,7 @@ Keyboard::set_current_dialog (ArdourDialog* dialog)
(bind (mem_fun(*this, &Keyboard::set_current_dialog), (bind (mem_fun(*this, &Keyboard::set_current_dialog),
reinterpret_cast<ArdourDialog *>(0))); reinterpret_cast<ArdourDialog *>(0)));
current_dialog->signal_unmap_event.connect (mem_fun(*this, &Keyboard::current_dialog_vanished)); current_dialog->signal_unmap_event().connect (mem_fun(*this, &Keyboard::current_dialog_vanished));
known_dialogs.push_back (dialog); known_dialogs.push_back (dialog);
} }

2
gtk2_ardour/keyboard_target.cc
View file

@ -64,7 +64,7 @@ KeyboardTarget::add_binding (string keystring, string action)
{ {
KeyMap::iterator existing; KeyMap::iterator existing;
Keyboard::State state; Keyboard::State state;
KeyAction key_action = 0; KeyAction key_action;
state = Keyboard::translate_key_name (keystring); state = Keyboard::translate_key_name (keystring);

29
gtk2_ardour/keyboard_target.h
View file

@ -24,19 +24,20 @@
#include <map> #include <map>
#include <string> #include <string>
#include <sigc++/signal.h> #include <sigc++/signal.h>
#include <sigc++/slot.h>
#include <gdk/gdk.h> #include <gdk/gdk.h>
#include <gtkmm/window.h>
#include <pbd/xml++.h> #include <pbd/xml++.h>
#include "keyboard.h" #include "keyboard.h"
using std::map; namespace Gtk {
using std::string; class Window;
}
class KeyboardTarget class KeyboardTarget
{ {
public: public:
KeyboardTarget(Gtk::Window& w, string name); KeyboardTarget(Gtk::Window& w, std::string name);
virtual ~KeyboardTarget(); virtual ~KeyboardTarget();
sigc::signal<void> Hiding; sigc::signal<void> Hiding;
@ -44,35 +45,35 @@ class KeyboardTarget
typedef sigc::slot<void> KeyAction; typedef sigc::slot<void> KeyAction;
string name() const { return _name; } std::string name() const { return _name; }
void key_press_event (GdkEventKey *, Keyboard::State&, bool& handled); void key_press_event (GdkEventKey *, Keyboard::State&, bool& handled);
void key_release_event (GdkEventKey *, Keyboard::State&); void key_release_event (GdkEventKey *, Keyboard::State&);
int add_binding (string keys, string name); int add_binding (std::string keys, std::string name);
string get_binding (string name); /* returns keys bound to name */ std::string get_binding (std::string name); /* returns keys bound to name */
XMLNode& get_binding_state () const; XMLNode& get_binding_state () const;
int set_binding_state (const XMLNode&); int set_binding_state (const XMLNode&);
static int32_t add_action (string, KeyAction); static int32_t add_action (std::string, KeyAction);
static int32_t find_action (string, KeyAction&); static int32_t find_action (std::string, KeyAction&);
static int32_t remove_action (string); static int32_t remove_action (std::string);
static void show_all_actions(); static void show_all_actions();
Gtk::Window& window() const { return _window; } Gtk::Window& window() const { return _window; }
protected: protected:
typedef map<Keyboard::State,KeyAction> KeyMap; typedef std::map<Keyboard::State,KeyAction> KeyMap;
typedef map<string,string> BindingMap; typedef std::map<std::string,std::string> BindingMap;
KeyMap keymap; KeyMap keymap;
BindingMap bindings; BindingMap bindings;
private: private:
typedef map<string,KeyAction> ActionMap; typedef map<std::string,KeyAction> ActionMap;
static ActionMap actions; static ActionMap actions;
string _name; std::string _name;
Gtk::Window& _window; Gtk::Window& _window;
int load_bindings (const XMLNode&); int load_bindings (const XMLNode&);

4
gtk2_ardour/library_ui.cc
View file

@ -1117,8 +1117,8 @@ SoundFileBox::setup_labels (string uri)
path_entry.set_text (file); path_entry.set_text (file);
path_entry.set_position (-1); path_entry.set_position (-1);
path_entry.signal_signal_focus_in_event().connect (ptr_fun (ARDOUR_UI::generic_focus_in_event)); path_entry.signal_focus_in_event()().connect (ptr_fun (ARDOUR_UI::generic_focus_in_event));
path_entry.signal_signal_focus_out_event().connect (ptr_fun (ARDOUR_UI::generic_focus_out_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_alignment (0.0f, 0.0f);
length.set_text (compose("Length: %1", length2string(sf_info->frames, sf_info->samplerate))); length.set_text (compose("Length: %1", length2string(sf_info->frames, sf_info->samplerate)));

16
gtk2_ardour/location_ui.cc
View file

@ -108,16 +108,16 @@ LocationEditRow::LocationEditRow(Session * sess, Location * loc, int32_t num)
cd_track_details_hbox.pack_start (composer_entry, true, true); cd_track_details_hbox.pack_start (composer_entry, true, true);
isrc_entry.changed.connect (mem_fun(*this, &LocationEditRow::isrc_entry_changed)); isrc_entry.changed.connect (mem_fun(*this, &LocationEditRow::isrc_entry_changed));
isrc_entry.signal_signal_focus_in_event().connect (mem_fun(*this, &LocationEditRow::entry_focus_event)); isrc_entry.signal_focus_in_event()().connect (mem_fun(*this, &LocationEditRow::entry_focus_event));
isrc_entry.signal_signal_focus_out_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 (mem_fun(*this, &LocationEditRow::performer_entry_changed)); performer_entry.changed.connect (mem_fun(*this, &LocationEditRow::performer_entry_changed));
performer_entry.signal_signal_focus_in_event().connect (mem_fun(*this, &LocationEditRow::entry_focus_event)); performer_entry.signal_focus_in_event()().connect (mem_fun(*this, &LocationEditRow::entry_focus_event));
performer_entry.signal_signal_focus_out_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 (mem_fun(*this, &LocationEditRow::composer_entry_changed)); composer_entry.changed.connect (mem_fun(*this, &LocationEditRow::composer_entry_changed));
composer_entry.signal_signal_focus_in_event().connect (mem_fun(*this, &LocationEditRow::entry_focus_event)); composer_entry.signal_focus_in_event()().connect (mem_fun(*this, &LocationEditRow::entry_focus_event));
composer_entry.signal_signal_focus_out_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(mem_fun(*this, &LocationEditRow::scms_toggled)); scms_check_button.toggled.connect(mem_fun(*this, &LocationEditRow::scms_toggled));
preemph_check_button.toggled.connect(mem_fun(*this, &LocationEditRow::preemph_toggled)); preemph_check_button.toggled.connect(mem_fun(*this, &LocationEditRow::preemph_toggled));
@ -240,8 +240,8 @@ LocationEditRow::set_location (Location *loc)
name_entry.set_size_request (100, -1); name_entry.set_size_request (100, -1);
name_entry.set_editable (true); name_entry.set_editable (true);
name_entry.changed.connect (mem_fun(*this, &LocationEditRow::name_entry_changed)); name_entry.changed.connect (mem_fun(*this, &LocationEditRow::name_entry_changed));
name_entry.signal_signal_focus_in_event().connect (mem_fun(*this, &LocationEditRow::entry_focus_event)); name_entry.signal_focus_in_event()().connect (mem_fun(*this, &LocationEditRow::entry_focus_event));
name_entry.signal_signal_focus_out_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()) { if (!name_entry.get_parent()) {
item_table.attach (name_entry, 1, 2, 0, 1, Gtk::FILL | Gtk::EXPAND, Gtk::FILL, 4, 0); item_table.attach (name_entry, 1, 2, 0, 1, Gtk::FILL | Gtk::EXPAND, Gtk::FILL, 4, 0);

4
gtk2_ardour/main.cc
View file

@ -306,8 +306,8 @@ Please consider the possibilities, and perhaps (re)start JACK."));
win.set_border_width (7); win.set_border_width (7);
win.add (vpacker); win.add (vpacker);
win.show_all (); win.show_all ();
win.signal_delete_event.connect (sigc::ptr_fun (jack_fooey)); win.signal_delete_event().connect (sigc::ptr_fun (jack_fooey));
win.signal_add_events (Gdk::BUTTON_RELEASE_MASK|Gdk::BUTTON_PRESS_MASK); win.signal_add_event()s (Gdk::BUTTON_RELEASE_MASK|Gdk::BUTTON_PRESS_MASK);
win.set_position (GTK_WIN_POS_CENTER); win.set_position (GTK_WIN_POS_CENTER);
win.realize (); win.realize ();
win.get_window().set_decorations (GdkWMDecoration (GDK_DECOR_BORDER|GDK_DECOR_RESIZEH)); win.get_window().set_decorations (GdkWMDecoration (GDK_DECOR_BORDER|GDK_DECOR_RESIZEH));

24
gtk2_ardour/meter_bridge_strip.cc
View file

@ -61,10 +61,10 @@ MeterBridgeStrip::MeterBridgeStrip (AudioEngine &eng,
label.set_name ("ChannelMeterLabel"); label.set_name ("ChannelMeterLabel");
label_ebox.set_name ("MeterBridgeWindow"); label_ebox.set_name ("MeterBridgeWindow");
label_ebox.signal_set_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK); 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.add (label);
label_ebox.signal_button_release_event.connect (mem_fun(*this, &MeterBridgeStrip::label_button_press_release)); label_ebox.signal_button_release_event().connect (mem_fun(*this, &MeterBridgeStrip::label_button_press_release));
ARDOUR_UI::instance()->tooltips().set_tip (label_ebox, _route.name()); ARDOUR_UI::instance()->tooltips().set_tip (label_ebox, _route.name());
over_long_label.set_text ("0"); over_long_label.set_text ("0");
@ -102,8 +102,8 @@ MeterBridgeStrip::MeterBridgeStrip (AudioEngine &eng,
below_meter_vbox.pack_start (label_ebox); below_meter_vbox.pack_start (label_ebox);
over_short_button.signal_button_release_event.connect (mem_fun(*this,&MeterBridgeStrip::gui_clear_overs)); over_short_button.signal_button_release_event().connect (mem_fun(*this,&MeterBridgeStrip::gui_clear_overs));
over_long_button.signal_button_release_event.connect (mem_fun(*this,&MeterBridgeStrip::gui_clear_overs)); over_long_button.signal_button_release_event().connect (mem_fun(*this,&MeterBridgeStrip::gui_clear_overs));
last_over_short = 0; last_over_short = 0;
last_over_long = 0; last_over_long = 0;
@ -215,22 +215,24 @@ MeterBridgeStrip::set_meter_on (bool yn)
gint gint
MeterBridgeStrip::label_button_press_release (GdkEventButton *ev) MeterBridgeStrip::label_button_press_release (GdkEventButton *ev)
{ {
string name;
ArdourPrompter prompter (true); ArdourPrompter prompter (true);
prompter.set_prompt (_("New name for meter:")); prompter.set_prompt (_("New name for meter:"));
prompter.set_initial_text (label.get_text()); prompter.set_initial_text (label.get_text());
prompter.done.connect (Gtk::Main::quit.slot());
prompter.show_all(); prompter.show_all();
Gtk::Main::run(); switch (prompter.run ()) {
case Gtk::RESPONSE_ACCEPT:
if (prompter.status == Gtkmm2ext::Prompter::entered) {
string name;
prompter.get_result (name); prompter.get_result (name);
if (name.length()) { if (name.length()) {
label.set_text(name); label.set_text(name);
} }
default:
break;
} }
return FALSE; return FALSE;

52
gtk2_ardour/mixer_strip.cc
View file

@ -176,7 +176,7 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, Route& rt, bool in_mixer)
ARDOUR_UI::instance()->tooltips().set_tip (pan_automation_style_button, _("Pan automation type")); ARDOUR_UI::instance()->tooltips().set_tip (pan_automation_style_button, _("Pan automation type"));
ARDOUR_UI::instance()->tooltips().set_tip (gain_automation_style_button, _("Gain automation type")); ARDOUR_UI::instance()->tooltips().set_tip (gain_automation_style_button, _("Gain automation type"));
hide_button.signal_set_events (hide_button.signal_get_events() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK)); hide_button.signal_set_event()s (hide_button.signal_get_event()s() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK));
width_button.unset_flags (Gtk::CAN_FOCUS); width_button.unset_flags (Gtk::CAN_FOCUS);
hide_button.unset_flags (Gtk::CAN_FOCUS); hide_button.unset_flags (Gtk::CAN_FOCUS);
@ -364,35 +364,35 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, Route& rt, bool in_mixer)
_route.comment_changed.connect (mem_fun(*this, &MixerStrip::comment_changed)); _route.comment_changed.connect (mem_fun(*this, &MixerStrip::comment_changed));
_route.gui_changed.connect (mem_fun(*this, &MixerStrip::route_gui_changed)); _route.gui_changed.connect (mem_fun(*this, &MixerStrip::route_gui_changed));
input_button.signal_button_release_event.connect (mem_fun(*this, &MixerStrip::input_press)); input_button.signal_button_release_event().connect (mem_fun(*this, &MixerStrip::input_press));
output_button.signal_button_release_event.connect (mem_fun(*this, &MixerStrip::output_press)); output_button.signal_button_release_event().connect (mem_fun(*this, &MixerStrip::output_press));
rec_enable_button->signal_button_press_event.connect (mem_fun(*this, &RouteUI::rec_enable_press)); rec_enable_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::rec_enable_press));
solo_button->signal_button_press_event.connect (mem_fun(*this, &RouteUI::solo_press)); solo_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::solo_press));
solo_button->signal_button_release_event.connect (mem_fun(*this, &RouteUI::solo_release)); solo_button->signal_button_release_event().connect (mem_fun(*this, &RouteUI::solo_release));
mute_button->signal_button_press_event.connect (mem_fun(*this, &RouteUI::mute_press)); mute_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::mute_press));
mute_button->signal_button_release_event.connect (mem_fun(*this, &RouteUI::mute_release)); mute_button->signal_button_release_event().connect (mem_fun(*this, &RouteUI::mute_release));
gain_automation_style_button.signal_button_press_event.connect_after (ptr_fun (do_not_propagate)); gain_automation_style_button.signal_button_press_event().connect_after (ptr_fun (do_not_propagate));
pan_automation_style_button.signal_button_press_event.connect_after (ptr_fun (do_not_propagate)); pan_automation_style_button.signal_button_press_event().connect_after (ptr_fun (do_not_propagate));
gain_automation_state_button.signal_button_press_event.connect_after (ptr_fun (do_not_propagate)); gain_automation_state_button.signal_button_press_event().connect_after (ptr_fun (do_not_propagate));
pan_automation_state_button.signal_button_press_event.connect_after (ptr_fun (do_not_propagate)); pan_automation_state_button.signal_button_press_event().connect_after (ptr_fun (do_not_propagate));
gain_automation_style_button.signal_button_press_event.connect (mem_fun(*this, &MixerStrip::gain_automation_style_button_event)); gain_automation_style_button.signal_button_press_event().connect (mem_fun(*this, &MixerStrip::gain_automation_style_button_event));
gain_automation_style_button.signal_button_release_event.connect (mem_fun(*this, &MixerStrip::gain_automation_style_button_event)); gain_automation_style_button.signal_button_release_event().connect (mem_fun(*this, &MixerStrip::gain_automation_style_button_event));
pan_automation_style_button.signal_button_press_event.connect (mem_fun(*this, &MixerStrip::pan_automation_style_button_event)); pan_automation_style_button.signal_button_press_event().connect (mem_fun(*this, &MixerStrip::pan_automation_style_button_event));
pan_automation_style_button.signal_button_release_event.connect (mem_fun(*this, &MixerStrip::pan_automation_style_button_event)); pan_automation_style_button.signal_button_release_event().connect (mem_fun(*this, &MixerStrip::pan_automation_style_button_event));
gain_automation_state_button.signal_button_press_event.connect (mem_fun(*this, &MixerStrip::gain_automation_state_button_event)); gain_automation_state_button.signal_button_press_event().connect (mem_fun(*this, &MixerStrip::gain_automation_state_button_event));
gain_automation_state_button.signal_button_release_event.connect (mem_fun(*this, &MixerStrip::gain_automation_state_button_event)); gain_automation_state_button.signal_button_release_event().connect (mem_fun(*this, &MixerStrip::gain_automation_state_button_event));
pan_automation_state_button.signal_button_press_event.connect (mem_fun(*this, &MixerStrip::pan_automation_state_button_event)); pan_automation_state_button.signal_button_press_event().connect (mem_fun(*this, &MixerStrip::pan_automation_state_button_event));
pan_automation_state_button.signal_button_release_event.connect (mem_fun(*this, &MixerStrip::pan_automation_state_button_event)); pan_automation_state_button.signal_button_release_event().connect (mem_fun(*this, &MixerStrip::pan_automation_state_button_event));
polarity_button.toggled.connect (mem_fun(*this, &MixerStrip::polarity_toggled)); polarity_button.toggled.connect (mem_fun(*this, &MixerStrip::polarity_toggled));
name_button.signal_button_release_event.connect (mem_fun(*this, &MixerStrip::name_button_button_release)); name_button.signal_button_release_event().connect (mem_fun(*this, &MixerStrip::name_button_button_release));
group_button.signal_button_press_event.connect (mem_fun(*this, &MixerStrip::select_mix_group)); group_button.signal_button_press_event().connect (mem_fun(*this, &MixerStrip::select_mix_group));
_width = (Width) -1; _width = (Width) -1;
set_stuff_from_route (); set_stuff_from_route ();
@ -1136,14 +1136,14 @@ MixerStrip::setup_comment_editor ()
comment_area.set_name ("MixerTrackCommentArea"); comment_area.set_name ("MixerTrackCommentArea");
comment_area.set_editable (true); comment_area.set_editable (true);
comment_area.signal_signal_focus_in_event().connect (ptr_fun (ARDOUR_UI::generic_focus_in_event)); comment_area.signal_focus_in_event()().connect (ptr_fun (ARDOUR_UI::generic_focus_in_event));
comment_area.signal_signal_focus_out_event().connect (ptr_fun (ARDOUR_UI::generic_focus_out_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.changed.connect (mem_fun(*this, &MixerStrip::comment_edited));
comment_area.signal_button_release_event.connect_after (ptr_fun (do_not_propagate)); comment_area.signal_button_release_event().connect_after (ptr_fun (do_not_propagate));
comment_area.show (); comment_area.show ();
comment_window->add (comment_area); comment_window->add (comment_area);
comment_window->signal_delete_event.connect (bind (ptr_fun (just_hide_it), comment_window)); comment_window->signal_delete_event().connect (bind (ptr_fun (just_hide_it), comment_window));
} }
void void

16
gtk2_ardour/mixer_ui.cc
View file

@ -91,9 +91,9 @@ Mixer_UI::Mixer_UI (AudioEngine& eng)
XMLNode* node = ARDOUR_UI::instance()->mixer_settings(); XMLNode* node = ARDOUR_UI::instance()->mixer_settings();
set_state (*node); set_state (*node);
scroller_base.signal_add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); scroller_base.signal_add_event()s (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
scroller_base.set_name ("MixerWindow"); scroller_base.set_name ("MixerWindow");
scroller_base.signal_button_release_event.connect (mem_fun(*this, &Mixer_UI::strip_scroller_button_release)); scroller_base.signal_button_release_event().connect (mem_fun(*this, &Mixer_UI::strip_scroller_button_release));
// add as last item of strip packer // add as last item of strip packer
strip_packer.pack_end (scroller_base, true, true); strip_packer.pack_end (scroller_base, true, true);
@ -180,9 +180,9 @@ Mixer_UI::Mixer_UI (AudioEngine& eng)
rhs_pane2.set_data ("collapse-direction", (gpointer) 0); rhs_pane2.set_data ("collapse-direction", (gpointer) 0);
list_hpane.set_data ("collapse-direction", (gpointer) 1); list_hpane.set_data ("collapse-direction", (gpointer) 1);
rhs_pane1.signal_button_release_event.connect (bind (ptr_fun (pane_handler), static_cast<Paned*>(&rhs_pane1))); rhs_pane1.signal_button_release_event().connect (bind (ptr_fun (pane_handler), static_cast<Paned*>(&rhs_pane1)));
rhs_pane2.signal_button_release_event.connect (bind (ptr_fun (pane_handler), static_cast<Paned*>(&rhs_pane2))); rhs_pane2.signal_button_release_event().connect (bind (ptr_fun (pane_handler), static_cast<Paned*>(&rhs_pane2)));
list_hpane.signal_button_release_event.connect (bind (ptr_fun (pane_handler), static_cast<Paned*>(&list_hpane))); list_hpane.signal_button_release_event().connect (bind (ptr_fun (pane_handler), static_cast<Paned*>(&list_hpane)));
global_vpacker.pack_start (list_hpane, true, true); global_vpacker.pack_start (list_hpane, true, true);
@ -203,12 +203,12 @@ Mixer_UI::Mixer_UI (AudioEngine& eng)
track_display_list.click_column.connect (mem_fun(*this, &Mixer_UI::track_column_click)); track_display_list.click_column.connect (mem_fun(*this, &Mixer_UI::track_column_click));
group_list_button.signal_clicked().connect (mem_fun(*this, &Mixer_UI::group_list_button_clicked)); group_list_button.signal_clicked().connect (mem_fun(*this, &Mixer_UI::group_list_button_clicked));
group_list.signal_button_press_event.connect (mem_fun(*this, &Mixer_UI::group_list_button_press_event)); group_list.signal_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.select_row.connect (mem_fun(*this, &Mixer_UI::group_selected));
group_list.unselect_row.connect (mem_fun(*this, &Mixer_UI::group_unselected)); group_list.unselect_row.connect (mem_fun(*this, &Mixer_UI::group_unselected));
_plugin_selector = new PluginSelector (PluginManager::the_manager()); _plugin_selector = new PluginSelector (PluginManager::the_manager());
_plugin_selector->signal_delete_event.connect (bind (ptr_fun (just_hide_it), _plugin_selector->signal_delete_event().connect (bind (ptr_fun (just_hide_it),
static_cast<Window *> (_plugin_selector))); static_cast<Window *> (_plugin_selector)));
configure_event.connect (mem_fun (*ARDOUR_UI::instance(), &ARDOUR_UI::configure_handler)); configure_event.connect (mem_fun (*ARDOUR_UI::instance(), &ARDOUR_UI::configure_handler));
@ -273,7 +273,7 @@ Mixer_UI::add_strip (Route* route)
route->name_changed.connect (bind (mem_fun(*this, &Mixer_UI::strip_name_changed), 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->GoingAway.connect (bind (mem_fun(*this, &Mixer_UI::remove_strip), strip));
strip->signal_button_release_event.connect (bind (mem_fun(*this, &Mixer_UI::strip_button_release_event), strip)); strip->signal_button_release_event().connect (bind (mem_fun(*this, &Mixer_UI::strip_button_release_event), strip));
// if (width() < gdk_screen_width()) { // if (width() < gdk_screen_width()) {
// set_size_request (width() + (_strip_width == Wide ? 75 : 50), height()); // set_size_request (width() + (_strip_width == Wide ? 75 : 50), height());

46
gtk2_ardour/option_editor.cc
View file

@ -411,8 +411,8 @@ OptionEditor::setup_path_options()
session_raid_entry.activate.connect (mem_fun(*this, &OptionEditor::raid_path_changed)); session_raid_entry.activate.connect (mem_fun(*this, &OptionEditor::raid_path_changed));
session_raid_entry.signal_signal_focus_in_event().connect (mem_fun (Keyboard::the_keyboard(), &Keyboard::focus_in_handler)); session_raid_entry.signal_focus_in_event()().connect (mem_fun (Keyboard::the_keyboard(), &Keyboard::focus_in_handler));
session_raid_entry.signal_signal_focus_out_event().connect (bind (mem_fun(*this, &OptionEditor::focus_out_event_handler), &OptionEditor::raid_path_changed)); 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 = manage(new Label(_("session RAID path")));
label->set_name ("OptionsLabel"); label->set_name ("OptionsLabel");
@ -427,7 +427,7 @@ OptionEditor::setup_path_options()
vector<string> nfstrings = internationalize (native_format_strings); vector<string> nfstrings = internationalize (native_format_strings);
set_popdown_strings (native_format_combo, nfstrings); set_popdown_strings (native_format_combo, nfstrings);
native_format_combo.get_popwin()->signal_unmap_event.connect (mem_fun(*this, &OptionEditor::native_format_chosen)); native_format_combo.get_popwin()->signal_unmap_event().connect (mem_fun(*this, &OptionEditor::native_format_chosen));
fixup_combo_size (native_format_combo, nfstrings); fixup_combo_size (native_format_combo, nfstrings);
@ -488,7 +488,7 @@ OptionEditor::setup_fade_options ()
dumb.push_back (lmode_strings[Session::AddHigher]); dumb.push_back (lmode_strings[Session::AddHigher]);
set_popdown_strings (layer_mode_combo, dumb); set_popdown_strings (layer_mode_combo, dumb);
layer_mode_combo.get_popwin()->signal_unmap_event.connect (mem_fun(*this, &OptionEditor::layer_mode_chosen)); layer_mode_combo.get_popwin()->signal_unmap_event().connect (mem_fun(*this, &OptionEditor::layer_mode_chosen));
fixup_combo_size (layer_mode_combo, layer_mode_strings); fixup_combo_size (layer_mode_combo, layer_mode_strings);
@ -506,7 +506,7 @@ OptionEditor::setup_fade_options ()
dumb.push_back (xfade_model_strings[ShortCrossfade]); dumb.push_back (xfade_model_strings[ShortCrossfade]);
set_popdown_strings (xfade_model_combo, dumb); set_popdown_strings (xfade_model_combo, dumb);
xfade_model_combo.get_popwin()->signal_unmap_event.connect (mem_fun(*this, &OptionEditor::xfade_model_chosen)); xfade_model_combo.get_popwin()->signal_unmap_event().connect (mem_fun(*this, &OptionEditor::xfade_model_chosen));
fixup_combo_size (xfade_model_combo, xfade_model_strings); fixup_combo_size (xfade_model_combo, xfade_model_strings);
@ -704,7 +704,7 @@ OptionEditor::setup_display_options ()
dumb.push_back (_("Medium")); dumb.push_back (_("Medium"));
dumb.push_back (_("Long")); dumb.push_back (_("Long"));
set_popdown_strings (meter_hold_combo, dumb); set_popdown_strings (meter_hold_combo, dumb);
meter_hold_combo.get_popwin()->signal_unmap_event.connect (mem_fun(*this, &OptionEditor::meter_hold_chosen)); meter_hold_combo.get_popwin()->signal_unmap_event().connect (mem_fun(*this, &OptionEditor::meter_hold_chosen));
hbox = manage (new HBox); hbox = manage (new HBox);
hbox->set_border_width (8); hbox->set_border_width (8);
hbox->set_spacing (8); hbox->set_spacing (8);
@ -723,7 +723,7 @@ OptionEditor::setup_display_options ()
dumb.push_back (_("Faster")); dumb.push_back (_("Faster"));
dumb.push_back (_("Fastest")); dumb.push_back (_("Fastest"));
set_popdown_strings (meter_falloff_combo, dumb); set_popdown_strings (meter_falloff_combo, dumb);
meter_falloff_combo.get_popwin()->signal_unmap_event.connect (mem_fun(*this, &OptionEditor::meter_falloff_chosen)); meter_falloff_combo.get_popwin()->signal_unmap_event().connect (mem_fun(*this, &OptionEditor::meter_falloff_chosen));
hbox = manage (new HBox); hbox = manage (new HBox);
hbox->set_border_width (8); hbox->set_border_width (8);
hbox->set_spacing (8); hbox->set_spacing (8);
@ -836,7 +836,7 @@ OptionEditor::setup_sync_options ()
slave_type_combo.set_value_in_list (true, false); slave_type_combo.set_value_in_list (true, false);
slave_type_combo.get_entry()->set_editable (false); slave_type_combo.get_entry()->set_editable (false);
slave_type_combo.get_entry()->set_name ("OptionsEntry"); slave_type_combo.get_entry()->set_name ("OptionsEntry");
slave_type_combo.get_popwin()->signal_unmap_event.connect (mem_fun(*this, &OptionEditor::slave_type_chosen)); slave_type_combo.get_popwin()->signal_unmap_event().connect (mem_fun(*this, &OptionEditor::slave_type_chosen));
dumb.clear (); dumb.clear ();
dumb.push_back (X_("24 FPS")); dumb.push_back (X_("24 FPS"));
@ -845,7 +845,7 @@ OptionEditor::setup_sync_options ()
dumb.push_back (X_("30 FPS non-drop")); dumb.push_back (X_("30 FPS non-drop"));
set_popdown_strings (smpte_fps_combo, dumb); set_popdown_strings (smpte_fps_combo, dumb);
smpte_fps_combo.get_popwin()->signal_unmap_event.connect (mem_fun(*this, &OptionEditor::smpte_fps_chosen)); smpte_fps_combo.get_popwin()->signal_unmap_event().connect (mem_fun(*this, &OptionEditor::smpte_fps_chosen));
smpte_offset_clock.set_mode (AudioClock::SMPTE); smpte_offset_clock.set_mode (AudioClock::SMPTE);
smpte_offset_clock.ValueChanged.connect (mem_fun(*this, &OptionEditor::smpte_offset_chosen)); smpte_offset_clock.ValueChanged.connect (mem_fun(*this, &OptionEditor::smpte_offset_chosen));
@ -900,7 +900,7 @@ OptionEditor::setup_sync_options ()
jack_time_master_button.set_active (Config->get_jack_time_master()); jack_time_master_button.set_active (Config->get_jack_time_master());
send_mtc_button.signal_button_press_event.connect (bind (mem_fun(*this, &OptionEditor::send_mtc_toggled), &send_mtc_button)); send_mtc_button.signal_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)); 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)); smpte_offset_negative_button.signal_clicked().connect (mem_fun(*this, &OptionEditor::smpte_offset_negative_clicked));
} }
@ -994,19 +994,19 @@ OptionEditor::setup_midi_options ()
} }
tb->set_active (!(*i).second->input()->offline()); tb->set_active (!(*i).second->input()->offline());
tb->signal_button_press_event.connect (bind (mem_fun(*this, &OptionEditor::port_online_toggled), (*i).second, tb)); tb->signal_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)); (*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); table->attach (*tb, 1, 2, n+2, n+3, 0, 0);
tb = manage (new ToggleButton ()); tb = manage (new ToggleButton ());
tb->set_name ("OptionEditorToggleButton"); tb->set_name ("OptionEditorToggleButton");
tb->signal_button_press_event.connect (bind (mem_fun(*this, &OptionEditor::port_trace_in_toggled), (*i).second, tb)); tb->signal_button_press_event().connect (bind (mem_fun(*this, &OptionEditor::port_trace_in_toggled), (*i).second, tb));
tb->set_size_request (10, 10); tb->set_size_request (10, 10);
table->attach (*tb, 2, 3, n+2, n+3, 0, 0); table->attach (*tb, 2, 3, n+2, n+3, 0, 0);
tb = manage (new ToggleButton ()); tb = manage (new ToggleButton ());
tb->set_name ("OptionEditorToggleButton"); tb->set_name ("OptionEditorToggleButton");
tb->signal_button_press_event.connect (bind (mem_fun(*this, &OptionEditor::port_trace_out_toggled), (*i).second, tb)); tb->signal_button_press_event().connect (bind (mem_fun(*this, &OptionEditor::port_trace_out_toggled), (*i).second, tb));
tb->set_size_request (10, 10); tb->set_size_request (10, 10);
table->attach (*tb, 3, 4, n+2, n+3, 0, 0); table->attach (*tb, 3, 4, n+2, n+3, 0, 0);
@ -1019,7 +1019,7 @@ OptionEditor::setup_midi_options ()
rb->set_group (first_mtc_button->group()); rb->set_group (first_mtc_button->group());
} }
table->attach (*rb, 4, 5, n+2, n+3, 0, 0); table->attach (*rb, 4, 5, n+2, n+3, 0, 0);
rb->signal_button_press_event.connect (bind (mem_fun(*this, &OptionEditor::mtc_port_chosen), (*i).second, rb)); rb->signal_button_press_event().connect (bind (mem_fun(*this, &OptionEditor::mtc_port_chosen), (*i).second, rb));
if (Config->get_mtc_port_name() == i->first) { if (Config->get_mtc_port_name() == i->first) {
rb->set_active (true); rb->set_active (true);
@ -1034,7 +1034,7 @@ OptionEditor::setup_midi_options ()
rb->set_group (first_mmc_button->group()); rb->set_group (first_mmc_button->group());
} }
table->attach (*rb, 6, 7, n+2, n+3, 0, 0); table->attach (*rb, 6, 7, n+2, n+3, 0, 0);
rb->signal_button_press_event.connect (bind (mem_fun(*this, &OptionEditor::mmc_port_chosen), (*i).second, rb)); rb->signal_button_press_event().connect (bind (mem_fun(*this, &OptionEditor::mmc_port_chosen), (*i).second, rb));
if (Config->get_mmc_port_name() == i->first) { if (Config->get_mmc_port_name() == i->first) {
rb->set_active (true); rb->set_active (true);
@ -1049,7 +1049,7 @@ OptionEditor::setup_midi_options ()
rb->set_group (first_midi_button->group()); rb->set_group (first_midi_button->group());
} }
table->attach (*rb, 8, 9, n+2, n+3, 0, 0); table->attach (*rb, 8, 9, n+2, n+3, 0, 0);
rb->signal_button_press_event.connect (bind (mem_fun(*this, &OptionEditor::midi_port_chosen), (*i).second, rb)); rb->signal_button_press_event().connect (bind (mem_fun(*this, &OptionEditor::midi_port_chosen), (*i).second, rb));
if (Config->get_midi_port_name() == i->first) { if (Config->get_midi_port_name() == i->first) {
rb->set_active (true); rb->set_active (true);
@ -1551,10 +1551,10 @@ OptionEditor::setup_click_editor ()
click_path_entry.activate.connect (mem_fun(*this, &OptionEditor::click_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_emphasis_path_entry.activate.connect (mem_fun(*this, &OptionEditor::click_emphasis_sound_changed));
click_path_entry.signal_signal_focus_in_event().connect (mem_fun (Keyboard::the_keyboard(), &Keyboard::focus_in_handler)); click_path_entry.signal_focus_in_event()().connect (mem_fun (Keyboard::the_keyboard(), &Keyboard::focus_in_handler));
click_path_entry.signal_signal_focus_out_event().connect (bind (mem_fun(*this, &OptionEditor::focus_out_event_handler), &OptionEditor::click_sound_changed)); 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_signal_focus_in_event().connect (mem_fun (Keyboard::the_keyboard(), &Keyboard::focus_in_handler)); click_emphasis_path_entry.signal_focus_in_event()().connect (mem_fun (Keyboard::the_keyboard(), &Keyboard::focus_in_handler));
click_emphasis_path_entry.signal_signal_focus_out_event().connect (bind (mem_fun(*this, &OptionEditor::focus_out_event_handler), &OptionEditor::click_emphasis_sound_changed)); 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_browse_button.set_name ("EditorGTKButton");
click_emphasis_browse_button.set_name ("EditorGTKButton"); click_emphasis_browse_button.set_name ("EditorGTKButton");
@ -1849,7 +1849,7 @@ OptionEditor::setup_keyboard_options ()
} }
set_popdown_strings (edit_modifier_combo, dumb); set_popdown_strings (edit_modifier_combo, dumb);
edit_modifier_combo.get_popwin()->signal_unmap_event.connect (mem_fun(*this, &OptionEditor::edit_modifier_chosen)); edit_modifier_combo.get_popwin()->signal_unmap_event().connect (mem_fun(*this, &OptionEditor::edit_modifier_chosen));
for (int x = 0; modifiers[x].name; ++x) { for (int x = 0; modifiers[x].name; ++x) {
if (modifiers[x].modifier == Keyboard::edit_modifier ()) { if (modifiers[x].modifier == Keyboard::edit_modifier ()) {
@ -1876,7 +1876,7 @@ OptionEditor::setup_keyboard_options ()
edit_button_adjustment.value_changed.connect (mem_fun(*this, &OptionEditor::edit_button_changed)); edit_button_adjustment.value_changed.connect (mem_fun(*this, &OptionEditor::edit_button_changed));
set_popdown_strings (delete_modifier_combo, dumb); set_popdown_strings (delete_modifier_combo, dumb);
delete_modifier_combo.get_popwin()->signal_unmap_event.connect (mem_fun(*this, &OptionEditor::delete_modifier_chosen)); delete_modifier_combo.get_popwin()->signal_unmap_event().connect (mem_fun(*this, &OptionEditor::delete_modifier_chosen));
for (int x = 0; modifiers[x].name; ++x) { for (int x = 0; modifiers[x].name; ++x) {
if (modifiers[x].modifier == Keyboard::delete_modifier ()) { if (modifiers[x].modifier == Keyboard::delete_modifier ()) {
@ -1903,7 +1903,7 @@ OptionEditor::setup_keyboard_options ()
delete_button_adjustment.value_changed.connect (mem_fun(*this, &OptionEditor::delete_button_changed)); delete_button_adjustment.value_changed.connect (mem_fun(*this, &OptionEditor::delete_button_changed));
set_popdown_strings (snap_modifier_combo, dumb); set_popdown_strings (snap_modifier_combo, dumb);
snap_modifier_combo.get_popwin()->signal_unmap_event.connect (mem_fun(*this, &OptionEditor::snap_modifier_chosen)); snap_modifier_combo.get_popwin()->signal_unmap_event().connect (mem_fun(*this, &OptionEditor::snap_modifier_chosen));
for (int x = 0; modifiers[x].name; ++x) { for (int x = 0; modifiers[x].name; ++x) {
if (modifiers[x].modifier == (guint) Keyboard::snap_modifier ()) { if (modifiers[x].modifier == (guint) Keyboard::snap_modifier ()) {

10
gtk2_ardour/panner_ui.cc
View file

@ -119,9 +119,9 @@ PannerUI::PannerUI (IO& io, Session& s)
panning_link_direction_button.clicked.connect panning_link_direction_button.clicked.connect
(mem_fun(*this, &PannerUI::panning_link_direction_clicked)); (mem_fun(*this, &PannerUI::panning_link_direction_clicked));
panning_link_button.signal_button_press_event.connect panning_link_button.signal_button_press_event().connect
(mem_fun(*this, &PannerUI::panning_link_button_press)); (mem_fun(*this, &PannerUI::panning_link_button_press));
panning_link_button.signal_button_release_event.connect panning_link_button.signal_button_release_event().connect
(mem_fun(*this, &PannerUI::panning_link_button_release)); (mem_fun(*this, &PannerUI::panning_link_button_release));
panning_up.set_border_width (3); panning_up.set_border_width (3);
@ -334,8 +334,8 @@ PannerUI::setup_pan ()
bc->set_name ("PanSlider"); bc->set_name ("PanSlider");
bc->set_shadow_type (GTK_SHADOW_NONE); bc->set_shadow_type (GTK_SHADOW_NONE);
bc->set_style (BarController::Line); bc->set_style (BarController::Line);
bc->get_spin_button().signal_signal_focus_in_event().connect (mem_fun(*this, &PannerUI::entry_focus_event)); bc->get_spin_button().signal_focus_in_event()().connect (mem_fun(*this, &PannerUI::entry_focus_event));
bc->get_spin_button().signal_signal_focus_out_event().connect (mem_fun(*this, &PannerUI::entry_focus_event)); bc->get_spin_button().signal_focus_out_event()().connect (mem_fun(*this, &PannerUI::entry_focus_event));
bc->StartGesture.connect (bind (mem_fun (_io, &IO::start_pan_touch), (uint32_t) asz)); bc->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)); bc->StopGesture.connect (bind (mem_fun (_io, &IO::end_pan_touch), (uint32_t) asz));
@ -344,7 +344,7 @@ PannerUI::setup_pan ()
snprintf (buf, sizeof (buf), _("panner for channel %u"), asz + 1); snprintf (buf, sizeof (buf), _("panner for channel %u"), asz + 1);
ARDOUR_UI::instance()->tooltips().set_tip (bc->event_widget(), buf); ARDOUR_UI::instance()->tooltips().set_tip (bc->event_widget(), buf);
bc->event_widget().signal_button_release_event.connect bc->event_widget().signal_button_release_event().connect
(bind (mem_fun(*this, &PannerUI::pan_button_event), (uint32_t) asz)); (bind (mem_fun(*this, &PannerUI::pan_button_event), (uint32_t) asz));
pan_bars.push_back (bc); pan_bars.push_back (bc);

8
gtk2_ardour/plugin_ui.cc
View file

@ -476,7 +476,7 @@ PluginUI::build_control_ui (AudioEngine &engine, guint32 port_index, MIDI::Contr
control_ui->combo = new Gtk::Combo; control_ui->combo = new Gtk::Combo;
control_ui->combo->set_value_in_list(true, false); control_ui->combo->set_value_in_list(true, false);
set_popdown_strings (*control_ui->combo, setup_scale_values(port_index, control_ui)); set_popdown_strings (*control_ui->combo, setup_scale_values(port_index, control_ui));
control_ui->combo->get_popwin()->signal_unmap_event, un(*this, &PluginUI::control_combo_changed), control_ui)); control_ui->combo->get_popwin()->signal_unmap_event(), un(*this, &PluginUI::control_combo_changed), control_ui));
plugin.ParameterChanged.connect (bind (mem_fun(*this, &PluginUI::parameter_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->label, true, true);
control_ui->pack_start(*control_ui->combo, false, true); control_ui->pack_start(*control_ui->combo, false, true);
@ -550,8 +550,8 @@ PluginUI::build_control_ui (AudioEngine &engine, guint32 port_index, MIDI::Contr
control_ui->control->set_style (BarController::LeftToRight); control_ui->control->set_style (BarController::LeftToRight);
control_ui->control->set_use_parent (true); control_ui->control->set_use_parent (true);
control_ui->control->get_spin_button().signal_signal_focus_in_event().connect (mem_fun(*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_signal_focus_out_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 (mem_fun(*this, &PluginUI::start_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->control->StopGesture.connect (bind (mem_fun(*this, &PluginUI::stop_touch), control_ui));
@ -874,7 +874,7 @@ PlugUIBase::PlugUIBase (PluginInsert& pi)
combo.set_use_arrows_always(true); combo.set_use_arrows_always(true);
set_popdown_strings (combo, plugin.get_presets()); set_popdown_strings (combo, plugin.get_presets());
combo.set_active_text (""); combo.set_active_text ("");
combo.get_popwin()->signal_unmap_event.connect(mem_fun(*this, &PlugUIBase::setting_selected)); combo.get_popwin()->signal_unmap_event().connect(mem_fun(*this, &PlugUIBase::setting_selected));
save_button.set_name ("PluginSaveButton"); save_button.set_name ("PluginSaveButton");
save_button.clicked.connect(mem_fun(*this, &PlugUIBase::save_plugin_setting)); save_button.clicked.connect(mem_fun(*this, &PlugUIBase::save_plugin_setting));

4
gtk2_ardour/prompter.cc
View file

@ -26,7 +26,7 @@ using namespace sigc;
ArdourPrompter::ArdourPrompter (bool modal) ArdourPrompter::ArdourPrompter (bool modal)
: Gtkmm2ext::Prompter (modal) : Gtkmm2ext::Prompter (modal)
{ {
the_entry().signal_signal_focus_in_event().connect (ptr_fun (ARDOUR_UI::generic_focus_in_event)); the_entry().signal_focus_in_event().connect (ptr_fun (ARDOUR_UI::generic_focus_in_event));
the_entry().signal_signal_focus_out_event().connect (ptr_fun (ARDOUR_UI::generic_focus_out_event)); the_entry().signal_focus_out_event().connect (ptr_fun (ARDOUR_UI::generic_focus_out_event));
} }

64
gtk2_ardour/public_editor.cc
View file

@ -15,130 +15,130 @@ PublicEditor::~PublicEditor()
gint gint
PublicEditor::canvas_fade_in_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) { PublicEditor::canvas_fade_in_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) {
return instance()->signal__canvas_fade_in_event (item, event, data); return instance()->signal__canvas_fade_in_event() (item, event, data);
} }
gint gint
PublicEditor::canvas_fade_in_handle_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) { PublicEditor::canvas_fade_in_handle_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) {
return instance()->signal__canvas_fade_in_handle_event (item, event, data); return instance()->signal__canvas_fade_in_handle_event() (item, event, data);
} }
gint gint
PublicEditor::canvas_fade_out_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) { PublicEditor::canvas_fade_out_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) {
return instance()->signal__canvas_fade_out_event (item, event, data); return instance()->signal__canvas_fade_out_event() (item, event, data);
} }
gint gint
PublicEditor::canvas_fade_out_handle_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) { PublicEditor::canvas_fade_out_handle_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) {
return instance()->signal__canvas_fade_out_handle_event (item, event, data); return instance()->signal__canvas_fade_out_handle_event() (item, event, data);
} }
gint gint
PublicEditor::canvas_crossfade_view_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) { PublicEditor::canvas_crossfade_view_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) {
return instance()->signal__canvas_crossfade_view_event (item, event, data); return instance()->signal__canvas_crossfade_view_event() (item, event, data);
} }
gint gint
PublicEditor::canvas_region_view_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) { PublicEditor::canvas_region_view_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) {
return instance()->signal__canvas_region_view_event (item, event, data); return instance()->signal__canvas_region_view_event() (item, event, data);
} }
gint gint
PublicEditor::canvas_region_view_name_highlight_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) { PublicEditor::canvas_region_view_name_highlight_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) {
return instance()->signal__canvas_region_view_name_highlight_event (item, event, data); return instance()->signal__canvas_region_view_name_highlight_event() (item, event, data);
} }
gint gint
PublicEditor::canvas_region_view_name_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) { PublicEditor::canvas_region_view_name_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) {
return instance()->signal__canvas_region_view_name_event (item, event, data); return instance()->signal__canvas_region_view_name_event() (item, event, data);
} }
gint gint
PublicEditor::canvas_stream_view_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) { PublicEditor::canvas_stream_view_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) {
return instance()->signal__canvas_stream_view_event (item, event, data); return instance()->signal__canvas_stream_view_event() (item, event, data);
} }
gint gint
PublicEditor::canvas_automation_track_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) { PublicEditor::canvas_automation_track_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) {
return instance()->signal__canvas_automation_track_event (item, event, data); return instance()->signal__canvas_automation_track_event() (item, event, data);
} }
gint gint
PublicEditor::canvas_marker_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) { PublicEditor::canvas_marker_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) {
return instance()->signal__canvas_marker_event (item, event, data); return instance()->signal__canvas_marker_event() (item, event, data);
} }
gint gint
PublicEditor::canvas_zoom_rect_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) { PublicEditor::canvas_zoom_rect_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) {
return instance()->signal__canvas_zoom_rect_event (item, event, data); return instance()->signal__canvas_zoom_rect_event() (item, event, data);
} }
gint gint
PublicEditor::canvas_selection_rect_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) { PublicEditor::canvas_selection_rect_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) {
return instance()->signal__canvas_selection_rect_event (item, event, data); return instance()->signal__canvas_selection_rect_event() (item, event, data);
} }
gint gint
PublicEditor::canvas_selection_start_trim_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) { PublicEditor::canvas_selection_start_trim_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) {
return instance()->signal__canvas_selection_start_trim_event (item, event, data); return instance()->signal__canvas_selection_start_trim_event() (item, event, data);
} }
gint gint
PublicEditor::canvas_selection_end_trim_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) { PublicEditor::canvas_selection_end_trim_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) {
return instance()->signal__canvas_selection_end_trim_event (item, event, data); return instance()->signal__canvas_selection_end_trim_event() (item, event, data);
} }
gint gint
PublicEditor::canvas_control_point_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) { PublicEditor::canvas_control_point_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) {
return instance()->signal__canvas_control_point_event (item, event, data); return instance()->signal__canvas_control_point_event() (item, event, data);
} }
gint gint
PublicEditor::canvas_line_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) { PublicEditor::canvas_line_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) {
return instance()->signal__canvas_line_event (item, event, data); return instance()->signal__canvas_line_event() (item, event, data);
} }
gint gint
PublicEditor::canvas_tempo_marker_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) { PublicEditor::canvas_tempo_marker_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) {
return instance()->signal__canvas_tempo_marker_event (item, event, data); return instance()->signal__canvas_tempo_marker_event() (item, event, data);
} }
gint gint
PublicEditor::canvas_meter_marker_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) { PublicEditor::canvas_meter_marker_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) {
return instance()->signal__canvas_meter_marker_event (item, event, data); return instance()->signal__canvas_meter_marker_event() (item, event, data);
} }
gint gint
PublicEditor::canvas_tempo_bar_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) { PublicEditor::canvas_tempo_bar_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) {
return instance()->signal__canvas_tempo_bar_event (item, event, data); return instance()->signal__canvas_tempo_bar_event() (item, event, data);
} }
gint gint
PublicEditor::canvas_meter_bar_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) { PublicEditor::canvas_meter_bar_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) {
return instance()->signal__canvas_meter_bar_event (item, event, data); return instance()->signal__canvas_meter_bar_event() (item, event, data);
} }
gint gint
PublicEditor::canvas_marker_bar_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) { PublicEditor::canvas_marker_bar_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) {
return instance()->signal__canvas_marker_bar_event (item, event, data); return instance()->signal__canvas_marker_bar_event() (item, event, data);
} }
gint gint
PublicEditor::canvas_range_marker_bar_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) { PublicEditor::canvas_range_marker_bar_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) {
return instance()->signal__canvas_range_marker_bar_event (item, event, data); return instance()->signal__canvas_range_marker_bar_event() (item, event, data);
} }
gint gint
PublicEditor::canvas_transport_marker_bar_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) { PublicEditor::canvas_transport_marker_bar_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) {
return instance()->signal__canvas_transport_marker_bar_event (item, event, data); return instance()->signal__canvas_transport_marker_bar_event() (item, event, data);
} }
gint gint
PublicEditor::canvas_imageframe_item_view_event(GnomeCanvasItem *item, GdkEvent* event, gpointer data) { PublicEditor::canvas_imageframe_item_view_event(GnomeCanvasItem *item, GdkEvent* event, gpointer data) {
return instance()->signal__canvas_imageframe_item_view_event(item, event, data); return instance()->signal__canvas_imageframe_item_view_event()(item, event, data);
} }
gint gint
PublicEditor::canvas_imageframe_view_event(GnomeCanvasItem *item, GdkEvent* event, gpointer data) { PublicEditor::canvas_imageframe_view_event(GnomeCanvasItem *item, GdkEvent* event, gpointer data) {
return instance()->signal__canvas_imageframe_view_event(item, event, data); return instance()->signal__canvas_imageframe_view_event()(item, event, data);
} }
gint gint
PublicEditor::canvas_imageframe_start_handle_event(GnomeCanvasItem* item, GdkEvent* event, gpointer data) { PublicEditor::canvas_imageframe_start_handle_event(GnomeCanvasItem* item, GdkEvent* event, gpointer data) {
return instance()->signal__canvas_imageframe_start_handle_event(item, event, data); return instance()->signal__canvas_imageframe_start_handle_event()(item, event, data);
} }
gint gint
PublicEditor::canvas_imageframe_end_handle_event(GnomeCanvasItem* item, GdkEvent* event, gpointer data) { PublicEditor::canvas_imageframe_end_handle_event(GnomeCanvasItem* item, GdkEvent* event, gpointer data) {
return instance()->signal__canvas_imageframe_end_handle_event(item, event, data); return instance()->signal__canvas_imageframe_end_handle_event()(item, event, data);
} }
gint gint
PublicEditor::canvas_marker_time_axis_view_event(GnomeCanvasItem* item, GdkEvent* event, gpointer data) { PublicEditor::canvas_marker_time_axis_view_event(GnomeCanvasItem* item, GdkEvent* event, gpointer data) {
return instance()->signal__canvas_marker_time_axis_view_event(item, event, data); return instance()->signal__canvas_marker_time_axis_view_event()(item, event, data);
} }
gint gint
PublicEditor::canvas_markerview_item_view_event(GnomeCanvasItem* item, GdkEvent* event, gpointer data) { PublicEditor::canvas_markerview_item_view_event(GnomeCanvasItem* item, GdkEvent* event, gpointer data) {
return instance()->signal__canvas_markerview_item_view_event(item, event, data); return instance()->signal__canvas_markerview_item_view_event()(item, event, data);
} }
gint gint
PublicEditor::canvas_markerview_start_handle_event(GnomeCanvasItem* item, GdkEvent* event, gpointer data) { PublicEditor::canvas_markerview_start_handle_event(GnomeCanvasItem* item, GdkEvent* event, gpointer data) {
return instance()->signal__canvas_markerview_start_handle_event(item, event, data); return instance()->signal__canvas_markerview_start_handle_event()(item, event, data);
} }
gint gint
PublicEditor::canvas_markerview_end_handle_event(GnomeCanvasItem* item, GdkEvent* event, gpointer data) { PublicEditor::canvas_markerview_end_handle_event(GnomeCanvasItem* item, GdkEvent* event, gpointer data) {
return instance()->signal__canvas_markerview_end_handle_event(item, event, data); return instance()->signal__canvas_markerview_end_handle_event()(item, event, data);
} }

8
gtk2_ardour/redirect_box.cc
View file

@ -108,10 +108,10 @@ RedirectBox::RedirectBox (Placement pcmnt, Session& sess, Route& rt, PluginSelec
_route.redirects_changed.connect (mem_fun(*this, &RedirectBox::redirects_changed)); _route.redirects_changed.connect (mem_fun(*this, &RedirectBox::redirects_changed));
redirect_display.signal_button_press_event.connect (mem_fun(*this, &RedirectBox::redirect_button)); redirect_display.signal_button_press_event().connect (mem_fun(*this, &RedirectBox::redirect_button));
redirect_display.signal_button_release_event.connect (mem_fun(*this, &RedirectBox::redirect_button)); redirect_display.signal_button_release_event().connect (mem_fun(*this, &RedirectBox::redirect_button));
redirect_display.signal_button_release_event.connect_after (ptr_fun (do_not_propagate)); redirect_display.signal_button_release_event().connect_after (ptr_fun (do_not_propagate));
_plugin_selector.hide.connect(mem_fun(*this,&RedirectBox::disconnect_newplug)); _plugin_selector.hide.connect(mem_fun(*this,&RedirectBox::disconnect_newplug));
redirect_display.click_column.connect (mem_fun(*this, &RedirectBox::show_redirect_menu)); redirect_display.click_column.connect (mem_fun(*this, &RedirectBox::show_redirect_menu));
@ -413,7 +413,7 @@ RedirectBox::build_redirect_menu (CList& clist)
&RedirectBox::edit_redirect))); &RedirectBox::edit_redirect)));
selection_dependent_items.push_back (items.back()); selection_dependent_items.push_back (items.back());
menu->signal_map_event.connect (mem_fun(*this, &RedirectBox::redirect_menu_map_handler)); menu->signal_map_event().connect (mem_fun(*this, &RedirectBox::redirect_menu_map_handler));
return menu; return menu;
} }

40
gtk2_ardour/region_editor.cc
View file

@ -70,8 +70,8 @@ AudioRegionEditor::AudioRegionEditor (Session&s, AudioRegion& r, AudioRegionView
name_entry.set_name ("AudioRegionEditorEntry"); name_entry.set_name ("AudioRegionEditorEntry");
name_label.set_name ("AudioRegionEditorLabel"); name_label.set_name ("AudioRegionEditorLabel");
name_entry.signal_signal_focus_in_event().connect (mem_fun(*this, &AudioRegionEditor::focus_change)); name_entry.signal_focus_in_event()().connect (mem_fun(*this, &AudioRegionEditor::focus_change));
name_entry.signal_signal_focus_out_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.set_spacing (5);
name_hbox.pack_start (name_label, false, false); name_hbox.pack_start (name_label, false, false);
@ -123,14 +123,14 @@ AudioRegionEditor::AudioRegionEditor (Session&s, AudioRegion& r, AudioRegionView
fade_out_active_button.unset_flags (Gtk::CAN_FOCUS); fade_out_active_button.unset_flags (Gtk::CAN_FOCUS);
audition_button.unset_flags (Gtk::CAN_FOCUS); audition_button.unset_flags (Gtk::CAN_FOCUS);
mute_button.signal_set_events (mute_button.signal_get_events() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK)); mute_button.signal_set_event()s (mute_button.signal_get_event()s() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK));
opaque_button.signal_set_events (opaque_button.signal_get_events() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK)); opaque_button.signal_set_event()s (opaque_button.signal_get_event()s() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK));
lock_button.signal_set_events (lock_button.signal_get_events() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK)); lock_button.signal_set_event()s (lock_button.signal_get_event()s() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK));
envelope_active_button.signal_set_events (envelope_active_button.signal_get_events() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK)); envelope_active_button.signal_set_event()s (envelope_active_button.signal_get_event()s() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK));
envelope_view_button.signal_set_events (envelope_view_button.signal_get_events() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK)); envelope_view_button.signal_set_event()s (envelope_view_button.signal_get_event()s() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK));
fade_in_active_button.signal_set_events (fade_in_active_button.signal_get_events() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK)); fade_in_active_button.signal_set_event()s (fade_in_active_button.signal_get_event()s() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK));
fade_out_active_button.signal_set_events (fade_out_active_button.signal_get_events() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK)); fade_out_active_button.signal_set_event()s (fade_out_active_button.signal_get_event()s() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK));
audition_button.signal_set_events (audition_button.signal_get_events() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK)); audition_button.signal_set_event()s (audition_button.signal_get_event()s() & ~(GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK));
top_row_button_hbox.set_border_width (5); top_row_button_hbox.set_border_width (5);
top_row_button_hbox.set_spacing (5); top_row_button_hbox.set_spacing (5);
@ -204,8 +204,8 @@ AudioRegionEditor::AudioRegionEditor (Session&s, AudioRegion& r, AudioRegionView
fade_in_length_spinner.set_digits (3); fade_in_length_spinner.set_digits (3);
fade_in_length_spinner.signal_signal_focus_in_event().connect (mem_fun(*this, &AudioRegionEditor::focus_change)); fade_in_length_spinner.signal_focus_in_event()().connect (mem_fun(*this, &AudioRegionEditor::focus_change));
fade_in_length_spinner.signal_signal_focus_out_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)); 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); Gtkmm2ext::set_size_request_to_display_given_text (fade_in_length_spinner, "500g", 20, -1);
@ -240,8 +240,8 @@ AudioRegionEditor::AudioRegionEditor (Session&s, AudioRegion& r, AudioRegionView
fade_out_length_spinner.set_digits (3); fade_out_length_spinner.set_digits (3);
fade_out_length_spinner.signal_signal_focus_in_event().connect (mem_fun(*this, &AudioRegionEditor::focus_change)); fade_out_length_spinner.signal_focus_in_event()().connect (mem_fun(*this, &AudioRegionEditor::focus_change));
fade_out_length_spinner.signal_signal_focus_out_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)); 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); Gtkmm2ext::set_size_request_to_display_given_text (fade_out_length_spinner, "500g", 20, -1);
@ -431,14 +431,14 @@ AudioRegionEditor::connect_editor_events ()
end_clock.ValueChanged.connect (mem_fun(*this, &AudioRegionEditor::end_clock_changed)); end_clock.ValueChanged.connect (mem_fun(*this, &AudioRegionEditor::end_clock_changed));
length_clock.ValueChanged.connect (mem_fun(*this, &AudioRegionEditor::length_clock_changed)); length_clock.ValueChanged.connect (mem_fun(*this, &AudioRegionEditor::length_clock_changed));
fade_in_length_spinner.signal_button_press_event.connect (bind (mem_fun(*this, &AudioRegionEditor::bpressed), &fade_in_length_spinner, fade_in_length_spinner.signal_button_press_event().connect (bind (mem_fun(*this, &AudioRegionEditor::bpressed), &fade_in_length_spinner,
&AudioRegionEditor::start_editing_fade_in)); &AudioRegionEditor::start_editing_fade_in));
fade_in_length_spinner.signal_button_release_event.connect (bind (mem_fun (*this, &AudioRegionEditor::breleased), &fade_in_length_spinner, fade_in_length_spinner.signal_button_release_event().connect (bind (mem_fun (*this, &AudioRegionEditor::breleased), &fade_in_length_spinner,
&AudioRegionEditor::stop_editing_fade_in)); &AudioRegionEditor::stop_editing_fade_in));
fade_out_length_spinner.signal_button_press_event.connect (bind (mem_fun(*this, &AudioRegionEditor::bpressed), &fade_out_length_spinner, fade_out_length_spinner.signal_button_press_event().connect (bind (mem_fun(*this, &AudioRegionEditor::bpressed), &fade_out_length_spinner,
&AudioRegionEditor::start_editing_fade_out)); &AudioRegionEditor::start_editing_fade_out));
fade_out_length_spinner.signal_button_release_event.connect (bind (mem_fun (*this, &AudioRegionEditor::breleased), &fade_out_length_spinner, fade_out_length_spinner.signal_button_release_event().connect (bind (mem_fun (*this, &AudioRegionEditor::breleased), &fade_out_length_spinner,
&AudioRegionEditor::stop_editing_fade_out)); &AudioRegionEditor::stop_editing_fade_out));
fade_in_length_adjustment.value_changed.connect (mem_fun(*this, &AudioRegionEditor::fade_in_length_adjustment_changed)); fade_in_length_adjustment.value_changed.connect (mem_fun(*this, &AudioRegionEditor::fade_in_length_adjustment_changed));
@ -447,8 +447,8 @@ AudioRegionEditor::connect_editor_events ()
fade_in_active_button.toggled.connect (mem_fun(*this, &AudioRegionEditor::fade_in_active_toggled)); 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)); fade_out_active_button.toggled.connect (mem_fun(*this, &AudioRegionEditor::fade_out_active_toggled));
envelope_active_button.signal_button_press_event.connect (mem_fun(*this, &AudioRegionEditor::envelope_active_button_press)); envelope_active_button.signal_button_press_event().connect (mem_fun(*this, &AudioRegionEditor::envelope_active_button_press));
envelope_active_button.signal_button_release_event.connect (mem_fun(*this, &AudioRegionEditor::envelope_active_button_release)); envelope_active_button.signal_button_release_event().connect (mem_fun(*this, &AudioRegionEditor::envelope_active_button_release));
audition_button.toggled.connect (mem_fun(*this, &AudioRegionEditor::audition_button_toggled)); audition_button.toggled.connect (mem_fun(*this, &AudioRegionEditor::audition_button_toggled));
envelope_view_button.toggled.connect (mem_fun(*this, &AudioRegionEditor::envelope_view_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)); lock_button.signal_clicked().connect (mem_fun(*this, &AudioRegionEditor::lock_button_clicked));

2
gtk2_ardour/route_params_ui.cc
View file

@ -147,7 +147,7 @@ RouteParams_UI::RouteParams_UI (AudioEngine& eng)
add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK|Gdk::BUTTON_RELEASE_MASK); add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK|Gdk::BUTTON_RELEASE_MASK);
_plugin_selector = new PluginSelector (PluginManager::the_manager()); _plugin_selector = new PluginSelector (PluginManager::the_manager());
_plugin_selector->signal_delete_event.connect (bind (ptr_fun (just_hide_it), _plugin_selector->signal_delete_event().connect (bind (ptr_fun (just_hide_it),
static_cast<Window *> (_plugin_selector))); static_cast<Window *> (_plugin_selector)));

3
gtk2_ardour/route_ui.h
View file

@ -53,9 +53,8 @@ class RouteUI : public virtual AxisView
string name() const; string name() const;
ARDOUR::Route& _route; ARDOUR::Route& _route;
void set_color (Gdk_Color c); void set_color (Gdk::Color c);
bool choose_color (); bool choose_color ();
bool ignore_toggle; bool ignore_toggle;

12
gtk2_ardour/time_axis_view.cc
View file

@ -86,11 +86,11 @@ TimeAxisView::TimeAxisView(ARDOUR::Session& sess, PublicEditor& ed, TimeAxisView
*/ */
name_entry.set_name ("EditorTrackNameDisplay"); name_entry.set_name ("EditorTrackNameDisplay");
name_entry.signal_button_release_event.connect (mem_fun (*this, &TimeAxisView::name_entry_button_release)); name_entry.signal_button_release_event().connect (mem_fun (*this, &TimeAxisView::name_entry_button_release));
name_entry.signal_button_press_event.connect (mem_fun (*this, &TimeAxisView::name_entry_button_press)); name_entry.signal_button_press_event().connect (mem_fun (*this, &TimeAxisView::name_entry_button_press));
name_entry.signal_signal_focus_in_event().connect (ptr_fun (ARDOUR_UI::generic_focus_in_event)); name_entry.signal_focus_in_event()().connect (ptr_fun (ARDOUR_UI::generic_focus_in_event));
name_entry.signal_signal_focus_out_event().connect (ptr_fun (ARDOUR_UI::generic_focus_out_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 Gtkmm2ext::set_size_request_to_display_given_text (name_entry, N_("gTortnam"), 10, 10); // just represents a short name
@ -124,10 +124,10 @@ TimeAxisView::TimeAxisView(ARDOUR::Session& sess, PublicEditor& ed, TimeAxisView
controls_ebox.set_name ("TimeAxisViewControlsBaseUnselected"); controls_ebox.set_name ("TimeAxisViewControlsBaseUnselected");
controls_ebox.add (controls_vbox); controls_ebox.add (controls_vbox);
controls_ebox.signal_add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); controls_ebox.signal_add_event()s (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
controls_ebox.set_flags (Gtk::CAN_FOCUS); controls_ebox.set_flags (Gtk::CAN_FOCUS);
controls_ebox.signal_button_release_event.connect (mem_fun (*this, &TimeAxisView::controls_ebox_button_release)); controls_ebox.signal_button_release_event().connect (mem_fun (*this, &TimeAxisView::controls_ebox_button_release));
controls_lhs_pad.set_name ("TimeAxisViewControlsPadding"); controls_lhs_pad.set_name ("TimeAxisViewControlsPadding");
controls_hbox.pack_start (controls_lhs_pad,false,false); controls_hbox.pack_start (controls_lhs_pad,false,false);

10
gtk2_ardour/visual_time_axis.cc
View file

@ -95,16 +95,16 @@ VisualTimeAxis::VisualTimeAxis(std::string name, PublicEditor& ed, ARDOUR::Sessi
_marked_for_display = true; _marked_for_display = true;
name_entry.activate.connect(mem_fun(*this, &VisualTimeAxis::name_entry_changed)) ; name_entry.activate.connect(mem_fun(*this, &VisualTimeAxis::name_entry_changed)) ;
name_entry.signal_focus_out_event.connect(mem_fun(*this, &VisualTimeAxis::name_entry_focus_out_handler)) ; name_entry.signal_focus_out_event().connect(mem_fun(*this, &VisualTimeAxis::name_entry_focus_out_handler)) ;
name_entry.signal_button_press_event.connect(mem_fun(*this, &VisualTimeAxis::name_entry_button_press_handler)) ; name_entry.signal_button_press_event().connect(mem_fun(*this, &VisualTimeAxis::name_entry_button_press_handler)) ;
name_entry.signal_button_release_event.connect(mem_fun(*this, &VisualTimeAxis::name_entry_button_release_handler)) ; name_entry.signal_button_release_event().connect(mem_fun(*this, &VisualTimeAxis::name_entry_button_release_handler)) ;
name_entry.signal_key_release_event.connect(mem_fun(*this, &VisualTimeAxis::name_entry_key_release_handler)) ; name_entry.signal_key_release_event().connect(mem_fun(*this, &VisualTimeAxis::name_entry_key_release_handler)) ;
size_button.set_name("TrackSizeButton") ; size_button.set_name("TrackSizeButton") ;
visual_button.set_name("TrackVisualButton") ; visual_button.set_name("TrackVisualButton") ;
hide_button.set_name("TrackRemoveButton") ; hide_button.set_name("TrackRemoveButton") ;
hide_button.add(*(Gtk::manage(new Gtk::Image(small_x_xpm)))) ; hide_button.add(*(Gtk::manage(new Gtk::Image(small_x_xpm)))) ;
size_button.signal_button_release_event.connect (mem_fun (*this, &VisualTimeAxis::size_click)) ; size_button.signal_button_release_event().connect (mem_fun (*this, &VisualTimeAxis::size_click)) ;
visual_button.signal_clicked().connect (mem_fun (*this, &VisualTimeAxis::visual_click)) ; visual_button.signal_clicked().connect (mem_fun (*this, &VisualTimeAxis::visual_click)) ;
hide_button.signal_clicked().connect (mem_fun (*this, &VisualTimeAxis::hide_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(size_button,_("Display Height")) ;

2
gtk2_ardour/vst_pluginui.cc
View file

@ -69,7 +69,7 @@ VSTPluginUI::package (Gtk::Window& win)
/* forward configure events to plugin window */ /* forward configure events to plugin window */
win.signal_configure_event.connect (bind (mem_fun (*this, &VSTPluginUI::configure_handler), socket.gobj())); win.signal_configure_event().connect (bind (mem_fun (*this, &VSTPluginUI::configure_handler), socket.gobj()));
/* XXX in GTK2, use add_id() instead of steal, although add_id() /* XXX in GTK2, use add_id() instead of steal, although add_id()
assumes that the window's owner understands the XEmbed protocol. assumes that the window's owner understands the XEmbed protocol.

39
libs/gtkmm2ext/gtkmm2ext/prompter.h
View file

@ -22,16 +22,24 @@
#define __gtkmm2ext_prompter_h__ #define __gtkmm2ext_prompter_h__
#include <string> #include <string>
#include <gtkmm.h> #include <gtkmm/box.h>
#include <gtkmm/entry.h>
#include <gtkmm/label.h>
#include <gtkmm/dialog.h>
#include <sigc++/sigc++.h> #include <sigc++/sigc++.h>
namespace Gtk {
class Window;
}
namespace Gtkmm2ext { namespace Gtkmm2ext {
class Prompter : public Gtk::Window class Prompter : public Gtk::Dialog
{ {
public: public:
Prompter (bool modal = false); Prompter (bool modal = false);
Prompter (Gtk::Window& parent, bool modal = false);
~Prompter () {}; ~Prompter () {};
void set_prompt (std::string prompt) { void set_prompt (std::string prompt) {
@ -45,40 +53,17 @@ class Prompter : public Gtk::Window
void change_labels (std::string ok, std::string cancel); void change_labels (std::string ok, std::string cancel);
enum PrompterStatus {
entered,
cancelled
};
PrompterStatus status;
void get_result (std::string &str); void get_result (std::string &str);
/* the prompter will send a `done' signal when it is finished.
the "caller" can then check `status' and if it wants to
can then call `get_result()'.
*/
sigc::signal<void> done;
protected: protected:
Gtk::Entry& the_entry() { return entry; } Gtk::Entry& the_entry() { return entry; }
private: private:
Gtk::VBox packer;
Gtk::HBox buttonBox;
Gtk::Entry entry; Gtk::Entry entry;
Gtk::VBox entryBox; Gtk::VBox entryBox;
Gtk::Label entryLabel; Gtk::Label entryLabel;
Gtk::Button ok;
Gtk::Button cancel; void init ();
void activated ();
void cancel_click ();
bool deleted (GdkEventAny *);
void on_realize ();
void on_map ();
}; };
} /* namespace */ } /* namespace */

84
libs/gtkmm2ext/prompter.cc
View file

@ -20,6 +20,7 @@
#include <string> #include <string>
#include <gtkmm/stock.h>
#include <gtkmm2ext/prompter.h> #include <gtkmm2ext/prompter.h>
#include "i18n.h" #include "i18n.h"
@ -27,16 +28,30 @@
using namespace std; using namespace std;
using namespace Gtkmm2ext; using namespace Gtkmm2ext;
Prompter::Prompter (Gtk::Window& parent, bool modal)
: Gtk::Dialog ("", parent, modal)
{
init ();
}
Prompter::Prompter (bool modal) Prompter::Prompter (bool modal)
: Gtk::Window (Gtk::WINDOW_POPUP), : Gtk::Dialog ("", modal)
ok (_("OK")), {
cancel (_("Cancel")) init ();
}
void
Prompter::init ()
{ {
set_position (Gtk::WIN_POS_MOUSE); set_position (Gtk::WIN_POS_MOUSE);
set_name ("Prompter"); set_name ("Prompter");
set_modal (modal);
add (packer); set_default_response (Gtk::RESPONSE_ACCEPT);
add_button (Gtk::Stock::OK, Gtk::RESPONSE_ACCEPT);
add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
add_action_widget (entry, Gtk::RESPONSE_ACCEPT);
entryLabel.set_line_wrap (true); entryLabel.set_line_wrap (true);
entryLabel.set_name ("PrompterLabel"); entryLabel.set_name ("PrompterLabel");
@ -47,67 +62,16 @@ Prompter::Prompter (bool modal)
entryBox.pack_start (entryLabel); entryBox.pack_start (entryLabel);
entryBox.pack_start (entry, false, false); entryBox.pack_start (entry, false, false);
buttonBox.set_homogeneous (true); get_vbox()->pack_start (entryBox);
buttonBox.set_border_width (10);
buttonBox.pack_start (ok, false, true);
buttonBox.pack_start (cancel, false, true);
packer.pack_start (entryBox);
packer.pack_start (buttonBox);
entry.signal_activate().connect(mem_fun(*this,&Prompter::activated));
ok.signal_clicked().connect(mem_fun(*this,&Prompter::activated));
cancel.signal_clicked().connect(mem_fun(*this,&Prompter::cancel_click));
signal_delete_event().connect (mem_fun (*this, &Prompter::deleted));
entry.signal_activate().connect (bind (mem_fun (*this, &Prompter::response), Gtk::RESPONSE_ACCEPT));
} }
void void
Prompter::change_labels (string okstr, string cancelstr) Prompter::change_labels (string okstr, string cancelstr)
{ {
dynamic_cast<Gtk::Label*>(ok.get_child())->set_text (okstr); // dynamic_cast<Gtk::Label*>(ok.get_child())->set_text (okstr);
dynamic_cast<Gtk::Label*>(cancel.get_child())->set_text (cancelstr); // dynamic_cast<Gtk::Label*>(cancel.get_child())->set_text (cancelstr);
}
void
Prompter::on_realize ()
{
Gtk::Window::on_realize ();
Glib::RefPtr<Gdk::Window> win (get_window());
win->set_decorations (Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH|Gdk::DECOR_MENU));
}
void
Prompter::on_map ()
{
entry.grab_focus();
Gtk::Window::on_map ();
}
void
Prompter::activated ()
{
status = entered;
hide_all ();
done ();
}
void
Prompter::cancel_click ()
{
entry.set_text ("");
status = cancelled;
hide_all ();
done ();
}
bool
Prompter::deleted (GdkEventAny *ev)
{
cancel_click ();
return false;
} }
void void