Browse Source

Rename `PortSetDeviceName` to `PortSetDeviceMetadata`

tags/v1.9.13
falkTX 5 years ago
parent
commit
bb416c7801
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

@@ -1074,7 +1074,7 @@ int JackEngine::PortRename(int refnum, jack_port_id_t port, const char* name)
return 0; 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"; static const char* type = "text/plain";
jack_uuid_t uuid = jack_port_uuid_generate(port); jack_uuid_t uuid = jack_port_uuid_generate(port);


+ 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 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(); int ComputeTotalLatencies();




+ 2
- 2
common/JackLockedEngine.h View File

@@ -246,11 +246,11 @@ class SERVER_EXPORT JackLockedEngine
CATCH_EXCEPTION_RETURN 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 TRY_CALL
JackLock lock(&fEngine); 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 CATCH_EXCEPTION_RETURN
} }




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

@@ -80,7 +80,7 @@ JackALSARawMidiDriver::Attach()
port = fGraphManager->GetPort(index); port = fGraphManager->GetPort(index);
port->SetAlias(alias); port->SetAlias(alias);
port->SetLatencyRange(JackCaptureLatency, &latency_range); port->SetLatencyRange(JackCaptureLatency, &latency_range);
fEngine->PortSetDeviceName(fClientControl.fRefNum, index,
fEngine->PortSetDeviceMetadata(fClientControl.fRefNum, index,
input_port->GetDeviceName()); input_port->GetDeviceName());
fCapturePortList[i] = index; fCapturePortList[i] = index;


@@ -108,7 +108,7 @@ JackALSARawMidiDriver::Attach()
port = fGraphManager->GetPort(index); port = fGraphManager->GetPort(index);
port->SetAlias(alias); port->SetAlias(alias);
port->SetLatencyRange(JackPlaybackLatency, &latency_range); port->SetLatencyRange(JackPlaybackLatency, &latency_range);
fEngine->PortSetDeviceName(fClientControl.fRefNum, index,
fEngine->PortSetDeviceMetadata(fClientControl.fRefNum, index,
output_port->GetDeviceName()); output_port->GetDeviceName());
fPlaybackPortList[i] = index; fPlaybackPortList[i] = index;




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

@@ -372,7 +372,7 @@ JackCoreMidiDriver::Attach()
port = fGraphManager->GetPort(index); port = fGraphManager->GetPort(index);
port->SetAlias(port_obj->GetAlias()); port->SetAlias(port_obj->GetAlias());
port->SetLatencyRange(JackCaptureLatency, &latency_range); port->SetLatencyRange(JackCaptureLatency, &latency_range);
fEngine->PortSetDeviceName(fClientControl.fRefNum, index,
fEngine->PortSetDeviceMetadata(fClientControl.fRefNum, index,
port_obj->GetDeviceName()); port_obj->GetDeviceName());
fCapturePortList[i] = index; fCapturePortList[i] = index;
} }
@@ -392,7 +392,7 @@ JackCoreMidiDriver::Attach()
port = fGraphManager->GetPort(index); port = fGraphManager->GetPort(index);
port->SetAlias(port_obj->GetAlias()); port->SetAlias(port_obj->GetAlias());
port->SetLatencyRange(JackCaptureLatency, &latency_range); port->SetLatencyRange(JackCaptureLatency, &latency_range);
fEngine->PortSetDeviceName(fClientControl.fRefNum, index,
fEngine->PortSetDeviceMetadata(fClientControl.fRefNum, index,
port_obj->GetDeviceName()); port_obj->GetDeviceName());
fCapturePortList[num_physical_inputs + i] = index; fCapturePortList[num_physical_inputs + i] = index;
} }
@@ -419,7 +419,7 @@ JackCoreMidiDriver::Attach()
port = fGraphManager->GetPort(index); port = fGraphManager->GetPort(index);
port->SetAlias(port_obj->GetAlias()); port->SetAlias(port_obj->GetAlias());
port->SetLatencyRange(JackPlaybackLatency, &latency_range); port->SetLatencyRange(JackPlaybackLatency, &latency_range);
fEngine->PortSetDeviceName(fClientControl.fRefNum, index,
fEngine->PortSetDeviceMetadata(fClientControl.fRefNum, index,
port_obj->GetDeviceName()); port_obj->GetDeviceName());
fPlaybackPortList[i] = index; fPlaybackPortList[i] = index;
} }
@@ -440,7 +440,7 @@ JackCoreMidiDriver::Attach()
port = fGraphManager->GetPort(index); port = fGraphManager->GetPort(index);
port->SetAlias(port_obj->GetAlias()); port->SetAlias(port_obj->GetAlias());
port->SetLatencyRange(JackPlaybackLatency, &latency_range); port->SetLatencyRange(JackPlaybackLatency, &latency_range);
fEngine->PortSetDeviceName(fClientControl.fRefNum, index,
fEngine->PortSetDeviceMetadata(fClientControl.fRefNum, index,
port_obj->GetDeviceName()); port_obj->GetDeviceName());
fPlaybackPortList[num_physical_outputs + i] = index; 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 = fGraphManager->GetPort(index);
port->SetAlias(input_port->GetAlias()); port->SetAlias(input_port->GetAlias());
port->SetLatencyRange(JackCaptureLatency, &latency_range); port->SetLatencyRange(JackCaptureLatency, &latency_range);
fEngine->PortSetDeviceName(fClientControl.fRefNum, index,
fEngine->PortSetDeviceMetadata(fClientControl.fRefNum, index,
input_port->GetDeviceName()); input_port->GetDeviceName());
fCapturePortList[i] = index; fCapturePortList[i] = index;
} }
@@ -97,7 +97,7 @@ JackWinMMEDriver::Attach()
port = fGraphManager->GetPort(index); port = fGraphManager->GetPort(index);
port->SetAlias(output_port->GetAlias()); port->SetAlias(output_port->GetAlias());
port->SetLatencyRange(JackPlaybackLatency, &latency_range); port->SetLatencyRange(JackPlaybackLatency, &latency_range);
fEngine->PortSetDeviceName(fClientControl.fRefNum, index,
fEngine->PortSetDeviceMetadata(fClientControl.fRefNum, index,
output_port->GetDeviceName()); output_port->GetDeviceName());
fPlaybackPortList[i] = index; fPlaybackPortList[i] = index;
} }


Loading…
Cancel
Save