summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
authorJulien de Kozak <jdekozak@hotmail.com>2013-03-23 14:33:20 +0100
committerJulien de Kozak <jdekozak@hotmail.com>2013-03-23 14:50:58 +0100
commit16f8fc06578dac939e9d26af2f016a2d42405d7a (patch)
tree0c3e0f7886eafcf3d9fcb271f0cf8773ee4e29cb /gtk2_ardour
parent268553ecd471e31d0a1a3976f02389260130e41d (diff)
Fix some compilation warnings
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/startup.cc2
-rw-r--r--gtk2_ardour/utils.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/gtk2_ardour/startup.cc b/gtk2_ardour/startup.cc
index a0ae965f07..72c7d5e8b5 100644
--- a/gtk2_ardour/startup.cc
+++ b/gtk2_ardour/startup.cc
@@ -1459,7 +1459,7 @@ ArdourStartup::info_scroller_update()
char buf[512];
snprintf (buf, std::min(info_scroller_count,sizeof(buf)-1), "%s", ARDOUR_UI::instance()->announce_string().c_str() );
- buf[info_scroller_count] = NULL;
+ buf[info_scroller_count] = 0;
info_scroller_label.set_text (buf);
info_scroller_label.show();
diff --git a/gtk2_ardour/utils.cc b/gtk2_ardour/utils.cc
index aa68519560..19f93ad2e8 100644
--- a/gtk2_ardour/utils.cc
+++ b/gtk2_ardour/utils.cc
@@ -676,7 +676,7 @@ set_pango_fontsize ()
/* FT2 rendering - used by GnomeCanvas, sigh */
- pango_ft2_font_map_set_resolution ((PangoFT2FontMap*) pango_ft2_font_map_for_display(), val/1024, val/1024);
+ pango_ft2_font_map_set_resolution ((PangoFT2FontMap*) pango_ft2_font_map_new(), val/1024, val/1024);
/* Cairo rendering, in case there is any */