From 60f817b0d2411947c257ecbf0b0376589ea77acd Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 5 Oct 2005 13:48:09 +0000 Subject: 2 cleanup patches from nickm, plus work on mixer_ui.cc so that it compiles git-svn-id: svn://localhost/trunk/ardour2@47 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/ardour_ui_dependents.cc | 4 +- gtk2_ardour/axis_view.cc | 22 ++-- gtk2_ardour/axis_view.h | 4 +- gtk2_ardour/canvas-imageframe.h | 6 +- gtk2_ardour/canvas-simpleline.h | 4 +- gtk2_ardour/canvas-simplerect.h | 4 +- gtk2_ardour/editor.h | 4 +- gtk2_ardour/editor_canvas_events.cc | 56 +++++----- gtk2_ardour/imageframe_time_axis_group.h | 2 +- gtk2_ardour/imageframe_time_axis_view.cc | 2 +- gtk2_ardour/imageframe_time_axis_view.h | 4 +- gtk2_ardour/imageframe_view.cc | 2 +- gtk2_ardour/imageframe_view.h | 2 +- gtk2_ardour/marker_time_axis_view.cc | 2 +- gtk2_ardour/marker_time_axis_view.h | 4 +- gtk2_ardour/marker_view.cc | 2 +- gtk2_ardour/marker_view.h | 2 +- gtk2_ardour/mixer_ui.cc | 184 +++++++++++++------------------ gtk2_ardour/mixer_ui.h | 22 ++-- gtk2_ardour/public_editor.cc | 66 +++++------ gtk2_ardour/tempo_dialog.cc | 2 + gtk2_ardour/time_axis_view_item.h | 4 +- gtk2_ardour/visual_time_axis.h | 2 +- 23 files changed, 192 insertions(+), 214 deletions(-) diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc index e60e7629e5..68c1edd3e8 100644 --- a/gtk2_ardour/ardour_ui_dependents.cc +++ b/gtk2_ardour/ardour_ui_dependents.cc @@ -92,13 +92,13 @@ void ARDOUR_UI::goto_editor_window () { editor->show_window (); - editor->window().get_window().raise (); + editor->present(); } void ARDOUR_UI::goto_mixer_window () { mixer->show_window (); - mixer->get_window().raise (); + mixer->present(); } gint diff --git a/gtk2_ardour/axis_view.cc b/gtk2_ardour/axis_view.cc index 123f9b4b57..6b8b5e59fa 100644 --- a/gtk2_ardour/axis_view.cc +++ b/gtk2_ardour/axis_view.cc @@ -43,7 +43,7 @@ using namespace Gtk; using namespace Gtkmm2ext; -list AxisView::used_colors; +list AxisView::used_colors; AxisView::AxisView (ARDOUR::Session& sess) : _session(sess) { @@ -55,10 +55,10 @@ AxisView::~AxisView() } -GdkColor +Gdk::Color AxisView::unique_random_color() { - GdkColor newcolor; + Gdk::Color newcolor; while (1) { @@ -68,22 +68,22 @@ AxisView::unique_random_color() const int32_t max_saturation = 48000; // 65535 would open up the whole color wheel - newcolor.red = random() % max_saturation; - newcolor.blue = random() % max_saturation; - newcolor.green = random() % max_saturation; + newcolor.set_red (random() % max_saturation); + newcolor.set_blue (random() % max_saturation); + newcolor.set_green (random() % max_saturation); if (used_colors.size() == 0) { used_colors.push_back (newcolor); return newcolor; } - for (list::iterator i = used_colors.begin(); i != used_colors.end(); ++i) { - GdkColor c = *i; + for (list::iterator i = used_colors.begin(); i != used_colors.end(); ++i) { + Gdk::Color c = *i; float rdelta, bdelta, gdelta; - rdelta = newcolor.red - c.red; - bdelta = newcolor.blue - c.blue; - gdelta = newcolor.green - c.green; + rdelta = newcolor.get_red() - c.get_red(); + bdelta = newcolor.get_blue() - c.get_blue(); + gdelta = newcolor.get_green() - c.get_green(); if (sqrt (rdelta*rdelta + bdelta*bdelta + gdelta*gdelta) > 25.0) { used_colors.push_back (newcolor); diff --git a/gtk2_ardour/axis_view.h b/gtk2_ardour/axis_view.h index 0d09ca51ac..93c4f4870f 100644 --- a/gtk2_ardour/axis_view.h +++ b/gtk2_ardour/axis_view.h @@ -77,13 +77,13 @@ class AxisView : public sigc::trackable * * @return the unique random color. */ - static GdkColor unique_random_color(); + static Gdk::Color unique_random_color(); ARDOUR::Session& _session; Gdk::Color _color; - static list used_colors; + static list used_colors; Gtk::Label name_label; diff --git a/gtk2_ardour/canvas-imageframe.h b/gtk2_ardour/canvas-imageframe.h index 9522bf3796..6c2e5ab8b6 100644 --- a/gtk2_ardour/canvas-imageframe.h +++ b/gtk2_ardour/canvas-imageframe.h @@ -15,12 +15,12 @@ #include #include -#include /* why the hell is GtkAnchorType here and not in gtkenums.h? */ +#include #include #include -BEGIN_GNOME_CANVAS_DECLS +G_BEGIN_DECLS /* Image item for the canvas. Images are positioned by anchoring them to a point. @@ -74,6 +74,6 @@ struct _GnomeCanvasImageFrameClass { GtkType gnome_canvas_imageframe_get_type (void); -END_GNOME_CANVAS_DECLS +G_END_DECLS #endif diff --git a/gtk2_ardour/canvas-simpleline.h b/gtk2_ardour/canvas-simpleline.h index 7a8a318985..4d9bb1a335 100644 --- a/gtk2_ardour/canvas-simpleline.h +++ b/gtk2_ardour/canvas-simpleline.h @@ -26,7 +26,7 @@ #include -BEGIN_GNOME_CANVAS_DECLS +G_BEGIN_DECLS /* Wave viewer item for canvas. */ @@ -60,6 +60,6 @@ struct _GnomeCanvasSimpleLineClass { GtkType gnome_canvas_simpleline_get_type (void); -END_GNOME_CANVAS_DECLS +G_END_DECLS #endif /* __GNOME_CANVAS_SIMPLELINE_H__ */ diff --git a/gtk2_ardour/canvas-simplerect.h b/gtk2_ardour/canvas-simplerect.h index b3ae7d1f56..a4031453b5 100644 --- a/gtk2_ardour/canvas-simplerect.h +++ b/gtk2_ardour/canvas-simplerect.h @@ -26,7 +26,7 @@ #include -BEGIN_GNOME_CANVAS_DECLS +G_BEGIN_DECLS /* Wave viewer item for canvas. */ @@ -66,6 +66,6 @@ struct _GnomeCanvasSimpleRectClass { GtkType gnome_canvas_simplerect_get_type (void); -END_GNOME_CANVAS_DECLS +G_END_DECLS #endif /* __GNOME_CANVAS_SIMPLERECT_H__ */ diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index 722dda8a6b..3b3b3a1340 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -415,7 +415,7 @@ class Editor : public PublicEditor LocationMarkers *find_location_markers (ARDOUR::Location *); ARDOUR::Location* find_location_from_marker (Marker *, bool& is_start); - typedef map LocationMarkerMap; + typedef std::map LocationMarkerMap; LocationMarkerMap location_markers; void hide_marker (GnomeCanvasItem*, GdkEvent*); @@ -1817,7 +1817,7 @@ class Editor : public PublicEditor void toggle_gain_envelope_visibility (); void toggle_gain_envelope_active (); - typedef map ColorStyleMap; + typedef std::map ColorStyleMap; void init_colormap (); }; diff --git a/gtk2_ardour/editor_canvas_events.cc b/gtk2_ardour/editor_canvas_events.cc index ec4115f352..09c03547b3 100644 --- a/gtk2_ardour/editor_canvas_events.cc +++ b/gtk2_ardour/editor_canvas_events.cc @@ -48,7 +48,7 @@ gint Editor::_canvas_copy_region_event (GnomeCanvasItem *item, GdkEvent *event, gpointer data) { Editor* editor = (Editor*)data; - return editor->signal_canvas_copy_region_event() (item, event); + return editor->canvas_copy_region_event (item, event); } gint @@ -56,7 +56,7 @@ Editor::_canvas_crossfade_view_event (GnomeCanvasItem *item, GdkEvent *event, gp { CrossfadeView* xfv = static_cast (data); Editor* editor = dynamic_cast(&xfv->get_time_axis_view().editor); - return editor->signal_canvas_crossfade_view_event() (item, event, xfv); + return editor->canvas_crossfade_view_event (item, event, xfv); } gint @@ -64,7 +64,7 @@ Editor::_canvas_fade_in_event (GnomeCanvasItem *item, GdkEvent *event, gpointer { AudioRegionView* rv = static_cast (data); Editor* editor = dynamic_cast(&rv->get_time_axis_view().editor); - return editor->signal_canvas_fade_in_event() (item, event, rv); + return editor->canvas_fade_in_event (item, event, rv); } gint @@ -72,7 +72,7 @@ Editor::_canvas_fade_in_handle_event (GnomeCanvasItem *item, GdkEvent *event, gp { AudioRegionView* rv = static_cast (data); Editor* editor = dynamic_cast(&rv->get_time_axis_view().editor); - return editor->signal_canvas_fade_in_handle_event() (item, event, rv); + return editor->canvas_fade_in_handle_event (item, event, rv); } gint @@ -80,7 +80,7 @@ Editor::_canvas_fade_out_event (GnomeCanvasItem *item, GdkEvent *event, gpointer { AudioRegionView* rv = static_cast (data); Editor* editor = dynamic_cast(&rv->get_time_axis_view().editor); - return editor->signal_canvas_fade_out_event() (item, event, rv); + return editor->canvas_fade_out_event (item, event, rv); } gint @@ -88,7 +88,7 @@ Editor::_canvas_fade_out_handle_event (GnomeCanvasItem *item, GdkEvent *event, g { AudioRegionView* rv = static_cast (data); Editor* editor = dynamic_cast(&rv->get_time_axis_view().editor); - return editor->signal_canvas_fade_out_handle_event() (item, event, rv); + return editor->canvas_fade_out_handle_event (item, event, rv); } gint @@ -97,7 +97,7 @@ Editor::_canvas_region_view_event (GnomeCanvasItem *item, GdkEvent *event, gpoin AudioRegionView *rv = reinterpret_cast(data); Editor* editor = dynamic_cast(&rv->get_time_axis_view().editor); - return editor->signal_canvas_region_view_event() (item, event, rv); + return editor->canvas_region_view_event (item, event, rv); } gint @@ -106,7 +106,7 @@ Editor::_canvas_region_view_name_highlight_event (GnomeCanvasItem *item, GdkEven AudioRegionView *rv = reinterpret_cast (data); Editor* editor = dynamic_cast(&rv->get_time_axis_view().editor); - return editor->signal_canvas_region_view_name_highlight_event() (item, event); + return editor->canvas_region_view_name_highlight_event (item, event); } gint @@ -115,7 +115,7 @@ Editor::_canvas_region_view_name_event (GnomeCanvasItem *item, GdkEvent *event, AudioRegionView *rv = reinterpret_cast (data); Editor* editor = dynamic_cast(&rv->get_time_axis_view().editor); - return editor->signal_canvas_region_view_name_event() (item, event); + return editor->canvas_region_view_name_event (item, event); } gint @@ -126,7 +126,7 @@ Editor::_canvas_stream_view_event (GnomeCanvasItem *item, GdkEvent *event, gpoin AudioTimeAxisView *tv = (AudioTimeAxisView *) data; Editor* editor = dynamic_cast(&tv->editor); - return editor->signal_canvas_stream_view_event() (item, event, tv); + return editor->canvas_stream_view_event (item, event, tv); } gint @@ -135,7 +135,7 @@ Editor::_canvas_automation_track_event (GnomeCanvasItem *item, GdkEvent *event, AutomationTimeAxisView* atv = (AutomationTimeAxisView*) data; Editor* editor = dynamic_cast(&atv->editor); - return editor->signal_canvas_automation_track_event() (item, event, atv); + return editor->canvas_automation_track_event (item, event, atv); } gint @@ -158,7 +158,7 @@ Editor::_canvas_control_point_event (GnomeCanvasItem *item, GdkEvent *event, gpo break; } - return editor->signal_canvas_control_point_event() (item, event); + return editor->canvas_control_point_event (item, event); } gint @@ -167,21 +167,21 @@ Editor::_canvas_line_event (GnomeCanvasItem *item, GdkEvent *event, gpointer dat AutomationLine *line = reinterpret_cast (data); Editor* editor = dynamic_cast(&line->trackview.editor); - return editor->signal_canvas_line_event() (item, event); + return editor->canvas_line_event (item, event); } gint Editor::_canvas_tempo_marker_event (GnomeCanvasItem *item, GdkEvent *event, gpointer data) { Editor* editor = dynamic_cast((PublicEditor*) data); - return editor->signal_canvas_tempo_marker_event() (item, event); + return editor->canvas_tempo_marker_event (item, event); } gint Editor::_canvas_meter_marker_event (GnomeCanvasItem *item, GdkEvent *event, gpointer data) { Editor* editor = dynamic_cast((PublicEditor *) data); - return editor->signal_canvas_meter_marker_event() (item, event); + return editor->canvas_meter_marker_event (item, event); } gint @@ -189,7 +189,7 @@ Editor::_canvas_tempo_bar_event (GnomeCanvasItem *item, GdkEvent *event, gpointe { /* XXX NO CAST */ Editor* editor = (Editor*) data; - return editor->signal_canvas_tempo_bar_event() (item, event); + return editor->canvas_tempo_bar_event (item, event); } gint @@ -197,14 +197,14 @@ Editor::_canvas_meter_bar_event (GnomeCanvasItem *item, GdkEvent *event, gpointe { /* XXX NO CAST */ Editor* editor = (Editor*) data; - return editor->signal_canvas_meter_bar_event() (item, event); + return editor->canvas_meter_bar_event (item, event); } gint Editor::_canvas_marker_event (GnomeCanvasItem *item, GdkEvent *event, gpointer data) { Editor* editor = dynamic_cast((PublicEditor*) data); - return editor->signal_canvas_marker_event() (item, event); + return editor->canvas_marker_event (item, event); } gint @@ -212,7 +212,7 @@ Editor::_canvas_marker_bar_event (GnomeCanvasItem *item, GdkEvent *event, gpoint { /* NO CAST */ Editor* editor = (Editor*) data; - return editor->signal_canvas_marker_bar_event() (item, event); + return editor->canvas_marker_bar_event (item, event); } gint @@ -220,7 +220,7 @@ Editor::_canvas_range_marker_bar_event (GnomeCanvasItem *item, GdkEvent *event, { /* NO CAST */ Editor* editor = (Editor*) data; - return editor->signal_canvas_range_marker_bar_event() (item, event); + return editor->canvas_range_marker_bar_event (item, event); } gint @@ -228,7 +228,7 @@ Editor::_canvas_transport_marker_bar_event (GnomeCanvasItem *item, GdkEvent *eve { /* NO CAST */ Editor* editor = (Editor*) data; - return editor->signal_canvas_transport_marker_bar_event() (item, event); + return editor->canvas_transport_marker_bar_event (item, event); } gint @@ -236,7 +236,7 @@ Editor::_canvas_playhead_cursor_event (GnomeCanvasItem *item, GdkEvent *event, g { /* NO CAST */ Editor* editor = (Editor*) data; - return editor->signal_canvas_playhead_cursor_event() (item, event); + return editor->canvas_playhead_cursor_event (item, event); } gint @@ -244,35 +244,35 @@ Editor::_canvas_edit_cursor_event (GnomeCanvasItem *item, GdkEvent *event, gpoin { /* NO CAST */ Editor* editor = (Editor*) data; - return editor->signal_canvas_edit_cursor_event() (item, event); + return editor->canvas_edit_cursor_event (item, event); } gint Editor::_canvas_zoom_rect_event (GnomeCanvasItem *item, GdkEvent *event, gpointer data) { Editor* editor = dynamic_cast((PublicEditor*) data); - return editor->signal_canvas_zoom_rect_event() (item, event); + return editor->canvas_zoom_rect_event (item, event); } gint Editor::_canvas_selection_rect_event (GnomeCanvasItem *item, GdkEvent *event, gpointer data) { Editor* editor = dynamic_cast((PublicEditor*) data); - return editor->signal_canvas_selection_rect_event() (item, event); + return editor->canvas_selection_rect_event (item, event); } gint Editor::_canvas_selection_start_trim_event (GnomeCanvasItem *item, GdkEvent *event, gpointer data) { Editor* editor = dynamic_cast((PublicEditor*) data); - return editor->signal_canvas_selection_start_trim_event() (item, event); + return editor->canvas_selection_start_trim_event (item, event); } gint Editor::_canvas_selection_end_trim_event (GnomeCanvasItem *item, GdkEvent *event, gpointer data) { Editor* editor = dynamic_cast((PublicEditor*) data); - return editor->signal_canvas_selection_end_trim_event() (item, event); + return editor->canvas_selection_end_trim_event (item, event); } gint @@ -281,7 +281,7 @@ Editor::_track_canvas_event (GnomeCanvasItem *item, GdkEvent *event, gpointer da /* NO CAST */ Editor* editor = (Editor*) data; - return editor->signal_track_canvas_event() (item, event); + return editor->track_canvas_event (item, event); } /********** END OF.TATIC EVENT HANDLERS */ diff --git a/gtk2_ardour/imageframe_time_axis_group.h b/gtk2_ardour/imageframe_time_axis_group.h index e258a40047..aa17606267 100644 --- a/gtk2_ardour/imageframe_time_axis_group.h +++ b/gtk2_ardour/imageframe_time_axis_group.h @@ -117,7 +117,7 @@ class ImageFrameTimeAxisGroup : public sigc::trackable * * @param color the new base color */ - void apply_item_color(GdkColor&) ; + void apply_item_color(Gdk::Color&) ; //---------------------------------------------------------------------------------------// diff --git a/gtk2_ardour/imageframe_time_axis_view.cc b/gtk2_ardour/imageframe_time_axis_view.cc index 27852af55e..32ac725318 100644 --- a/gtk2_ardour/imageframe_time_axis_view.cc +++ b/gtk2_ardour/imageframe_time_axis_view.cc @@ -187,7 +187,7 @@ ImageFrameTimeAxisView::set_samples_per_unit (gdouble spp) * @param color the new base color */ void -ImageFrameTimeAxisView::apply_color(GdkColor& color) +ImageFrameTimeAxisView::apply_color(Gdk::Color& color) { region_color = color ; for(ImageFrameGroupList::const_iterator citer = imageframe_groups.begin(); citer != imageframe_groups.end(); citer++) diff --git a/gtk2_ardour/imageframe_time_axis_view.h b/gtk2_ardour/imageframe_time_axis_view.h index 1aa1b0724c..f6215236f1 100644 --- a/gtk2_ardour/imageframe_time_axis_view.h +++ b/gtk2_ardour/imageframe_time_axis_view.h @@ -112,7 +112,7 @@ class ImageFrameTimeAxisView : public sigc::trackable * * @param color the new base color */ - void apply_color (GdkColor&) ; + void apply_color (Gdk::Color&) ; //---------------------------------------------------------------------------------------// // Child ImageFrameTimeAxisGroup Accessors/Mutators @@ -263,7 +263,7 @@ class ImageFrameTimeAxisView : public sigc::trackable double _samples_per_unit ; /* XXX why are these different? */ - GdkColor region_color ; + Gdk::Color region_color ; uint32_t stream_base_color ; } ; /* class ImageFrameTimeAxisView */ diff --git a/gtk2_ardour/imageframe_view.cc b/gtk2_ardour/imageframe_view.cc index 1b13f5d145..96c7d51374 100644 --- a/gtk2_ardour/imageframe_view.cc +++ b/gtk2_ardour/imageframe_view.cc @@ -60,7 +60,7 @@ ImageFrameView::ImageFrameView(std::string item_id, ImageFrameTimeAxis* tv, ImageFrameTimeAxisGroup* item_group, double spu, - GdkColor& basic_color, + Gdk::Color& basic_color, jack_nframes_t start, jack_nframes_t duration, unsigned char* rgb_data, diff --git a/gtk2_ardour/imageframe_view.h b/gtk2_ardour/imageframe_view.h index 87bbba4a74..9229295343 100644 --- a/gtk2_ardour/imageframe_view.h +++ b/gtk2_ardour/imageframe_view.h @@ -64,7 +64,7 @@ class ImageFrameView : public TimeAxisViewItem ImageFrameTimeAxis *tv, ImageFrameTimeAxisGroup* group, double spu, - GdkColor& base_color, + Gdk::Color& base_color, jack_nframes_t start, jack_nframes_t duration, unsigned char* rgb_data, diff --git a/gtk2_ardour/marker_time_axis_view.cc b/gtk2_ardour/marker_time_axis_view.cc index 60216290f4..bd4d8b21d7 100644 --- a/gtk2_ardour/marker_time_axis_view.cc +++ b/gtk2_ardour/marker_time_axis_view.cc @@ -174,7 +174,7 @@ MarkerTimeAxisView::set_samples_per_unit(gdouble spp) * @param color the new base color */ void -MarkerTimeAxisView::apply_color(GdkColor& color) +MarkerTimeAxisView::apply_color(Gdk::Color& color) { region_color = color; diff --git a/gtk2_ardour/marker_time_axis_view.h b/gtk2_ardour/marker_time_axis_view.h index f611a38f2e..633bcd559c 100644 --- a/gtk2_ardour/marker_time_axis_view.h +++ b/gtk2_ardour/marker_time_axis_view.h @@ -114,7 +114,7 @@ class MarkerTimeAxisView : public sigc::trackable * * @param color the new base color */ - void apply_color(GdkColor& color) ; + void apply_color(Gdk::Color& color) ; //---------------------------------------------------------------------------------------// // Child MarkerView Accessors/Mutators @@ -231,7 +231,7 @@ class MarkerTimeAxisView : public sigc::trackable double _samples_per_unit; /* XXX why are these different? */ - GdkColor region_color; + Gdk::Color region_color; uint32_t stream_base_color; }; /* class MarkerTimeAxisView */ diff --git a/gtk2_ardour/marker_view.cc b/gtk2_ardour/marker_view.cc index bf18c911dc..7ee74cc4d1 100644 --- a/gtk2_ardour/marker_view.cc +++ b/gtk2_ardour/marker_view.cc @@ -51,7 +51,7 @@ MarkerView::MarkerView(GnomeCanvasGroup *parent, TimeAxisView* tv, ImageFrameView* marked, double spu, - GdkColor& basic_color, + Gdk::Color& basic_color, std::string mark_type, std::string mark_id, jack_nframes_t start, diff --git a/gtk2_ardour/marker_view.h b/gtk2_ardour/marker_view.h index 3e5645bea5..10f94b7a34 100644 --- a/gtk2_ardour/marker_view.h +++ b/gtk2_ardour/marker_view.h @@ -58,7 +58,7 @@ class MarkerView : public TimeAxisViewItem TimeAxisView *tv, ImageFrameView* marked, double spu, - GdkColor& base_color, + Gdk::Color& base_color, std::string mark_type, std::string mark_id, jack_nframes_t start, diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc index 2d25126757..1c711a5e41 100644 --- a/gtk2_ardour/mixer_ui.cc +++ b/gtk2_ardour/mixer_ui.cc @@ -36,7 +36,6 @@ #include "mixer_strip.h" #include "plugin_selector.h" #include "ardour_ui.h" -#include "check_mark.h" #include "prompter.h" #include "utils.h" #include "gui_thread.h" @@ -133,13 +132,13 @@ Mixer_UI::Mixer_UI (AudioEngine& eng) list_hpane.add1(list_vpacker); list_hpane.add2(global_hpacker); - rhs_pane1.size_allocate.connect_after (bind (mem_fun(*this, &Mixer_UI::pane_allocation_handler), - static_cast (&rhs_pane1))); - rhs_pane2.size_allocate.connect_after (bind (mem_fun(*this, &Mixer_UI::pane_allocation_handler), - static_cast (&rhs_pane2))); - list_hpane.size_allocate.connect_after (bind (mem_fun(*this, &Mixer_UI::pane_allocation_handler), - static_cast (&list_hpane))); - + rhs_pane1.signal_size_allocate().connect (bind (mem_fun(*this, &Mixer_UI::pane_allocation_handler), + static_cast (&rhs_pane1))); + rhs_pane2.signal_size_allocate().connect (bind (mem_fun(*this, &Mixer_UI::pane_allocation_handler), + static_cast (&rhs_pane2))); + list_hpane.signal_size_allocate().connect (bind (mem_fun(*this, &Mixer_UI::pane_allocation_handler), + static_cast (&list_hpane))); + rhs_pane1.set_data ("collapse-direction", (gpointer) 0); rhs_pane2.set_data ("collapse-direction", (gpointer) 0); @@ -156,24 +155,24 @@ Mixer_UI::Mixer_UI (AudioEngine& eng) set_title (_("ardour: mixer")); set_wmclass (_("ardour_mixer"), "Ardour"); - delete_event.connect (bind (ptr_fun (just_hide_it), static_cast(this))); + signal_delete_event().connect (bind (ptr_fun (just_hide_it), static_cast(this))); add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK); track_display.get_selection()->signal_changed().connect (mem_fun(*this, &Mixer_UI::track_display_selection_changed)); - track_display_model.signal_rows_reordered().connect (mem_fun (*this, &Mixer_UI::track_display_reordered)); - track_display.signal_button_press_event().connect_notify (mem_fun (*this, &Mixer_UI::track_display_button_press)); + track_display_model->signal_rows_reordered().connect (mem_fun (*this, &Mixer_UI::track_display_reordered_proxy)); + track_display.signal_button_press_event().connect (mem_fun (*this, &Mixer_UI::track_display_button_press)); - group_display.signal_button_press_event().connect_notify (mem_fun (*this, &Mixer_UI::group_display_button_press)); + group_display.signal_button_press_event().connect (mem_fun (*this, &Mixer_UI::group_display_button_press)); group_display.get_selection()->signal_changed().connect (mem_fun (*this, &Mixer_UI::group_display_selection_changed)); snapshot_display.get_selection()->signal_changed().connect (mem_fun(*this, &Mixer_UI::snapshot_display_selection_changed)); - snapshot_display.signal_button_press_event().connect_notify (mem_fun (*this, &Mixer_UI::snapshot_display_button_press)); + snapshot_display.signal_button_press_event().connect (mem_fun (*this, &Mixer_UI::snapshot_display_button_press)); _plugin_selector = new PluginSelector (PluginManager::the_manager()); _plugin_selector->signal_delete_event().connect (bind (ptr_fun (just_hide_it), static_cast (_plugin_selector))); - configure_event.connect (mem_fun (*ARDOUR_UI::instance(), &ARDOUR_UI::configure_handler)); + signal_configure_event().connect (mem_fun (*ARDOUR_UI::instance(), &ARDOUR_UI::configure_handler)); _selection.RoutesChanged.connect (mem_fun(*this, &Mixer_UI::follow_strip_selection)); } @@ -195,10 +194,12 @@ Mixer_UI::show_window () /* now reset each strips width so the right widgets are shown */ MixerStrip* ms; - CList_Helpers::RowList::iterator i; - for (i = track_display_list.rows().begin(); i != track_display_list.rows().end(); ++i) { - ms = (MixerStrip *) i->get_data (); + TreeModel::Children rows = track_display_model->children(); + TreeModel::Children::iterator ri; + + for (ri = rows.begin(); ri != rows.end(); ++ri) { + ms = (*ri)[track_display_columns.strip]; ms->set_width (ms->get_width()); } } @@ -220,10 +221,10 @@ Mixer_UI::add_strip (Route* route) strip->set_width (_strip_width); show_strip (strip); - TreeModel:: TreeModel::Row row = *(track_display_model->append()); - row[columns.text] = route->name(); - row[columns.data] = strip; + row[track_display_columns.text] = route->name(); + row[track_display_columns.route] = route; + row[track_display_columns.strip] = strip; if (strip->marked_for_display() || strip->packed()) { track_display.get_selection()->select (row); @@ -244,7 +245,7 @@ Mixer_UI::remove_strip (MixerStrip* strip) { ENSURE_GUI_THREAD(bind (mem_fun(*this, &Mixer_UI::remove_strip), strip)); - TreeModel::Children::iterator rows = track_display_model.children(); + TreeModel::Children rows = track_display_model->children(); TreeModel::Children::iterator ri; list::iterator i; @@ -253,8 +254,8 @@ Mixer_UI::remove_strip (MixerStrip* strip) } for (ri = rows.begin(); ri != rows.end(); ++ri) { - if ((MixerStrip *) ri->get_data () == strip) { - track_display_model.erase (ri); + if ((*ri)[track_display_columns.strip] == strip) { + track_display_model->erase (ri); break; } } @@ -331,7 +332,7 @@ Mixer_UI::disconnect_from_session () { ENSURE_GUI_THREAD(mem_fun(*this, &Mixer_UI::disconnect_from_session)); - group_display.clear (); + group_display_model->clear (); set_title (_("ardour: mixer")); stop_updating (); hide_all_strips (false); @@ -340,7 +341,6 @@ Mixer_UI::disconnect_from_session () void Mixer_UI::hide_all_strips (bool with_select) { - MixerStrip* ms; TreeModel::Children rows = track_display_model->children(); TreeModel::Children::iterator i; @@ -350,7 +350,7 @@ Mixer_UI::hide_all_strips (bool with_select) for (i = rows.begin(); i != rows.end(); ++i) { TreeModel::Row row = (*i); - MixerStrip* ms = row[columns.data]; + MixerStrip* ms = row[track_display_columns.strip]; if (with_select) { track_display.get_selection()->unselect (i); @@ -390,7 +390,7 @@ Mixer_UI::strip_select_op (bool audiotrack, bool select) // track_display_list.freeze (); for (i = rows.begin(); i != rows.end(); ++i) { - ms = (MixerStrip *) (*i)[columns.data]; + ms = (*i)[track_display_columns.strip]; if (ms->is_audio_track() == audiotrack) { if (select) { @@ -422,7 +422,7 @@ Mixer_UI::select_all_audiobus_strips () } void -Mixer_UI::select_all_audiobus_strips () +Mixer_UI::unselect_all_audiobus_strips () { strip_select_op (false, false); } @@ -493,17 +493,17 @@ Mixer_UI::fast_update_strips () } void -Mixer_UI::snapshot_display_selection_changed (gint row, gint col, GdkEvent* ev) +Mixer_UI::snapshot_display_selection_changed () { TreeModel::iterator i = snapshot_display.get_selection()->get_selected(); - string snap_name = (*i)[snapshot_display_columns.real_name] + Glib::ustring snap_name = (*i)[snapshot_display_columns.real_name]; if (session->snap_name() == snap_name) { return; } - ARDOUR_UI::instance()->load_session(session->path(), snap_name); + ARDOUR_UI::instance()->load_session(session->path(), string (snap_name)); } bool @@ -518,7 +518,7 @@ Mixer_UI::track_display_selection_changed () MixerStrip* strip; TreeModel::Children rows = track_display_model->children(); TreeModel::Children::iterator i; - Glib::RefPtr selection = track_display.get_selection(); + Glib::RefPtr selection = track_display.get_selection(); for (i = rows.begin(); i != rows.end(); ++i) { if (selection->is_selected (i)) { @@ -538,14 +538,14 @@ Mixer_UI::select_strip_op (MixerStrip *strip, bool yn) { TreeModel::Children rows = track_display_model->children(); TreeModel::Children::iterator i; - Glib::RefPtr selection = track_display.get_selection(); + Glib::RefPtr selection = track_display.get_selection(); for (i = rows.begin(); i != rows.end(); ++i) { - if ((*i)[rows.data] == strip) { + if ((*i)[track_display_columns.strip] == strip) { if (yn) { - track_display.get_selection()->select (*i); + selection->select (*i); } else { - track_display.get_selection()->unselect (*i); + selection->unselect (*i); } break; } @@ -564,35 +564,26 @@ Mixer_UI::select_strip_in_display (MixerStrip *strip) } void -Mixer_UI::queue_track_display_reordered (gint arg1, gint arg2) +Mixer_UI::track_display_reordered_proxy (const TreeModel::Path& path, const TreeModel::iterator& i, int* n) { - /* the problem here is that we are called *before* the - list has been reordered. so just queue up - the actual re-drawer to happen once the re-ordering - is complete. - */ - - Main::idle.connect (mem_fun(*this, &Mixer_UI::track_display_reordered)); + track_display_reordered (); } -int +void Mixer_UI::track_display_reordered () { TreeModel::Children rows = track_display_model->children(); TreeModel::Children::iterator i; - Glib::RefPtr selection = track_display.get_selection(); long order; for (order = 0, i = rows.begin(); i != rows.end(); ++i, ++order) { - MixerStrip* strip = (*i)[columns.data]; + MixerStrip* strip = (*i)[track_display_columns.strip]; if (strip->marked_for_display()) { strip->route().set_order_key (N_("signal"), order); strip_packer.reorder_child (*strip, -1); /* put at end */ } } - - return FALSE; } void @@ -632,11 +623,10 @@ Mixer_UI::strip_name_changed (void* src, MixerStrip* mx) TreeModel::Children rows = track_display_model->children(); TreeModel::Children::iterator i; - Glib::RefPtr selection = track_display.get_selection(); for (i = rows.begin(); i != rows.end(); ++i) { - if ((*i)[columns.data] == mx) { - (*i)[columns.text] = mx->route().name(); + if ((*i)[track_display_columns.strip] == mx) { + (*i)[track_display_columns.text] = mx->route().name(); return; } } @@ -651,35 +641,30 @@ Mixer_UI::new_mix_group () string result; prompter.set_prompt (_("Name for new mix group")); - prompter.done.connect (Main::quit.slot()); - prompter.show_all (); - Main::run (); - - if (prompter.status != Gtkmm2ext::Prompter::entered) { - return; - } - - prompter.get_result (result); - - if (result.length()) { - session->add_mix_group (result); + switch (prompter.run ()) { + case GTK_RESPONSE_ACCEPT: + prompter.get_result (result); + if (result.length()) { + session->add_mix_group (result); + } + break; } } -void -Mixer_UI::group_display_button_clicked () -{ - if (session) { - new_mix_group (); - } -} +// GTK2FIX +//void +//Mixer_UI::group_display_button_clicked () +//{ +// if (session) { +// new_mix_group (); +// } +//} bool Mixer_UI::group_display_button_press (GdkEventButton* ev) { - gint row, col; RouteGroup* group; TreeIter iter; @@ -692,11 +677,11 @@ Mixer_UI::group_display_button_press (GdkEventButton* ev) return false; } - switch (GPOINTER_TO_UINT (column.get_data (X_("colnum")))) { + switch (GPOINTER_TO_UINT (column->get_data (X_("colnum")))) { case 0: /* active column click */ - if ((iter = group_display.get_iter (path))) { + if ((iter = group_display_model->get_iter (path))) { /* path points to a valid node */ if ((group = (*iter)[group_display_columns.group]) != 0) { group->set_active (!group->is_active (), this); @@ -720,16 +705,16 @@ Mixer_UI::group_display_button_press (GdkEventButton* ev) } void -Mixer_UI::group_selection_changed () +Mixer_UI::group_display_selection_changed () { TreeModel::iterator i; TreeModel::Children rows = group_display_model->children(); - TreeViewSelection* selection = group_display.get_selection(); + Glib::RefPtr selection = group_display.get_selection(); for (i = rows.begin(); i != rows.end(); ++i) { RouteGroup* group; - group = (*iter)[group_display_columns.group]; + group = (*i)[group_display_columns.group]; if (selection->is_selected (i)) { group->set_hidden (true, this); @@ -750,17 +735,12 @@ Mixer_UI::group_flags_changed (void* src, RouteGroup* group) // select row } - TreeModel::Children rows; + TreeModel::Children rows = group_display_model->children(); TreeModel::Children::iterator gi; TreeModel::Children::iterator ti; - MixGroup* group; - - CList_Helpers::RowIterator ri = group_display.rows().find_data (group); - rows = group_display_model->children(); - - for (gi = rows.begin(); gi != grows.end(); ++gi) { - if ((*gi)[columns.data] == group) { + for (gi = rows.begin(); gi != rows.end(); ++gi) { + if ((*gi)[group_display_columns.group] == group) { break; } } @@ -789,18 +769,11 @@ Mixer_UI::add_mix_group (RouteGroup* group) { ENSURE_GUI_THREAD(bind (mem_fun(*this, &Mixer_UI::add_mix_group), group)); - - list names; - names.push_back (""); - names.push_back (group->name()); - - group_list.rows().push_back (names); - group_list.rows().back().set_data (group); - - /* update display to reflect group flags */ - - group_flags_changed (0, group); + TreeModel::Row row = *(group_display_model->append()); + row[group_display_columns.active] = group->is_active(); + row[group_display_columns.text] = group->name(); + row[group_display_columns.group] = group; group->FlagsChanged.connect (bind (mem_fun(*this, &Mixer_UI::group_flags_changed), group)); } @@ -821,9 +794,9 @@ Mixer_UI::redisplay_snapshots () for (vector::iterator i = states->begin(); i != states->end(); ++i) { string statename = *(*i); - row = *(snapshot_display_model->append()); - row[snapshot_columns.visible_name] = statename; - row[snapshot_columns.real_name] = statename; + TreeModel::Row row = *(snapshot_display_model->append()); + row[snapshot_display_columns.visible_name] = statename; + row[snapshot_display_columns.real_name] = statename; } delete states; @@ -887,7 +860,8 @@ Mixer_UI::set_state (const XMLNode& node) } set_default_size(width, height); - set_uposition(x, y-yoff); + // GTK2FIX + // set_uposition(x, y-yoff); if ((prop = node.property ("narrow-strips"))) { if (prop->value() == "yes") { @@ -906,12 +880,12 @@ Mixer_UI::get_state (void) XMLNode* node = new XMLNode ("Mixer"); if (is_realized()) { - Gdk_Window win = get_window(); + Glib::RefPtr win = get_window(); int x, y, xoff, yoff, width, height; - win.get_root_origin(x, y); - win.get_position(xoff, yoff); - win.get_size(width, height); + win->get_root_origin(x, y); + win->get_position(xoff, yoff); + win->get_size(width, height); XMLNode* geometry = new XMLNode ("geometry"); char buf[32]; @@ -945,7 +919,7 @@ Mixer_UI::get_state (void) void -Mixer_UI::pane_allocation_handler (GtkAllocation *alloc, Gtk::Paned* which) +Mixer_UI::pane_allocation_handler (Allocation& alloc, Gtk::Paned* which) { int pos; XMLProperty* prop = 0; diff --git a/gtk2_ardour/mixer_ui.h b/gtk2_ardour/mixer_ui.h index 504074642b..c520e66282 100644 --- a/gtk2_ardour/mixer_ui.h +++ b/gtk2_ardour/mixer_ui.h @@ -102,7 +102,7 @@ class Mixer_UI : public Gtk::Window, public KeyboardTarget Gtk::HBox out_packer; Gtk::HPaned list_hpane; - void pane_allocation_handler (GtkAllocation*, Gtk::Paned*); + void pane_allocation_handler (Gtk::Allocation&, Gtk::Paned*); list strips; @@ -122,7 +122,8 @@ class Mixer_UI : public Gtk::Window, public KeyboardTarget void unselect_all_audiobus_strips (); void select_all_audiobus_strips (); - void select_strip_op (bool); + void strip_select_op (bool audiotrack, bool select); + void select_strip_op (MixerStrip*, bool select); void follow_strip_selection (); @@ -136,12 +137,11 @@ class Mixer_UI : public Gtk::Window, public KeyboardTarget sigc::connection fast_screen_update_connection; void fast_update_strips (); - void snapshot_display_selected (gint row, gint col, GdkEvent* ev); - void track_display_selected (gint row, gint col, GdkEvent *ev); void track_display_unselected (gint row, gint col, GdkEvent *ev); void queue_track_display_reordered (gint row, gint col); - gint track_display_reordered (); + void track_display_reordered_proxy (const Gtk::TreePath& path, const Gtk::TreeIter& i, int* n); + void track_display_reordered (); void track_name_changed (MixerStrip *); void group_selected (gint row, gint col, GdkEvent *ev); @@ -170,21 +170,23 @@ class Mixer_UI : public Gtk::Window, public KeyboardTarget struct TrackDisplayModelColumns : public Gtk::TreeModel::ColumnRecord { TrackDisplayModelColumns() { add (text); - add (data); + add (route); + add (strip); } - Gtk::TreeModelColumn text; - Gtk::TreeModelColumn data; + Gtk::TreeModelColumn text; + Gtk::TreeModelColumn route; + Gtk::TreeModelColumn strip; }; struct GroupDisplayModelColumns : public Gtk::TreeModel::ColumnRecord { GroupDisplayModelColumns() { add (active); add (text); - add (data); + add (group); } Gtk::TreeModelColumn active; Gtk::TreeModelColumn text; - Gtk::TreeModelColumn data; + Gtk::TreeModelColumn group; }; struct SnapshotDisplayModelColumns : public Gtk::TreeModel::ColumnRecord { diff --git a/gtk2_ardour/public_editor.cc b/gtk2_ardour/public_editor.cc index 184c1c0dc9..f1c287b969 100644 --- a/gtk2_ardour/public_editor.cc +++ b/gtk2_ardour/public_editor.cc @@ -4,7 +4,7 @@ PublicEditor* PublicEditor::_instance = 0; PublicEditor::PublicEditor () - : Window (GTK_WINDOW_TOPLEVEL), + : Window (Gtk::WINDOW_TOPLEVEL), KeyboardTarget (*this, "editor") { } @@ -15,130 +15,130 @@ PublicEditor::~PublicEditor() gint PublicEditor::canvas_fade_in_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) { - return instance()->signal__canvas_fade_in_event() (item, event, data); + return instance()->canvas_fade_in_event (item, event, data); } gint 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()->canvas_fade_in_handle_event (item, event, data); } gint PublicEditor::canvas_fade_out_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) { - return instance()->signal__canvas_fade_out_event() (item, event, data); + return instance()->canvas_fade_out_event (item, event, data); } gint 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()->canvas_fade_out_handle_event (item, event, data); } gint PublicEditor::canvas_crossfade_view_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) { - return instance()->signal__canvas_crossfade_view_event() (item, event, data); + return instance()->canvas_crossfade_view_event (item, event, data); } gint PublicEditor::canvas_region_view_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) { - return instance()->signal__canvas_region_view_event() (item, event, data); + return instance()->canvas_region_view_event (item, event, data); } gint 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()->canvas_region_view_name_highlight_event (item, event, data); } gint 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()->canvas_region_view_name_event (item, event, data); } gint PublicEditor::canvas_stream_view_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) { - return instance()->signal__canvas_stream_view_event() (item, event, data); + return instance()->canvas_stream_view_event (item, event, data); } gint PublicEditor::canvas_automation_track_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) { - return instance()->signal__canvas_automation_track_event() (item, event, data); + return instance()->canvas_automation_track_event (item, event, data); } gint PublicEditor::canvas_marker_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) { - return instance()->signal__canvas_marker_event() (item, event, data); + return instance()->canvas_marker_event (item, event, data); } gint PublicEditor::canvas_zoom_rect_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) { - return instance()->signal__canvas_zoom_rect_event() (item, event, data); + return instance()->canvas_zoom_rect_event (item, event, data); } gint PublicEditor::canvas_selection_rect_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) { - return instance()->signal__canvas_selection_rect_event() (item, event, data); + return instance()->canvas_selection_rect_event (item, event, data); } gint 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()->canvas_selection_start_trim_event (item, event, data); } gint 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()->canvas_selection_end_trim_event (item, event, data); } gint PublicEditor::canvas_control_point_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) { - return instance()->signal__canvas_control_point_event() (item, event, data); + return instance()->canvas_control_point_event (item, event, data); } gint PublicEditor::canvas_line_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) { - return instance()->signal__canvas_line_event() (item, event, data); + return instance()->canvas_line_event (item, event, data); } gint PublicEditor::canvas_tempo_marker_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) { - return instance()->signal__canvas_tempo_marker_event() (item, event, data); + return instance()->canvas_tempo_marker_event (item, event, data); } gint PublicEditor::canvas_meter_marker_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) { - return instance()->signal__canvas_meter_marker_event() (item, event, data); + return instance()->canvas_meter_marker_event (item, event, data); } gint PublicEditor::canvas_tempo_bar_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) { - return instance()->signal__canvas_tempo_bar_event() (item, event, data); + return instance()->canvas_tempo_bar_event (item, event, data); } gint PublicEditor::canvas_meter_bar_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) { - return instance()->signal__canvas_meter_bar_event() (item, event, data); + return instance()->canvas_meter_bar_event (item, event, data); } gint PublicEditor::canvas_marker_bar_event (GnomeCanvasItem* item, GdkEvent* event, gpointer data) { - return instance()->signal__canvas_marker_bar_event() (item, event, data); + return instance()->canvas_marker_bar_event (item, event, data); } gint 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()->canvas_range_marker_bar_event (item, event, data); } gint 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()->canvas_transport_marker_bar_event (item, event, data); } gint 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()->canvas_imageframe_item_view_event(item, event, data); } gint PublicEditor::canvas_imageframe_view_event(GnomeCanvasItem *item, GdkEvent* event, gpointer data) { - return instance()->signal__canvas_imageframe_view_event()(item, event, data); + return instance()->canvas_imageframe_view_event(item, event, data); } gint 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()->canvas_imageframe_start_handle_event(item, event, data); } gint 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()->canvas_imageframe_end_handle_event(item, event, data); } gint 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()->canvas_marker_time_axis_view_event(item, event, data); } gint 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()->canvas_markerview_item_view_event(item, event, data); } gint 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()->canvas_markerview_start_handle_event(item, event, data); } gint 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()->canvas_markerview_end_handle_event(item, event, data); } diff --git a/gtk2_ardour/tempo_dialog.cc b/gtk2_ardour/tempo_dialog.cc index 0132aebfcb..d2eb039056 100644 --- a/gtk2_ardour/tempo_dialog.cc +++ b/gtk2_ardour/tempo_dialog.cc @@ -8,6 +8,7 @@ #include "i18n.h" using namespace Gtk; +using namespace Gtkmm2ext; using namespace ARDOUR; TempoDialog::TempoDialog (TempoMap& map, jack_nframes_t frame, string action) @@ -175,6 +176,7 @@ MeterDialog::init (const BBT_Time& when, double bpb, double note_type, bool mova bpb_entry.select_region (0, -1); Gtkmm2ext::set_size_request_to_display_given_text (bpb_entry, "999999g", 5, 5); + vector strings; strings.push_back (_("whole (1)")); strings.push_back (_("second (2)")); diff --git a/gtk2_ardour/time_axis_view_item.h b/gtk2_ardour/time_axis_view_item.h index 5152d3c656..a71f46c275 100644 --- a/gtk2_ardour/time_axis_view_item.h +++ b/gtk2_ardour/time_axis_view_item.h @@ -215,7 +215,7 @@ class TimeAxisViewItem : public sigc::trackable, public Selectable /** * */ - void set_color(GdkColor& color) ; + void set_color(Gdk::Color& color) ; /** * @@ -334,7 +334,7 @@ class TimeAxisViewItem : public sigc::trackable, public Selectable * @param start the start point of this item * @param duration the duration of this item */ - TimeAxisViewItem(std::string it_name, GnomeCanvasGroup* parent, TimeAxisView& tv, double spu, GdkColor& base_color, + TimeAxisViewItem(std::string it_name, GnomeCanvasGroup* parent, TimeAxisView& tv, double spu, Gdk::Color& base_color, jack_nframes_t start, jack_nframes_t duration, Visibility v = Visibility (0)); /** diff --git a/gtk2_ardour/visual_time_axis.h b/gtk2_ardour/visual_time_axis.h index ad4868d624..b6d6cc1f0b 100644 --- a/gtk2_ardour/visual_time_axis.h +++ b/gtk2_ardour/visual_time_axis.h @@ -202,7 +202,7 @@ class VisualTimeAxis : public TimeAxisView * * @param c the new TimeAxis color */ - void set_time_axis_color(Gdk_Color c) ; + void set_time_axis_color(Gdk::Color c) ; //---------------------------------------------------------------------------------------// -- cgit v1.2.3