Remove jack_port_tie() and jack_port_untie() from libjack.so; undeprecate them in libjackserver.so

This commit is contained in:
Nedko Arnaudov 2023-08-26 19:35:45 +03:00
parent 2da0ec96f0
commit d9ead0da7a
4 changed files with 45 additions and 22 deletions

View File

@ -138,8 +138,8 @@ extern "C"
LIB_EXPORT const char* * jack_port_get_connections(const jack_port_t *port);
LIB_EXPORT const char* * jack_port_get_all_connections(const jack_client_t *client,
const jack_port_t *port);
LIB_EXPORT int jack_port_tie(jack_port_t *src, jack_port_t *dst);
LIB_EXPORT int jack_port_untie(jack_port_t *port);
int jack_port_tie(jack_port_t *src, jack_port_t *dst);
int jack_port_untie(jack_port_t *port);
// Old latency API
LIB_EXPORT jack_nframes_t jack_port_get_latency(jack_port_t *port);
@ -490,7 +490,7 @@ LIB_EXPORT int jack_port_connected_to(const jack_port_t* port, const char* port_
}
}
LIB_EXPORT int jack_port_tie(jack_port_t* src, jack_port_t* dst)
SERVER_EXPORT int jack_port_tie(jack_port_t* src, jack_port_t* dst)
{
JackGlobals::CheckContext("jack_port_tie");
@ -515,7 +515,7 @@ LIB_EXPORT int jack_port_tie(jack_port_t* src, jack_port_t* dst)
}
}
LIB_EXPORT int jack_port_untie(jack_port_t* port)
SERVER_EXPORT int jack_port_untie(jack_port_t* port)
{
JackGlobals::CheckContext("jack_port_untie");

View File

@ -7,6 +7,7 @@
#ifndef JACKCTL_H__2EEDAD78_DF4C_4B26_83B7_4FF1A446A47E__INCLUDED
#define JACKCTL_H__2EEDAD78_DF4C_4B26_83B7_4FF1A446A47E__INCLUDED
#include "jack/types.h"
#include "jslist.h"
#include "JackCompilerDeps.h"
@ -245,6 +246,27 @@ jack_log(
const char *format,
...);
/**
* Tie two ports. This will make anything appearing on the playback port (input, sink)
* to appear as if sent from the capture port (output, source)
*
* @param port jack port to untie
*
* @return 0 on success, otherwise a non-zero error code
*/
SERVER_EXPORT
int jack_port_tie (jack_port_t *src, jack_port_t *dst);
/**
* Untie two ports previously tied by call to ::jack_port_tie().
*
* @param port jack port to untie
*
* @return 0 on success, otherwise a non-zero error code
*/
SERVER_EXPORT
int jack_port_untie (jack_port_t *port);
SERVER_EXPORT const JSList *
jackctl_server_get_internals_list(
jackctl_server *server_ptr);

View File

@ -615,6 +615,25 @@ jack_log(
const char *format,
...);
/**
* Tie two ports. This will make anything appearing on the playback port (input, sink)
* to appear as if sent from the capture port (output, source)
*
* @param port jack port to untie
*
* @return 0 on success, otherwise a non-zero error code
*/
int jack_port_tie (jack_port_t *src, jack_port_t *dst);
/**
* Untie two ports previously tied by call to ::jack_port_tie().
*
* @param port jack port to untie
*
* @return 0 on success, otherwise a non-zero error code
*/
int jack_port_untie (jack_port_t *port);
/**@}*/
#if 0

View File

@ -870,24 +870,6 @@ const char ** jack_port_get_connections (const jack_port_t *port) JACK_OPTIONAL_
const char ** jack_port_get_all_connections (const jack_client_t *client,
const jack_port_t *port) JACK_OPTIONAL_WEAK_EXPORT;
/**
*
* @deprecated This function will be removed from a future version
* of JACK. Do not use it. There is no replacement. It has
* turned out to serve essentially no purpose in real-life
* JACK clients.
*/
int jack_port_tie (jack_port_t *src, jack_port_t *dst) JACK_OPTIONAL_WEAK_DEPRECATED_EXPORT;
/**
*
* @deprecated This function will be removed from a future version
* of JACK. Do not use it. There is no replacement. It has
* turned out to serve essentially no purpose in real-life
* JACK clients.
*/
int jack_port_untie (jack_port_t *port) JACK_OPTIONAL_WEAK_DEPRECATED_EXPORT;
/**
* \bold THIS FUNCTION IS DEPRECATED AND SHOULD NOT BE USED IN
* NEW JACK CLIENTS