From 6b14bbd4f3a3222b223a9bda81ab6a6592f7df4d Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 13 Feb 2011 13:01:14 +0000 Subject: [PATCH] Remove unused and uncompiled panner code. git-svn-id: svn://localhost/ardour2/branches/3.0@8834 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/panner.cc | 202 ---------------------------------------- gtk2_ardour/panner.h | 43 --------- gtk2_ardour/panner_ui.h | 1 - 3 files changed, 246 deletions(-) delete mode 100644 gtk2_ardour/panner.cc delete mode 100644 gtk2_ardour/panner.h diff --git a/gtk2_ardour/panner.cc b/gtk2_ardour/panner.cc deleted file mode 100644 index 145ef020e3..0000000000 --- a/gtk2_ardour/panner.cc +++ /dev/null @@ -1,202 +0,0 @@ -/* - Copyright (C) 2000-2007 Paul Davis - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -*/ - -#include -#include -#include -#include "ardour/panner.h" -#include "panner.h" -#include "i18n.h" - -using namespace std; -using namespace Gtk; - -static const int triangle_size = 5; - -PannerBar::PannerBar (Adjustment& adj, boost::shared_ptr c) - : BarController (adj, c) -{ - set_style (BarController::Line); -} - -PannerBar::~PannerBar () -{ -} - -bool -PannerBar::expose (GdkEventExpose* ev) -{ - Glib::RefPtr win (darea.get_window()); - Glib::RefPtr gc (get_style()->get_base_gc (get_state())); - - BarController::expose (ev); - - /* now draw triangles for left, right and center */ - - GdkPoint points[3]; - - // left - - points[0].x = 0; - points[0].y = 0; - - points[1].x = triangle_size; - points[1].y = 0; - - points[2].x = 0; - points[2].y = triangle_size; - - gdk_draw_polygon (win->gobj(), gc->gobj(), true, points, 3); - - // center - - points[0].x = (darea.get_width()/2 - triangle_size); - points[0].y = 0; - - points[1].x = (darea.get_width()/2 + triangle_size); - points[1].y = 0; - - points[2].x = darea.get_width()/2; - points[2].y = triangle_size - 1; - - gdk_draw_polygon (win->gobj(), gc->gobj(), true, points, 3); - - // right - - points[0].x = (darea.get_width() - triangle_size); - points[0].y = 0; - - points[1].x = darea.get_width(); - points[1].y = 0; - - points[2].x = darea.get_width(); - points[2].y = triangle_size; - - gdk_draw_polygon (win->gobj(), gc->gobj(), true, points, 3); - - return true; -} - -bool -PannerBar::button_press (GdkEventButton* ev) -{ - if (ev->button == 1 && ev->type == GDK_BUTTON_PRESS && ev->y < 10) { - if (ev->x < triangle_size) { - adjustment.set_value (adjustment.get_lower()); - } else if (ev->x > (darea.get_width() - triangle_size)) { - adjustment.set_value (adjustment.get_upper()); - } else if (ev->x > (darea.get_width()/2 - triangle_size) && - ev->x < (darea.get_width()/2 + triangle_size)) { - adjustment.set_value (adjustment.get_lower() + ((adjustment.get_upper() - adjustment.get_lower()) / 2.0)); - } - } - - return BarController::button_press (ev); -} - -bool -PannerBar::button_release (GdkEventButton* ev) -{ - bool const r = BarController::button_release (ev); - - /* get rid of any `C' labels that may exist */ - queue_draw (); - return r; -} - -bool -PannerBar::entry_input (double *new_value) -{ - Entry* e = dynamic_cast (&spinner); - string const text = e->get_text (); - - string digits; - string letters; - - string const L = _("L"); - string const C = _("C"); - string const R = _("R"); - - for (string::size_type i = 0; i < text.length(); ++i) { - if (isdigit (text[i])) { - digits += text[i]; - } else if (text[i] != '%') { - letters += text[i]; - } - } - - if (letters.empty()) { - /* no letter specified, so take any number as a percentage where - * 0 is left and 100 right */ - *new_value = digits.empty() ? 0.5 : (atoi (digits.c_str()) / 100.0); - } else { - /* letter given, so value is a percentage to the extreme - * (e.g. 100L is full left, 1L is slightly left */ - if (letters[0] == L[0] || letters[0] == tolower (L[0])) { - *new_value = digits.empty() ? 0 : (0.5 - atoi (digits.c_str()) / 200.0); - } else if (letters[0] == R[0] || letters[0] == tolower (R[0])) { - *new_value = digits.empty() ? 1 : 0.5 + atoi (digits.c_str()) / 200.0; - } else if (letters[0] == C[0] || letters[0] == tolower (C[0])) { - *new_value = 0.5; - } - } - - return true; -} - -bool -PannerBar::entry_output () -{ - Entry* e = dynamic_cast (&spinner); - e->set_text (ARDOUR::Panner::value_as_string (spinner.get_adjustment()->get_value())); - return true; -} - -std::string -PannerBar::get_label (int& x) -{ - double const value = spinner.get_adjustment()->get_value (); - - if (ARDOUR::Panner::equivalent (value, 0.5)) { - - /* centre: only display text during a drag */ - - if (!grabbed) { - return ""; - } - - } else { - - /* non-centre: display text on the side of the panner which has more space */ - - Glib::RefPtr p = get_pango_context (); - Glib::RefPtr l = Pango::Layout::create (p); - l->set_text (ARDOUR::Panner::value_as_string (value)); - - Pango::Rectangle const ext = l->get_ink_extents (); - - if (value < 0.5) { - x = (darea.get_width() - 4 - ext.get_width() / Pango::SCALE); - } else { - x = 4; - } - } - - return ARDOUR::Panner::value_as_string (value); -} diff --git a/gtk2_ardour/panner.h b/gtk2_ardour/panner.h deleted file mode 100644 index 298e866c3d..0000000000 --- a/gtk2_ardour/panner.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - Copyright (C) 2000-2007 Paul Davis - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -*/ - -#ifndef __gtk_ardour_panner_h__ -#define __gtk_ardour_panner_h__ - -#include -#include - -class PannerBar : public Gtkmm2ext::BarController -{ - public: - PannerBar (Gtk::Adjustment& adj, boost::shared_ptr); - ~PannerBar (); - - protected: - bool expose (GdkEventExpose*); - bool button_press (GdkEventButton*); - bool button_release (GdkEventButton*); - bool entry_input (double *); - bool entry_output (); - - private: - std::string get_label (int&); -}; - -#endif /* __gtk_ardour_panner_h__ */ diff --git a/gtk2_ardour/panner_ui.h b/gtk2_ardour/panner_ui.h index 3d714d9253..b62bcefa36 100644 --- a/gtk2_ardour/panner_ui.h +++ b/gtk2_ardour/panner_ui.h @@ -37,7 +37,6 @@ #include "enums.h" class Panner2d; -class PannerBar; class Panner2dWindow; class StereoPanner; class MonoPanner;