Browse Source

Rename PortSetPrettyNameProperty to PortSetDeviceName

pull/498/head
Luciano Iammarino 6 years ago
parent
commit
93e233d2b5
6 changed files with 12 additions and 12 deletions
  1. +1
    -1
      common/JackEngine.cpp
  2. +1
    -1
      common/JackEngine.h
  3. +2
    -2
      common/JackLockedEngine.h
  4. +2
    -2
      linux/alsarawmidi/JackALSARawMidiDriver.cpp
  5. +4
    -4
      macosx/coremidi/JackCoreMidiDriver.mm
  6. +2
    -2
      windows/winmme/JackWinMMEDriver.cpp

+ 1
- 1
common/JackEngine.cpp View File

@@ -1073,7 +1073,7 @@ int JackEngine::PortRename(int refnum, jack_port_id_t port, const char* name)
return 0;
}

int JackEngine::PortSetPrettyNameProperty(jack_port_id_t port, const char* pretty_name)
int JackEngine::PortSetDeviceName(jack_port_id_t port, const char* pretty_name)
{
jack_uuid_t uuid = jack_port_uuid_generate(port);
static const char* key = "http://jackaudio.org/metadata/pretty-name";


+ 1
- 1
common/JackEngine.h View File

@@ -138,7 +138,7 @@ class SERVER_EXPORT JackEngine : public JackLockAble

int PortRename(int refnum, jack_port_id_t port, const char* name);

int PortSetPrettyNameProperty(jack_port_id_t port, const char* pretty_name);
int PortSetDeviceName(jack_port_id_t port, const char* pretty_name);

int ComputeTotalLatencies();



+ 2
- 2
common/JackLockedEngine.h View File

@@ -246,11 +246,11 @@ class SERVER_EXPORT JackLockedEngine
CATCH_EXCEPTION_RETURN
}

int PortSetPrettyNameProperty(int refnum, jack_port_id_t port, const char* pretty_name)
int PortSetDeviceName(int refnum, jack_port_id_t port, const char* pretty_name)
{
TRY_CALL
JackLock lock(&fEngine);
return (fEngine.CheckClient(refnum)) ? fEngine.PortSetPrettyNameProperty(port, pretty_name) : -1;
return (fEngine.CheckClient(refnum)) ? fEngine.PortSetDeviceName(port, pretty_name) : -1;
CATCH_EXCEPTION_RETURN
}



+ 2
- 2
linux/alsarawmidi/JackALSARawMidiDriver.cpp View File

@@ -80,7 +80,7 @@ JackALSARawMidiDriver::Attach()
port = fGraphManager->GetPort(index);
port->SetAlias(alias);
port->SetLatencyRange(JackCaptureLatency, &latency_range);
fEngine->PortSetPrettyNameProperty(fClientControl.fRefNum, index,
fEngine->PortSetDeviceName(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->PortSetPrettyNameProperty(fClientControl.fRefNum, index,
fEngine->PortSetDeviceName(fClientControl.fRefNum, index,
output_port->GetDeviceName());
fPlaybackPortList[i] = index;



+ 4
- 4
macosx/coremidi/JackCoreMidiDriver.mm View File

@@ -372,7 +372,7 @@ JackCoreMidiDriver::Attach()
port = fGraphManager->GetPort(index);
port->SetAlias(port_obj->GetAlias());
port->SetLatencyRange(JackCaptureLatency, &latency_range);
fEngine->PortSetPrettyNameProperty(fClientControl.fRefNum, index,
fEngine->PortSetDeviceName(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->PortSetPrettyNameProperty(fClientControl.fRefNum, index,
fEngine->PortSetDeviceName(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->PortSetPrettyNameProperty(fClientControl.fRefNum, index,
fEngine->PortSetDeviceName(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->PortSetPrettyNameProperty(fClientControl.fRefNum, index,
fEngine->PortSetDeviceName(fClientControl.fRefNum, index,
port_obj->GetDeviceName());
fPlaybackPortList[num_physical_outputs + i] = index;
}


+ 2
- 2
windows/winmme/JackWinMMEDriver.cpp View File

@@ -71,7 +71,7 @@ JackWinMMEDriver::Attach()
port = fGraphManager->GetPort(index);
port->SetAlias(input_port->GetAlias());
port->SetLatencyRange(JackCaptureLatency, &latency_range);
fEngine->PortSetPrettyNameProperty(fClientControl.fRefNum, index,
fEngine->PortSetDeviceName(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->PortSetPrettyNameProperty(fClientControl.fRefNum, index,
fEngine->PortSetDeviceName(fClientControl.fRefNum, index,
output_port->GetDeviceName());
fPlaybackPortList[i] = index;
}


Loading…
Cancel
Save