smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 23:05:04 +01:00
Code Issues Projects Releases Wiki Activity

Fix broken indentation.

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@9558 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2011-05-19 21:11:21 +00:00
parent ecb97a38e0
commit 74fa33486c
2 changed files with 655 additions and 649 deletions
Download patch file Download diff file Expand all files Collapse all files

46
gtk2_ardour/midi_region_view.cc
View file

@ -1,5 +1,5 @@
/* /*
Copyright (C) 2001-2007 Paul Davis Copyright (C) 2001-2011 Paul Davis
Author: David Robillard Author: David Robillard
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
@ -103,10 +103,10 @@ MidiRegionView::MidiRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView &
, _sort_needed (true) , _sort_needed (true)
, _optimization_iterator (_events.end()) , _optimization_iterator (_events.end())
, _list_editor (0) , _list_editor (0)
, no_sound_notes (false) , _no_sound_notes (false)
, _last_event_x (0) , _last_event_x (0)
, _last_event_y (0) , _last_event_y (0)
, pre_enter_cursor (0) , _pre_enter_cursor (0)
{ {
_note_group->raise_to_top(); _note_group->raise_to_top();
PublicEditor::DropDownKeys.connect (sigc::mem_fun (*this, &MidiRegionView::drop_down_keys)); PublicEditor::DropDownKeys.connect (sigc::mem_fun (*this, &MidiRegionView::drop_down_keys));
@ -137,7 +137,7 @@ MidiRegionView::MidiRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView &
, _sort_needed (true) , _sort_needed (true)
, _optimization_iterator (_events.end()) , _optimization_iterator (_events.end())
, _list_editor (0) , _list_editor (0)
, no_sound_notes (false) , _no_sound_notes (false)
, _last_event_x (0) , _last_event_x (0)
, _last_event_y (0) , _last_event_y (0)
{ {
@ -169,7 +169,7 @@ MidiRegionView::MidiRegionView (const MidiRegionView& other)
, _sort_needed (true) , _sort_needed (true)
, _optimization_iterator (_events.end()) , _optimization_iterator (_events.end())
, _list_editor (0) , _list_editor (0)
, no_sound_notes (false) , _no_sound_notes (false)
, _last_event_x (0) , _last_event_x (0)
, _last_event_y (0) , _last_event_y (0)
{ {
@ -203,7 +203,7 @@ MidiRegionView::MidiRegionView (const MidiRegionView& other, boost::shared_ptr<M
, _sort_needed (true) , _sort_needed (true)
, _optimization_iterator (_events.end()) , _optimization_iterator (_events.end())
, _list_editor (0) , _list_editor (0)
, no_sound_notes (false) , _no_sound_notes (false)
, _last_event_x (0) , _last_event_x (0)
, _last_event_y (0) , _last_event_y (0)
{ {
@ -255,7 +255,8 @@ MidiRegionView::init (Gdk::Color const & basic_color, bool wfd)
} }
group->raise_to_top(); group->raise_to_top();
group->signal_event().connect (sigc::mem_fun (this, &MidiRegionView::canvas_event), false); group->signal_event().connect(
sigc::mem_fun(this, &MidiRegionView::canvas_event), false);
midi_view()->signal_channel_mode_changed().connect( midi_view()->signal_channel_mode_changed().connect(
sigc::mem_fun(this, &MidiRegionView::midi_channel_mode_changed)); sigc::mem_fun(this, &MidiRegionView::midi_channel_mode_changed));
@ -263,7 +264,9 @@ MidiRegionView::init (Gdk::Color const & basic_color, bool wfd)
midi_view()->signal_midi_patch_settings_changed().connect( midi_view()->signal_midi_patch_settings_changed().connect(
sigc::mem_fun(this, &MidiRegionView::midi_patch_settings_changed)); sigc::mem_fun(this, &MidiRegionView::midi_patch_settings_changed));
trackview.editor().SnapChanged.connect (snap_changed_connection, invalidator (*this), ui_bind (&MidiRegionView::snap_changed, this), gui_context ()); trackview.editor().SnapChanged.connect(snap_changed_connection, invalidator(*this),
ui_bind(&MidiRegionView::snap_changed, this),
gui_context());
connect_to_diskstream (); connect_to_diskstream ();
} }
@ -271,7 +274,10 @@ MidiRegionView::init (Gdk::Color const & basic_color, bool wfd)
void void
MidiRegionView::connect_to_diskstream () MidiRegionView::connect_to_diskstream ()
{ {
midi_view()->midi_track()->DataRecorded.connect (*this, invalidator (*this), ui_bind (&MidiRegionView::data_recorded, this, _1, _2), gui_context ()); midi_view()->midi_track()->DataRecorded.connect(
*this, invalidator(*this),
ui_bind(&MidiRegionView::data_recorded, this, _1, _2),
gui_context());
} }
bool bool
@ -1387,7 +1393,7 @@ MidiRegionView::extend_active_notes()
void void
MidiRegionView::play_midi_note(boost::shared_ptr<NoteType> note) MidiRegionView::play_midi_note(boost::shared_ptr<NoteType> note)
{ {
if (no_sound_notes || !trackview.editor().sound_notes()) { if (_no_sound_notes || !trackview.editor().sound_notes()) {
return; return;
} }
@ -1405,7 +1411,7 @@ MidiRegionView::play_midi_note(boost::shared_ptr<NoteType> note)
void void
MidiRegionView::play_midi_chord (vector<boost::shared_ptr<NoteType> > notes) MidiRegionView::play_midi_chord (vector<boost::shared_ptr<NoteType> > notes)
{ {
if (no_sound_notes || !trackview.editor().sound_notes()) { if (_no_sound_notes || !trackview.editor().sound_notes()) {
return; return;
} }
@ -1908,7 +1914,7 @@ MidiRegionView::select_matching_notes (uint8_t notenum, uint16_t channel_mask, b
high_note = max (high_note, notenum); high_note = max (high_note, notenum);
} }
no_sound_notes = true; _no_sound_notes = true;
for (MidiModel::Notes::iterator n = notes.begin(); n != notes.end(); ++n) { for (MidiModel::Notes::iterator n = notes.begin(); n != notes.end(); ++n) {
@ -1938,7 +1944,7 @@ MidiRegionView::select_matching_notes (uint8_t notenum, uint16_t channel_mask, b
} }
no_sound_notes = false; _no_sound_notes = false;
} }
void void
@ -2131,7 +2137,7 @@ MidiRegionView::move_selection(double dx, double dy, double cumulative_dy)
(*i)->move_event(dx, dy); (*i)->move_event(dx, dy);
} }
if (dy && !_selection.empty() && !no_sound_notes && trackview.editor().sound_notes()) { if (dy && !_selection.empty() && !_no_sound_notes && trackview.editor().sound_notes()) {
if (to_play.size() > 1) { if (to_play.size() > 1) {
@ -2814,7 +2820,7 @@ MidiRegionView::note_entered(ArdourCanvas::CanvasNoteEvent* ev)
{ {
Editor* editor = dynamic_cast<Editor*>(&trackview.editor()); Editor* editor = dynamic_cast<Editor*>(&trackview.editor());
pre_enter_cursor = editor->get_canvas_cursor (); _pre_enter_cursor = editor->get_canvas_cursor ();
if (_mouse_state == SelectTouchDragging) { if (_mouse_state == SelectTouchDragging) {
note_selected (ev, true); note_selected (ev, true);
@ -2834,9 +2840,9 @@ MidiRegionView::note_left (ArdourCanvas::CanvasNoteEvent*)
editor->verbose_cursor()->hide (); editor->verbose_cursor()->hide ();
if (pre_enter_cursor) { if (_pre_enter_cursor) {
editor->set_canvas_cursor (pre_enter_cursor); editor->set_canvas_cursor (_pre_enter_cursor);
pre_enter_cursor = 0; _pre_enter_cursor = 0;
} }
} }
@ -2864,8 +2870,8 @@ MidiRegionView::note_mouse_position (float x_fraction, float /*y_fraction*/, boo
} else if (x_fraction >= 0.75 && x_fraction < 1.0) { } else if (x_fraction >= 0.75 && x_fraction < 1.0) {
editor->set_canvas_cursor (editor->cursors()->right_side_trim); editor->set_canvas_cursor (editor->cursors()->right_side_trim);
} else { } else {
if (pre_enter_cursor && can_set_cursor) { if (_pre_enter_cursor && can_set_cursor) {
editor->set_canvas_cursor (pre_enter_cursor); editor->set_canvas_cursor (_pre_enter_cursor);
} }
} }
} }

12
gtk2_ardour/midi_region_view.h
View file

@ -1,5 +1,5 @@
/* /*
Copyright (C) 2001-2010 Paul Davis Copyright (C) 2001-2011 Paul Davis
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -68,7 +68,7 @@ class EditNoteDialog;
class MidiRegionView : public RegionView class MidiRegionView : public RegionView
{ {
public: public:
typedef Evoral::Note<Evoral::MusicalTime> NoteType; typedef Evoral::Note<Evoral::MusicalTime> NoteType;
typedef Evoral::Sequence<Evoral::MusicalTime>::Notes Notes; typedef Evoral::Sequence<Evoral::MusicalTime>::Notes Notes;
@ -277,7 +277,7 @@ class MidiRegionView : public RegionView
void trim_front_starting (); void trim_front_starting ();
void trim_front_ending (); void trim_front_ending ();
protected: protected:
/** Allows derived types to specify their visibility requirements /** Allows derived types to specify their visibility requirements
* to the TimeAxisViewItem parent class. * to the TimeAxisViewItem parent class.
*/ */
@ -295,7 +295,7 @@ class MidiRegionView : public RegionView
void reset_width_dependent_items (double pixel_width); void reset_width_dependent_items (double pixel_width);
private: private:
friend class EditNoteDialog; friend class EditNoteDialog;
@ -413,7 +413,7 @@ class MidiRegionView : public RegionView
void update_ghost_note (double, double); void update_ghost_note (double, double);
MidiListEditor* _list_editor; MidiListEditor* _list_editor;
bool no_sound_notes; bool _no_sound_notes;
PBD::ScopedConnection note_delete_connection; PBD::ScopedConnection note_delete_connection;
void maybe_remove_deleted_note_from_selection (ArdourCanvas::CanvasNoteEvent*); void maybe_remove_deleted_note_from_selection (ArdourCanvas::CanvasNoteEvent*);
@ -446,7 +446,7 @@ class MidiRegionView : public RegionView
PBD::ScopedConnection _mouse_mode_connection; PBD::ScopedConnection _mouse_mode_connection;
Gdk::Cursor* pre_enter_cursor; Gdk::Cursor* _pre_enter_cursor;
}; };