diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-10-28 09:46:59 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-10-28 09:46:59 -0400 |
| commit | 7fec9910775f6ecb2ec15c145846086edf5a1df5 (patch) | |
| tree | 1b0b391393483fe549b6e218b66fc66dfe0c44af | |
| parent | fe14092d57a137bc6613046062f74307d05f709a (diff) | |
fix thinko in declaration of ARDOUR::PortEngine::get_port_by_name()
| -rw-r--r-- | libs/ardour/ardour/port_engine.h | 5 | ||||
| -rw-r--r-- | libs/ardour/audioengine.cc | 4 | ||||
| -rw-r--r-- | libs/backends/jack/jack_audiobackend.h | 2 | ||||
| -rw-r--r-- | libs/backends/jack/jack_portengine.cc | 4 |
4 files changed, 8 insertions, 7 deletions
diff --git a/libs/ardour/ardour/port_engine.h b/libs/ardour/ardour/port_engine.h index 8c0ec9e754..68f8fe1232 100644 --- a/libs/ardour/ardour/port_engine.h +++ b/libs/ardour/ardour/port_engine.h @@ -117,10 +117,11 @@ class PortEngine { * does not exist, return an empty string. */ virtual std::string get_port_name (PortHandle) const = 0; + /** Return a reference to a port with the fullname @param name. Return - * a null pointer if no such port exists. + * an "empty" PortHandle (analogous to a null pointer) if no such port exists. */ - virtual PortHandle* get_port_by_name (const std::string&) const = 0; + virtual PortHandle get_port_by_name (const std::string&) const = 0; /** Find the set of ports whose names, types and flags match * specified values, place the names of each port into @param ports, diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc index 45b8bbf757..7f4d3c2a1d 100644 --- a/libs/ardour/audioengine.cc +++ b/libs/ardour/audioengine.cc @@ -1065,8 +1065,8 @@ AudioEngine::start_latency_detection () /* find the ports we will connect to */ - PortEngine::PortHandle* out = pe.get_port_by_name (_latency_output_name); - PortEngine::PortHandle* in = pe.get_port_by_name (_latency_input_name); + PortEngine::PortHandle out = pe.get_port_by_name (_latency_output_name); + PortEngine::PortHandle in = pe.get_port_by_name (_latency_input_name); if (!out || !in) { stop (true); diff --git a/libs/backends/jack/jack_audiobackend.h b/libs/backends/jack/jack_audiobackend.h index c59ddb5c67..2c77e6112b 100644 --- a/libs/backends/jack/jack_audiobackend.h +++ b/libs/backends/jack/jack_audiobackend.h @@ -126,7 +126,7 @@ class JACKAudioBackend : public AudioBackend { int set_port_name (PortHandle, const std::string&); std::string get_port_name (PortHandle) const; - PortHandle* get_port_by_name (const std::string&) const; + PortHandle get_port_by_name (const std::string&) const; int get_ports (const std::string& port_name_pattern, DataType type, PortFlags flags, std::vector<std::string>&) const; diff --git a/libs/backends/jack/jack_portengine.cc b/libs/backends/jack/jack_portengine.cc index 0d66f50448..1fe77fbb70 100644 --- a/libs/backends/jack/jack_portengine.cc +++ b/libs/backends/jack/jack_portengine.cc @@ -116,11 +116,11 @@ JACKAudioBackend::get_port_name (PortHandle port) const return jack_port_name ((jack_port_t*) port); } -PortEngine::PortHandle* +PortEngine::PortHandle JACKAudioBackend:: get_port_by_name (const std::string& name) const { GET_PRIVATE_JACK_POINTER_RET (_priv_jack, 0); - return (PortHandle*) jack_port_by_name (_priv_jack, name.c_str()); + return (PortHandle) jack_port_by_name (_priv_jack, name.c_str()); } void |