NO-OP: whitespace, alignment
This commit is contained in:
parent
8f5f0f298b
commit
37aaa2d11b
|
@ -442,7 +442,7 @@ Editor::button_selection (ArdourCanvas::Item* item, GdkEvent* event, ItemType it
|
|||
|
||||
if (get_smart_mode() && eff_mouse_mode == MouseRange && event->button.button == 3 && item_type == RegionItem) {
|
||||
/* context clicks are always about object properties, even if
|
||||
we're in range mode within smart mode.
|
||||
* we're in range mode within smart mode.
|
||||
*/
|
||||
eff_mouse_mode = MouseObject;
|
||||
}
|
||||
|
@ -682,9 +682,9 @@ bool
|
|||
Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_type)
|
||||
{
|
||||
/* single mouse clicks on any of these item types operate
|
||||
independent of mouse mode, mostly because they are
|
||||
not on the main track canvas or because we want
|
||||
them to be modeless.
|
||||
* independent of mouse mode, mostly because they are
|
||||
* not on the main track canvas or because we want
|
||||
* them to be modeless.
|
||||
*/
|
||||
|
||||
NoteBase* note = NULL;
|
||||
|
@ -800,10 +800,10 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
|
|||
|
||||
if (_join_object_range_state == JOIN_OBJECT_RANGE_OBJECT) {
|
||||
/* special case: allow trim of range selections in joined object mode;
|
||||
in theory eff should equal MouseRange in this case, but it doesn't
|
||||
because entering the range selection canvas item results in entered_regionview
|
||||
being set to 0, so update_join_object_range_location acts as if we aren't
|
||||
over a region.
|
||||
* in theory eff should equal MouseRange in this case, but it doesn't
|
||||
* because entering the range selection canvas item results in entered_regionview
|
||||
* being set to 0, so update_join_object_range_location acts as if we aren't
|
||||
* over a region.
|
||||
*/
|
||||
if (item_type == StartSelectionTrimItem) {
|
||||
_drags->set (new SelectionDrag (this, item, SelectionDrag::SelectionStartTrim), event);
|
||||
|
@ -847,8 +847,7 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
|
|||
/* grab selection for moving */
|
||||
_drags->set (new SelectionDrag (this, item, SelectionDrag::SelectionMove), event);
|
||||
} else {
|
||||
/* this was debated, but decided the more common action was to
|
||||
make a new selection */
|
||||
/* this was debated, but decided the more common action was to make a new selection */
|
||||
_drags->set (new SelectionDrag (this, item, SelectionDrag::CreateSelection), event);
|
||||
}
|
||||
break;
|
||||
|
@ -2138,12 +2137,12 @@ Editor::motion_handler (ArdourCanvas::Item* /*item*/, GdkEvent* event, bool from
|
|||
gint x, y;
|
||||
|
||||
/* We call this so that MOTION_NOTIFY events continue to be
|
||||
delivered to the canvas. We need to do this because we set
|
||||
Gdk::POINTER_MOTION_HINT_MASK on the canvas. This reduces
|
||||
the density of the events, at the expense of a round-trip
|
||||
to the server. Given that this will mostly occur on cases
|
||||
where DISPLAY = :0.0, and given the cost of what the motion
|
||||
event might do, its a good tradeoff.
|
||||
* delivered to the canvas. We need to do this because we set
|
||||
* Gdk::POINTER_MOTION_HINT_MASK on the canvas. This reduces
|
||||
* the density of the events, at the expense of a round-trip
|
||||
* to the server. Given that this will mostly occur on cases
|
||||
* where DISPLAY = :0.0, and given the cost of what the motion
|
||||
* event might do, its a good tradeoff.
|
||||
*/
|
||||
|
||||
_track_canvas->get_pointer (x, y);
|
||||
|
@ -2294,7 +2293,7 @@ void
|
|||
Editor::region_view_item_click (AudioRegionView& rv, GdkEventButton* event)
|
||||
{
|
||||
/* Either add to or set the set the region selection, unless
|
||||
this is an alignment click (control used)
|
||||
* this is an alignment click (control used)
|
||||
*/
|
||||
|
||||
if (Keyboard::modifier_state_contains (event->state, Keyboard::PrimaryModifier)) {
|
||||
|
@ -2573,17 +2572,17 @@ Editor::start_selection_grab (ArdourCanvas::Item* /*item*/, GdkEvent* event)
|
|||
boost::shared_ptr<Region> region (new_regions.front());
|
||||
|
||||
/* add it to the current stream/playlist.
|
||||
|
||||
tricky: the streamview for the track will add a new regionview. we will
|
||||
catch the signal it sends when it creates the regionview to
|
||||
set the regionview we want to then drag.
|
||||
*
|
||||
* tricky: the streamview for the track will add a new regionview. we will
|
||||
* catch the signal it sends when it creates the regionview to
|
||||
* set the regionview we want to then drag.
|
||||
*/
|
||||
|
||||
latest_regionviews.clear();
|
||||
sigc::connection c = clicked_routeview->view()->RegionViewAdded.connect (sigc::mem_fun(*this, &Editor::collect_new_region_view));
|
||||
|
||||
/* A selection grab currently creates two undo/redo operations, one for
|
||||
creating the new region and another for moving it.
|
||||
* creating the new region and another for moving it.
|
||||
*/
|
||||
begin_reversible_command (Operations::selection_grab);
|
||||
|
||||
|
@ -2602,7 +2601,7 @@ Editor::start_selection_grab (ArdourCanvas::Item* /*item*/, GdkEvent* event)
|
|||
}
|
||||
|
||||
/* we need to deselect all other regionviews, and select this one
|
||||
i'm ignoring undo stuff, because the region creation will take care of it
|
||||
* i'm ignoring undo stuff, because the region creation will take care of it
|
||||
*/
|
||||
|
||||
selection->set (latest_regionviews);
|
||||
|
|
|
@ -71,6 +71,7 @@ private:
|
|||
const ARDOUR::BeatsSamplesConverter* _time_converter;
|
||||
ARDOUR::InstrumentInfo& _info;
|
||||
AudioClock _time;
|
||||
|
||||
Gtk::SpinButton _channel;
|
||||
Gtk::SpinButton _program;
|
||||
Gtk::SpinButton _bank_msb;
|
||||
|
@ -79,6 +80,7 @@ private:
|
|||
Gtk::ComboBoxText _patch_combo;
|
||||
|
||||
boost::shared_ptr<MIDI::Name::PatchBank> _current_patch_bank;
|
||||
|
||||
bool _ignore_signals;
|
||||
bool _keep_open;
|
||||
|
||||
|
|
|
@ -854,7 +854,7 @@ RegionView::trim_front (samplepos_t new_bound, bool no_overlap, const int32_t su
|
|||
_region->trim_front (new_bound, sub_num);
|
||||
|
||||
if (no_overlap) {
|
||||
// Get the next region on the left of this region and shrink/expand it.
|
||||
/* Get the next region on the left of this region and shrink/expand it. */
|
||||
boost::shared_ptr<Playlist> playlist (_region->playlist());
|
||||
boost::shared_ptr<Region> region_left = playlist->find_next_region (pre_trim_first_sample, End, 0);
|
||||
|
||||
|
@ -864,7 +864,7 @@ RegionView::trim_front (samplepos_t new_bound, bool no_overlap, const int32_t su
|
|||
regions_touching = true;
|
||||
}
|
||||
|
||||
// Only trim region on the left if the first sample has gone beyond the left region's last sample.
|
||||
/* Only trim region on the left if the first sample has gone beyond the left region's last sample. */
|
||||
if (region_left != 0 && (region_left->last_sample() > _region->first_sample() || regions_touching)) {
|
||||
region_left->trim_end (_region->first_sample() - 1);
|
||||
}
|
||||
|
@ -887,7 +887,7 @@ RegionView::trim_end (samplepos_t new_bound, bool no_overlap, const int32_t sub_
|
|||
_region->trim_end (new_bound, sub_num);
|
||||
|
||||
if (no_overlap) {
|
||||
// Get the next region on the right of this region and shrink/expand it.
|
||||
/* Get the next region on the right of this region and shrink/expand it. */
|
||||
boost::shared_ptr<Playlist> playlist (_region->playlist());
|
||||
boost::shared_ptr<Region> region_right = playlist->find_next_region (pre_trim_last_sample, Start, 1);
|
||||
|
||||
|
@ -897,7 +897,7 @@ RegionView::trim_end (samplepos_t new_bound, bool no_overlap, const int32_t sub_
|
|||
regions_touching = true;
|
||||
}
|
||||
|
||||
// Only trim region on the right if the last sample has gone beyond the right region's first sample.
|
||||
/* Only trim region on the right if the last sample has gone beyond the right region's first sample. */
|
||||
if (region_right != 0 && (region_right->first_sample() < _region->last_sample() || regions_touching)) {
|
||||
region_right->trim_front (_region->last_sample() + 1, sub_num);
|
||||
}
|
||||
|
|
|
@ -49,7 +49,7 @@ public:
|
|||
protected:
|
||||
PublicEditor& editor;
|
||||
|
||||
ArdourCanvas::Container* _parent;
|
||||
ArdourCanvas::Container* parent;
|
||||
ArdourCanvas::Container* group;
|
||||
ArdourCanvas::Points* points;
|
||||
ArdourCanvas::FramedCurve* _curve;
|
||||
|
@ -62,15 +62,18 @@ protected:
|
|||
uint32_t _color;
|
||||
|
||||
void reposition ();
|
||||
|
||||
private:
|
||||
double _min_tempo;
|
||||
double _max_tempo;
|
||||
/* disallow copy construction */
|
||||
TempoCurve (TempoCurve const &);
|
||||
|
||||
TempoCurve & operator= (TempoCurve const &);
|
||||
|
||||
double _min_tempo;
|
||||
double _max_tempo;
|
||||
|
||||
ARDOUR::TempoSection& _tempo;
|
||||
ArdourCanvas::Text* _start_text;
|
||||
ArdourCanvas::Text* _end_text;
|
||||
|
||||
};
|
||||
#endif /* __gtk_ardour_tempo_curve_h__ */
|
||||
|
|
|
@ -185,7 +185,11 @@ class TimeAxisView : public virtual AxisView
|
|||
virtual bool paste (ARDOUR::samplepos_t pos,
|
||||
const Selection& selection,
|
||||
PasteContext& ctx,
|
||||
const int32_t sub_num) { return false; }
|
||||
const int32_t sub_num)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
virtual void set_selected_regionviews (RegionSelection&) {}
|
||||
virtual void set_selected_points (PointSelection&);
|
||||
|
|
Loading…
Reference in New Issue
Block a user