X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Faudio_diskstream.cc;h=c4b2c06e159320beca3d58c051c39797913d4c57;hb=8ab17e96312f1a61c014c50687e15430d5ae786b;hp=fbe12e6bf5c8936ee7ea8c91128b1ee1e9196aef;hpb=1b0f6b1d69bcad74c6127690cebc1c14486e8c1d;p=ardour.git

diff --git a/libs/ardour/audio_diskstream.cc b/libs/ardour/audio_diskstream.cc
index fbe12e6bf5..c4b2c06e15 100644
--- a/libs/ardour/audio_diskstream.cc
+++ b/libs/ardour/audio_diskstream.cc
@@ -212,13 +212,14 @@ AudioDiskstream::get_input_sources ()
 	uint32_t n;
 	ChannelList::iterator chan;
 	uint32_t ni = _io->n_inputs().n_audio();
+	vector<string> connections;
 
 	for (n = 0, chan = c->begin(); chan != c->end() && n < ni; ++chan, ++n) {
 		
-		const char **connections = _io->input(n)->get_connections ();
+		connections.clear ();
+
+		if (_io->input(n)->get_connections (connections) == 0) {
 		
-		if (connections == 0 || connections[0] == 0) {
-			
 			if ((*chan)->source) {
 				// _source->disable_metering ();
 			}
@@ -226,12 +227,7 @@ AudioDiskstream::get_input_sources ()
 			(*chan)->source = 0;
 			
 		} else {
-			(*chan)->source = dynamic_cast<AudioPort*>(
-				_session.engine().get_port_by_name (connections[0]) );
-		}
-		
-		if (connections) {
-			free (connections);
+			(*chan)->source = dynamic_cast<AudioPort*>(_session.engine().get_port_by_name (connections[0]) );
 		}
 	}
 }