mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-10 08:36:32 +01:00
a few more header files fixes, plus cleanup from nick_m, and the start of Action/UIManager adoption
git-svn-id: svn://localhost/trunk/ardour2@48 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis
parent
60f817b0d2
commit
a0663fbd27
26 changed files with 133 additions and 163 deletions
|
|
@ -76,7 +76,6 @@ automation_pan_line.cc
|
|||
curvetest.cc
|
||||
editor_scrub.cc
|
||||
ghostregion.cc
|
||||
gtkscrolledwindow.c
|
||||
imageframe_time_axis.cc
|
||||
imageframe_time_axis_view.cc
|
||||
imageframe_view.cc
|
||||
|
|
|
|||
|
|
@ -867,16 +867,20 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], string rcfile)
|
|||
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);
|
||||
|
||||
|
|
|
|||
|
|
@ -98,7 +98,8 @@ gnome_canvas_ruler_init (GnomeCanvasRuler *ruler)
|
|||
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
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
#include "libgnomecanvas/libgnomecanvas.h"
|
||||
|
||||
BEGIN_GNOME_CANVAS_DECLS
|
||||
G_BEGIN_DECLS
|
||||
|
||||
/* Wave viewer item for canvas.
|
||||
*/
|
||||
|
|
@ -62,6 +62,6 @@ struct _GnomeCanvasRulerClass {
|
|||
|
||||
GtkType gnome_canvas_ruler_get_type (void);
|
||||
|
||||
END_GNOME_CANVAS_DECLS
|
||||
G_END_DECLS
|
||||
|
||||
#endif /* __GNOME_CANVAS_RULER_H__ */
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
#include <libgnomecanvas/libgnomecanvas.h>
|
||||
|
||||
BEGIN_GNOME_CANVAS_DECLS
|
||||
G_BEGIN_DECLS
|
||||
|
||||
/* Wave viewer item for canvas.
|
||||
*/
|
||||
|
|
@ -122,6 +122,6 @@ struct _GnomeCanvasWaveViewClass {
|
|||
|
||||
GtkType gnome_canvas_waveview_get_type (void);
|
||||
|
||||
END_GNOME_CANVAS_DECLS
|
||||
G_END_DECLS
|
||||
|
||||
#endif /* __GNOME_CANVAS_WAVEVIEW_H__ */
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ CrossfadeView::CrossfadeView (GnomeCanvasGroup *parent,
|
|||
AudioTimeAxisView &tv,
|
||||
Crossfade& xf,
|
||||
double spu,
|
||||
GdkColor& basic_color,
|
||||
Gdk::Color& basic_color,
|
||||
AudioRegionView& lview,
|
||||
AudioRegionView& rview)
|
||||
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ struct CrossfadeView : public TimeAxisViewItem
|
|||
AudioTimeAxisView&,
|
||||
ARDOUR::Crossfade&,
|
||||
double initial_samples_per_unit,
|
||||
GdkColor& basic_color,
|
||||
Gdk::Color& basic_color,
|
||||
AudioRegionView& leftview,
|
||||
AudioRegionView& rightview);
|
||||
~CrossfadeView ();
|
||||
|
|
|
|||
|
|
@ -712,8 +712,8 @@ class Editor : public PublicEditor
|
|||
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;
|
||||
|
|
@ -746,13 +746,13 @@ class Editor : public PublicEditor
|
|||
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();
|
||||
|
|
@ -1490,7 +1490,7 @@ class Editor : public PublicEditor
|
|||
|
||||
/* diskstream/route display management */
|
||||
|
||||
Gtk::CList route_list;
|
||||
Gtk::TreeView route_list;
|
||||
Gtk::ScrolledWindow route_list_scroller;
|
||||
Gtk::Menu *route_list_menu;
|
||||
|
||||
|
|
@ -1507,7 +1507,7 @@ class Editor : public PublicEditor
|
|||
|
||||
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;
|
||||
|
|
|
|||
|
|
@ -103,9 +103,9 @@ Editor::write_a_region ()
|
|||
|
||||
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();
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
$Id$
|
||||
*/
|
||||
|
||||
#include <sigc++/rettype.h>
|
||||
#include <sigc++/retype.h>
|
||||
#include <cstdlib>
|
||||
#include <cmath>
|
||||
|
||||
|
|
@ -315,7 +315,7 @@ Editor::remove_marker (GnomeCanvasItem* item, GdkEvent* event)
|
|||
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));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -394,7 +394,7 @@ Editor::marker_context_menu (GdkEventButton* ev, GnomeCanvasItem* item)
|
|||
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);
|
||||
|
|
@ -753,7 +753,7 @@ Editor::marker_menu_rename ()
|
|||
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));
|
||||
|
|
@ -801,8 +801,8 @@ Editor::new_transport_marker_menu_set_loop ()
|
|||
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());
|
||||
}
|
||||
|
|
@ -826,8 +826,8 @@ Editor::new_transport_marker_menu_set_punch ()
|
|||
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());
|
||||
}
|
||||
|
|
|
|||
|
|
@ -251,13 +251,13 @@ Editor::mouse_add_new_tempo_event (jack_nframes_t frame)
|
|||
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);
|
||||
|
||||
|
|
@ -294,12 +294,12 @@ Editor::mouse_add_new_meter_event (jack_nframes_t frame)
|
|||
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);
|
||||
|
||||
|
|
@ -342,7 +342,7 @@ Editor::remove_tempo_marker (GnomeCanvasItem* item)
|
|||
}
|
||||
|
||||
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()));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -351,12 +351,12 @@ Editor::edit_meter_section (MeterSection* section)
|
|||
{
|
||||
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);
|
||||
|
||||
|
|
@ -382,13 +382,13 @@ Editor::edit_tempo_section (TempoSection* section)
|
|||
{
|
||||
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);
|
||||
|
||||
|
|
@ -477,7 +477,7 @@ Editor::remove_meter_marker (GnomeCanvasItem* item)
|
|||
}
|
||||
|
||||
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()));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -91,7 +91,7 @@ Editor::TimeStretchDialog::TimeStretchDialog (Editor& e)
|
|||
gint
|
||||
Editor::TimeStretchDialog::update_progress ()
|
||||
{
|
||||
progress_bar.set_percentage (request.progress);
|
||||
progress_bar.set_fraction (request.progress/100);
|
||||
return request.running;
|
||||
}
|
||||
|
||||
|
|
@ -119,7 +119,7 @@ Editor::run_timestretch (AudioRegionSelection& regions, float fraction)
|
|||
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));
|
||||
|
||||
|
|
@ -154,7 +154,7 @@ Editor::run_timestretch (AudioRegionSelection& regions, float fraction)
|
|||
|
||||
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 ();
|
||||
|
|
|
|||
|
|
@ -166,7 +166,7 @@ ImageFrameTimeAxisGroup::set_item_samples_per_units(gdouble spp)
|
|||
* @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++)
|
||||
|
|
@ -439,7 +439,7 @@ ImageFrameTimeAxisGroup::remove_this_group(void* src)
|
|||
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));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -288,7 +288,7 @@ class ImageFrameTimeAxisGroup : public sigc::trackable
|
|||
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 */
|
||||
|
|
|
|||
|
|
@ -303,31 +303,3 @@ MarkerTimeAxis::get_marked_time_axis()
|
|||
|
||||
|
||||
|
||||
/**
|
||||
* 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 ;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -120,13 +120,6 @@ class MarkerTimeAxis : public VisualTimeAxis
|
|||
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:
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -124,10 +124,10 @@ Panner2d::reset (uint32_t n_inputs)
|
|||
}
|
||||
|
||||
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);
|
||||
}
|
||||
|
|
@ -352,7 +352,7 @@ Panner2d::find_closest_object (gdouble x, gdouble y, int& which, bool& is_puck)
|
|||
return closest;
|
||||
}
|
||||
|
||||
gint
|
||||
bool
|
||||
Panner2d::on_motion_notify_event (GdkEventMotion *ev)
|
||||
{
|
||||
gint x, y;
|
||||
|
|
@ -419,7 +419,7 @@ Panner2d::handle_motion (gint evx, gint evy, GdkModifierType state)
|
|||
return TRUE;
|
||||
}
|
||||
|
||||
gint
|
||||
bool
|
||||
Panner2d::on_expose_event (GdkEventExpose *event)
|
||||
{
|
||||
gint x, y;
|
||||
|
|
@ -427,7 +427,7 @@ Panner2d::on_expose_event (GdkEventExpose *event)
|
|||
|
||||
/* 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);
|
||||
|
|
@ -450,7 +450,7 @@ Panner2d::on_expose_event (GdkEventExpose *event)
|
|||
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,
|
||||
|
|
@ -480,7 +480,7 @@ Panner2d::on_expose_event (GdkEventExpose *event)
|
|||
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);
|
||||
|
|
@ -491,7 +491,7 @@ Panner2d::on_expose_event (GdkEventExpose *event)
|
|||
return TRUE;
|
||||
}
|
||||
|
||||
gint
|
||||
bool
|
||||
Panner2d::on_button_press_event (GdkEventButton *ev)
|
||||
{
|
||||
switch (ev->button) {
|
||||
|
|
@ -514,7 +514,7 @@ Panner2d::on_button_press_event (GdkEventButton *ev)
|
|||
return FALSE;
|
||||
}
|
||||
|
||||
gint
|
||||
bool
|
||||
Panner2d::on_button_release_event (GdkEventButton *ev)
|
||||
{
|
||||
switch (ev->button) {
|
||||
|
|
@ -579,8 +579,8 @@ Panner2d::show_context_menu ()
|
|||
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));
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ class Panner2d : public Gtk::DrawingArea
|
|||
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 {
|
||||
|
|
@ -85,7 +85,7 @@ class Panner2d : public Gtk::DrawingArea
|
|||
Gtk::Menu* context_menu;
|
||||
Gtk::CheckMenuItem* bypass_menu_item;
|
||||
|
||||
typedef map<int,Target *> Targets;
|
||||
typedef std::map<int,Target *> Targets;
|
||||
Targets targets;
|
||||
Targets pucks;
|
||||
|
||||
|
|
|
|||
|
|
@ -44,8 +44,8 @@ AudioRegionEditor::AudioRegionEditor (Session&s, AudioRegion& r, AudioRegionView
|
|||
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),
|
||||
|
|
@ -70,8 +70,8 @@ AudioRegionEditor::AudioRegionEditor (Session&s, AudioRegion& r, AudioRegionView
|
|||
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);
|
||||
|
|
@ -123,14 +123,14 @@ AudioRegionEditor::AudioRegionEditor (Session&s, AudioRegion& r, AudioRegionView
|
|||
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);
|
||||
|
|
@ -163,14 +163,14 @@ AudioRegionEditor::AudioRegionEditor (Session&s, AudioRegion& r, AudioRegionView
|
|||
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");
|
||||
|
||||
|
|
@ -181,9 +181,9 @@ AudioRegionEditor::AudioRegionEditor (Session&s, AudioRegion& r, AudioRegionView
|
|||
|
||||
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 */
|
||||
|
||||
|
|
@ -204,9 +204,9 @@ AudioRegionEditor::AudioRegionEditor (Session&s, AudioRegion& r, AudioRegionView
|
|||
|
||||
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);
|
||||
|
||||
|
|
@ -214,12 +214,12 @@ AudioRegionEditor::AudioRegionEditor (Session&s, AudioRegion& r, AudioRegionView
|
|||
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 */
|
||||
|
||||
|
|
@ -240,21 +240,21 @@ AudioRegionEditor::AudioRegionEditor (Session&s, AudioRegion& r, AudioRegionView
|
|||
|
||||
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);
|
||||
|
|
@ -271,7 +271,7 @@ AudioRegionEditor::AudioRegionEditor (Session&s, AudioRegion& r, AudioRegionView
|
|||
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();
|
||||
|
|
@ -425,7 +425,7 @@ AudioRegionEditor::stop_editing_fade_out ()
|
|||
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));
|
||||
|
|
@ -441,16 +441,16 @@ AudioRegionEditor::connect_editor_events ()
|
|||
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));
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ AudioRegionView::AudioRegionView (GnomeCanvasGroup *parent, AudioTimeAxisView &t
|
|||
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(),
|
||||
|
|
@ -817,7 +817,7 @@ AudioRegionView::set_amplitude_above_axis (gdouble spp)
|
|||
}
|
||||
|
||||
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;
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ class AudioRegionView : public TimeAxisViewItem
|
|||
ARDOUR::AudioRegion&,
|
||||
double initial_samples_per_unit,
|
||||
double amplitude_above_axis,
|
||||
GdkColor& base_color,
|
||||
Gdk::Color& base_color,
|
||||
bool wait_for_waves);
|
||||
~AudioRegionView ();
|
||||
|
||||
|
|
@ -175,7 +175,7 @@ class AudioRegionView : public TimeAxisViewItem
|
|||
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();
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@ class RouteParams_UI : public ArdourDialog
|
|||
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;
|
||||
|
|
|
|||
|
|
@ -133,7 +133,7 @@ SendUIWindow::SendUIWindow (Send& s, Session& ss)
|
|||
|
||||
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)));
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
#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;
|
||||
|
|
@ -496,7 +496,7 @@ StreamView::diskstream_changed (void *src_ignored)
|
|||
}
|
||||
|
||||
void
|
||||
StreamView::apply_color (GdkColor& color, ColorTarget target)
|
||||
StreamView::apply_color (Gdk::Color& color, ColorTarget target)
|
||||
|
||||
{
|
||||
list<AudioRegionView *>::iterator i;
|
||||
|
|
|
|||
|
|
@ -87,11 +87,11 @@ class StreamView : public sigc::trackable
|
|||
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));
|
||||
|
|
@ -161,7 +161,7 @@ class StreamView : public sigc::trackable
|
|||
|
||||
/* XXX why are these different? */
|
||||
|
||||
GdkColor region_color;
|
||||
Gdk::Color region_color;
|
||||
uint32_t stream_base_color;
|
||||
|
||||
vector<sigc::connection> playlist_connections;
|
||||
|
|
|
|||
|
|
@ -47,7 +47,8 @@
|
|||
#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;
|
||||
|
||||
|
|
@ -89,8 +90,8 @@ TimeAxisView::TimeAxisView(ARDOUR::Session& sess, PublicEditor& ed, TimeAxisView
|
|||
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
|
||||
|
||||
|
|
@ -124,7 +125,7 @@ TimeAxisView::TimeAxisView(ARDOUR::Session& sess, PublicEditor& ed, TimeAxisView
|
|||
|
||||
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));
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue