diff options
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/export_profile_manager.cc | 2 | ||||
| -rw-r--r-- | libs/gtkmm2ext/utils.cc | 4 | ||||
| -rw-r--r-- | libs/gtkmm2ext/visibility_tracker.cc | 3 | ||||
| -rw-r--r-- | libs/pbd/cpus.cc | 2 |
4 files changed, 8 insertions, 3 deletions
diff --git a/libs/ardour/export_profile_manager.cc b/libs/ardour/export_profile_manager.cc index deeb3aea2b..388ffe2508 100644 --- a/libs/ardour/export_profile_manager.cc +++ b/libs/ardour/export_profile_manager.cc @@ -501,6 +501,8 @@ ExportProfileManager::init_channel_configs (XMLNodeList nodes) channel_configs.push_back (config); // Add master outs as default + if (!session.master_out()) { return false; } + IO* master_out = session.master_out()->output().get(); if (!master_out) { return false; } diff --git a/libs/gtkmm2ext/utils.cc b/libs/gtkmm2ext/utils.cc index 6b58a6f948..a11b431ef0 100644 --- a/libs/gtkmm2ext/utils.cc +++ b/libs/gtkmm2ext/utils.cc @@ -23,7 +23,6 @@ #include <gtk/gtkpaned.h> #include <gtk/gtk.h> -#include <gtkmm2ext/utils.h> #include <gtkmm/widget.h> #include <gtkmm/button.h> #include <gtkmm/window.h> @@ -32,6 +31,8 @@ #include <gtkmm/comboboxtext.h> #include <gtkmm/tooltip.h> +#include "gtkmm2ext/utils.h" + #include "i18n.h" using namespace std; @@ -659,3 +660,4 @@ Gtkmm2ext::disable_tooltips () { gtk_rc_parse_string ("gtk-enable-tooltips = 0"); } + diff --git a/libs/gtkmm2ext/visibility_tracker.cc b/libs/gtkmm2ext/visibility_tracker.cc index 7ba282f3f9..aac76a5021 100644 --- a/libs/gtkmm2ext/visibility_tracker.cc +++ b/libs/gtkmm2ext/visibility_tracker.cc @@ -16,7 +16,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ - +#include <iostream> #include <gtkmm/window.h> #include "gtkmm2ext/visibility_tracker.h" @@ -35,6 +35,7 @@ bool VisibilityTracker::handle_visibility_notify_event (GdkEventVisibility* ev) { _visibility = ev->state; + // std::cerr << "VT: " << _window.get_title() << " vis event, fv = " << fully_visible() << " pv = " << partially_visible() << " nv = " << not_visible() << std::endl; return false; } diff --git a/libs/pbd/cpus.cc b/libs/pbd/cpus.cc index 77b95a455d..48b919cd96 100644 --- a/libs/pbd/cpus.cc +++ b/libs/pbd/cpus.cc @@ -40,7 +40,7 @@ hardware_concurrency() #elif defined(__APPLE__) || defined(__FreeBSD__) int count; size_t size=sizeof(count); - return sysctlbyname("hw.ncpu",&count,&size,NULL,0)?0:count; + return sysctlbyname("hw.physicalcpu",&count,&size,NULL,0)?0:count; #elif defined(HAVE_UNISTD) && defined(_SC_NPROCESSORS_ONLN) int const count=sysconf(_SC_NPROCESSORS_ONLN); return (count>0)?count:0; |