debug output for pixbuf loaders; catch exception when loading AU plugins; miscellaneous character removal

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3646 d708f5d6-7413-0410-9779-e7cbd77b26cf

6 files changed, 29 insertions, 12 deletions

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index e04ed49b21..de28fd7c52 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -4770,7 +4770,7 @@ Editor::queue_draw_resize_line (int at)
 			/* redraw where it used to be */
 			
 			
-			Gdk::Rectangle r (xroot, old_resize_line_y - 1, controls_width + (int) canvas_width, 3);
+			Gdk::Rectangle r (0, old_resize_line_y - 1, controls_width + (int) canvas_width, 3);
 			win->invalidate_rect (r, true);
 			cerr << "invalidate " << xroot << "," << old_resize_line_y - 1 << ' ' 
 			     << controls_width + canvas_width << " x 3\n";
@@ -4778,7 +4778,7 @@ Editor::queue_draw_resize_line (int at)
 
 		/* draw where it is */
 
-		Gdk::Rectangle r (xroot, at - 1, controls_width + (int) canvas_width, 3);
+		Gdk::Rectangle r (0, at - 1, controls_width + (int) canvas_width, 3);
 		win->invalidate_rect (r, true);
 	}
 #endif
@@ -4813,7 +4813,7 @@ Editor::on_expose_event (GdkEventExpose* ev)
 		GdkRectangle lr;
 		GdkRectangle intersection;
 
-		lr.x = xroot;
+		lr.x = 0;
 		lr.y = resize_line_y;
 		lr.width = controls_width + (int) canvas_width;
 		lr.height = 3;
@@ -4834,15 +4834,17 @@ Editor::on_expose_event (GdkEventExpose* ev)
 						 Gdk::JOIN_MITER);
 			
 			gdk_draw_line (win, gc->gobj(), 
-				       xroot,
-				       yroot + resize_line_y, 
-				       xroot + (int) canvas_width + controls_width,
-				       yroot + resize_line_y);
+				       0,
+				       resize_line_y, 
+				       (int) canvas_width + controls_width,
+				       resize_line_y);
+#if 0
 			cerr << "drew line @ " << xroot << ", " << yroot + resize_line_y 
 			     << " to " << xroot + (int) canvas_width + controls_width
 			     << ", " << yroot + resize_line_y
 			     << endl;
-			old_resize_line_y = yroot + resize_line_y;
+#endif
+			old_resize_line_y = resize_line_y;
 			cerr << "NEXT EXPOSE SHOULD BE AT " << old_resize_line_y << endl;
 		} else {
 			cerr << "no intersect with "
diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index 32789d455d..c2337f64ec 100644
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -209,6 +209,7 @@ fixup_bundle_environment ()
 	path += "/../Resources/gdk-pixbuf.loaders";
 
 	setenv ("GDK_PIXBUF_MODULE_FILE", path.c_str(), 1);
+	cerr << "Set GDK_PIXBUF_MODULE_FILE to " << path << endl;
 
 	if (getenv ("ARDOUR_WITH_JACK")) {
 		// JACK driver dir
@@ -235,9 +236,12 @@ int main (int argc, char* argv[])
 {
 	vector<Glib::ustring> null_file_list;
 	
+	cerr << "here we go\n";
+	
 #ifdef __APPLE__
 	fixup_bundle_environment ();
 #endif
+	cerr << "just did it\n";
 
         Glib::thread_init();
 	gtk_set_locale ();
diff --git a/gtk2_ardour/utils.cc b/gtk2_ardour/utils.cc
index 292ea4127d..c5faef2b0c 100644
--- a/gtk2_ardour/utils.cc
+++ b/gtk2_ardour/utils.cc
@@ -680,7 +680,7 @@ set_pango_fontsize ()
 {
 	long val = ARDOUR::Config->get_font_scale();
 
-	/* FT2 rendering */
+	/* FT2 rendering - used by GnomeCanvas, sigh */
 
 	pango_ft2_font_map_set_resolution ((PangoFT2FontMap*) pango_ft2_font_map_for_display(), val/1024, val/1024);
 
diff --git a/libs/ardour/audio_unit.cc b/libs/ardour/audio_unit.cc
index 5544ba2e0e..d3a082824f 100644
--- a/libs/ardour/audio_unit.cc
+++ b/libs/ardour/audio_unit.cc
@@ -1060,10 +1060,19 @@ AUPluginInfo::cached_io_configuration (const std::string& unique_id,
 	
 	ARDOUR::BootMessage (string_compose (_("Checking AudioUnit: %1"), name));
 	
-	if (CAAudioUnit::Open (comp, unit) != noErr) {
+	try {
+
+		if (CAAudioUnit::Open (comp, unit) != noErr) {
+			return false;
+		}
+
+	} catch (...) {
+
+		warning << string_compose (_("Could not load AU plugin %1 - ignored"), name) << endmsg;
 		return false;
-	}
 
+	}
+		
 	if ((ret = unit.GetChannelInfo (&channel_info, cnt)) < 0) {
 		return false;
 	}
diff --git a/libs/vamp-plugins/SConscript b/libs/vamp-plugins/SConscript
index 58d12bcb6e..b45892ef8f 100644
--- a/libs/vamp-plugins/SConscript
+++ b/libs/vamp-plugins/SConscript
@@ -29,6 +29,8 @@ sources = plugin_files
 if vampplugs['AUBIO']:
     sources += aubio_files
     vampplugs.Merge ([libraries['aubio']])
+else:
+    print 'WARNING: some VAMP plugins will not be built because this machine has no AUBIO support'
 
 libvampplugins = vampplugs.SharedLibrary('ardourvampplugins', sources)
 
diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build
index 679e6b5bf7..cfbc070f60 100755
--- a/tools/osx_packaging/osx_build
+++ b/tools/osx_packaging/osx_build
@@ -196,7 +196,7 @@ while [ true ] ; do
 	break
     fi
 done
-5Becho
+echo
 
 echo "Copying other stuff to Ardour2.app  ..."