jackaudio
/
jack2
mirror of https://github.com/jackaudio/jack2
1
0
Fork 0
Code Releases 45 Activity
Browse Source

Rename PortSetDeviceMetadata to PortSetDefaultMetadata

tags/v1.9.14
Luciano Iam Filipe Coelho <falktx@falktx.com> 5 years ago
parent
9bf420dc95
commit
02528686c4
12 changed files with 22 additions and 22 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      common/JackEngine.cpp
  2. +1
    -1
      common/JackEngine.h
  3. +2
    -2
      common/JackLockedEngine.h
  4. +2
    -2
      linux/alsa/JackAlsaDriver.cpp
  5. +1
    -1
      linux/alsa/JackAlsaDriver.h
  6. +2
    -2
      linux/alsa/alsa_midi_impl.h
  7. +2
    -2
      linux/alsa/alsa_midi_jackmp.cpp
  8. +1
    -1
      linux/alsa/alsa_rawmidi.c
  9. +2
    -2
      linux/alsa/alsa_seqmidi.c
  10. +2
    -2
      linux/alsarawmidi/JackALSARawMidiDriver.cpp
  11. +4
    -4
      macosx/coremidi/JackCoreMidiDriver.mm
  12. +2
    -2
      windows/winmme/JackWinMMEDriver.cpp

+ 1
- 1
common/JackEngine.cpp View File

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


int JackEngine::PortSetDeviceMetadata(jack_port_id_t port, const char* pretty_name)
int JackEngine::PortSetDefaultMetadata(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 PortSetDeviceMetadata(jack_port_id_t port, const char* pretty_name);
int PortSetDefaultMetadata(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 PortSetDeviceMetadata(int refnum, jack_port_id_t port, const char* pretty_name)
int PortSetDefaultMetadata(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.PortSetDeviceMetadata(port, pretty_name) : -1;
return (fEngine.CheckClient(refnum)) ? fEngine.PortSetDefaultMetadata(port, pretty_name) : -1;
CATCH_EXCEPTION_RETURN CATCH_EXCEPTION_RETURN
} }




+ 2
- 2
linux/alsa/JackAlsaDriver.cpp View File

@@ -494,9 +494,9 @@ void JackAlsaDriver::SetTimetAux(jack_time_t time)
fBeginDateUst = time; fBeginDateUst = time;
} }


int JackAlsaDriver::PortSetDeviceMetadata(jack_port_id_t port_id, const char* pretty_name)
int JackAlsaDriver::PortSetDefaultMetadata(jack_port_id_t port_id, const char* pretty_name)
{ {
return fEngine->PortSetDeviceMetadata(fClientControl.fRefNum, port_id, pretty_name);
return fEngine->PortSetDefaultMetadata(fClientControl.fRefNum, port_id, pretty_name);
} }


void JackAlsaDriver::WriteOutputAux(jack_nframes_t orig_nframes, snd_pcm_sframes_t contiguous, snd_pcm_sframes_t nwritten) void JackAlsaDriver::WriteOutputAux(jack_nframes_t orig_nframes, snd_pcm_sframes_t contiguous, snd_pcm_sframes_t nwritten)


+ 1
- 1
linux/alsa/JackAlsaDriver.h View File

@@ -94,7 +94,7 @@ class JackAlsaDriver : public JackAudioDriver
void WriteOutputAux(jack_nframes_t orig_nframes, snd_pcm_sframes_t contiguous, snd_pcm_sframes_t nwritten); void WriteOutputAux(jack_nframes_t orig_nframes, snd_pcm_sframes_t contiguous, snd_pcm_sframes_t nwritten);
void SetTimetAux(jack_time_t time); void SetTimetAux(jack_time_t time);


int PortSetDeviceMetadata(jack_port_id_t port_id, const char* pretty_name);
int PortSetDefaultMetadata(jack_port_id_t port_id, const char* pretty_name);


// JACK API emulation for the midi driver // JACK API emulation for the midi driver
int is_realtime() const; int is_realtime() const;


+ 2
- 2
linux/alsa/alsa_midi_impl.h View File

@@ -37,7 +37,7 @@ extern "C"
int JACK_port_unregister(jack_client_t *, jack_port_t*); int JACK_port_unregister(jack_client_t *, jack_port_t*);
void* JACK_port_get_buffer(jack_port_t*, jack_nframes_t); void* JACK_port_get_buffer(jack_port_t*, jack_nframes_t);
int JACK_port_set_alias(jack_port_t* port, const char* name); int JACK_port_set_alias(jack_port_t* port, const char* name);
int JACK_port_set_device_metadata(jack_port_t* port, const char* pretty_name);
int jack_port_set_default_metadata(jack_port_t* port, const char* pretty_name);


jack_nframes_t JACK_get_sample_rate(jack_client_t *); jack_nframes_t JACK_get_sample_rate(jack_client_t *);
jack_nframes_t JACK_frame_time(jack_client_t *); jack_nframes_t JACK_frame_time(jack_client_t *);
@@ -50,7 +50,7 @@ extern "C"
#define jack_port_unregister JACK_port_unregister #define jack_port_unregister JACK_port_unregister
#define jack_port_get_buffer JACK_port_get_buffer #define jack_port_get_buffer JACK_port_get_buffer
#define jack_port_set_alias JACK_port_set_alias #define jack_port_set_alias JACK_port_set_alias
#define jack_port_set_device_metadata JACK_port_set_device_metadata
#define jack_port_set_default_metadata jack_port_set_default_metadata


#define jack_get_sample_rate JACK_get_sample_rate #define jack_get_sample_rate JACK_get_sample_rate
#define jack_frame_time JACK_frame_time #define jack_frame_time JACK_frame_time


+ 2
- 2
linux/alsa/alsa_midi_jackmp.cpp View File

@@ -71,10 +71,10 @@ int JACK_port_set_alias(jack_port_t *port, const char* name)
return real->driver->port_set_alias(real->port_id, name); return real->driver->port_set_alias(real->port_id, name);
} }


int JACK_port_set_device_metadata(jack_port_t* port, const char* pretty_name)
int jack_port_set_default_metadata(jack_port_t* port, const char* pretty_name)
{ {
fake_port_t* real = (fake_port_t*)port; fake_port_t* real = (fake_port_t*)port;
return real->driver->PortSetDeviceMetadata(real->port_id, pretty_name);
return real->driver->PortSetDefaultMetadata(real->port_id, pretty_name);
} }


jack_nframes_t JACK_get_sample_rate(jack_client_t *client) jack_nframes_t JACK_get_sample_rate(jack_client_t *client)


+ 1
- 1
linux/alsa/alsa_rawmidi.c View File

@@ -440,7 +440,7 @@ inline int midi_port_open_jack(alsa_rawmidi_t *midi, midi_port_t *port, int type


if (port->jack) { if (port->jack) {
jack_port_set_alias(port->jack, alias); jack_port_set_alias(port->jack, alias);
jack_port_set_device_metadata(port->jack, port->device_name);
jack_port_set_default_metadata(port->jack, port->device_name);
} }


return port->jack == NULL; return port->jack == NULL;


+ 2
- 2
linux/alsa/alsa_seqmidi.c View File

@@ -521,7 +521,7 @@ port_t* port_create(alsa_seqmidi_t *self, int type, snd_seq_addr_t addr, const s
goto failed; goto failed;


jack_port_set_alias (port->jack_port, port->name); jack_port_set_alias (port->jack_port, port->name);
jack_port_set_device_metadata (port->jack_port, device_name);
jack_port_set_default_metadata (port->jack_port, device_name);


/* generate an alias */ /* generate an alias */


@@ -534,7 +534,7 @@ port_t* port_create(alsa_seqmidi_t *self, int type, snd_seq_addr_t addr, const s
*c = '-'; *c = '-';


jack_port_set_alias (port->jack_port, port->name); jack_port_set_alias (port->jack_port, port->name);
jack_port_set_device_metadata (port->jack_port, device_name);
jack_port_set_default_metadata (port->jack_port, device_name);


if (type == PORT_INPUT) if (type == PORT_INPUT)
err = alsa_connect_from(self, port->remote.client, port->remote.port); err = alsa_connect_from(self, port->remote.client, port->remote.port);


+ 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->PortSetDeviceMetadata(fClientControl.fRefNum, index,
fEngine->PortSetDefaultMetadata(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->PortSetDeviceMetadata(fClientControl.fRefNum, index,
fEngine->PortSetDefaultMetadata(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->PortSetDeviceMetadata(fClientControl.fRefNum, index,
fEngine->PortSetDefaultMetadata(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->PortSetDeviceMetadata(fClientControl.fRefNum, index,
fEngine->PortSetDefaultMetadata(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->PortSetDeviceMetadata(fClientControl.fRefNum, index,
fEngine->PortSetDefaultMetadata(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->PortSetDeviceMetadata(fClientControl.fRefNum, index,
fEngine->PortSetDefaultMetadata(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->PortSetDeviceMetadata(fClientControl.fRefNum, index,
fEngine->PortSetDefaultMetadata(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->PortSetDeviceMetadata(fClientControl.fRefNum, index,
fEngine->PortSetDefaultMetadata(fClientControl.fRefNum, index,
output_port->GetDeviceName()); output_port->GetDeviceName());
fPlaybackPortList[i] = index; fPlaybackPortList[i] = index;
} }


Write Preview
Loading…
Cancel
Save