Remove unused method in RouteTimeAxisView. Fix bug with switching to layered region...

[ardour.git] / libs / ardour / export_format_manager.cc

diff --git a/libs/ardour/export_format_manager.cc b/libs/ardour/export_format_manager.cc
index e9e722dfeccf93a7936df3e1e8646e0353a7c2a1..8b4b9e550f32d9ea46d50361a31960abdeee4f1f 100644 (file)
--- a/libs/ardour/export_format_manager.cc
+++ b/libs/ardour/export_format_manager.cc
@@ -18,11 +18,11 @@
 
 */
 
-#include <ardour/export_format_manager.h>
+#include "ardour/export_format_manager.h"
 
-#include <ardour/types.h>
-#include <ardour/export_format_specification.h>
-#include <ardour/export_format_compatibility.h>
+#include "ardour/types.h"
+#include "ardour/export_format_specification.h"
+#include "ardour/export_format_compatibility.h"
 
 #include "i18n.h"
 
@@ -185,11 +185,15 @@ ExportFormatManager::init_formats ()
        fl_ptr->set_extension ("raw");
        add_format (f_ptr);
        
-       f_ptr.reset (new ExportFormatOggVorbis ());
-       add_format (f_ptr);
+       try {
+               f_ptr.reset (new ExportFormatOggVorbis ());
+               add_format (f_ptr);
+       } catch (ExportFormatIncompatible & e) {}
        
-       f_ptr.reset (new ExportFormatFLAC ());
-       add_format (f_ptr);
+       try {
+               f_ptr.reset (new ExportFormatFLAC ());
+               add_format (f_ptr);
+       } catch (ExportFormatIncompatible & e) {}
 }
 
 void
@@ -400,7 +404,7 @@ ExportFormatManager::change_dither_type_selection (bool select, WeakDitherTypePt
 }
 
 void
-ExportFormatManager::select_compatibility (WeakCompatPtr const & compat)
+ExportFormatManager::select_compatibility (WeakCompatPtr const & /*compat*/)
 {
        /* Calculate compatibility intersection for the selection */