diff options
author | David Robillard <d@drobilla.net> | 2014-11-18 02:36:28 -0500 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2014-11-18 02:55:03 -0500 |
commit | 976a150e6baa76b3a9ad741e88d0d562bbd6cd6e (patch) | |
tree | 51231fceb172eaf2a5f337119aac825bbf06ca23 | |
parent | 07d4f506899bfce60f37fadf851a67b83e66a75a (diff) |
Remove obviously dead/redundant code.
-rw-r--r-- | gtk2_ardour/utils.cc | 1 | ||||
-rw-r--r-- | libs/ardour/rb_effect.cc | 3 | ||||
-rw-r--r-- | libs/gtkmm2ext/motionfeedback.cc | 3 | ||||
-rw-r--r-- | libs/gtkmm2ext/scroomer.cc | 4 |
4 files changed, 2 insertions, 9 deletions
diff --git a/gtk2_ardour/utils.cc b/gtk2_ardour/utils.cc index 0f61656033..c4f984c01f 100644 --- a/gtk2_ardour/utils.cc +++ b/gtk2_ardour/utils.cc @@ -296,7 +296,6 @@ ARDOUR_UI_UTILS::rgba_from_style (string style, uint32_t r, uint32_t g, uint32_t a = rc->fg[GTK_STATE_ACTIVE].red / 257; } } else if (attr == "bg") { - r = g = b = 0; r = rc->bg[state].red / 257; g = rc->bg[state].green / 257; b = rc->bg[state].blue / 257; diff --git a/libs/ardour/rb_effect.cc b/libs/ardour/rb_effect.cc index 2749e18258..03ce918f31 100644 --- a/libs/ardour/rb_effect.cc +++ b/libs/ardour/rb_effect.cc @@ -209,8 +209,6 @@ RBEffect::run (boost::shared_ptr<Region> r, Progress* progress) for (uint32_t i = 0; i < channels; ++i) { - this_read = 0; - framepos_t this_time; this_time = min(bufsize, read_duration - pos); @@ -251,7 +249,6 @@ RBEffect::run (boost::shared_ptr<Region> r, Progress* progress) for (uint32_t i = 0; i < channels; ++i) { - this_read = 0; framepos_t this_time; this_time = min(bufsize, read_duration - pos); diff --git a/libs/gtkmm2ext/motionfeedback.cc b/libs/gtkmm2ext/motionfeedback.cc index 25ae7b3ca2..a320acb63b 100644 --- a/libs/gtkmm2ext/motionfeedback.cc +++ b/libs/gtkmm2ext/motionfeedback.cc @@ -572,9 +572,6 @@ MotionFeedback::core_draw (cairo_t* cr, int phase, double size, double progress_ xc = (xorigin + (size / 2.0)) * (1.0/scale_factor); yc = (yorigin + (size / 2.0)) * (1.0/scale_factor); - start_angle = 0.0; - end_angle = 0.0; - value_angle = 0.0; value = (phase * 1.0) / (65 - 1); start_angle = ((180 - 65) * G_PI) / 180; diff --git a/libs/gtkmm2ext/scroomer.cc b/libs/gtkmm2ext/scroomer.cc index 912bd92a6c..23fa71718b 100644 --- a/libs/gtkmm2ext/scroomer.cc +++ b/libs/gtkmm2ext/scroomer.cc @@ -170,9 +170,9 @@ Scroomer::on_motion_notify_event (GdkEventMotion* ev) page = min(page, adj.get_upper() - val); } else if (ev->x < 0) { /* on zoom out increase the page size as well as moving the range towards the mouse pos*/ - zoom = abs(ev->x); + /*zoom = abs(ev->x); - /*double higher = unzoomed_val + unzoomed_page - half_min_page - val_at_pointer; + double higher = unzoomed_val + unzoomed_page - half_min_page - val_at_pointer; double lower = val_at_pointer - (unzoomed_val + half_min_page); higher *= zoom / 128; |