X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Futils.h;h=7137f273c65752d44aa6513313be41ea89d679e6;hb=ba8953605dd8359f0ec8a2aacb51102deda05df7;hp=90a6de9ec4bc7967be80e527e9c78a4cb965d773;hpb=926f53244df3d0f43f647f93ee091378ebe101d6;p=ardour.git

diff --git a/gtk2_ardour/utils.h b/gtk2_ardour/utils.h
index 90a6de9ec4..7137f273c6 100644
--- a/gtk2_ardour/utils.h
+++ b/gtk2_ardour/utils.h
@@ -26,41 +26,25 @@
 #include "ardour/types.h"
 #include <libgnomecanvasmm/line.h>
 #include <gdkmm/types.h>
-#include <glibmm/ustring.h>
 #include <gtkmm/menushell.h>
 
 #include "canvas.h"
 
+namespace PBD {
+        class Controllable;
+        class ScopedConnectionList;
+}
+
 namespace Gtk {
 	class Window;
 	class ComboBoxText;
 	class Paned;
+        class Adjustment;
 }
 
-static inline double
-gain_to_slider_position (ARDOUR::gain_t g)
-{
-	if (g == 0) return 0;
-	return pow((6.0*log(g)/log(2.0)+192.0)/198.0, 8.0);
-
-}
-
-static inline ARDOUR::gain_t
-slider_position_to_gain (double pos)
-{
-	/* XXX Marcus writes: this doesn't seem right to me. but i don't have a better answer ... */
-	if (pos == 0.0) return 0;
-	return pow (2.0,(sqrt(sqrt(sqrt(pos)))*198.0-192.0)/6.0);
-}
-
-Glib::ustring fit_to_pixels (const Glib::ustring&, int pixel_width, Pango::FontDescription& font, int& actual_width, bool with_ellipses = false);
-
-std::pair<std::string, double> fit_to_pixels (cairo_t *, std::string, double);
-
-int pixel_width (const Glib::ustring& str, Pango::FontDescription& font);
+extern sigc::signal<void>  DPIReset;
 
 gint   just_hide_it (GdkEventAny*, Gtk::Window*);
-void   allow_keyboard_focus (bool);
 void add_item_with_sensitivity (Gtk::Menu_Helpers::MenuList &, Gtk::Menu_Helpers::MenuElem, bool);
 
 unsigned char* xpm2rgb  (const char** xpm, uint32_t& w, uint32_t& h);
@@ -68,14 +52,10 @@ unsigned char* xpm2rgba (const char** xpm, uint32_t& w, uint32_t& h);
 
 ArdourCanvas::Points* get_canvas_points (std::string who, uint32_t npoints);
 
-Pango::FontDescription* get_font_for_style (std::string widgetname);
+Pango::FontDescription get_font_for_style (std::string widgetname);
 
 uint32_t rgba_from_style (std::string, uint32_t, uint32_t, uint32_t, uint32_t, std::string = "fg", int = Gtk::STATE_NORMAL, bool = true);
 
-Gdk::Color color_from_style (std::string widget_style_name, int state, std::string attr);
-Glib::RefPtr<Gdk::GC> gc_from_style (std::string widget_style_name, int state, std::string attr);
-
-
 void decorate (Gtk::Window& w, Gdk::WMDecoration d);
 
 bool canvas_item_visible (ArdourCanvas::Item* item);
@@ -83,12 +63,11 @@ bool canvas_item_visible (ArdourCanvas::Item* item);
 void set_color (Gdk::Color&, int);
 
 bool relay_key_press (GdkEventKey* ev, Gtk::Window* win);
+bool forward_key_press (GdkEventKey* ev);
 bool key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey* ev);
-bool possibly_translate_keyval_to_make_legal_accelerator (uint32_t& keyval);
-uint32_t possibly_translate_legal_accelerator_to_real_key (uint32_t keyval);
 
 Glib::RefPtr<Gdk::Pixbuf> get_xpm (std::string);
-Glib::ustring get_icon_path (const char*);
+std::string get_icon_path (const char*);
 Glib::RefPtr<Gdk::Pixbuf> get_icon (const char*);
 static std::map<std::string, Glib::RefPtr<Gdk::Pixbuf> > xpm_map;
 const char* const *get_xpm_data (std::string path);
@@ -97,18 +76,11 @@ bool key_is_legal_for_numeric_entry (guint keyval);
 void reset_dpi ();
 void set_pango_fontsize ();
 
-inline guint8 convert_color_channel (guint8 src, guint8 alpha);
-void convert_bgra_to_rgba (guint8 const* src,
-			   guint8*       dst,
-			   int           width,
-			   int           height);
+void resize_window_to_proportion_of_monitor (Gtk::Window*, int, int);
 
-Glib::RefPtr<Gdk::Pixbuf> pixbuf_from_ustring (const Glib::ustring& name,
-					       Pango::FontDescription* font,
-					       int clip_width,
-					       int clip_height,
-					       Gdk::Color);
+std::string escape_underscores (std::string const &);
+std::string escape_angled_brackets (std::string const &);
 
-void resize_window_to_proportion_of_monitor (Gtk::Window*, int, int);
+Gdk::Color unique_random_color (std::list<Gdk::Color> &);
 
 #endif /* __ardour_gtk_utils_h__ */