ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Fix a few warnings

Browse Source
This commit is contained in:
Ben Loftis 2018-02-15 16:06:19 -06:00
parent 5c741bf8c5
commit f54f270627
6 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk2_ardour/editor.cc
View File

@ -2719,7 +2719,7 @@ Editor::snap_to_grid (vector<ArdourCanvas::Ruler::Mark> marks, samplepos_t presn
samplepos_t before;
samplepos_t after;
samplepos_t test;
samplepos_t test = presnap;
before = after = max_samplepos;
@ -2742,7 +2742,7 @@ Editor::snap_to_grid (vector<ArdourCanvas::Ruler::Mark> marks, samplepos_t presn
}
if (before == max_samplepos && after == max_samplepos) {
/* No smpte to snap to, so just don't snap */
/* No grid to snap to, so just don't snap */
return presnap;
} else if (before == max_samplepos) {
test = after;

1
gtk2_ardour/editor_mouse.cc
View File

@ -2237,7 +2237,6 @@ Editor::region_view_item_click (AudioRegionView& rv, GdkEventButton* event)
if (Keyboard::modifier_state_contains (event->state, Keyboard::PrimaryModifier)) {
TimeAxisView* tv = &rv.get_time_axis_view();
RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*>(tv);
samplepos_t where = get_preferred_edit_position();

2
gtk2_ardour/editor_selection.cc
View File

@ -1816,7 +1816,7 @@ Editor::set_selection_from_region ()
selection->set (tvl);
if (!get_smart_mode () || !mouse_mode == Editing::MouseObject) {
if (!get_smart_mode () || !(mouse_mode == Editing::MouseObject) ) {
set_mouse_mode (Editing::MouseRange, false);
}
}

3
gtk2_ardour/editor_summary.h
View File

@ -93,9 +93,6 @@ private:
samplepos_t _leftmost; ///< the earliest sample we ever viewed
samplepos_t _rightmost; ///< the latest sample we ever viewed
/** fraction of the session length by which the overview size should extend past the start and end markers */
double _overhang_fraction;
double _x_scale; ///< pixels per sample for the x axis of the pixmap
double _track_height;
double _last_playhead;

5
gtk2_ardour/midi_region_view.cc
View File

@ -1054,14 +1054,15 @@ MidiRegionView::note_diff_add_change (NoteBase* ev,
void
MidiRegionView::apply_diff (bool as_subcommand, bool was_copy)
{
bool add_or_remove;
bool commit = false;
if (!_note_diff_command) {
return;
}
if (!was_copy && (add_or_remove = _note_diff_command->adds_or_removes())) {
bool add_or_remove = _note_diff_command->adds_or_removes();
if (!was_copy && add_or_remove) {
// Mark all selected notes for selection when model reloads
for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
_marked_for_selection.insert((*i)->note());

1
gtk2_ardour/processor_box.h
View File

@ -120,7 +120,6 @@ class PluginPinWindowProxy : public WM::ProxyBase
ARDOUR::SessionHandlePtr* session_handle();
private:
ProcessorBox* _processor_box;
boost::weak_ptr<ARDOUR::Processor> _processor;
void processor_going_away ();