smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-07 15:25:01 +01:00
Code Issues Projects Releases Wiki Activity

OS 10.10 compile fixes

Browse source 
* fix clang pickiness regarding boolean
 * ignore ‘verify’ macro
 * tested with Apple LLVM version 6.0 (clang-600.0.51) (based on LLVM 3.5svn)
This commit is contained in:
Robin Gareus 2014-10-19 19:54:01 +02:00
parent 892909b052
commit ffde2fb5f9
8 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
gtk2_ardour/cocoacarbon.mm
View file

@ -25,6 +25,9 @@
#undef check #undef check
#undef YES #undef YES
#undef NO #undef NO
#ifdef verify
#undef verify
#endif
#include "ardour_ui.h" #include "ardour_ui.h"
#include "actions.h" #include "actions.h"

2
gtk2_ardour/editor_regions.cc
View file

@ -295,7 +295,7 @@ EditorRegions::add_region (boost::shared_ptr<Region> region)
string str; string str;
TreeModel::Row row; TreeModel::Row row;
Gdk::Color c; Gdk::Color c;
bool missing_source = boost::dynamic_pointer_cast<SilentFileSource>(region->source()); bool missing_source = boost::dynamic_pointer_cast<SilentFileSource>(region->source()) != NULL;
if (!_show_automatic_regions && region->automatic()) { if (!_show_automatic_regions && region->automatic()) {
return; return;

4
gtk2_ardour/export_preset_selector.cc
View file

@ -123,8 +123,8 @@ ExportPresetSelector::update_selection ()
} }
} }
save_button.set_sensitive (current); save_button.set_sensitive (current != 0);
remove_button.set_sensitive (current); remove_button.set_sensitive (current != 0);
new_button.set_sensitive (!current && !text.empty() && !preset_name_exists); new_button.set_sensitive (!current && !text.empty() && !preset_name_exists);
} }

2
gtk2_ardour/gain_meter.cc
View file

@ -1076,7 +1076,7 @@ GainMeterBase::get_controllable()
bool bool
GainMeterBase::level_meter_button_press (GdkEventButton* ev) GainMeterBase::level_meter_button_press (GdkEventButton* ev)
{ {
return LevelMeterButtonPress (ev); /* EMIT SIGNAL */ return !!LevelMeterButtonPress (ev); /* EMIT SIGNAL */
} }
void void

2
gtk2_ardour/level_meter.cc
View file

@ -436,7 +436,7 @@ LevelMeterBase::set_type(MeterType t)
bool bool
LevelMeterBase::meter_button_press (GdkEventButton* ev) LevelMeterBase::meter_button_press (GdkEventButton* ev)
{ {
return ButtonPress (ev); /* EMIT SIGNAL */ return !!ButtonPress (ev); /* EMIT SIGNAL */
} }
bool bool

4
gtk2_ardour/port_matrix.cc
View file

@ -708,7 +708,7 @@ PortMatrix::io_from_bundle (boost::shared_ptr<Bundle> b) const
bool bool
PortMatrix::can_add_channels (boost::shared_ptr<Bundle> b) const PortMatrix::can_add_channels (boost::shared_ptr<Bundle> b) const
{ {
return io_from_bundle (b); return io_from_bundle (b) != 0;
} }
void void
@ -731,7 +731,7 @@ PortMatrix::add_channel (boost::shared_ptr<Bundle> b, DataType t)
bool bool
PortMatrix::can_remove_channels (boost::shared_ptr<Bundle> b) const PortMatrix::can_remove_channels (boost::shared_ptr<Bundle> b) const
{ {
return io_from_bundle (b); return io_from_bundle (b) != 0;
} }
void void

2
gtk2_ardour/session_option_editor.cc
View file

@ -395,7 +395,7 @@ SessionOptionEditor::parameter_changed (std::string const & p)
bool bool
SessionOptionEditor::set_use_monitor_section (bool yn) SessionOptionEditor::set_use_monitor_section (bool yn)
{ {
bool had_monitor_section = _session->monitor_out(); bool had_monitor_section = _session->monitor_out() != 0;
if (yn) { if (yn) {
_session->add_monitor_section (); _session->add_monitor_section ();

2
libs/pbd/pbd/properties.h
View file

@ -443,7 +443,7 @@ public:
} }
operator bool () const { operator bool () const {
return _current; return _current ? true : false;
} }
protected: protected: