diff --git a/common/JackEngine.cpp b/common/JackEngine.cpp index c4649047..93c191a8 100644 --- a/common/JackEngine.cpp +++ b/common/JackEngine.cpp @@ -1074,7 +1074,7 @@ int JackEngine::PortRename(int refnum, jack_port_id_t port, const char* name) return 0; } -int JackEngine::PortSetDeviceName(jack_port_id_t port, const char* pretty_name) +int JackEngine::PortSetDeviceMetadata(jack_port_id_t port, const char* pretty_name) { static const char* type = "text/plain"; jack_uuid_t uuid = jack_port_uuid_generate(port); diff --git a/common/JackEngine.h b/common/JackEngine.h index b2c319a1..1e33e868 100644 --- a/common/JackEngine.h +++ b/common/JackEngine.h @@ -138,7 +138,7 @@ class SERVER_EXPORT JackEngine : public JackLockAble int PortRename(int refnum, jack_port_id_t port, const char* name); - int PortSetDeviceName(jack_port_id_t port, const char* pretty_name); + int PortSetDeviceMetadata(jack_port_id_t port, const char* pretty_name); int ComputeTotalLatencies(); diff --git a/common/JackLockedEngine.h b/common/JackLockedEngine.h index 1dc82d06..f774f6e8 100644 --- a/common/JackLockedEngine.h +++ b/common/JackLockedEngine.h @@ -246,11 +246,11 @@ class SERVER_EXPORT JackLockedEngine CATCH_EXCEPTION_RETURN } - int PortSetDeviceName(int refnum, jack_port_id_t port, const char* pretty_name) + int PortSetDeviceMetadata(int refnum, jack_port_id_t port, const char* pretty_name) { TRY_CALL JackLock lock(&fEngine); - return (fEngine.CheckClient(refnum)) ? fEngine.PortSetDeviceName(port, pretty_name) : -1; + return (fEngine.CheckClient(refnum)) ? fEngine.PortSetDeviceMetadata(port, pretty_name) : -1; CATCH_EXCEPTION_RETURN } diff --git a/linux/alsarawmidi/JackALSARawMidiDriver.cpp b/linux/alsarawmidi/JackALSARawMidiDriver.cpp index 7d072c4a..80a1dc5d 100644 --- a/linux/alsarawmidi/JackALSARawMidiDriver.cpp +++ b/linux/alsarawmidi/JackALSARawMidiDriver.cpp @@ -80,7 +80,7 @@ JackALSARawMidiDriver::Attach() port = fGraphManager->GetPort(index); port->SetAlias(alias); port->SetLatencyRange(JackCaptureLatency, &latency_range); - fEngine->PortSetDeviceName(fClientControl.fRefNum, index, + fEngine->PortSetDeviceMetadata(fClientControl.fRefNum, index, input_port->GetDeviceName()); fCapturePortList[i] = index; @@ -108,7 +108,7 @@ JackALSARawMidiDriver::Attach() port = fGraphManager->GetPort(index); port->SetAlias(alias); port->SetLatencyRange(JackPlaybackLatency, &latency_range); - fEngine->PortSetDeviceName(fClientControl.fRefNum, index, + fEngine->PortSetDeviceMetadata(fClientControl.fRefNum, index, output_port->GetDeviceName()); fPlaybackPortList[i] = index; diff --git a/macosx/coremidi/JackCoreMidiDriver.mm b/macosx/coremidi/JackCoreMidiDriver.mm index ddf67f46..4954ad7d 100644 --- a/macosx/coremidi/JackCoreMidiDriver.mm +++ b/macosx/coremidi/JackCoreMidiDriver.mm @@ -372,7 +372,7 @@ JackCoreMidiDriver::Attach() port = fGraphManager->GetPort(index); port->SetAlias(port_obj->GetAlias()); port->SetLatencyRange(JackCaptureLatency, &latency_range); - fEngine->PortSetDeviceName(fClientControl.fRefNum, index, + fEngine->PortSetDeviceMetadata(fClientControl.fRefNum, index, port_obj->GetDeviceName()); fCapturePortList[i] = index; } @@ -392,7 +392,7 @@ JackCoreMidiDriver::Attach() port = fGraphManager->GetPort(index); port->SetAlias(port_obj->GetAlias()); port->SetLatencyRange(JackCaptureLatency, &latency_range); - fEngine->PortSetDeviceName(fClientControl.fRefNum, index, + fEngine->PortSetDeviceMetadata(fClientControl.fRefNum, index, port_obj->GetDeviceName()); fCapturePortList[num_physical_inputs + i] = index; } @@ -419,7 +419,7 @@ JackCoreMidiDriver::Attach() port = fGraphManager->GetPort(index); port->SetAlias(port_obj->GetAlias()); port->SetLatencyRange(JackPlaybackLatency, &latency_range); - fEngine->PortSetDeviceName(fClientControl.fRefNum, index, + fEngine->PortSetDeviceMetadata(fClientControl.fRefNum, index, port_obj->GetDeviceName()); fPlaybackPortList[i] = index; } @@ -440,7 +440,7 @@ JackCoreMidiDriver::Attach() port = fGraphManager->GetPort(index); port->SetAlias(port_obj->GetAlias()); port->SetLatencyRange(JackPlaybackLatency, &latency_range); - fEngine->PortSetDeviceName(fClientControl.fRefNum, index, + fEngine->PortSetDeviceMetadata(fClientControl.fRefNum, index, port_obj->GetDeviceName()); fPlaybackPortList[num_physical_outputs + i] = index; } diff --git a/windows/winmme/JackWinMMEDriver.cpp b/windows/winmme/JackWinMMEDriver.cpp index 360b0f5f..ebe63bc5 100644 --- a/windows/winmme/JackWinMMEDriver.cpp +++ b/windows/winmme/JackWinMMEDriver.cpp @@ -71,7 +71,7 @@ JackWinMMEDriver::Attach() port = fGraphManager->GetPort(index); port->SetAlias(input_port->GetAlias()); port->SetLatencyRange(JackCaptureLatency, &latency_range); - fEngine->PortSetDeviceName(fClientControl.fRefNum, index, + fEngine->PortSetDeviceMetadata(fClientControl.fRefNum, index, input_port->GetDeviceName()); fCapturePortList[i] = index; } @@ -97,7 +97,7 @@ JackWinMMEDriver::Attach() port = fGraphManager->GetPort(index); port->SetAlias(output_port->GetAlias()); port->SetLatencyRange(JackPlaybackLatency, &latency_range); - fEngine->PortSetDeviceName(fClientControl.fRefNum, index, + fEngine->PortSetDeviceMetadata(fClientControl.fRefNum, index, output_port->GetDeviceName()); fPlaybackPortList[i] = index; }