curvetest.cc
editor_scrub.cc
ghostregion.cc
-gtkscrolledwindow.c
imageframe_time_axis.cc
imageframe_time_axis_view.cc
imageframe_view.cc
set_shuttle_units (Percentage);
set_shuttle_behaviour (Sprung);
- shuttle_unit_menu.items().push_back (MenuElem (_("Percentage"), bind (mem_fun(*this, &ARDOUR_UI::set_shuttle_units),
- Percentage)));
- shuttle_unit_menu.items().push_back (MenuElem (_("Semitones"), bind (mem_fun(*this, &ARDOUR_UI::set_shuttle_units),
- Semitones)));
-
- shuttle_style_menu.items().push_back (MenuElem (_("Sprung"), bind (mem_fun(*this, &ARDOUR_UI::set_shuttle_behaviour),
- Sprung)));
- shuttle_style_menu.items().push_back (MenuElem (_("Wheel"), bind (mem_fun(*this, &ARDOUR_UI::set_shuttle_behaviour),
- Wheel)));
+ Glib::RefPtr<ActionGroup> shuttle_style_actions = ActionGroup::create ();
+ Glib::RefPtr<ActionGroup> shuttle_unit_actions = ActionGroup::create ();
+
+ shuttle_unit_actions->add (Action::create (_("Percentage")), bind (mem_fun(*this, &ARDOUR_UI::set_shuttle_units), Percentage));
+ shuttle_unit_actions->add (Action::create (_("Semitones")), bind (mem_fun(*this, &ARDOUR_UI::set_shuttle_units), Semitones));
+ shuttle_style_actions->add (Action::create (_("Sprung")), bind (mem_fun(*this, &ARDOUR_UI::set_shuttle_behaviour), Sprung));
+ shuttle_style_actions->add (Action::create (_("Wheel")), bind (mem_fun(*this, &ARDOUR_UI::set_shuttle_behaviour), Wheel));
+
+ uiManager->insert_action_group (shuttle_style_actions);
+ uiManager->insert_action_group (shuttle_unit_actions);
+ shuttle_style_menu = uiManager.get_widget ('/ShuttleStyle');
+ shuttle_unit_menu = uiManager.get_widget ('/ShuttleUnits');
+
gettimeofday (&last_peak_grab, 0);
gettimeofday (&last_shuttle_request, 0);
ruler->fill_color = 0;
ruler->tick_color = 0;
- GNOME_CANVAS_ITEM(ruler)->object.flags |= GNOME_CANVAS_ITEM_NO_AUTO_REDRAW;
+ // GTK2FIX
+ //GNOME_CANVAS_ITEM(ruler)->object.flags |= GNOME_CANVAS_ITEM_NO_AUTO_REDRAW;
}
static void
#include "libgnomecanvas/libgnomecanvas.h"
-BEGIN_GNOME_CANVAS_DECLS
+G_BEGIN_DECLS
/* Wave viewer item for canvas.
*/
GtkType gnome_canvas_ruler_get_type (void);
-END_GNOME_CANVAS_DECLS
+G_END_DECLS
#endif /* __GNOME_CANVAS_RULER_H__ */
#include <libgnomecanvas/libgnomecanvas.h>
-BEGIN_GNOME_CANVAS_DECLS
+G_BEGIN_DECLS
/* Wave viewer item for canvas.
*/
GtkType gnome_canvas_waveview_get_type (void);
-END_GNOME_CANVAS_DECLS
+G_END_DECLS
#endif /* __GNOME_CANVAS_WAVEVIEW_H__ */
AudioTimeAxisView &tv,
Crossfade& xf,
double spu,
- GdkColor& basic_color,
+ Gdk::Color& basic_color,
AudioRegionView& lview,
AudioRegionView& rview)
AudioTimeAxisView&,
ARDOUR::Crossfade&,
double initial_samples_per_unit,
- GdkColor& basic_color,
+ Gdk::Color& basic_color,
AudioRegionView& leftview,
AudioRegionView& rightview);
~CrossfadeView ();
bool no_zoom_repos_update;
bool no_tempo_map_update;
- Gtk::CTree region_list_display;
- Gtk::CTree_Helpers::RowList::iterator region_list_hidden_node;
+ Gtk::TreeView region_list_display;
+ //Gtk::CTree_Helpers::RowList::iterator region_list_hidden_node;
Gtk::Menu *region_list_menu;
vector<Gtk::MenuItem*> rl_context_menu_region_items;
Gtk::ScrolledWindow region_list_scroller;
void toggle_full_region_list ();
void toggle_show_auto_regions ();
- static gint _region_list_sorter (GtkCList*, gconstpointer, gconstpointer);
+ static gint _region_list_sorter (GtkTreeView*, gconstpointer, gconstpointer);
gint region_list_sorter (gconstpointer, gconstpointer);
/* named selections */
Gtk::VPaned region_selection_vpane;
- Gtk::CList named_selection_display;
+ Gtk::TreeView named_selection_display;
Gtk::ScrolledWindow named_selection_scroller;
void name_selection();
/* diskstream/route display management */
- Gtk::CList route_list;
+ Gtk::TreeView route_list;
Gtk::ScrolledWindow route_list_scroller;
Gtk::Menu *route_list_menu;
Gtk::Button edit_group_list_button;
Gtk::Label edit_group_list_button_label;
- Gtk::CList edit_group_list;
+ Gtk::TreeView edit_group_list;
Gtk::ScrolledWindow edit_group_list_scroller;
Gtk::Menu *edit_group_list_menu;
Gtk::VBox edit_group_vbox;
FileSelection file_selector;
- file_selector.get_selection_entry()->activate.connect (bind (mem_fun(*this, &Editor::finish_sub_event_loop), 1));
- file_selector.get_cancel_button()-.signal_clicked().connect (bind (mem_fun(*this, &Editor::finish_sub_event_loop), -1));
- file_selector.get_ok_button()-.signal_clicked().connect (bind (mem_fun(*this, &Editor::finish_sub_event_loop), 1));
+ file_selector.get_selection_entry()->signal_activate().connect (sigc::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.signal_delete_event().connect (bind (mem_fun(*this, &Editor::finish_sub_event_loop_on_delete), -1));
file_selector.show_all();
$Id$
*/
-#include <sigc++/rettype.h>
+#include <sigc++/retype.h>
#include <cstdlib>
#include <cmath>
loc->set_hidden (true, this);
}
else {
- Gtk::Main::idle.connect (bind (mem_fun(*this, &Editor::really_remove_marker), loc));
+ Glib::signal_idle().connect (bind (mem_fun(*this, &Editor::really_remove_marker), loc));
}
}
}
Menu_Helpers::MenuList & children = marker_menu->items();
// XXX: should really find this some other way
if (children.size() >= 3) {
- MenuItem * loopitem = children[2];
+ MenuItem * loopitem = &children[2];
if (loopitem) {
if (loc->is_mark()) {
loopitem->set_sensitive(false);
ok_button.set_name ("EditorGTKButton");
cancel_button.set_name ("EditorGTKButton");
- entry.activate.connect (bind (mem_fun(*this, &Editor::finish_sub_event_loop), 1));
+ entry.signal_activate().connect (bind (mem_fun(*this, &Editor::finish_sub_event_loop), 1));
cancel_button.signal_clicked().connect (bind (mem_fun(*this, &Editor::finish_sub_event_loop), -1));
ok_button.signal_clicked().connect (bind (mem_fun(*this, &Editor::finish_sub_event_loop), 1));
dialog.signal_delete_event().connect (bind (mem_fun(*this, &Editor::finish_sub_event_loop_on_delete), -1));
session->add_redo_no_execute (session->locations()->get_memento());
}
else {
- session->add_undo (rettype<void>(bind (mem_fun (*tll, &Location::set), tll->start(), tll->end())));
- session->add_redo (rettype<void>(bind (mem_fun (*tll, &Location::set), temp_location->start(), temp_location->end())));
+ session->add_undo (retype_return<void>(bind (mem_fun (*tll, &Location::set), tll->start(), tll->end())));
+ session->add_redo (retype_return<void>(bind (mem_fun (*tll, &Location::set), temp_location->start(), temp_location->end())));
tll->set_hidden (false, this);
tll->set (temp_location->start(), temp_location->end());
}
session->set_auto_punch_location (tpl);
session->add_redo_no_execute (session->locations()->get_memento());
} else {
- session->add_undo (rettype<void>(bind (mem_fun (*tpl, &Location::set), tpl->start(), tpl->end())));
- session->add_redo (rettype<void>(bind (mem_fun (*tpl, &Location::set), temp_location->start(), temp_location->end())));
+ session->add_undo (retype_return<void>(bind (mem_fun (*tpl, &Location::set), tpl->start(), tpl->end())));
+ session->add_redo (retype_return<void>(bind (mem_fun (*tpl, &Location::set), temp_location->start(), temp_location->end())));
tpl->set_hidden(false, this);
tpl->set(temp_location->start(), temp_location->end());
}
TempoMap& map(session->tempo_map());
TempoDialog tempo_dialog (map, frame, _("add"));
- tempo_dialog.bpm_entry.activate.connect (bind (slot (tempo_dialog, &ArdourDialog::stop), 0));
- tempo_dialog.ok_button.signal_clicked().connect (bind (slot (tempo_dialog, &ArdourDialog::stop), 0));
- tempo_dialog.cancel_button.signal_clicked().connect (bind (slot (tempo_dialog, &ArdourDialog::stop), -1));
+ tempo_dialog.bpm_entry.signal_activate().connect (bind (mem_fun (tempo_dialog, &ArdourDialog::stop), 0));
+ tempo_dialog.ok_button.signal_clicked().connect (bind (mem_fun (tempo_dialog, &ArdourDialog::stop), 0));
+ tempo_dialog.cancel_button.signal_clicked().connect (bind (mem_fun (tempo_dialog, &ArdourDialog::stop), -1));
tempo_dialog.set_position (Gtk::WIN_POS_MOUSE);
tempo_dialog.realize ();
- tempo_dialog.get_window().set_decorations (GdkWMDecoration (GDK_DECOR_BORDER|GDK_DECOR_RESIZEH));
+ tempo_dialog.get_window()->set_decorations (Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH));
ensure_float (tempo_dialog);
TempoMap& map(session->tempo_map());
MeterDialog meter_dialog (map, frame, _("add"));
- meter_dialog.ok_button.signal_clicked().connect (bind (slot (meter_dialog, &ArdourDialog::stop), 0));
- meter_dialog.cancel_button.signal_clicked().connect (bind (slot (meter_dialog, &ArdourDialog::stop), -1));
+ meter_dialog.ok_button.signal_clicked().connect (bind (mem_fun (meter_dialog, &ArdourDialog::stop), 0));
+ meter_dialog.cancel_button.signal_clicked().connect (bind (mem_fun (meter_dialog, &ArdourDialog::stop), -1));
meter_dialog.set_position (Gtk::WIN_POS_MOUSE);
meter_dialog.realize ();
- meter_dialog.get_window().set_decorations (GdkWMDecoration (GDK_DECOR_BORDER|GDK_DECOR_RESIZEH));
+ meter_dialog.get_window()->set_decorations (Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH));
ensure_float (meter_dialog);
}
if (tempo_marker->tempo().movable()) {
- Gtk::Main::idle.connect (bind (mem_fun(*this, &Editor::real_remove_tempo_marker), &tempo_marker->tempo()));
+ Glib::signal_idle().connect (bind (mem_fun(*this, &Editor::real_remove_tempo_marker), &tempo_marker->tempo()));
}
}
{
MeterDialog meter_dialog (*section, _("done"));
- meter_dialog.ok_button.signal_clicked().connect (bind (slot (meter_dialog, &ArdourDialog::stop), 0));
- meter_dialog.cancel_button.signal_clicked().connect (bind (slot (meter_dialog, &ArdourDialog::stop), -1));
+ meter_dialog.ok_button.signal_clicked().connect (bind (mem_fun (meter_dialog, &ArdourDialog::stop), 0));
+ meter_dialog.cancel_button.signal_clicked().connect (bind (mem_fun (meter_dialog, &ArdourDialog::stop), -1));
meter_dialog.set_position (Gtk::WIN_POS_MOUSE);
meter_dialog.realize ();
- meter_dialog.get_window().set_decorations (GdkWMDecoration (GDK_DECOR_BORDER|GDK_DECOR_RESIZEH));
+ meter_dialog.get_window()->set_decorations (Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH));
ensure_float (meter_dialog);
{
TempoDialog tempo_dialog (*section, _("done"));
- tempo_dialog.bpm_entry.activate.connect (bind (slot (tempo_dialog, &ArdourDialog::stop), 0));
- tempo_dialog.ok_button.signal_clicked().connect (bind (slot (tempo_dialog, &ArdourDialog::stop), 0));
- tempo_dialog.cancel_button.signal_clicked().connect (bind (slot (tempo_dialog, &ArdourDialog::stop), -1));
+ tempo_dialog.bpm_entry.signal_activate().connect (bind (mem_fun (tempo_dialog, &ArdourDialog::stop), 0));
+ tempo_dialog.ok_button.signal_clicked().connect (bind (mem_fun (tempo_dialog, &ArdourDialog::stop), 0));
+ tempo_dialog.cancel_button.signal_clicked().connect (bind (mem_fun (tempo_dialog, &ArdourDialog::stop), -1));
tempo_dialog.set_position (Gtk::WIN_POS_MOUSE);
tempo_dialog.realize ();
- tempo_dialog.get_window().set_decorations (GdkWMDecoration (GDK_DECOR_BORDER|GDK_DECOR_RESIZEH));
+ tempo_dialog.get_window()->set_decorations (Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH));
ensure_float (tempo_dialog);
}
if (meter_marker->meter().movable()) {
- Gtk::Main::idle.connect (bind (mem_fun(*this, &Editor::real_remove_meter_marker), &meter_marker->meter()));
+ Glib::signal_idle().connect (bind (mem_fun(*this, &Editor::real_remove_meter_marker), &meter_marker->meter()));
}
}
gint
Editor::TimeStretchDialog::update_progress ()
{
- progress_bar.set_percentage (request.progress);
+ progress_bar.set_fraction (request.progress/100);
return request.running;
}
current_timestretch = new TimeStretchDialog (*this);
}
- current_timestretch->progress_bar.set_percentage (0.0f);
+ current_timestretch->progress_bar.set_fraction (0.0f);
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));
pthread_detach (thread);
- sigc::connection c = Main::timeout.connect (mem_fun (current_timestretch, &TimeStretchDialog::update_progress), 100);
+ sigc::connection c = Glib::signal_timeout().connect (mem_fun (current_timestretch, &TimeStretchDialog::update_progress), 100);
while (current_timestretch->request.running) {
gtk_main_iteration ();
* @param color the new base color
*/
void
-ImageFrameTimeAxisGroup::apply_item_color(GdkColor& color)
+ImageFrameTimeAxisGroup::apply_item_color(Gdk::Color& color)
{
region_color = color ;
for(ImageFrameViewList::const_iterator citer = imageframe_views.begin(); citer != imageframe_views.end(); citer++)
defer to idle loop, otherwise we'll delete this object
while we're still inside this function ...
*/
- Gtk::Main::idle.connect(bind(mem_fun(&ImageFrameTimeAxisGroup::idle_remove_this_group), this, src));
+ Glib::signal_idle().connect(bind(ptr_fun(&ImageFrameTimeAxisGroup::idle_remove_this_group), this, src));
}
/**
std::string _group_id ;
/* XXX why are these different? */
- GdkColor region_color ;
+ Gdk::Color region_color ;
uint32_t stream_base_color ;
/** indicates if this group is currently selected */
-/**
- * Handle the closing of the renaming dialog during the rename of this item
- */
-void
-MarkerTimeAxis::finish_route_rename()
-{
- name_prompter->hide_all ();
- ARDOUR_UI::instance()->allow_focus (false);
-
- if (name_prompter->status == Gtkmm2ext::Prompter::cancelled) {
- return;
- }
-
- string result;
- name_prompter->get_result(result);
- time_axis_name = result ;
- editor.route_name_changed(this) ;
- label_view() ;
- delete name_prompter ;
- name_prompter = 0 ;
-}
-
-
-
-
-
-
-
TimeAxisView* get_marked_time_axis() ;
- protected:
-
- /**
- * Handle the closing of the renaming dialog during the rename of this item
- */
- virtual void finish_route_rename() ;
-
private:
/**
}
void
-Panner2d::on_size_allocate (GtkAllocation *alloc)
+Panner2d::on_size_allocate (Gtk::Allocation alloc)
{
- width = alloc->width;
- height = alloc->height;
+ width = alloc.get_width();
+ height = alloc.get_height();
DrawingArea::on_size_allocate (alloc);
}
return closest;
}
-gint
+bool
Panner2d::on_motion_notify_event (GdkEventMotion *ev)
{
gint x, y;
return TRUE;
}
-gint
+bool
Panner2d::on_expose_event (GdkEventExpose *event)
{
gint x, y;
/* redraw the background */
- get_window().draw_rectangle (get_style()->get_bg_gc(get_state()),
+ get_window()->draw_rectangle (get_style()->get_bg_gc(get_state()),
true,
event->area.x, event->area.y,
event->area.width, event->area.height);
fy = max (fy, -1.0f);
y = (gint) floor (height * fy - 4);
- get_window().draw_arc (get_style()->get_fg_gc(Gtk::STATE_NORMAL),
+ get_window()->draw_arc (get_style()->get_fg_gc(Gtk::STATE_NORMAL),
true,
x, y,
8, 8,
fy = max (fy, -1.0f);
y = (gint) floor ((height - 8) * fy);
- get_window().draw_rectangle (get_style()->get_fg_gc(GTK_STATE_ACTIVE),
+ get_window()->draw_rectangle (get_style()->get_fg_gc(Gtk::STATE_ACTIVE),
true,
x, y,
4, 4);
return TRUE;
}
-gint
+bool
Panner2d::on_button_press_event (GdkEventButton *ev)
{
switch (ev->button) {
return FALSE;
}
-gint
+bool
Panner2d::on_button_release_event (GdkEventButton *ev)
{
switch (ev->button) {
MenuList& items = context_menu->items();
items.push_back (CheckMenuElem (_("Bypass")));
- bypass_menu_item = static_cast<CheckMenuItem*> (items.back());
- bypass_menu_item->toggled.connect (mem_fun(*this, &Panner2d::toggle_bypass));
+ bypass_menu_item = static_cast<CheckMenuItem*> (&items.back());
+ bypass_menu_item->signal_toggled().connect (mem_fun(*this, &Panner2d::toggle_bypass));
}
bool on_button_press_event (GdkEventButton *);
bool on_button_release_event (GdkEventButton *);
bool on_motion_notify_event (GdkEventMotion *);
- void on_size_allocate (GtkAllocation* alloc);
+ void on_size_allocate (Gtk::Allocation alloc);
private:
struct Target {
Gtk::Menu* context_menu;
Gtk::CheckMenuItem* bypass_menu_item;
- typedef map<int,Target *> Targets;
+ typedef std::map<int,Target *> Targets;
Targets targets;
Targets pucks;
lock_button (_("lock")),
mute_button (_("mute")),
opaque_button (_("opaque")),
- raise_arrow (GTK_ARROW_UP, Gtk::SHADOW_OUT),
- lower_arrow (GTK_ARROW_DOWN, Gtk::SHADOW_OUT),
+ raise_arrow (Gtk::ARROW_UP, Gtk::SHADOW_OUT),
+ lower_arrow (Gtk::ARROW_DOWN, Gtk::SHADOW_OUT),
layer_label (_("Layer")),
audition_label (_("play")),
time_table (3, 2),
name_entry.set_name ("AudioRegionEditorEntry");
name_label.set_name ("AudioRegionEditorLabel");
- name_entry.signal_focus_in_event()().connect (mem_fun(*this, &AudioRegionEditor::focus_change));
- name_entry.signal_focus_out_event()().connect (mem_fun(*this, &AudioRegionEditor::focus_change));
+ name_entry.signal_focus_in_event().connect (mem_fun(*this, &AudioRegionEditor::focus_change));
+ name_entry.signal_focus_out_event().connect (mem_fun(*this, &AudioRegionEditor::focus_change));
name_hbox.set_spacing (5);
name_hbox.pack_start (name_label, false, false);
fade_out_active_button.unset_flags (Gtk::CAN_FOCUS);
audition_button.unset_flags (Gtk::CAN_FOCUS);
- mute_button.signal_set_event()s (mute_button.signal_get_event()s() & ~(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_event()s (lock_button.signal_get_event()s() & ~(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_event()s (envelope_view_button.signal_get_event()s() & ~(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_event()s (fade_out_active_button.signal_get_event()s() & ~(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));
+ mute_button.set_events (mute_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
+ opaque_button.set_events (opaque_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
+ lock_button.set_events (lock_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
+ envelope_active_button.set_events (envelope_active_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
+ envelope_view_button.set_events (envelope_view_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
+ fade_in_active_button.set_events (fade_in_active_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
+ fade_out_active_button.set_events (fade_out_active_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
+ audition_button.set_events (audition_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
top_row_button_hbox.set_border_width (5);
top_row_button_hbox.set_spacing (5);
end_alignment.add (end_label);
length_alignment.add (length_label);
- time_table.attach (start_alignment, 0, 1, 0, 1);
- time_table.attach (start_clock, 1, 2, 0, 1, 0, 0);
+ time_table.attach (start_alignment, 0, 1, 0, 1, Gtk::FILL, Gtk::FILL);
+ time_table.attach (start_clock, 1, 2, 0, 1, Gtk::FILL, Gtk::FILL);
- time_table.attach (end_alignment, 0, 1, 1, 2);
- time_table.attach (end_clock, 1, 2, 1, 2, 0, 0);
+ time_table.attach (end_alignment, 0, 1, 1, 2, Gtk::FILL, Gtk::FILL);
+ time_table.attach (end_clock, 1, 2, 1, 2, Gtk::FILL, Gtk::FILL);
- time_table.attach (length_alignment, 0, 1, 2, 3);
- time_table.attach (length_clock, 1, 2, 2, 3, 0, 0);
+ time_table.attach (length_alignment, 0, 1, 2, 3, Gtk::FILL, Gtk::FILL);
+ time_table.attach (length_clock, 1, 2, 2, 3, Gtk::FILL, Gtk::FILL);
envelope_label.set_name ("AudioRegionEditorLabel");
envelope_loop_table.set_border_width (5);
envelope_loop_table.set_row_spacings (2);
- envelope_loop_table.attach (envelope_label, 0, 1, 0, 1, 0, 0);
- envelope_loop_table.attach (envelope_active_button, 0, 1, 1, 2, Gtk::FILL|Gtk::EXPAND, 0);
- envelope_loop_table.attach (envelope_view_button, 0, 1, 2, 3, Gtk::FILL|Gtk::EXPAND, 0);
+ envelope_loop_table.attach (envelope_label, 0, 1, 0, 1, Gtk::FILL, Gtk::FILL);
+ envelope_loop_table.attach (envelope_active_button, 0, 1, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL);
+ envelope_loop_table.attach (envelope_view_button, 0, 1, 2, 3, Gtk::FILL|Gtk::EXPAND, Gtk::FILL);
/* fade in */
fade_in_length_spinner.set_digits (3);
- fade_in_length_spinner.signal_focus_in_event()().connect (mem_fun(*this, &AudioRegionEditor::focus_change));
- fade_in_length_spinner.signal_focus_out_event()().connect (mem_fun(*this, &AudioRegionEditor::focus_change));
- fade_in_length_spinner.activate.connect (mem_fun(*this, &AudioRegionEditor::activation));
+ fade_in_length_spinner.signal_focus_in_event().connect (mem_fun(*this, &AudioRegionEditor::focus_change));
+ fade_in_length_spinner.signal_focus_out_event().connect (mem_fun(*this, &AudioRegionEditor::focus_change));
+ fade_in_length_spinner.signal_activate().connect (mem_fun(*this, &AudioRegionEditor::activation));
Gtkmm2ext::set_size_request_to_display_given_text (fade_in_length_spinner, "500g", 20, -1);
fade_in_label_align.set (0.5);
- fade_in_table.attach (fade_in_label_align, 0, 2, 0, 1, Gtk::FILL|Gtk::EXPAND, 0, 0, 0);
+ fade_in_table.attach (fade_in_label_align, 0, 2, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL);
- fade_in_table.attach (fade_in_length_label, 0, 1, 1, 2, Gtk::EXPAND, 0, 0, 0);
- fade_in_table.attach (fade_in_length_spinner, 0, 1, 2, 3, Gtk::FILL|Gtk::EXPAND, 0, 0, 0);
+ fade_in_table.attach (fade_in_length_label, 0, 1, 1, 2, Gtk::EXPAND, Gtk::FILL);
+ fade_in_table.attach (fade_in_length_spinner, 0, 1, 2, 3, Gtk::FILL|Gtk::EXPAND, Gtk::FILL);
- fade_in_table.attach (fade_in_active_button, 0, 2, 3, 5, Gtk::FILL|Gtk::EXPAND, 0);
+ fade_in_table.attach (fade_in_active_button, 0, 2, 3, 5, Gtk::FILL|Gtk::EXPAND, Gtk::FILL);
/* fade out */
fade_out_length_spinner.set_digits (3);
- fade_out_length_spinner.signal_focus_in_event()().connect (mem_fun(*this, &AudioRegionEditor::focus_change));
- fade_out_length_spinner.signal_focus_out_event()().connect (mem_fun(*this, &AudioRegionEditor::focus_change));
- fade_out_length_spinner.activate.connect (mem_fun(*this, &AudioRegionEditor::activation));
+ fade_out_length_spinner.signal_focus_in_event().connect (mem_fun(*this, &AudioRegionEditor::focus_change));
+ fade_out_length_spinner.signal_focus_out_event().connect (mem_fun(*this, &AudioRegionEditor::focus_change));
+ fade_out_length_spinner.signal_activate().connect (mem_fun(*this, &AudioRegionEditor::activation));
Gtkmm2ext::set_size_request_to_display_given_text (fade_out_length_spinner, "500g", 20, -1);
fade_out_label_align.add (fade_out_label);
fade_out_label_align.set (0.5);
- fade_out_table.attach (fade_out_label_align, 0, 2, 0, 1, Gtk::FILL|Gtk::EXPAND, 0, 0, 0);
+ fade_out_table.attach (fade_out_label_align, 0, 2, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL);
- fade_out_table.attach (fade_out_length_label, 0, 1, 1, 2, Gtk::EXPAND, 0, 0, 0);
- fade_out_table.attach (fade_out_length_spinner, 0, 1, 2, 3, Gtk::FILL|Gtk::EXPAND, 0, 0, 0);
+ fade_out_table.attach (fade_out_length_label, 0, 1, 1, 2, Gtk::EXPAND, Gtk::FILL);
+ fade_out_table.attach (fade_out_length_spinner, 0, 1, 2, 3, Gtk::FILL|Gtk::EXPAND, Gtk::FILL);
- fade_out_table.attach (fade_out_active_button, 0, 2, 3, 5, Gtk::FILL|Gtk::EXPAND, 0);
+ fade_out_table.attach (fade_out_active_button, 0, 2, 3, 5, Gtk::FILL|Gtk::EXPAND, Gtk::FILL);
lower_hbox.pack_start (time_table, true, true);
lower_hbox.pack_start (sep1, false, false);
set_name ("AudioRegionEditorWindow");
add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK);
- delete_event.connect (bind (ptr_fun (just_hide_it), static_cast<Window *> (this)));
+ signal_delete_event().connect (bind (sigc::ptr_fun (just_hide_it), static_cast<Window *> (this)));
string title = _("ardour: region ");
title += _region.name();
void
AudioRegionEditor::connect_editor_events ()
{
- name_entry.changed.connect (mem_fun(*this, &AudioRegionEditor::name_entry_changed));
+ name_entry.signal_changed().connect (mem_fun(*this, &AudioRegionEditor::name_entry_changed));
start_clock.ValueChanged.connect (mem_fun(*this, &AudioRegionEditor::start_clock_changed));
end_clock.ValueChanged.connect (mem_fun(*this, &AudioRegionEditor::end_clock_changed));
fade_out_length_spinner.signal_button_release_event().connect (bind (mem_fun (*this, &AudioRegionEditor::breleased), &fade_out_length_spinner,
&AudioRegionEditor::stop_editing_fade_out));
- fade_in_length_adjustment.value_changed.connect (mem_fun(*this, &AudioRegionEditor::fade_in_length_adjustment_changed));
- fade_out_length_adjustment.value_changed.connect (mem_fun(*this, &AudioRegionEditor::fade_out_length_adjustment_changed));
+ fade_in_length_adjustment.signal_value_changed().connect (mem_fun(*this, &AudioRegionEditor::fade_in_length_adjustment_changed));
+ fade_out_length_adjustment.signal_value_changed().connect (mem_fun(*this, &AudioRegionEditor::fade_out_length_adjustment_changed));
- fade_in_active_button.toggled.connect (mem_fun(*this, &AudioRegionEditor::fade_in_active_toggled));
- fade_out_active_button.toggled.connect (mem_fun(*this, &AudioRegionEditor::fade_out_active_toggled));
+ fade_in_active_button.signal_toggled().connect (mem_fun(*this, &AudioRegionEditor::fade_in_active_toggled));
+ fade_out_active_button.signal_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_release_event().connect (mem_fun(*this, &AudioRegionEditor::envelope_active_button_release));
- audition_button.toggled.connect (mem_fun(*this, &AudioRegionEditor::audition_button_toggled));
- envelope_view_button.toggled.connect (mem_fun(*this, &AudioRegionEditor::envelope_view_button_toggled));
+ audition_button.signal_toggled().connect (mem_fun(*this, &AudioRegionEditor::audition_button_toggled));
+ envelope_view_button.signal_toggled().connect (mem_fun(*this, &AudioRegionEditor::envelope_view_button_toggled));
lock_button.signal_clicked().connect (mem_fun(*this, &AudioRegionEditor::lock_button_clicked));
mute_button.signal_clicked().connect (mem_fun(*this, &AudioRegionEditor::mute_button_clicked));
opaque_button.signal_clicked().connect (mem_fun(*this, &AudioRegionEditor::opaque_button_clicked));
AudioRegion& r,
double spu,
double amplitude_above_axis,
- GdkColor& basic_color,
+ Gdk::Color& basic_color,
bool wfw)
: TimeAxisViewItem (r.name(), parent, tv, spu, basic_color, r.position(), r.length(),
}
void
-AudioRegionView::compute_colors (GdkColor& basic_color)
+AudioRegionView::compute_colors (Gdk::Color& basic_color)
{
TimeAxisViewItem::compute_colors (basic_color);
uint32_t r, g, b, a;
ARDOUR::AudioRegion&,
double initial_samples_per_unit,
double amplitude_above_axis,
- GdkColor& base_color,
+ Gdk::Color& base_color,
bool wait_for_waves);
~AudioRegionView ();
void store_flags ();
void set_colors ();
- void compute_colors (GdkColor&);
+ void compute_colors (Gdk::Color&);
void set_frame_color ();
void reset_width_dependent_items (double pixel_width);
void set_waveview_data_src();
Gtk::VBox mixer_scroller_vpacker;
Gtk::VBox list_vpacker;
- Gtk::CList route_select_list;
+ Gtk::TreeView route_select_list;
Gtk::Label route_list_button_label;
Gtk::Button route_list_button;
Gtk::ScrolledWindow route_select_scroller;
s.GoingAway.connect (mem_fun (*this, &SendUIWindow::send_going_away));
- delete_event.connect (bind (ptr_fun (just_hide_it), reinterpret_cast<Window *> (this)));
+ signal_delete_event().connect (bind (ptr_fun (just_hide_it), reinterpret_cast<Window *> (this)));
}
#include "ardour_ui.h"
#include "crossfade_view.h"
#include "rgb_macros.h"
-#include "extra_bind.h"
+//#include "extra_bind.h"
#include "gui_thread.h"
using namespace ARDOUR;
}
void
-StreamView::apply_color (GdkColor& color, ColorTarget target)
+StreamView::apply_color (Gdk::Color& color, ColorTarget target)
{
list<AudioRegionView *>::iterator i;
StreamBaseColor
};
- void apply_color (GdkColor&, ColorTarget t);
+ void apply_color (Gdk::Color&, ColorTarget t);
void set_selected_regionviews (AudioRegionSelection&);
void get_selectables (jack_nframes_t start, jack_nframes_t end, list<Selectable* >&);
void get_inverted_selectables (Selection&, list<Selectable* >& results);
- GdkColor get_region_color () const { return region_color; }
+ Gdk::Color get_region_color () const { return region_color; }
void foreach_regionview (sigc::slot<void,AudioRegionView*> slot);
void foreach_crossfadeview (void (CrossfadeView::*pmf)(void));
/* XXX why are these different? */
- GdkColor region_color;
+ Gdk::Color region_color;
uint32_t stream_base_color;
vector<sigc::connection> playlist_connections;
#include "i18n.h"
using namespace Gtk;
-using namespace sigc;
+/*can't use sigc namespace while we have the compose() in libs/pbd3/pbd */
+//using namespace sigc;
using namespace ARDOUR;
using namespace Editing;
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_focus_in_event()().connect (ptr_fun (ARDOUR_UI::generic_focus_in_event));
- name_entry.signal_focus_out_event()().connect (ptr_fun (ARDOUR_UI::generic_focus_out_event));
+ name_entry.signal_focus_in_event().connect (sigc::ptr_fun (ARDOUR_UI::generic_focus_in_event));
+ name_entry.signal_focus_out_event().connect (sigc::ptr_fun (ARDOUR_UI::generic_focus_out_event));
Gtkmm2ext::set_size_request_to_display_given_text (name_entry, N_("gTortnam"), 10, 10); // just represents a short name
controls_ebox.set_name ("TimeAxisViewControlsBaseUnselected");
controls_ebox.add (controls_vbox);
- controls_ebox.signal_add_event()s (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
+ controls_ebox.set_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
controls_ebox.set_flags (Gtk::CAN_FOCUS);
controls_ebox.signal_button_release_event().connect (mem_fun (*this, &TimeAxisView::controls_ebox_button_release));
projects / ardour.git / commitdiff