A few whitespace fixes

A few trivial whitesapce fixes, including replacing leading spaces with tabs in
editor.h.
This commit is contained in:
Colin Fletcher 2015-02-03 19:33:22 +00:00
parent bd6ef95989
commit ee6ecf9034
3 changed files with 74 additions and 77 deletions

View file

@ -180,7 +180,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
static ARDOUR_UI *instance () { return theArdourUI; } static ARDOUR_UI *instance () { return theArdourUI; }
static UIConfiguration *config () { return theArdourUI->ui_config; } static UIConfiguration *config () { return theArdourUI->ui_config; }
PublicEditor& the_editor(){return *editor;} PublicEditor& the_editor() { return *editor;}
Mixer_UI* the_mixer() { return mixer; } Mixer_UI* the_mixer() { return mixer; }
void new_midi_tracer_window (); void new_midi_tracer_window ();

View file

@ -4644,9 +4644,9 @@ Editor::get_preferred_edit_position (bool ignore_playhead, bool from_context_men
framepos_t where = 0; framepos_t where = 0;
EditPoint ep = _edit_point; EditPoint ep = _edit_point;
if(Profile->get_mixbus()) if (Profile->get_mixbus())
if (ep == EditAtSelectedMarker) if (ep == EditAtSelectedMarker)
ep=EditAtPlayhead; ep = EditAtPlayhead;
if (from_outside_canvas && (ep == EditAtMouse)) { if (from_outside_canvas && (ep == EditAtMouse)) {
ep = EditAtPlayhead; ep = EditAtPlayhead;
@ -4670,8 +4670,9 @@ Editor::get_preferred_edit_position (bool ignore_playhead, bool from_context_men
/* XXX not right but what can we do ? */ /* XXX not right but what can we do ? */
return 0; return 0;
} }
} else } else {
where = _session->audible_frame(); where = _session->audible_frame();
}
DEBUG_TRACE (DEBUG::CutNPaste, string_compose ("GPEP: use playhead @ %1\n", where)); DEBUG_TRACE (DEBUG::CutNPaste, string_compose ("GPEP: use playhead @ %1\n", where));
break; break;

View file

@ -1611,16 +1611,12 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
void new_tempo_section (); void new_tempo_section ();
void mouse_add_new_tempo_event (framepos_t where);
void mouse_add_new_meter_event (framepos_t where);
void remove_tempo_marker (ArdourCanvas::Item*); void remove_tempo_marker (ArdourCanvas::Item*);
void remove_meter_marker (ArdourCanvas::Item*); void remove_meter_marker (ArdourCanvas::Item*);
gint real_remove_tempo_marker (ARDOUR::TempoSection*); gint real_remove_tempo_marker (ARDOUR::TempoSection*);
gint real_remove_meter_marker (ARDOUR::MeterSection*); gint real_remove_meter_marker (ARDOUR::MeterSection*);
void edit_tempo_section (ARDOUR::TempoSection*);
void edit_meter_section (ARDOUR::MeterSection*);
void edit_tempo_marker (TempoMarker&); void edit_tempo_marker (TempoMarker&);
void edit_meter_marker (MeterMarker&); void edit_meter_marker (MeterMarker&);
void edit_control_point (ArdourCanvas::Item*); void edit_control_point (ArdourCanvas::Item*);