fixes for OS X compilation

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

5 files changed, 8 insertions, 12 deletions

diff --git a/gtk2_ardour/new_session_dialog.cc b/gtk2_ardour/new_session_dialog.cc
index f024680c1e..c25f3606d6 100644
--- a/gtk2_ardour/new_session_dialog.cc
+++ b/gtk2_ardour/new_session_dialog.cc
@@ -609,7 +609,7 @@ NewSessionDialog::notebook_page_changed (GtkNotebookPage* np, uint pagenum)
 		on_new_session_page = false;
 		m_okbutton->set_label(_("Open"));
 		set_response_sensitive (Gtk::RESPONSE_NONE, false);
-		m_okbutton->set_image (*(new Gtk::Image (Gtk::Stock::OPEN, Gtk::ICON_SIZE_BUTTON)));
+		// m_okbutton->set_image (*(new Gtk::Image (Gtk::Stock::OPEN, Gtk::ICON_SIZE_BUTTON)));
 		if (m_treeview->get_selection()->count_selected_rows() == 0) {
 			set_response_sensitive (Gtk::RESPONSE_OK, false);
 		} else {
@@ -621,7 +621,7 @@ NewSessionDialog::notebook_page_changed (GtkNotebookPage* np, uint pagenum)
 			set_response_sensitive (Gtk::RESPONSE_NONE, true);
 		}
 		m_okbutton->set_label(_("New"));
-		m_okbutton->set_image (*(new Gtk::Image (Gtk::Stock::NEW, Gtk::ICON_SIZE_BUTTON)));
+		// m_okbutton->set_image (*(new Gtk::Image (Gtk::Stock::NEW, Gtk::ICON_SIZE_BUTTON)));
 		if (m_name->get_text() == "") {
 			set_response_sensitive (Gtk::RESPONSE_OK, false);
 		} else {
diff --git a/libs/ardour/ardour/automation_event.h b/libs/ardour/ardour/automation_event.h
index 7db5e3f459..9792e00552 100644
--- a/libs/ardour/ardour/automation_event.h
+++ b/libs/ardour/ardour/automation_event.h
@@ -59,7 +59,7 @@ class ControlEvent {
    allocates 8k of new pointers at a time
 */
 
-typedef boost::fast_pool_allocator<ControlEvent,
+typedef boost::fast_pool_allocator<ControlEvent*,
 	boost::default_user_allocator_new_delete,
 	boost::details::pool::null_mutex,
 	8192> ControlEventAllocator;
diff --git a/libs/midi++2/coremidi_midiport.cc b/libs/midi++2/coremidi_midiport.cc
index 307abfa8d6..38f84fe750 100644
--- a/libs/midi++2/coremidi_midiport.cc
+++ b/libs/midi++2/coremidi_midiport.cc
@@ -49,15 +49,6 @@ CoreMidi_MidiPort::CoreMidi_MidiPort (PortRequest &req) : Port (req)
 
 CoreMidi_MidiPort::~CoreMidi_MidiPort () {Close();}
 
-XMLNode&
-CoreMidi::MidiPort::get_state() const
-{
-	XMLNode& node (Port::get_state());
-	node.add_property ("type", "coremidi");
-	return node;
-}
-
-
 void CoreMidi_MidiPort::Close ()
 {
  	if (midi_destination) MIDIEndpointDispose(midi_destination);
diff --git a/libs/midi++2/midi++/coremidi_midiport.h b/libs/midi++2/midi++/coremidi_midiport.h
index 89047540cb..828872f85c 100644
--- a/libs/midi++2/midi++/coremidi_midiport.h
+++ b/libs/midi++2/midi++/coremidi_midiport.h
@@ -22,11 +22,13 @@
 
 #include <list>
 #include <string>
+#include <vector>
 
 #include <fcntl.h>
 #include <unistd.h>
 
 #include <midi++/port.h>
+#include <midi++/port_request.h>
 
 #include <CoreMIDI/CoreMIDI.h>
 
diff --git a/libs/surfaces/mackie/mackie_jog_wheel.cc b/libs/surfaces/mackie/mackie_jog_wheel.cc
index 4ba01c8cf3..d05eb23638 100644
--- a/libs/surfaces/mackie/mackie_jog_wheel.cc
+++ b/libs/surfaces/mackie/mackie_jog_wheel.cc
@@ -1,3 +1,5 @@
+#include <cmath>
+
 #include "mackie_jog_wheel.h"
 
 #include "mackie_control_protocol.h"
@@ -8,6 +10,7 @@
 #include <algorithm>
 
 using namespace Mackie;
+using std::isnan;
 
 JogWheel::JogWheel( MackieControlProtocol & mcp )
 : _mcp( mcp )