Found another one -- does this ever end? :)
[ardour.git] / gtk2_ardour / editor.h
index 04c32b7128acdab450b058504d2c8e180dfc5e08..b7c3d7e2c5844215d607a5f5f71cfa2625993a54 100644 (file)
@@ -145,7 +145,7 @@ public:
        Editor ();
        ~Editor ();
 
-       void             set_session (ARDOUR::Session *);
+       void             set_session (ARDOUR::Session*);
 
        Gtk::Window* use_own_window (bool and_fill_it);
 
@@ -155,7 +155,7 @@ public:
        samplepos_t leftmost_sample() const { return _leftmost_sample; }
 
        samplecnt_t current_page_samples() const {
-               return (samplecnt_t) _visible_canvas_width * samples_per_pixel;
+               return (samplecnt_t) _visible_canvas_width* samples_per_pixel;
        }
 
        double visible_canvas_height () const {
@@ -184,7 +184,7 @@ public:
        void step_mouse_mode (bool next);
        Editing::MouseMode current_mouse_mode () const { return mouse_mode; }
        Editing::MidiEditMode current_midi_edit_mode () const;
-       void remove_midi_note (ArdourCanvas::Item *, GdkEvent *);
+       void remove_midi_note (ArdourCanvas::Item*, GdkEvent*);
 
        bool internal_editing() const;
 
@@ -295,7 +295,7 @@ public:
 
        void               set_zoom_focus (Editing::ZoomFocus);
        Editing::ZoomFocus get_zoom_focus () const { return zoom_focus; }
-       samplecnt_t         get_current_zoom () const { return samples_per_pixel; }
+       samplecnt_t        get_current_zoom () const { return samples_per_pixel; }
        void               cycle_zoom_focus ();
        void temporal_zoom_step (bool zoom_out);
        void temporal_zoom_step_scale (bool zoom_out, double scale);
@@ -369,10 +369,6 @@ public:
        void toggle_region_fades (int dir);
        void update_region_fade_visibility ();
 
-       /* redirect shared ops menu. caller must free returned menu */
-
-       Gtk::Menu* redirect_menu ();
-
        /* floating windows/transient */
 
        void ensure_float (Gtk::Window&);
@@ -405,8 +401,8 @@ public:
        void reposition_and_zoom (samplepos_t, double);
 
        samplepos_t get_preferred_edit_position (Editing::EditIgnoreOption = Editing::EDIT_IGNORE_NONE,
-                                               bool use_context_click = false,
-                                               bool from_outside_canvas = false);
+                                                bool use_context_click = false,
+                                                bool from_outside_canvas = false);
 
        bool update_mouse_speed ();
        bool decelerate_mouse_speed ();
@@ -436,13 +432,13 @@ public:
                        ARDOUR::SrcQuality                    quality,
                        ARDOUR::MidiTrackNameSource           mts,
                        ARDOUR::MidiTempoMapDisposition       mtd,
-                       samplepos_t&                           pos,
+                       samplepos_t&                          pos,
                        boost::shared_ptr<ARDOUR::PluginInfo> instrument = boost::shared_ptr<ARDOUR::PluginInfo>());
 
        void do_embed (std::vector<std::string>              paths,
                       Editing::ImportDisposition            disposition,
                       Editing::ImportMode                   mode,
-                      samplepos_t&                           pos,
+                      samplepos_t&                          pos,
                       boost::shared_ptr<ARDOUR::PluginInfo> instrument = boost::shared_ptr<ARDOUR::PluginInfo>());
 
        void get_regions_corresponding_to (boost::shared_ptr<ARDOUR::Region> region, std::vector<RegionView*>& regions, bool src_comparison);
@@ -455,14 +451,14 @@ public:
        TrackViewList axis_views_from_routes (boost::shared_ptr<ARDOUR::RouteList>) const;
 
        void snap_to (ARDOUR::MusicSample& first,
-                     ARDOUR::RoundMode   direction = ARDOUR::RoundNearest,
-                     ARDOUR::SnapPref    pref = ARDOUR::SnapToAny_Visual,
-                     bool                ensure_snap = false);
+                     ARDOUR::RoundMode    direction = ARDOUR::RoundNearest,
+                     ARDOUR::SnapPref     pref = ARDOUR::SnapToAny_Visual,
+                     bool                 ensure_snap = false);
 
        void snap_to_with_modifier (ARDOUR::MusicSample& first,
-                                   GdkEvent const *    ev,
-                                   ARDOUR::RoundMode   direction = ARDOUR::RoundNearest,
-                                   ARDOUR::SnapPref    pref = ARDOUR::SnapToAny_Visual);
+                                   GdkEvent const*      ev,
+                                   ARDOUR::RoundMode    direction = ARDOUR::RoundNearest,
+                                   ARDOUR::SnapPref     pref = ARDOUR::SnapToAny_Visual);
 
        void set_snapped_cursor_position (samplepos_t pos);
 
@@ -488,7 +484,7 @@ public:
        void set_current_trimmable (boost::shared_ptr<ARDOUR::Trimmable>);
        void set_current_movable (boost::shared_ptr<ARDOUR::Movable>);
 
-       MouseCursors const * cursors () const {
+       MouseCursors const* cursors () const {
                return _cursors;
        }
 
@@ -580,8 +576,8 @@ private:
                VisualState (bool with_tracks);
                ~VisualState ();
                double              y_position;
-               samplecnt_t          samples_per_pixel;
-               samplepos_t          _leftmost_sample;
+               samplecnt_t         samples_per_pixel;
+               samplepos_t        _leftmost_sample;
                Editing::ZoomFocus  zoom_focus;
                GUIObjectState*     gui_state;
        };
@@ -599,8 +595,8 @@ private:
        void start_visual_state_op (uint32_t n);
        void cancel_visual_state_op (uint32_t n);
 
-       samplepos_t         _leftmost_sample;
-       samplecnt_t         samples_per_pixel;
+       samplepos_t       _leftmost_sample;
+       samplecnt_t        samples_per_pixel;
        Editing::ZoomFocus zoom_focus;
 
        void set_samples_per_pixel (samplecnt_t);
@@ -630,8 +626,8 @@ private:
        Gtk::VBox _editor_list_vbox;
        Gtk::Notebook _the_notebook;
        bool _notebook_shrunk;
-       void add_notebook_page (std::string const &, Gtk::Widget &);
-       bool notebook_tab_clicked (GdkEventButton *, Gtk::Widget *);
+       void add_notebook_page (std::string const&, Gtk::Widget&);
+       bool notebook_tab_clicked (GdkEventButton*, Gtk::Widget*);
 
        ArdourWidgets::HPane edit_pane;
        ArdourWidgets::VPane editor_summary_pane;
@@ -641,13 +637,13 @@ private:
        Gtk::HBox     marker_box;
        Gtk::VBox     scrollers_rulers_markers_box;
 
-       void location_changed (ARDOUR::Location *);
-       void location_flags_changed (ARDOUR::Location *);
+       void location_changed (ARDOUR::Location*);
+       void location_flags_changed (ARDOUR::Location*);
        void refresh_location_display ();
        void refresh_location_display_internal (const ARDOUR::Locations::LocationList&);
-       void add_new_location (ARDOUR::Location *);
-       ArdourCanvas::Container* add_new_location_internal (ARDOUR::Location *);
-       void location_gone (ARDOUR::Location *);
+       void add_new_location (ARDOUR::Location*);
+       ArdourCanvas::Container* add_new_location_internal (ARDOUR::Location*);
+       void location_gone (ARDOUR::Location*);
        void remove_marker (ArdourCanvas::Item&, GdkEvent*);
        gint really_remove_marker (ARDOUR::Location* loc);
        void goto_nth_marker (int nth);
@@ -687,18 +683,18 @@ private:
                void set_color_rgba (uint32_t);
        };
 
-       LocationMarkers  *find_location_markers (ARDOUR::Location *) const;
-       ARDOUR::Location* find_location_from_marker (ArdourMarker *, bool& is_start) const;
-       ArdourMarker* find_marker_from_location_id (PBD::ID const &, bool) const;
+       LocationMarkers*  find_location_markers (ARDOUR::Location*) const;
+       ARDOUR::Location* find_location_from_marker (ArdourMarker*, bool& is_start) const;
+       ArdourMarker* find_marker_from_location_id (PBD::ID const&, bool) const;
        ArdourMarker* entered_marker;
        bool _show_marker_lines;
 
-       typedef std::map<ARDOUR::Location*,LocationMarkers *> LocationMarkerMap;
+       typedef std::map<ARDOUR::Location*,LocationMarkers*> LocationMarkerMap;
        LocationMarkerMap location_markers;
 
        void update_marker_labels ();
-       void update_marker_labels (ArdourCanvas::Container *);
-       void check_marker_label (ArdourMarker *);
+       void update_marker_labels (ArdourCanvas::Container*);
+       void check_marker_label (ArdourMarker*);
 
        /** A set of lists of Markers that are in each of the canvas groups
         *  for the marker sections at the top of the editor.  These lists
@@ -706,17 +702,17 @@ private:
         *  a marker has moved we can decide whether we need to update the labels
         *  for all markers or for just a few.
         */
-       std::map<ArdourCanvas::Container *, std::list<ArdourMarker *> > _sorted_marker_lists;
-       void remove_sorted_marker (ArdourMarker *);
+       std::map<ArdourCanvas::Container*, std::list<ArdourMarker*> > _sorted_marker_lists;
+       void remove_sorted_marker (ArdourMarker*);
 
        void hide_marker (ArdourCanvas::Item*, GdkEvent*);
        void clear_marker_display ();
        void mouse_add_new_range (samplepos_t);
        void mouse_add_new_loop (samplepos_t);
        void mouse_add_new_punch (samplepos_t);
-       bool choose_new_marker_name(std::string &name);
+       bool choose_new_marker_name(std::string &name, bool is_range=false);
        void update_cd_marker_display ();
-       void ensure_cd_marker_updated (LocationMarkers * lam, ARDOUR::Location * location);
+       void ensure_cd_marker_updated (LocationMarkers* lam, ARDOUR::Location* location);
 
        TimeAxisView*      clicked_axisview;
        RouteTimeAxisView* clicked_routeview;
@@ -740,7 +736,7 @@ private:
        void mapover_tracks_with_unique_playlists (sigc::slot<void,RouteTimeAxisView&,uint32_t> sl, TimeAxisView*, PBD::PropertyID) const;
 
        /* functions to be passed to mapover_tracks(), possibly with sigc::bind()-supplied arguments */
-       void mapped_get_equivalent_regions (RouteTimeAxisView&, uint32_t, RegionView *, std::vector<RegionView*>*) const;
+       void mapped_get_equivalent_regions (RouteTimeAxisView&, uint32_t, RegionView*, std::vector<RegionView*>*) const;
        void mapped_use_new_playlist (RouteTimeAxisView&, uint32_t, std::vector<boost::shared_ptr<ARDOUR::Playlist> > const &);
        void mapped_use_copy_playlist (RouteTimeAxisView&, uint32_t, std::vector<boost::shared_ptr<ARDOUR::Playlist> > const &);
        void mapped_clear_playlist (RouteTimeAxisView&, uint32_t);
@@ -749,7 +745,7 @@ private:
        bool button_release_can_deselect;
        bool _mouse_changed_selection;
 
-       void catch_vanishing_regionview (RegionView *);
+       void catch_vanishing_regionview (RegionView*);
 
        void set_selected_track (TimeAxisView&, Selection::Operation op = Selection::Set, bool no_remove=false);
        void select_all_tracks ();
@@ -761,19 +757,13 @@ private:
        bool set_selected_regionview_from_click (bool press, Selection::Operation op = Selection::Set);
 
        bool set_selected_regionview_from_map_event (GdkEventAny*, StreamView*, boost::weak_ptr<ARDOUR::Region>);
-       void collect_new_region_view (RegionView *);
-       void collect_and_select_new_region_view (RegionView *);
+       void collect_new_region_view (RegionView*);
+       void collect_and_select_new_region_view (RegionView*);
 
        Gtk::Menu track_context_menu;
        Gtk::Menu track_region_context_menu;
        Gtk::Menu track_selection_context_menu;
 
-       Gtk::MenuItem* region_edit_menu_split_item;
-       Gtk::MenuItem* region_edit_menu_split_multichannel_item;
-       Gtk::Menu * track_region_edit_playlist_menu;
-       Gtk::Menu * track_edit_playlist_submenu;
-       Gtk::Menu * track_selection_edit_playlist_submenu;
-
        GdkEvent context_click_event;
 
        void popup_track_context_menu (int, int, ItemType, bool);
@@ -787,15 +777,15 @@ private:
        void add_selection_context_items (Gtk::Menu_Helpers::MenuList&);
        Gtk::MenuItem* _popup_region_menu_item;
 
-       void popup_control_point_context_menu (ArdourCanvas::Item *, GdkEvent *);
+       void popup_control_point_context_menu (ArdourCanvas::Item*, GdkEvent*);
        Gtk::Menu _control_point_context_menu;
 
-       void popup_note_context_menu (ArdourCanvas::Item *, GdkEvent *);
+       void popup_note_context_menu (ArdourCanvas::Item*, GdkEvent*);
        Gtk::Menu _note_context_menu;
 
        void add_stripables (ARDOUR::StripableList&);
        void add_routes (ARDOUR::RouteList&);
-       void timeaxisview_deleted (TimeAxisView *);
+       void timeaxisview_deleted (TimeAxisView*);
        void add_vcas (ARDOUR::VCAList&);
 
        Gtk::HBox global_hpacker;
@@ -830,18 +820,18 @@ private:
        void parameter_changed (std::string);
        void ui_parameter_changed (std::string);
 
-       Gtk::EventBox             time_bars_event_box;
-       Gtk::VBox                 time_bars_vbox;
+       Gtk::EventBox            time_bars_event_box;
+       Gtk::VBox                time_bars_vbox;
 
-       ArdourCanvas::Container      *tempo_group;
-       ArdourCanvas::Container      *meter_group;
-       ArdourCanvas::Container      *marker_group;
-       ArdourCanvas::Container      *range_marker_group;
-       ArdourCanvas::Container      *transport_marker_group;
-       ArdourCanvas::Container*      cd_marker_group;
+       ArdourCanvas::Containertempo_group;
+       ArdourCanvas::Containermeter_group;
+       ArdourCanvas::Containermarker_group;
+       ArdourCanvas::Containerrange_marker_group;
+       ArdourCanvas::Containertransport_marker_group;
+       ArdourCanvas::Container* cd_marker_group;
 
        /* parent for groups which themselves contain time markers */
-       ArdourCanvas::Container*     _time_markers_group;
+       ArdourCanvas::Container* _time_markers_group;
 
        /* The group containing all other groups that are scrolled vertically
           and horizontally.
@@ -873,21 +863,6 @@ private:
        ArdourCanvas::Rectangle* _canvas_drop_zone;
        bool canvas_drop_zone_event (GdkEvent* event);
 
-       enum RulerType {
-               ruler_metric_timecode = 0,
-               ruler_metric_bbt = 1,
-               ruler_metric_samples = 2,
-               ruler_metric_minsec = 3,
-
-               ruler_time_tempo = 4,
-               ruler_time_meter = 5,
-               ruler_time_marker = 6,
-               ruler_time_range_marker = 7,
-               ruler_time_transport_marker = 8,
-               ruler_time_cd_marker = 9,
-               ruler_video_timeline = 10,
-       };
-
        Glib::RefPtr<Gtk::ToggleAction> ruler_timecode_action;
        Glib::RefPtr<Gtk::ToggleAction> ruler_bbt_action;
        Glib::RefPtr<Gtk::ToggleAction> ruler_samples_action;
@@ -900,7 +875,7 @@ private:
        Glib::RefPtr<Gtk::ToggleAction> ruler_cd_marker_action;
        bool                            no_ruler_shown_update;
 
-       Gtk::Widget * ruler_grabbed_widget;
+       Gtk::Widget* ruler_grabbed_widget;
 
        RulerDialog* ruler_dialog;
 
@@ -911,8 +886,7 @@ private:
        void update_tempo_based_rulers ();
        void popup_ruler_menu (samplepos_t where = 0, ItemType type = RegionItem);
        void update_ruler_visibility ();
-       void set_ruler_visible (RulerType, bool);
-       void toggle_ruler_visibility (RulerType rt);
+       void toggle_ruler_visibility ();
        void ruler_toggled (int);
        bool ruler_label_button_release (GdkEventButton*);
        void store_ruler_visibility ();
@@ -979,7 +953,7 @@ private:
 
        static double timebar_height;
        guint32 visible_timebars;
-       Gtk::Menu          *editor_ruler_menu;
+       Gtk::Menueditor_ruler_menu;
 
        ArdourCanvas::Rectangle* tempo_bar;
        ArdourCanvas::Rectangle* meter_bar;
@@ -1006,7 +980,7 @@ private:
        Glib::RefPtr<Gtk::ToggleAction> xjadeo_proc_action;
        Glib::RefPtr<Gtk::ToggleAction> xjadeo_ontop_action;
        Glib::RefPtr<Gtk::ToggleAction> xjadeo_timecode_action;
-       Glib::RefPtr<Gtk::ToggleAction> xjadeo_sample_action;
+       Glib::RefPtr<Gtk::ToggleAction> xjadeo_frame_action;
        Glib::RefPtr<Gtk::ToggleAction> xjadeo_osdbg_action;
        Glib::RefPtr<Gtk::ToggleAction> xjadeo_fullscreen_action;
        Glib::RefPtr<Gtk::ToggleAction> xjadeo_letterbox_action;
@@ -1037,8 +1011,8 @@ private:
        void    cursor_to_next_region_point (EditorCursor*, ARDOUR::RegionPoint);
        void    cursor_to_previous_region_point (EditorCursor*, ARDOUR::RegionPoint);
        void    cursor_to_region_point (EditorCursor*, ARDOUR::RegionPoint, int32_t dir);
-       void    cursor_to_selection_start (EditorCursor *);
-       void    cursor_to_selection_end   (EditorCursor *);
+       void    cursor_to_selection_start (EditorCursor*);
+       void    cursor_to_selection_end   (EditorCursor*);
 
        void    selected_marker_to_region_boundary (bool with_selection, int32_t dir);
        void    selected_marker_to_next_region_boundary (bool with_selection);
@@ -1049,12 +1023,12 @@ private:
        void    selected_marker_to_selection_start ();
        void    selected_marker_to_selection_end   ();
 
-       void    select_all_selectables_using_cursor (EditorCursor *, bool);
+       void    select_all_selectables_using_cursor (EditorCursor*, bool);
        void    select_all_selectables_using_edit (bool, bool);
        void    select_all_selectables_between (bool within);
        void    select_range_between ();
 
-       boost::shared_ptr<ARDOUR::Region> find_next_region (ARDOUR::samplepos_t, ARDOUR::RegionPoint, int32_t dir, TrackViewList&, TimeAxisView ** = 0);
+       boost::shared_ptr<ARDOUR::Region> find_next_region (ARDOUR::samplepos_t, ARDOUR::RegionPoint, int32_t dir, TrackViewList&, TimeAxisView** = 0);
        ARDOUR::samplepos_t find_next_region_boundary (ARDOUR::samplepos_t, int32_t dir, const TrackViewList&);
 
        std::vector<ARDOUR::samplepos_t> region_boundary_cache;
@@ -1097,8 +1071,8 @@ private:
        bool track_canvas_map_handler (GdkEventAny*);
 
        bool edit_controls_button_release (GdkEventButton*);
-       Gtk::Menu *edit_controls_left_menu;
-       Gtk::Menu *edit_controls_right_menu;
+       Gtk::Menuedit_controls_left_menu;
+       Gtk::Menuedit_controls_right_menu;
 
        Gtk::VBox           track_canvas_vbox;
        Gtk::VBox           edit_controls_vbox;
@@ -1131,10 +1105,10 @@ private:
                        VideoTimeline = 0x8
                };
 
-               Type       pending;
+               Type        pending;
                samplepos_t time_origin;
-               samplecnt_t samples_per_pixel;
-               double     y_origin;
+               samplecnt_t samples_per_pixel;
+               double      y_origin;
 
                int idle_handler_id;
                /** true if we are currently in the idle handler */
@@ -1151,7 +1125,7 @@ private:
 
        void pre_render ();
 
-       static int _idle_visual_changer (void *arg);
+       static int _idle_visual_changer (voidarg);
        int idle_visual_changer ();
        void visual_changer (const VisualChange&);
        void ensure_visual_change_idle_handler ();
@@ -1189,8 +1163,8 @@ private:
 
        bool typed_event (ArdourCanvas::Item*, GdkEvent*, ItemType);
        bool button_press_handler (ArdourCanvas::Item*, GdkEvent*, ItemType);
-       bool button_press_handler_1 (ArdourCanvas::Item *, GdkEvent *, ItemType);
-       bool button_press_handler_2 (ArdourCanvas::Item *, GdkEvent *, ItemType);
+       bool button_press_handler_1 (ArdourCanvas::Item*, GdkEvent*, ItemType);
+       bool button_press_handler_2 (ArdourCanvas::Item*, GdkEvent*, ItemType);
        bool button_release_handler (ArdourCanvas::Item*, GdkEvent*, ItemType);
        bool button_double_click_handler (ArdourCanvas::Item*, GdkEvent*, ItemType);
        bool button_press_dispatch (GdkEventButton*);
@@ -1214,7 +1188,7 @@ private:
        /* CUT/COPY/PASTE */
 
        samplepos_t last_paste_pos;
-       unsigned   paste_count;
+       unsigned    paste_count;
 
        void cut_copy (Editing::CutCopyOp);
        bool can_cut_copy () const;
@@ -1366,7 +1340,7 @@ private:
                             Editing::ImportDisposition            disposition,
                             Editing::ImportMode                   mode,
                             ARDOUR::SrcQuality                    quality,
-                            samplepos_t&                           pos,
+                            samplepos_t&                          pos,
                             int                                   target_regions,
                             int                                   target_tracks,
                             boost::shared_ptr<ARDOUR::Track>&     track,
@@ -1378,7 +1352,7 @@ private:
                            bool&                                 check_sample_rate,
                            Editing::ImportDisposition            disposition,
                            Editing::ImportMode                   mode,
-                           samplepos_t&                           pos,
+                           samplepos_t&                          pos,
                            int                                   target_regions,
                            int                                   target_tracks,
                            boost::shared_ptr<ARDOUR::Track>&     track,
@@ -1386,7 +1360,7 @@ private:
 
        int add_sources (std::vector<std::string>              paths,
                         ARDOUR::SourceList&                   sources,
-                        samplepos_t&                           pos,
+                        samplepos_t&                          pos,
                         Editing::ImportDisposition            disposition,
                         Editing::ImportMode                   mode,
                         int                                   target_regions,
@@ -1398,7 +1372,7 @@ private:
        int finish_bringing_in_material (boost::shared_ptr<ARDOUR::Region>     region,
                                         uint32_t                              in_chans,
                                         uint32_t                              out_chans,
-                                        samplepos_t&                           pos,
+                                        samplepos_t&                          pos,
                                         Editing::ImportMode                   mode,
                                         boost::shared_ptr<ARDOUR::Track>&     existing_track,
                                         const std::string&                    new_track_name,
@@ -1420,7 +1394,7 @@ private:
        /* PT import specific */
        void external_pt_dialog ();
        ARDOUR::ImportStatus import_pt_status;
-       static void *_import_pt_thread (void *);
+       static void*_import_pt_thread (void*);
        void* import_pt_thread ();
        PTFFormat import_ptf;
 
@@ -1436,7 +1410,7 @@ private:
        };
 
        EditorImportStatus import_status;
-       static void *_import_thread (void *);
+       static void*_import_thread (void*);
        void* import_thread ();
        void finish_import ();
 
@@ -1571,8 +1545,8 @@ private:
 
        void region_view_item_click (AudioRegionView&, GdkEventButton*);
 
-       bool can_remove_control_point (ArdourCanvas::Item *);
-       void remove_control_point (ArdourCanvas::Item *);
+       bool can_remove_control_point (ArdourCanvas::Item*);
+       void remove_control_point (ArdourCanvas::Item*);
 
        void mouse_brush_insert_region (RegionView*, samplepos_t pos);
 
@@ -1592,7 +1566,7 @@ private:
        bool canvas_fade_out_handle_event (GdkEvent* event,ArdourCanvas::Item*, AudioRegionView*, bool trim = false);
        bool canvas_region_view_event (GdkEvent* event,ArdourCanvas::Item*, RegionView*);
        bool canvas_wave_view_event (GdkEvent* event,ArdourCanvas::Item*, RegionView*);
-       bool canvas_sample_handle_event (GdkEvent* event,ArdourCanvas::Item*, RegionView*);
+       bool canvas_frame_handle_event (GdkEvent* event,ArdourCanvas::Item*, RegionView*);
        bool canvas_region_view_name_highlight_event (GdkEvent* event,ArdourCanvas::Item*, RegionView*);
        bool canvas_region_view_name_event (GdkEvent* event,ArdourCanvas::Item*, RegionView*);
        bool canvas_feature_line_event (GdkEvent* event, ArdourCanvas::Item*, RegionView*);
@@ -1602,9 +1576,9 @@ private:
        bool canvas_tempo_curve_event (GdkEvent* event,ArdourCanvas::Item*, TempoCurve*);
        bool canvas_meter_marker_event (GdkEvent* event,ArdourCanvas::Item*, MeterMarker*);
        bool canvas_automation_track_event(GdkEvent* event, ArdourCanvas::Item*, AutomationTimeAxisView*);
-       bool canvas_note_event (GdkEvent* event, ArdourCanvas::Item *);
+       bool canvas_note_event (GdkEvent* event, ArdourCanvas::Item*);
 
-       bool canvas_ruler_event (GdkEvent* event, ArdourCanvas::Item *, ItemType);
+       bool canvas_ruler_event (GdkEvent* event, ArdourCanvas::Item*, ItemType);
        bool canvas_tempo_bar_event (GdkEvent* event, ArdourCanvas::Item*);
        bool canvas_meter_bar_event (GdkEvent* event, ArdourCanvas::Item*);
        bool canvas_marker_bar_event (GdkEvent* event, ArdourCanvas::Item*);
@@ -1646,8 +1620,8 @@ private:
        void track_canvas_viewport_allocate (Gtk::Allocation alloc);
        void track_canvas_viewport_size_allocated ();
        bool track_canvas_drag_motion (Glib::RefPtr<Gdk::DragContext> const &, int, int, guint);
-       bool track_canvas_key_press (GdkEventKey *);
-       bool track_canvas_key_release (GdkEventKey *);
+       bool track_canvas_key_press (GdkEventKey*);
+       bool track_canvas_key_release (GdkEventKey*);
 
        void set_playhead_cursor ();
 
@@ -1692,7 +1666,7 @@ private:
        void marker_menu_edit ();
        void marker_menu_remove ();
        void marker_menu_rename ();
-       void rename_marker (ArdourMarker *marker);
+       void rename_marker (ArdourMarkermarker);
        void toggle_marker_lock_style ();
        void toggle_tempo_clamped ();
        void toggle_tempo_type ();
@@ -1720,20 +1694,19 @@ private:
        void marker_context_menu (GdkEventButton*, ArdourCanvas::Item*);
        void tempo_or_meter_marker_context_menu (GdkEventButton*, ArdourCanvas::Item*);
        void new_transport_marker_context_menu (GdkEventButton*, ArdourCanvas::Item*);
-       void build_range_marker_menu (ARDOUR::Location *, bool, bool);
-       void build_marker_menu (ARDOUR::Location *);
-       void build_tempo_marker_menu (TempoMarker *, bool);
-       void build_meter_marker_menu (MeterMarker *, bool);
+       void build_range_marker_menu (ARDOUR::Location*, bool, bool);
+       void build_marker_menu (ARDOUR::Location*);
+       void build_tempo_marker_menu (TempoMarker*, bool);
+       void build_meter_marker_menu (MeterMarker*, bool);
        void build_new_transport_marker_menu ();
+
        void dynamic_cast_marker_object (void*, MeterMarker**, TempoMarker**) const;
 
        Gtk::Menu* tempo_marker_menu;
        Gtk::Menu* meter_marker_menu;
        Gtk::Menu* marker_menu;
        Gtk::Menu* range_marker_menu;
-       Gtk::Menu* transport_marker_menu;
        Gtk::Menu* new_transport_marker_menu;
-       Gtk::Menu* cd_marker_menu;
        ArdourCanvas::Item* marker_menu_item;
 
        typedef std::list<ArdourMarker*> Marks;
@@ -1816,7 +1789,7 @@ private:
        void build_grid_type_menu ();
 
        ArdourWidgets::ArdourButton snap_mode_button;
-       bool snap_mode_button_clicked (GdkEventButton *);
+       bool snap_mode_button_clicked (GdkEventButton*);
 
        Gtk::HBox snap_box;
 
@@ -1949,7 +1922,7 @@ private:
        void stop_canvas_autoscroll ();
 
        /* trimming */
-       void point_trim (GdkEvent *, samplepos_t);
+       void point_trim (GdkEvent*, samplepos_t);
 
        void trim_region_front();
        void trim_region_back();
@@ -2024,8 +1997,8 @@ private:
        uint32_t selection_op_cmd_depth;
        uint32_t selection_op_history_it;
 
-       std::list<XMLNode *> selection_op_history; /* used in *_reversible_selection_op */
-       std::list<XMLNode *> before; /* used in *_reversible_command */
+       std::list<XMLNode*> selection_op_history; /* used in *_reversible_selection_op */
+       std::list<XMLNode*> before; /* used in *_reversible_command */
 
        void update_title ();
        void update_title_s (const std::string & snapshot_name);
@@ -2052,19 +2025,19 @@ private:
        /** computes the timeline sample (sample) of an event whose coordinates
         * are in canvas units (pixels, scroll offset included).
         */
-       samplepos_t canvas_event_sample (GdkEvent const *, double* px = 0, double* py = 0) const;
+       samplepos_t canvas_event_sample (GdkEvent const*, double* px = 0, double* py = 0) const;
 
        /** computes the timeline sample (sample) of an event whose coordinates
         * are in window units (pixels, no scroll offset).
         */
-       samplepos_t window_event_sample (GdkEvent const *, double* px = 0, double* py = 0) const;
+       samplepos_t window_event_sample (GdkEvent const*, double* px = 0, double* py = 0) const;
 
        /* returns false if mouse pointer is not in track or marker canvas
         */
        bool mouse_sample (samplepos_t&, bool& in_track_canvas) const;
 
        TimeFXDialog* current_timefx;
-       static void* timefx_thread (void *arg);
+       static void* timefx_thread (voidarg);
        void do_timefx ();
 
        int time_stretch (RegionSelection&, float fraction);
@@ -2206,12 +2179,12 @@ private:
                                          ARDOUR::SnapPref    gpref);
 
        void snap_to_internal (ARDOUR::MusicSample& first,
-                              ARDOUR::RoundMode   direction = ARDOUR::RoundNearest,
-                              ARDOUR::SnapPref    gpref = ARDOUR::SnapToAny_Visual,
-                              bool                ensure_snap = false);
+                              ARDOUR::RoundMode    direction = ARDOUR::RoundNearest,
+                              ARDOUR::SnapPref     gpref = ARDOUR::SnapToAny_Visual,
+                              bool                 ensure_snap = false);
 
-       samplepos_t snap_to_marker (samplepos_t        presnap,
-                                   ARDOUR::RoundMode   direction = ARDOUR::RoundNearest);
+       samplepos_t snap_to_marker (samplepos_t       presnap,
+                                   ARDOUR::RoundMode direction = ARDOUR::RoundNearest);
 
        RhythmFerret* rhythm_ferret;
 
@@ -2246,11 +2219,11 @@ private:
        Gtk::HBox _summary_hbox;
        EditorSummary* _summary;
 
-       void region_view_added (RegionView *);
+       void region_view_added (RegionView*);
        void region_view_removed ();
 
        EditorGroupTabs* _group_tabs;
-       void fit_route_group (ARDOUR::RouteGroup *);
+       void fit_route_group (ARDOUR::RouteGroup*);
 
        void step_edit_status_change (bool);
        void start_step_editing ();
@@ -2313,12 +2286,12 @@ private:
 
        /* private helper functions to help with registering region actions */
 
-       Glib::RefPtr<Gtk::Action> register_region_action (Glib::RefPtr<Gtk::ActionGroup> group, Editing::RegionActionTarget, char const * name, char const * label, sigc::slot<void> slot);
-       void register_toggle_region_action (Glib::RefPtr<Gtk::ActionGroup> group, Editing::RegionActionTarget, char const * name, char const * label, sigc::slot<void> slot);
+       Glib::RefPtr<Gtk::Action> register_region_action (Glib::RefPtr<Gtk::ActionGroup> group, Editing::RegionActionTarget, char const* name, char const* label, sigc::slot<void> slot);
+       void register_toggle_region_action (Glib::RefPtr<Gtk::ActionGroup> group, Editing::RegionActionTarget, char const* name, char const* label, sigc::slot<void> slot);
 
-       Glib::RefPtr<Gtk::Action> reg_sens (Glib::RefPtr<Gtk::ActionGroup> group, char const * name, char const * label, sigc::slot<void> slot);
-       void toggle_reg_sens (Glib::RefPtr<Gtk::ActionGroup> group, char const * name, char const * label, sigc::slot<void> slot);
-       void radio_reg_sens (Glib::RefPtr<Gtk::ActionGroup> action_group, Gtk::RadioAction::Group& radio_group, char const * name, char const * label, sigc::slot<void> slot);
+       Glib::RefPtr<Gtk::Action> reg_sens (Glib::RefPtr<Gtk::ActionGroup> group, char const* name, char const* label, sigc::slot<void> slot);
+       void toggle_reg_sens (Glib::RefPtr<Gtk::ActionGroup> group, char const* name, char const* label, sigc::slot<void> slot);
+       void radio_reg_sens (Glib::RefPtr<Gtk::ActionGroup> action_group, Gtk::RadioAction::Group& radio_group, char const* name, char const* label, sigc::slot<void> slot);
 
        friend class Drag;
        friend class RegionCutDrag;