Tidy up slightly.
authorCarl Hetherington <carl@carlh.net>
Sun, 30 Jan 2011 01:39:47 +0000 (01:39 +0000)
committerCarl Hetherington <carl@carlh.net>
Sun, 30 Jan 2011 01:39:47 +0000 (01:39 +0000)
git-svn-id: svn://localhost/ardour2/branches/3.0@8614 d708f5d6-7413-0410-9779-e7cbd77b26cf

libs/gtkmm2ext/pixfader.cc

index 1d12cb622b592c203e521610e0b9d0a7d7b80132..46f31cbe765ad95ae42e5f57accf6d96aa4c1e94 100644 (file)
@@ -258,9 +258,9 @@ bool
 PixFader::on_motion_notify_event (GdkEventMotion* ev)
 {
        if (dragging) {
-               double fract, delta, scale, ev_pos;
-                ev_pos = (_orien == VERT) ? ev->y : ev->x;
-               //cerr << "PixFader::on_motion_notify_event() called x:y = " << ev->x << ":" << ev->y;
+               double scale = 1.0;
+               double const ev_pos = (_orien == VERT) ? ev->y : ev->x;
+               
                if (ev->window != grab_window) {
                        grab_loc = ev_pos;
                        grab_window = ev->window;
@@ -273,14 +273,12 @@ PixFader::on_motion_notify_event (GdkEventMotion* ev)
                        } else {
                                scale = 0.1;
                        }
-               } else {
-                       scale = 1.0;
                }
-               //cerr << " ev_pos=" << ev_pos << " grab_loc=" << grab_loc;
-               delta = ev_pos - grab_loc;
+
+               double const delta = ev_pos - grab_loc;
                grab_loc = ev_pos;
 
-               fract = (delta / span);
+               double fract = (delta / span);
 
                fract = min (1.0, fract);
                fract = max (-1.0, fract);
@@ -292,7 +290,6 @@ PixFader::on_motion_notify_event (GdkEventMotion* ev)
                }
 
                adjustment.set_value (adjustment.get_value() + scale * fract * (adjustment.get_upper() - adjustment.get_lower()));
-               //cerr << " adj=" << adjustment.get_value() << " fract=" << fract << " delta=" << delta << " scale=" << scale << endl;
        }
 
        return true;