diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-07-28 20:51:28 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-07-28 20:51:28 +0000 |
| commit | 3ae28868ff02abf44102fff9954e7e8d6359867f (patch) | |
| tree | 6202724eba77a9844d9079614c5ea91f91c110e5 /gtk2_ardour/utils.cc | |
| parent | 5eaf61242f16c7638c0e71a9c82af5a781c24e87 (diff) | |
remove all MIDI-specific editing modes by making standard work either at object level or within (e.g. notes, etc) ; make tool buttons proxies for GtkActions ; internal sends have their own BufferSet now, instead of using Session ones; don't make internal sends to the monitor bus active when added to the Route
git-svn-id: svn://localhost/ardour2/branches/3.0@5434 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/utils.cc')
| -rw-r--r-- | gtk2_ardour/utils.cc | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/gtk2_ardour/utils.cc b/gtk2_ardour/utils.cc index df922c2d62..7a1c9c6968 100644 --- a/gtk2_ardour/utils.cc +++ b/gtk2_ardour/utils.cc @@ -705,9 +705,8 @@ get_xpm (std::string name) return xpm_map[name]; } - -Glib::RefPtr<Gdk::Pixbuf> -get_icon (const char* cname) +Glib::ustring +get_icon_path (const char* cname) { string name = cname; name += X_(".png"); @@ -723,9 +722,15 @@ get_icon (const char* cname) fatal << string_compose (_("cannot find icon image for %1"), name) << endmsg; } + return data_file_path.to_string(); +} + +Glib::RefPtr<Gdk::Pixbuf> +get_icon (const char* cname) +{ Glib::RefPtr<Gdk::Pixbuf> img; try { - img = Gdk::Pixbuf::create_from_file (data_file_path.to_string()); + img = Gdk::Pixbuf::create_from_file (get_icon_path (cname)); } catch (const Gdk::PixbufError &e) { cerr << "Caught PixbufError: " << e.what() << endl; } catch (...) { |