X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fio.h;h=6793072cba8a710eb6c0da477e95cc210224c77d;hb=90172686b92b53cc5ab1d60c0e6daecb65d17d3d;hp=72815c17ccc756eb5fb5e1777d0c187010b58d78;hpb=576cdb08b5eab456eea91263fac1709dd7931a9d;p=ardour.git

diff --git a/libs/ardour/ardour/io.h b/libs/ardour/ardour/io.h
index 72815c17cc..6793072cba 100644
--- a/libs/ardour/ardour/io.h
+++ b/libs/ardour/ardour/io.h
@@ -33,7 +33,6 @@
 #include "pbd/controllable.h"
 
 #include "ardour/ardour.h"
-#include "ardour/automatable_controls.h"
 #include "ardour/automation_control.h"
 #include "ardour/bundle.h"
 #include "ardour/chan_count.h"
@@ -164,7 +163,7 @@ class IO : public SessionObject, public Latent
 	/* three utility functions - this just seems to be simplest place to put them */
 
 	void collect_input (BufferSet& bufs, nframes_t nframes, ChanCount offset);
-	void process_input (boost::shared_ptr<Processor>, sframes_t start_frame, sframes_t end_frame, nframes_t nframes);
+	void process_input (boost::shared_ptr<Processor>, framepos_t start_frame, framepos_t end_frame, nframes_t nframes);
 	void copy_to_outputs (BufferSet& bufs, DataType type, nframes_t nframes, nframes_t offset);
 
 	/* AudioTrack::deprecated_use_diskstream_connections() needs these */
@@ -218,7 +217,7 @@ class IO : public SessionObject, public Latent
 	int32_t find_port_hole (const char* base);
 
 	void setup_bundle ();
-	std::string bundle_channel_name (uint32_t, uint32_t) const;
+	std::string bundle_channel_name (uint32_t, uint32_t, DataType) const;
 };
 
 } // namespace ARDOUR