Trim include dependency tree (particularly on evoral/Sequence.hpp).

git-svn-id: svn://localhost/ardour2/branches/3.0@4589 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 88 insertions, 77 deletions

diff --git a/gtk2_ardour/piano_roll_header.cc b/gtk2_ardour/piano_roll_header.cc
index 5032e97e91..9d0f1e504a 100644
--- a/gtk2_ardour/piano_roll_header.cc
+++ b/gtk2_ardour/piano_roll_header.cc
@@ -16,14 +16,14 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#include <iostream>
+#include <evoral/midi_events.h>
 #include <ardour/midi_track.h>
 
 #include "piano_roll_header.h"
 #include "midi_time_axis.h"
 #include "midi_streamview.h"
 
-#include <iostream>
-
 const int no_note = 0xff;
 
 using namespace std;
@@ -41,17 +41,20 @@ PianoRollHeader::Color PianoRollHeader::black_shade_dark = PianoRollHeader::Colo
 PianoRollHeader::Color::Color()
 	: r(1.0f)
 	, g(1.0f)
-	, b(1.0f) {
+	, b(1.0f)
+{
 }
 
 PianoRollHeader::Color::Color(double _r, double _g, double _b)
 	: r(_r)
 	, g(_g)
-	, b(_b) {
+	, b(_b)
+{
 }
 
 inline void
-PianoRollHeader::Color::set(const PianoRollHeader::Color& c) {
+PianoRollHeader::Color::set(const PianoRollHeader::Color& c)
+{
 	r = c.r;
 	g = c.g;
 	b = c.b;
@@ -61,8 +64,8 @@ PianoRollHeader::PianoRollHeader(MidiStreamView& v)
 	: _view(v) 
 	, _highlighted_note(no_note)
 	, _clicked_note(no_note)
-	, _dragging(false) {
-
+	, _dragging(false)
+{
 	add_events (Gdk::BUTTON_PRESS_MASK |
 		    Gdk::BUTTON_RELEASE_MASK |
 		    Gdk::POINTER_MOTION_MASK |
@@ -70,7 +73,7 @@ PianoRollHeader::PianoRollHeader(MidiStreamView& v)
 		    Gdk::LEAVE_NOTIFY_MASK |
 		    Gdk::SCROLL_MASK);
 
-	for(int i = 0; i < 128; ++i) {
+	for (int i = 0; i < 128; ++i) {
 		_active_notes[i] = false;
 	}
 
@@ -78,17 +81,19 @@ PianoRollHeader::PianoRollHeader(MidiStreamView& v)
 }
 
 inline void
-create_path(Cairo::RefPtr<Cairo::Context> cr, double x[], double y[], int start, int stop) {
+create_path(Cairo::RefPtr<Cairo::Context> cr, double x[], double y[], int start, int stop)
+{
 	cr->move_to(x[start], y[start]);
 
-	for(int i = start+1; i <= stop; ++i) {
+	for (int i = start+1; i <= stop; ++i) {
 		cr->line_to(x[i], y[i]);
 	}
 }
 
 inline void 
 render_rect(Cairo::RefPtr<Cairo::Context> cr, int note, double x[], double y[],
-	     PianoRollHeader::Color& bg, PianoRollHeader::Color& tl_shadow, PianoRollHeader::Color& br_shadow) {
+	     PianoRollHeader::Color& bg, PianoRollHeader::Color& tl_shadow, PianoRollHeader::Color& br_shadow)
+{
 	cr->set_source_rgb(bg.r, bg.g, bg.b);
 	create_path(cr, x, y, 0, 4);
 	cr->fill();
@@ -104,7 +109,8 @@ render_rect(Cairo::RefPtr<Cairo::Context> cr, int note, double x[], double y[],
 
 inline void
 render_cf(Cairo::RefPtr<Cairo::Context> cr, int note, double x[], double y[],
-		PianoRollHeader::Color& bg, PianoRollHeader::Color& tl_shadow, PianoRollHeader::Color& br_shadow) {
+		PianoRollHeader::Color& bg, PianoRollHeader::Color& tl_shadow, PianoRollHeader::Color& br_shadow)
+{
 	cr->set_source_rgb(bg.r, bg.g, bg.b);
 	create_path(cr, x, y, 0, 6);
 	cr->fill();
@@ -120,7 +126,8 @@ render_cf(Cairo::RefPtr<Cairo::Context> cr, int note, double x[], double y[],
 
 inline void
 render_eb(Cairo::RefPtr<Cairo::Context> cr, int note, double x[], double y[],
-		PianoRollHeader::Color& bg, PianoRollHeader::Color& tl_shadow, PianoRollHeader::Color& br_shadow) {
+		PianoRollHeader::Color& bg, PianoRollHeader::Color& tl_shadow, PianoRollHeader::Color& br_shadow)
+{
 	cr->set_source_rgb(bg.r, bg.g, bg.b);
 	create_path(cr, x, y, 0, 6);
 	cr->fill();
@@ -140,7 +147,8 @@ render_eb(Cairo::RefPtr<Cairo::Context> cr, int note, double x[], double y[],
 
 inline void
 render_dga(Cairo::RefPtr<Cairo::Context> cr, int note, double x[], double y[],
-		 PianoRollHeader::Color& bg, PianoRollHeader::Color& tl_shadow, PianoRollHeader::Color& br_shadow) {
+		 PianoRollHeader::Color& bg, PianoRollHeader::Color& tl_shadow, PianoRollHeader::Color& br_shadow)
+{
 	cr->set_source_rgb(bg.r, bg.g, bg.b);
 	create_path(cr, x, y, 0, 8);
 	cr->fill();
@@ -159,21 +167,21 @@ render_dga(Cairo::RefPtr<Cairo::Context> cr, int note, double x[], double y[],
 }
 
 void
-PianoRollHeader::get_path(PianoRollHeader::ItemType note_type, int note, double x[], double y[]) {
+PianoRollHeader::get_path(PianoRollHeader::ItemType note_type, int note, double x[], double y[])
+{
 	double y_pos = floor(_view.note_to_y(note)) - 0.5f;
 	double note_height;
 	double other_y1 = floor(_view.note_to_y(note+1)) + floor(_note_height / 2.0f) + 0.5f;
 	double other_y2 = floor(_view.note_to_y(note-1)) + floor(_note_height / 2.0f) - 1.0f;
 	double width = get_width();
 
-	if(note == 0) {
+	if (note == 0) {
 		note_height = floor(_view.contents_height()) - y_pos;
-	}
-	else {
+	} else {
 		note_height = floor(_view.note_to_y(note - 1)) - y_pos;
 	}
 
-	switch(note_type) {
+	switch (note_type) {
 	case BLACK_SEPARATOR:
 		x[0] = 1.5f;
 		y[0] = y_pos;
@@ -274,7 +282,8 @@ PianoRollHeader::get_path(PianoRollHeader::ItemType note_type, int note, double
 }
 
 bool
-PianoRollHeader::on_expose_event (GdkEventExpose* ev) {
+PianoRollHeader::on_expose_event (GdkEventExpose* ev)
+{
 	GdkRectangle& rect = ev->area;
 	double font_size;
 	int lowest, highest;
@@ -291,7 +300,7 @@ PianoRollHeader::on_expose_event (GdkEventExpose* ev) {
 	lowest = max(_view.lowest_note(), _view.y_to_note(y2));
 	highest = min(_view.highest_note(), _view.y_to_note(y1));
 
-	if(lowest > 127) {
+	if (lowest > 127) {
 		lowest = 0;
 	}
 
@@ -322,28 +331,26 @@ PianoRollHeader::on_expose_event (GdkEventExpose* ev) {
 	//pat->add_color_stop_rgb(1.0, 0.22, 0.22, 0.22);
 	//cr->set_source(pat);
 
-	for(int i = lowest; i <= highest; ++i) {
+	for (int i = lowest; i <= highest; ++i) {
 		oct_rel = i % 12;
 
-		switch(oct_rel) {
+		switch (oct_rel) {
 		case 1:
 		case 3:
 		case 6:
 		case 8:
 		case 10:
 			/* black note */
-			if(i == _highlighted_note) {
+			if (i == _highlighted_note) {
 				bg.set(black_highlight);
-			}
-			else {
+			} else {
 				bg.set(black);
 			}
 
-			if(_active_notes[i]) {
+			if (_active_notes[i]) {
 				tl_shadow.set(black_shade_dark);
 				br_shadow.set(black_shade_light);
-			}
-			else {
+			} else {
 				tl_shadow.set(black_shade_light);
 				br_shadow.set(black_shade_dark);
 			}
@@ -364,18 +371,16 @@ PianoRollHeader::on_expose_event (GdkEventExpose* ev) {
 
 		default:
 			/* white note */
-			if(i == _highlighted_note) {
+			if (i == _highlighted_note) {
 				bg.set(white_highlight);
-			}
-			else {
+			} else {
 				bg.set(white);
 			}
 
-			if(_active_notes[i]) {
+			if (_active_notes[i]) {
 				tl_shadow.set(white_shade_dark);
 				br_shadow.set(white_shade_light);
-			}
-			else {
+			} else {
 				tl_shadow.set(white_shade_light);
 				br_shadow.set(white_shade_dark);
 			}
@@ -383,11 +388,10 @@ PianoRollHeader::on_expose_event (GdkEventExpose* ev) {
 			switch(oct_rel) {
 			case 0:
 			case 5:
-				if(i == _view.highest_note()) {
+				if (i == _view.highest_note()) {
 					get_path(WHITE_RECT, i, x, y);
 					render_rect(cr, i, x, y, bg, tl_shadow, br_shadow);
-				}
-				else {
+				} else {
 					get_path(WHITE_CF, i, x, y);
 					render_cf(cr, i, x, y, bg, tl_shadow, br_shadow);
 				}
@@ -396,15 +400,13 @@ PianoRollHeader::on_expose_event (GdkEventExpose* ev) {
 			case 2:
 			case 7:
 			case 9:
-				if(i == _view.highest_note()) {
+				if (i == _view.highest_note()) {
 					get_path(WHITE_EB, i, x, y);
 					render_eb(cr, i, x, y, bg, tl_shadow, br_shadow);
-				}
-				else if(i == _view.lowest_note()) {
+				} else if (i == _view.lowest_note()) {
 					get_path(WHITE_CF, i, x, y);
 					render_cf(cr, i, x, y, bg, tl_shadow, br_shadow);
-				}
-				else {
+				} else {
 					get_path(WHITE_DGA, i, x, y);
 					render_dga(cr, i, x, y, bg, tl_shadow, br_shadow);
 				}
@@ -417,11 +419,10 @@ PianoRollHeader::on_expose_event (GdkEventExpose* ev) {
 				create_path(cr, x, y, 0, 1);
 				cr->stroke();
 
-				if(i == _view.lowest_note()) {
+				if (i == _view.lowest_note()) {
 					get_path(WHITE_RECT, i, x, y);
 					render_rect(cr, i, x, y, bg, tl_shadow, br_shadow);
-				}
-				else {
+				} else {
 					get_path(WHITE_EB, i, x, y);
 					render_eb(cr, i, x, y, bg, tl_shadow, br_shadow);
 				}
@@ -436,7 +437,7 @@ PianoRollHeader::on_expose_event (GdkEventExpose* ev) {
 		}
 
 		/* render the name of which C this is */
-		if(oct_rel == 0) {
+		if (oct_rel == 0) {
 			std::stringstream s;
 			double y = floor(_view.note_to_y(i)) - 0.5f;
 			double note_height = floor(_view.note_to_y(i - 1)) - y;
@@ -455,14 +456,14 @@ PianoRollHeader::on_expose_event (GdkEventExpose* ev) {
 }
 
 bool
-PianoRollHeader::on_motion_notify_event (GdkEventMotion* ev) {
+PianoRollHeader::on_motion_notify_event (GdkEventMotion* ev)
+{
 	int note = _view.y_to_note(ev->y);
 
-	if(_highlighted_note != no_note) {
-		if(note > _highlighted_note) {
+	if (_highlighted_note != no_note) {
+		if (note > _highlighted_note) {
 			invalidate_note_range(_highlighted_note, note);
-		}
-		else {
+		} else {
 			invalidate_note_range(note, _highlighted_note);
 		}
 
@@ -470,13 +471,13 @@ PianoRollHeader::on_motion_notify_event (GdkEventMotion* ev) {
 	}
 
 	/* redraw already taken care of above */
-	if(_clicked_note != no_note && _clicked_note != note) {
+	if (_clicked_note != no_note && _clicked_note != note) {
 		_active_notes[_clicked_note] = false;
 		send_note_off(_clicked_note);
 
 		_clicked_note = note;
 
-		if(!_active_notes[note]) {
+		if (!_active_notes[note]) {
 			_active_notes[note] = true;
 			send_note_on(note);
 		}
@@ -488,21 +489,21 @@ PianoRollHeader::on_motion_notify_event (GdkEventMotion* ev) {
 }
 
 bool
-PianoRollHeader::on_button_press_event (GdkEventButton* ev) {
+PianoRollHeader::on_button_press_event (GdkEventButton* ev)
+{
 	int note = _view.y_to_note(ev->y);
 
-	if(ev->type == GDK_BUTTON_PRESS && note >= 0 && note < 128) {
+	if (ev->type == GDK_BUTTON_PRESS && note >= 0 && note < 128) {
 		add_modal_grab();
 		_dragging = true;
 
-		if(!_active_notes[note]) {
+		if (!_active_notes[note]) {
 			_active_notes[note] = true;
 			_clicked_note = note;
 			send_note_on(note);
 			
 			invalidate_note_range(note, note);
-		}
-		else {
+		} else {
 			_clicked_note = no_note;
 		}
 	}
@@ -511,14 +512,15 @@ PianoRollHeader::on_button_press_event (GdkEventButton* ev) {
 }
 
 bool
-PianoRollHeader::on_button_release_event (GdkEventButton* ev) {
+PianoRollHeader::on_button_release_event (GdkEventButton* ev)
+{
 	int note = _view.y_to_note(ev->y);
 
-	if(_dragging) {
+	if (_dragging) {
 		remove_modal_grab();
 		_dragging = false;
 
-		if(note == _clicked_note) {
+		if (note == _clicked_note) {
 			_active_notes[note] = false;
 			_clicked_note = no_note;
 			send_note_off(note);
@@ -531,7 +533,8 @@ PianoRollHeader::on_button_release_event (GdkEventButton* ev) {
 }
 
 bool
-PianoRollHeader::on_enter_notify_event (GdkEventCrossing* ev) {
+PianoRollHeader::on_enter_notify_event (GdkEventCrossing* ev)
+{
 	_highlighted_note = _view.y_to_note(ev->y);
 
 	invalidate_note_range(_highlighted_note, _highlighted_note);
@@ -539,14 +542,15 @@ PianoRollHeader::on_enter_notify_event (GdkEventCrossing* ev) {
 }
 
 bool
-PianoRollHeader::on_leave_notify_event (GdkEventCrossing*) {
+PianoRollHeader::on_leave_notify_event (GdkEventCrossing*)
+{
 	invalidate_note_range(_highlighted_note, _highlighted_note);
 	
-	if(_clicked_note != no_note) {
+	if (_clicked_note != no_note) {
 		_active_notes[_clicked_note] = false;
 		send_note_off(_clicked_note);
 
-		if(_clicked_note != _highlighted_note) {
+		if (_clicked_note != _highlighted_note) {
 			invalidate_note_range(_clicked_note, _clicked_note);
 		}
 
@@ -558,25 +562,28 @@ PianoRollHeader::on_leave_notify_event (GdkEventCrossing*) {
 }
 
 bool
-PianoRollHeader::on_scroll_event (GdkEventScroll* ev) {
+PianoRollHeader::on_scroll_event (GdkEventScroll* ev)
+{
 	return true;
 }
 
 void
-PianoRollHeader::note_range_changed() {
+PianoRollHeader::note_range_changed()
+{
 	_note_height = floor(_view.note_height()) + 0.5f;
 
 	queue_draw();
 
 	Glib::RefPtr<Gdk::Window> win = get_window();
 
-	if(win) {
+	if (win) {
 		win->process_updates(false);
 	}
 }
 
 void
-PianoRollHeader::invalidate_note_range(int lowest, int highest) {
+PianoRollHeader::invalidate_note_range(int lowest, int highest)
+{
 	Glib::RefPtr<Gdk::Window> win = get_window();
 	Gdk::Rectangle rect;
 
@@ -617,30 +624,33 @@ PianoRollHeader::invalidate_note_range(int lowest, int highest) {
 	rect.set_y((int) floor(y));
 	rect.set_height((int) floor(height));
 
-	if(win) {
+	if (win) {
 		win->invalidate_rect(rect, false);
 	}
 }
 
 void
-PianoRollHeader::on_size_request(Gtk::Requisition* r) {
+PianoRollHeader::on_size_request(Gtk::Requisition* r)
+{
 	r->width = 20;
 }
 
 void
-PianoRollHeader::on_size_allocate(Gtk::Allocation& a) {
+PianoRollHeader::on_size_allocate(Gtk::Allocation& a)
+{
 	DrawingArea::on_size_allocate(a);
 	
 	_black_note_width = floor(0.7 * get_width()) + 0.5f;
 }
 
 void
-PianoRollHeader::send_note_on(uint8_t note) {
+PianoRollHeader::send_note_on(uint8_t note)
+{
 	boost::shared_ptr<ARDOUR::MidiTrack> track = _view.trackview().midi_track();
 
 	//cerr << "note on: " << (int) note << endl;
 
-	if(track) {
+	if (track) {
 		_event[0] = MIDI_CMD_NOTE_ON;
 		_event[1] = note;
 		_event[2] = 100;
@@ -650,10 +660,11 @@ PianoRollHeader::send_note_on(uint8_t note) {
 }
 
 void
-PianoRollHeader::send_note_off(uint8_t note) {
+PianoRollHeader::send_note_off(uint8_t note)
+{
 	boost::shared_ptr<ARDOUR::MidiTrack> track = _view.trackview().midi_track();
 
-	if(track) {
+	if (track) {
 		_event[0] = MIDI_CMD_NOTE_OFF;
 		_event[1] = note;
 		_event[2] = 100;