Merge remote-tracking branch 'remotes/origin/cairocanvas' into windows

[ardour.git] / gtk2_ardour / midi_time_axis.cc

diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc
index a8fc9c3e60fa511927edeca940e9ed4fb40b3fb1..4884dc34f38c929f9b3b3edf9600925994bfd2e9 100644 (file)
--- a/gtk2_ardour/midi_time_axis.cc
+++ b/gtk2_ardour/midi_time_axis.cc
@@ -19,8 +19,6 @@
 #include <cstdlib>
 #include <cmath>
 
-#include <strings.h> // for ffs(3)
-
 #include <algorithm>
 #include <string>
 #include <vector>
@@ -28,6 +26,7 @@
 #include <sigc++/bind.h>
 
 #include "pbd/error.h"
+#include "pbd/ffs.h"
 #include "pbd/stl_delete.h"
 #include "pbd/whitespace.h"
 #include "pbd/basename.h"
@@ -61,8 +60,6 @@
 #include "ardour_button.h"
 #include "automation_line.h"
 #include "automation_time_axis.h"
-#include "canvas-note-event.h"
-#include "canvas_impl.h"
 #include "editor.h"
 #include "enums.h"
 #include "ghostregion.h"
@@ -83,8 +80,8 @@
 #include "rgb_macros.h"
 #include "selection.h"
 #include "step_editor.h"
-#include "simplerect.h"
 #include "utils.h"
+#include "note_base.h"
 
 #include "ardour/midi_track.h"
 
@@ -100,7 +97,7 @@ using namespace Editing;
 static const uint32_t MIDI_CONTROLS_BOX_MIN_HEIGHT = 140;
 static const uint32_t KEYBOARD_MIN_HEIGHT = 130;
 
-MidiTimeAxisView::MidiTimeAxisView (PublicEditor& ed, Session* sess, Canvas& canvas)
+MidiTimeAxisView::MidiTimeAxisView (PublicEditor& ed, Session* sess, ArdourCanvas::Canvas& canvas)
        : AxisView(sess) // virtually inherited
        , RouteTimeAxisView(ed, sess, canvas)
        , _ignore_signals(false)
@@ -315,7 +312,7 @@ MidiTimeAxisView::set_route (boost::shared_ptr<Route> rt)
        if (!color_mode.empty()) {
                _color_mode = ColorMode (string_2_enum(color_mode, _color_mode));
                if (_channel_selector && _color_mode == ChannelColors) {
-                       _channel_selector->set_channel_colors(CanvasNoteEvent::midi_channel_colors);
+                       _channel_selector->set_channel_colors(NoteBase::midi_channel_colors);
                }
        }
 
@@ -512,7 +509,7 @@ MidiTimeAxisView::toggle_channel_selector ()
                _channel_selector = new MidiChannelSelectorWindow (midi_track());
 
                if (_color_mode == ChannelColors) {
-                       _channel_selector->set_channel_colors(CanvasNoteEvent::midi_channel_colors);
+                       _channel_selector->set_channel_colors(NoteBase::midi_channel_colors);
                } else {
                        _channel_selector->set_default_channel_color ();
                }
@@ -739,7 +736,7 @@ MidiTimeAxisView::add_single_channel_controller_item(Menu_Helpers::MenuList& ctl
                                }
                        }
 
-                       Gtk::CheckMenuItem* cmi = static_cast<CheckMenuItem*>(&ctl_items.back());
+                       Gtk::CheckMenuItem* cmi = static_cast<Gtk::CheckMenuItem*>(&ctl_items.back());
                        _controller_menu_map[fully_qualified_param] = cmi;
                        cmi->set_active (visible);
 
@@ -795,7 +792,7 @@ MidiTimeAxisView::add_multi_channel_controller_item(Menu_Helpers::MenuList& ctl_
                                }
                        }
 
-                       Gtk::CheckMenuItem* cmi = static_cast<CheckMenuItem*>(&chn_items.back());
+                       Gtk::CheckMenuItem* cmi = static_cast<Gtk::CheckMenuItem*>(&chn_items.back());
                        _controller_menu_map[fully_qualified_param] = cmi;
                        cmi->set_active (visible);
                }
@@ -1035,7 +1032,7 @@ MidiTimeAxisView::set_color_mode (ColorMode mode, bool force, bool redisplay, bo
                
                if (_channel_selector) {
                        if (mode == ChannelColors) {
-                               _channel_selector->set_channel_colors(CanvasNoteEvent::midi_channel_colors);
+                               _channel_selector->set_channel_colors(NoteBase::midi_channel_colors);
                        } else {
                                _channel_selector->set_default_channel_color();
                        }
@@ -1491,7 +1488,7 @@ MidiTimeAxisView::playback_channel_mode_changed ()
                _playback_channel_status.set_markup (string_compose ("<b>%1</b>: <i>%2</i>", _("Play"), _("some")));
                break;
        case ForceChannel:
-               _playback_channel_status.set_markup (string_compose ("<b>%1</b>: <i>%2>%3</i>", _("Play"), _("all"), ffs (midi_track()->get_playback_channel_mask())));
+               _playback_channel_status.set_markup (string_compose ("<b>%1</b>: <i>%2>%3</i>", _("Play"), _("all"), PBD::ffs (midi_track()->get_playback_channel_mask())));
                break;
        }
 }
@@ -1507,7 +1504,7 @@ MidiTimeAxisView::capture_channel_mode_changed ()
                _capture_channel_status.set_markup (string_compose ("<b>%1</b>: <i>%2</i>", _("Rec"), _("some")));
                break;
        case ForceChannel:
-               _capture_channel_status.set_markup (string_compose ("<b>%1</b>: <i>%2>%3</i>", _("Rec"), _("all"), ffs (midi_track()->get_capture_channel_mask())));
+               _capture_channel_status.set_markup (string_compose ("<b>%1</b>: <i>%2>%3</i>", _("Rec"), _("all"), PBD::ffs (midi_track()->get_capture_channel_mask())));
                break;
        }
 }