From 1563a30b031d2c459c60dd540df83d6bc38f55f5 Mon Sep 17 00:00:00 2001 From: Doug McLain Date: Tue, 15 Jul 2008 08:46:00 +0000 Subject: [PATCH] done debugging, remove the debug output, and cleanup the catchphrase in create_from_file git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3612 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/marker.cc | 3 +-- gtk2_ardour/utils.cc | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc index 76b0df26ad..48b8403584 100644 --- a/gtk2_ardour/marker.cc +++ b/gtk2_ardour/marker.cc @@ -34,7 +34,6 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con : editor (ed), _parent(&parent), _type(type) { - cerr << "Marker() constructed";//DEBUG double label_offset = 0; bool annotate_left = false; @@ -244,7 +243,7 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con mark->property_outline_color_rgba() = rgba; mark->property_width_pixels() = 1; Pango::FontDescription* font = get_font_for_style (N_("MarkerText")); - cerr << " font->get_size() = " << font->get_size() << " is_absolute = " << pango_font_description_get_size_is_absolute(font->gobj()) << " to_string = " << font->to_string() << endl; + //cerr << " font->get_size() = " << font->get_size() << " is_absolute = " << pango_font_description_get_size_is_absolute(font->gobj()) << " to_string = " << font->to_string() << endl; text = new Text (*group); text->property_font_desc() = *font; text->property_text() = annotation.c_str(); diff --git a/gtk2_ardour/utils.cc b/gtk2_ardour/utils.cc index 1197e99b41..292ea4127d 100644 --- a/gtk2_ardour/utils.cc +++ b/gtk2_ardour/utils.cc @@ -558,13 +558,13 @@ key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey* ev) Glib::RefPtr get_xpm (std::string name) { - cerr << "xpm path = " << ARDOUR::find_data_file(name, "pixmaps") << endl;//DEBUG + //cerr << "xpm path = " << ARDOUR::find_data_file(name, "pixmaps") << endl;//DEBUG if (!xpm_map[name]) { try { xpm_map[name] = Gdk::Pixbuf::create_from_file (ARDOUR::find_data_file(name, "pixmaps")); } catch(const Glib::Error& e) { - cerr << e.what() << endl; + warning << "Caught Glib::Error: " << e.what() << endmsg; } }