Remove unused variables (fix warnings).
This commit is contained in:
parent
c95c221493
commit
885f1c71ec
@ -517,14 +517,11 @@ Editor::maybe_autoscroll (bool allow_horiz, bool allow_vert, bool from_headers)
|
|||||||
|
|
||||||
ArdourCanvas::Rect scrolling_boundary;
|
ArdourCanvas::Rect scrolling_boundary;
|
||||||
Gtk::Allocation alloc;
|
Gtk::Allocation alloc;
|
||||||
int cx, cy;
|
|
||||||
|
|
||||||
if (from_headers) {
|
if (from_headers) {
|
||||||
alloc = controls_layout.get_allocation ();
|
alloc = controls_layout.get_allocation ();
|
||||||
} else {
|
} else {
|
||||||
alloc = _track_canvas_viewport->get_allocation ();
|
alloc = _track_canvas_viewport->get_allocation ();
|
||||||
cx = alloc.get_x();
|
|
||||||
cy = alloc.get_y();
|
|
||||||
|
|
||||||
/* reduce height by the height of the timebars, which happens
|
/* reduce height by the height of the timebars, which happens
|
||||||
to correspond to the position of the hv_scroll_group.
|
to correspond to the position of the hv_scroll_group.
|
||||||
@ -581,7 +578,6 @@ Editor::autoscroll_canvas ()
|
|||||||
Gdk::ModifierType mask;
|
Gdk::ModifierType mask;
|
||||||
frameoffset_t dx = 0;
|
frameoffset_t dx = 0;
|
||||||
bool no_stop = false;
|
bool no_stop = false;
|
||||||
bool y_motion = false;
|
|
||||||
|
|
||||||
get_window()->get_pointer (x, y, mask);
|
get_window()->get_pointer (x, y, mask);
|
||||||
|
|
||||||
@ -644,14 +640,14 @@ Editor::autoscroll_canvas ()
|
|||||||
/* scroll to make higher tracks visible */
|
/* scroll to make higher tracks visible */
|
||||||
|
|
||||||
if (autoscroll_cnt && (autoscroll_cnt % speed_factor == 0)) {
|
if (autoscroll_cnt && (autoscroll_cnt % speed_factor == 0)) {
|
||||||
y_motion = scroll_up_one_track ();
|
scroll_up_one_track ();
|
||||||
vertical_motion = true;
|
vertical_motion = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
} else if (y > autoscroll_boundary.y1) {
|
} else if (y > autoscroll_boundary.y1) {
|
||||||
|
|
||||||
if (autoscroll_cnt && (autoscroll_cnt % speed_factor == 0)) {
|
if (autoscroll_cnt && (autoscroll_cnt % speed_factor == 0)) {
|
||||||
y_motion = scroll_down_one_track ();
|
scroll_down_one_track ();
|
||||||
vertical_motion = true;
|
vertical_motion = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -735,13 +735,11 @@ EditorRoutes::route_removed (TimeAxisView *tv)
|
|||||||
|
|
||||||
TreeModel::Children rows = _model->children();
|
TreeModel::Children rows = _model->children();
|
||||||
TreeModel::Children::iterator ri;
|
TreeModel::Children::iterator ri;
|
||||||
bool found = false;
|
|
||||||
|
|
||||||
for (ri = rows.begin(); ri != rows.end(); ++ri) {
|
for (ri = rows.begin(); ri != rows.end(); ++ri) {
|
||||||
if ((*ri)[_columns.tv] == tv) {
|
if ((*ri)[_columns.tv] == tv) {
|
||||||
PBD::Unwinder<bool> uw (_route_deletion_in_progress, true);
|
PBD::Unwinder<bool> uw (_route_deletion_in_progress, true);
|
||||||
_model->erase (ri);
|
_model->erase (ri);
|
||||||
found = true;
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -136,8 +136,6 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, boost::shared_ptr<Route> rt
|
|||||||
void
|
void
|
||||||
MixerStrip::init ()
|
MixerStrip::init ()
|
||||||
{
|
{
|
||||||
int button_table_row = 0;
|
|
||||||
|
|
||||||
_entered_mixer_strip= 0;
|
_entered_mixer_strip= 0;
|
||||||
group_menu = 0;
|
group_menu = 0;
|
||||||
route_ops_menu = 0;
|
route_ops_menu = 0;
|
||||||
|
@ -137,7 +137,6 @@ VerboseCursor::set_duration (framepos_t start, framepos_t end)
|
|||||||
Timecode::Time timecode;
|
Timecode::Time timecode;
|
||||||
Timecode::BBT_Time sbbt;
|
Timecode::BBT_Time sbbt;
|
||||||
Timecode::BBT_Time ebbt;
|
Timecode::BBT_Time ebbt;
|
||||||
framepos_t frame_rate;
|
|
||||||
Meter meter_at_start (_editor->_session->tempo_map().meter_at(start));
|
Meter meter_at_start (_editor->_session->tempo_map().meter_at(start));
|
||||||
|
|
||||||
if (_editor->_session == 0) {
|
if (_editor->_session == 0) {
|
||||||
|
@ -168,7 +168,6 @@ void
|
|||||||
MIDISceneChanger::locate (framepos_t pos)
|
MIDISceneChanger::locate (framepos_t pos)
|
||||||
{
|
{
|
||||||
boost::shared_ptr<MIDISceneChange> msc;
|
boost::shared_ptr<MIDISceneChange> msc;
|
||||||
framepos_t when;
|
|
||||||
|
|
||||||
{
|
{
|
||||||
Glib::Threads::RWLock::ReaderLock lm (scene_lock);
|
Glib::Threads::RWLock::ReaderLock lm (scene_lock);
|
||||||
@ -196,7 +195,6 @@ MIDISceneChanger::locate (framepos_t pos)
|
|||||||
--i;
|
--i;
|
||||||
}
|
}
|
||||||
|
|
||||||
when = i->first;
|
|
||||||
msc = i->second;
|
msc = i->second;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -553,21 +553,12 @@ MotionFeedback::core_draw (cairo_t* cr, int phase, double size, double progress_
|
|||||||
double progress_radius;
|
double progress_radius;
|
||||||
double progress_radius_inner;
|
double progress_radius_inner;
|
||||||
double progress_radius_outer;
|
double progress_radius_outer;
|
||||||
double knob_disc_radius;
|
|
||||||
cairo_pattern_t* pattern;
|
|
||||||
double progress_rim_width;
|
|
||||||
cairo_pattern_t* progress_shine;
|
|
||||||
double degrees;
|
|
||||||
cairo_pattern_t* knob_ripples;
|
|
||||||
double pxs;
|
|
||||||
double pys;
|
|
||||||
|
|
||||||
g_return_if_fail (cr != NULL);
|
g_return_if_fail (cr != NULL);
|
||||||
|
|
||||||
progress_radius = 40.0;
|
progress_radius = 40.0;
|
||||||
progress_radius_inner = progress_radius - (progress_width / 2.0);
|
progress_radius_inner = progress_radius - (progress_width / 2.0);
|
||||||
progress_radius_outer = progress_radius + (progress_width / 2.0);
|
progress_radius_outer = progress_radius + (progress_width / 2.0);
|
||||||
knob_disc_radius = progress_radius_inner - 5.0;
|
|
||||||
|
|
||||||
const double pad = 2.0; /* line width for boundary of progress ring */
|
const double pad = 2.0; /* line width for boundary of progress ring */
|
||||||
const double actual_width = ((2.0 * pad) + (2.0 * progress_radius_outer));
|
const double actual_width = ((2.0 * pad) + (2.0 * progress_radius_outer));
|
||||||
@ -581,9 +572,6 @@ MotionFeedback::core_draw (cairo_t* cr, int phase, double size, double progress_
|
|||||||
xc = (xorigin + (size / 2.0)) * (1.0/scale_factor);
|
xc = (xorigin + (size / 2.0)) * (1.0/scale_factor);
|
||||||
yc = (yorigin + (size / 2.0)) * (1.0/scale_factor);
|
yc = (yorigin + (size / 2.0)) * (1.0/scale_factor);
|
||||||
|
|
||||||
pxs = xorigin * (1.0/scale_factor);
|
|
||||||
pys = yorigin * (1.0/scale_factor);
|
|
||||||
|
|
||||||
start_angle = 0.0;
|
start_angle = 0.0;
|
||||||
end_angle = 0.0;
|
end_angle = 0.0;
|
||||||
value_angle = 0.0;
|
value_angle = 0.0;
|
||||||
|
2
wscript
2
wscript
@ -359,7 +359,7 @@ def set_compiler_flags (conf,opt):
|
|||||||
#
|
#
|
||||||
|
|
||||||
compiler_flags.extend(
|
compiler_flags.extend(
|
||||||
('-Wall', '-Wpointer-arith', '-Wcast-qual', '-Wcast-align'))
|
('-Wall', '-Wpointer-arith', '-Wcast-qual', '-Wcast-align', '-Wno-unused-parameter'))
|
||||||
|
|
||||||
c_flags.extend(('-Wstrict-prototypes', '-Wmissing-prototypes'))
|
c_flags.extend(('-Wstrict-prototypes', '-Wmissing-prototypes'))
|
||||||
cxx_flags.append('-Woverloaded-virtual')
|
cxx_flags.append('-Woverloaded-virtual')
|
||||||
|
Loading…
Reference in New Issue
Block a user