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
This commit is contained in:
Doug McLain 2008-07-15 08:46:00 +00:00
parent 9ea93a27ac
commit 1563a30b03
2 changed files with 3 additions and 4 deletions

View file

@ -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();

View file

@ -558,13 +558,13 @@ key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey* ev)
Glib::RefPtr<Gdk::Pixbuf>
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;
}
}