| control.h | | control.h | |
|---|
| | | | |
| skipping to change at line 51 | | skipping to change at line 51 | |
|---|
| JackParamInt = 1, /**< @brief value type is a signed i
nteger */ | | JackParamInt = 1, /**< @brief value type is a signed i
nteger */ | |
| JackParamUInt, /**< @brief value type is an
unsigned integer */ | | JackParamUInt, /**< @brief value type is an
unsigned integer */ | |
| JackParamChar, /**< @brief value type is a
char */ | | JackParamChar, /**< @brief value type is a
char */ | |
| JackParamString, /**< @brief value type is a string w
ith max size of ::JACK_PARAM_STRING_MAX+1 chars */ | | JackParamString, /**< @brief value type is a string w
ith max size of ::JACK_PARAM_STRING_MAX+1 chars */ | |
| JackParamBool, /**< @brief value type is a
boolean */ | | JackParamBool, /**< @brief value type is a
boolean */ | |
| } jackctl_param_type_t; | | } jackctl_param_type_t; | |
| | | | |
| /** @brief Max value that jackctl_param_type_t type can have */ | | /** @brief Max value that jackctl_param_type_t type can have */ | |
| #define JACK_PARAM_MAX (JackParamBool + 1) | | #define JACK_PARAM_MAX (JackParamBool + 1) | |
| | | | |
|
| /** @brief Max length of string parameter value, excluding terminating nul | | /** @brief Max length of string parameter value, excluding terminating null | |
| char */ | | char */ | |
| #define JACK_PARAM_STRING_MAX 63 | | #define JACK_PARAM_STRING_MAX 127 | |
| | | | |
| /** @brief Type for parameter value */ | | /** @brief Type for parameter value */ | |
| /* intentionally similar to jack_driver_param_value_t */ | | /* intentionally similar to jack_driver_param_value_t */ | |
| union jackctl_parameter_value | | union jackctl_parameter_value | |
| { | | { | |
| uint32_t ui; /**< @brief member used for
::JackParamUInt */ | | uint32_t ui; /**< @brief member used for
::JackParamUInt */ | |
| int32_t i; /**< @brief member used for
::JackParamInt */ | | int32_t i; /**< @brief member used for
::JackParamInt */ | |
| char c; /**< @brief member u
sed for ::JackParamChar */ | | char c; /**< @brief member u
sed for ::JackParamChar */ | |
| char str[JACK_PARAM_STRING_MAX + 1]; /**< @brief member used for ::Jack
ParamString */ | | char str[JACK_PARAM_STRING_MAX + 1]; /**< @brief member used for ::Jack
ParamString */ | |
| bool b; /**< @brief member used for ::JackPa
ramBool */ | | bool b; /**< @brief member used for ::JackPa
ramBool */ | |
| | | | |
| End of changes. 1 change blocks. |
|---|
| 3 lines changed or deleted | | 3 lines changed or added | |
|---|
|
| jack.h | | jack.h | |
|---|
| | | | |
| skipping to change at line 735 | | skipping to change at line 735 | |
|---|
| * | | * | |
| * @see jack_port_name_size() | | * @see jack_port_name_size() | |
| */ | | */ | |
| int jack_port_connected_to (const jack_port_t *port, | | int jack_port_connected_to (const jack_port_t *port, | |
| const char *port_name) JACK_OPTIONAL_WEAK_EXPOR
T; | | const char *port_name) JACK_OPTIONAL_WEAK_EXPOR
T; | |
| | | | |
| /** | | /** | |
| * @return a null-terminated array of full port names to which the @a | | * @return a null-terminated array of full port names to which the @a | |
| * port is connected. If none, returns NULL. | | * port is connected. If none, returns NULL. | |
| * | | * | |
|
| * The caller is responsible for calling free(3) on any non-NULL | | * The caller is responsible for calling jack_free(3) on any non-NULL | |
| * returned value. | | * returned value. | |
| * | | * | |
| * @param port locally owned jack_port_t pointer. | | * @param port locally owned jack_port_t pointer. | |
| * | | * | |
| * @see jack_port_name_size(), jack_port_get_all_connections() | | * @see jack_port_name_size(), jack_port_get_all_connections() | |
| */ | | */ | |
| const char ** jack_port_get_connections (const jack_port_t *port) JACK_OPTI
ONAL_WEAK_EXPORT; | | const char ** jack_port_get_connections (const jack_port_t *port) JACK_OPTI
ONAL_WEAK_EXPORT; | |
| | | | |
| /** | | /** | |
| * @return a null-terminated array of full port names to which the @a | | * @return a null-terminated array of full port names to which the @a | |
| * port is connected. If none, returns NULL. | | * port is connected. If none, returns NULL. | |
| * | | * | |
|
| * The caller is responsible for calling free(3) on any non-NULL | | * The caller is responsible for calling jack_free(3) on any non-NULL | |
| * returned value. | | * returned value. | |
| * | | * | |
| * This differs from jack_port_get_connections() in two important | | * This differs from jack_port_get_connections() in two important | |
| * respects: | | * respects: | |
| * | | * | |
| * 1) You may not call this function from code that is | | * 1) You may not call this function from code that is | |
| * executed in response to a JACK event. For example, | | * executed in response to a JACK event. For example, | |
| * you cannot use it in a GraphReordered handler. | | * you cannot use it in a GraphReordered handler. | |
| * | | * | |
| * 2) You need not be the owner of the port to get information | | * 2) You need not be the owner of the port to get information | |
| | | | |
| skipping to change at line 999 | | skipping to change at line 999 | |
|---|
| * @param port_name_pattern A regular expression used to select | | * @param port_name_pattern A regular expression used to select | |
| * ports by name. If NULL or of zero length, no selection based | | * ports by name. If NULL or of zero length, no selection based | |
| * on name will be carried out. | | * on name will be carried out. | |
| * @param type_name_pattern A regular expression used to select | | * @param type_name_pattern A regular expression used to select | |
| * ports by type. If NULL or of zero length, no selection based | | * ports by type. If NULL or of zero length, no selection based | |
| * on type will be carried out. | | * on type will be carried out. | |
| * @param flags A value used to select ports by their flags. | | * @param flags A value used to select ports by their flags. | |
| * If zero, no selection based on flags will be carried out. | | * If zero, no selection based on flags will be carried out. | |
| * | | * | |
| * @return a NULL-terminated array of ports that match the specified | | * @return a NULL-terminated array of ports that match the specified | |
|
| * arguments. The caller is responsible for calling free(3) any | | * arguments. The caller is responsible for calling jack_free(3) any | |
| * non-NULL returned value. | | * non-NULL returned value. | |
| * | | * | |
| * @see jack_port_name_size(), jack_port_type_size() | | * @see jack_port_name_size(), jack_port_type_size() | |
| */ | | */ | |
| const char ** jack_get_ports (jack_client_t *, | | const char ** jack_get_ports (jack_client_t *, | |
| const char *port_name_pattern, | | const char *port_name_pattern, | |
| const char *type_name_pattern, | | const char *type_name_pattern, | |
| unsigned long flags) JACK_OPTIONAL_WEAK_EXPOR
T; | | unsigned long flags) JACK_OPTIONAL_WEAK_EXPOR
T; | |
| | | | |
| /** | | /** | |
| | | | |
| End of changes. 3 change blocks. |
|---|
| 3 lines changed or deleted | | 3 lines changed or added | |
|---|
|