ardour/livetrax
13
0
Fork 0
Code

fix whitespace/indentation and compiler warnings

Browse Source
This commit is contained in:
Paul Davis 2015-06-16 11:22:10 -04:00
parent 03dbf7857e
commit e6b4c9f610
2 changed files with 117 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libs/gtkmm2ext/fader.cc
View File

@ -63,17 +63,6 @@ static void get_closest_point_on_line(double xa, double ya, double xb, double yb
// your closest point // your closest point
double t = atp_dot_atb / atb2; double t = atp_dot_atb / atb2;
// The vector perpendicular to a_to_b;
// This step can also be combined with the next
double perpendicular_x = -a_to_b_y;
double perpendicular_y = a_to_b_x;
// Finding Q, the point "in the right direction"
// If you want a mess, you can also combine this
// with the next step.
double xq = xp + perpendicular_x;
double yq = yp + perpendicular_y;
// Add the distance to A, moving // Add the distance to A, moving
// towards B // towards B
double x = xa + a_to_b_x * t; double x = xa + a_to_b_x * t;
@ -142,11 +131,11 @@ Fader::Fader (Gtk::Adjustment& adj,
, _min_pos_y (min_pos_y) , _min_pos_y (min_pos_y)
, _max_pos_x (max_pos_x) , _max_pos_x (max_pos_x)
, _max_pos_y (max_pos_y) , _max_pos_y (max_pos_y)
, _default_value (adjustment.get_value())
, _dragging (false)
, _read_only (read_only)
, _grab_window (0) , _grab_window (0)
, _touch_cursor (0) , _touch_cursor (0)
, _dragging (false)
, _default_value (adjustment.get_value())
, _read_only (read_only)
{ {
update_unity_position (); update_unity_position ();

7
libs/gtkmm2ext/gtkmm2ext/fader.h
View File

@ -74,7 +74,6 @@ class LIBGTKMM2EXT_API Fader : public CairoWidget
BindingProxy binding_proxy; BindingProxy binding_proxy;
private: private:
const Glib::RefPtr<Gdk::Pixbuf> _face_pixbuf; const Glib::RefPtr<Gdk::Pixbuf> _face_pixbuf;
const Glib::RefPtr<Gdk::Pixbuf> _active_face_pixbuf; const Glib::RefPtr<Gdk::Pixbuf> _active_face_pixbuf;
const Glib::RefPtr<Gdk::Pixbuf> _underlay_pixbuf; const Glib::RefPtr<Gdk::Pixbuf> _underlay_pixbuf;
@ -84,12 +83,9 @@ class LIBGTKMM2EXT_API Fader : public CairoWidget
int _min_pos_y; int _min_pos_y;
int _max_pos_x; int _max_pos_x;
int _max_pos_y; int _max_pos_y;
bool _hovering; bool _hovering;
GdkWindow* _grab_window; GdkWindow* _grab_window;
Gdk::Cursor *_touch_cursor; Gdk::Cursor *_touch_cursor;
double _grab_start_mouse_x; double _grab_start_mouse_x;
double _grab_start_mouse_y; double _grab_start_mouse_y;
double _grab_start_handle_x; double _grab_start_handle_x;
@ -98,7 +94,6 @@ class LIBGTKMM2EXT_API Fader : public CairoWidget
double _last_drawn_y; double _last_drawn_y;
bool _dragging; bool _dragging;
float _default_value; float _default_value;
int _unity_loc;
bool _read_only; bool _read_only;
void adjustment_changed (); void adjustment_changed ();
@ -108,4 +103,4 @@ class LIBGTKMM2EXT_API Fader : public CairoWidget
} /* namespace */ } /* namespace */
#endif /* __gtkmm2ext_fader_h__ */ #endif /* __gtkmm2ext_fader_h__ */