mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-03 09:01:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

monitor: fix copy and paste errors

Browse source 
Remove some leftover stuff from the spa_monitor

Spotted by: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
This commit is contained in:
Wim Taymans 2020-03-06 18:30:34 +01:00
parent 1b0ad00fb1
commit 7f086da39e
2 changed files with 4 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

18
spa/include/spa/monitor/utils.h
View file

@ -22,8 +22,8 @@
* DEALINGS IN THE SOFTWARE. * DEALINGS IN THE SOFTWARE.
*/ */
#ifndef SPA_NODE_UTILS_H #ifndef SPA_DEVICE_UTILS_H
#define SPA_NODE_UTILS_H #define SPA_DEVICE_UTILS_H
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -79,18 +79,6 @@ static inline int spa_device_enum_params_sync(struct spa_device *device,
return res; return res;
} }
#define spa_monitor_call(callbacks,method,version,...) \
({ \
int __res = 0; \
spa_callbacks_call_res(callbacks, struct spa_monitor_callbacks, \
__res, method, version, ##__VA_ARGS__); \
__res; \
})
#define spa_monitor_call_info(hook,i) spa_monitor_call(hook, info, 0, i)
#define spa_monitor_call_event(hook,e) spa_monitor_call(hook, event, 0, e)
#define spa_monitor_call_object_info(hook,id,i) spa_monitor_call(hook, object_info, 0, id, i)
#define spa_device_emit(hooks,method,version,...) \ #define spa_device_emit(hooks,method,version,...) \
spa_hook_list_call_simple(hooks, struct spa_device_events, \ spa_hook_list_call_simple(hooks, struct spa_device_events, \
method, version, ##__VA_ARGS__) method, version, ##__VA_ARGS__)
@ -104,4 +92,4 @@ static inline int spa_device_enum_params_sync(struct spa_device *device,
} /* extern "C" */ } /* extern "C" */
#endif #endif
#endif /* SPA_NODE_UTILS_H */ #endif /* SPA_DEVICE_UTILS_H */

2
spa/include/spa/support/plugin.h
View file

@ -139,7 +139,7 @@ struct spa_handle_factory {
* \param factory a spa_handle_factory * \param factory a spa_handle_factory
* \param handle a pointer to memory * \param handle a pointer to memory
* \param info extra handle specific information, usually obtained * \param info extra handle specific information, usually obtained
* from a spa_monitor. This can be used to configure the handle. * from a spa_device. This can be used to configure the handle.
* \param support support items * \param support support items
* \param n_support number of elements in \a support * \param n_support number of elements in \a support
* \return 0 on success * \return 0 on success