VirtualBox

Changeset 73161 in vbox for trunk/src/VBox/Devices


Ignore:
Timestamp:
Jul 16, 2018 4:24:17 PM (7 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
123763
Message:

Audio/ALSA: Re-ordered / cleaned up stubs and mangling. No new functions.

Location:
trunk/src/VBox/Devices/Audio
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Devices/Audio/alsa_mangling.h

    r73160 r73161  
    2323#define ALSA_MANGLER(symbol) VBox_##symbol
    2424
     25#define snd_lib_error_set_handler               ALSA_MANGLER(snd_lib_error_set_handler)
     26#define snd_strerror                            ALSA_MANGLER(snd_strerror)
     27
    2528#define snd_device_name_hint                    ALSA_MANGLER(snd_device_name_hint)
    2629#define snd_device_name_get_hint                ALSA_MANGLER(snd_device_name_get_hint)
    2730#define snd_device_name_free_hint               ALSA_MANGLER(snd_device_name_free_hint)
    2831
    29 #define snd_pcm_hw_params_any                   ALSA_MANGLER(snd_pcm_hw_params_any)
     32#define snd_pcm_avail_update                    ALSA_MANGLER(snd_pcm_avail_update)
    3033#define snd_pcm_close                           ALSA_MANGLER(snd_pcm_close)
    3134#define snd_pcm_delay                           ALSA_MANGLER(snd_pcm_delay)
    3235#define snd_pcm_drain                           ALSA_MANGLER(snd_pcm_drain)
    33 #define snd_pcm_avail_update                    ALSA_MANGLER(snd_pcm_avail_update)
     36#define snd_pcm_drop                            ALSA_MANGLER(snd_pcm_drop)
    3437#define snd_pcm_nonblock                        ALSA_MANGLER(snd_pcm_nonblock)
    35 #define snd_pcm_hw_params_set_channels_near     ALSA_MANGLER(snd_pcm_hw_params_set_channels_near)
    36 #define snd_pcm_hw_params_set_period_time_near  ALSA_MANGLER(snd_pcm_hw_params_set_period_time_near)
     38#define snd_pcm_open                            ALSA_MANGLER(snd_pcm_open)
    3739#define snd_pcm_prepare                         ALSA_MANGLER(snd_pcm_prepare)
    38 #define snd_pcm_sw_params_sizeof                ALSA_MANGLER(snd_pcm_sw_params_sizeof)
    39 #define snd_pcm_hw_params_set_period_size_near  ALSA_MANGLER(snd_pcm_hw_params_set_period_size_near)
    40 #define snd_pcm_hw_params_get_period_size       ALSA_MANGLER(snd_pcm_hw_params_get_period_size)
     40#define snd_pcm_readi                           ALSA_MANGLER(snd_pcm_readi)
     41#define snd_pcm_resume                          ALSA_MANGLER(snd_pcm_resume)
     42#define snd_pcm_start                           ALSA_MANGLER(snd_pcm_start)
     43#define snd_pcm_state                           ALSA_MANGLER(snd_pcm_state)
     44#define snd_pcm_writei                          ALSA_MANGLER(snd_pcm_writei)
     45
    4146#define snd_pcm_hw_params                       ALSA_MANGLER(snd_pcm_hw_params)
     47#define snd_pcm_hw_params_any                   ALSA_MANGLER(snd_pcm_hw_params_any)
    4248#define snd_pcm_hw_params_sizeof                ALSA_MANGLER(snd_pcm_hw_params_sizeof)
    43 #define snd_pcm_state                           ALSA_MANGLER(snd_pcm_state)
    44 #define snd_pcm_open                            ALSA_MANGLER(snd_pcm_open)
    45 #define snd_lib_error_set_handler               ALSA_MANGLER(snd_lib_error_set_handler)
    46 #define snd_pcm_sw_params                       ALSA_MANGLER(snd_pcm_sw_params)
     49#define snd_pcm_hw_params_get_buffer_size       ALSA_MANGLER(snd_pcm_hw_params_get_buffer_size)
    4750#define snd_pcm_hw_params_get_period_size_min   ALSA_MANGLER(snd_pcm_hw_params_get_period_size_min)
    48 #define snd_pcm_writei                          ALSA_MANGLER(snd_pcm_writei)
    49 #define snd_pcm_readi                           ALSA_MANGLER(snd_pcm_readi)
    50 #define snd_strerror                            ALSA_MANGLER(snd_strerror)
    51 #define snd_pcm_start                           ALSA_MANGLER(snd_pcm_start)
    52 #define snd_pcm_drop                            ALSA_MANGLER(snd_pcm_drop)
    53 #define snd_pcm_resume                          ALSA_MANGLER(snd_pcm_resume)
    54 #define snd_pcm_hw_params_get_buffer_size       ALSA_MANGLER(snd_pcm_hw_params_get_buffer_size)
    5551#define snd_pcm_hw_params_set_rate_near         ALSA_MANGLER(snd_pcm_hw_params_set_rate_near)
    5652#define snd_pcm_hw_params_set_access            ALSA_MANGLER(snd_pcm_hw_params_set_access)
    … …  
    5854#define snd_pcm_hw_params_set_buffer_size_near  ALSA_MANGLER(snd_pcm_hw_params_set_buffer_size_near)
    5955#define snd_pcm_hw_params_get_buffer_size_min   ALSA_MANGLER(snd_pcm_hw_params_get_buffer_size_min)
     56#define snd_pcm_hw_params_set_channels_near     ALSA_MANGLER(snd_pcm_hw_params_set_channels_near)
    6057#define snd_pcm_hw_params_set_format            ALSA_MANGLER(snd_pcm_hw_params_set_format)
     58#define snd_pcm_hw_params_get_period_size       ALSA_MANGLER(snd_pcm_hw_params_get_period_size)
     59#define snd_pcm_hw_params_set_period_size_near  ALSA_MANGLER(snd_pcm_hw_params_set_period_size_near)
     60#define snd_pcm_hw_params_set_period_time_near  ALSA_MANGLER(snd_pcm_hw_params_set_period_time_near)
     61
     62#define snd_pcm_sw_params                       ALSA_MANGLER(snd_pcm_sw_params)
    6163#define snd_pcm_sw_params_current               ALSA_MANGLER(snd_pcm_sw_params_current)
    6264#define snd_pcm_sw_params_set_start_threshold   ALSA_MANGLER(snd_pcm_sw_params_set_start_threshold)
    6365#define snd_pcm_sw_params_set_avail_min         ALSA_MANGLER(snd_pcm_sw_params_set_avail_min)
     66#define snd_pcm_sw_params_sizeof                ALSA_MANGLER(snd_pcm_sw_params_sizeof)
    6467
    6568#endif /* !AUDIO_ALSA_MANGLING_H */

  • trunk/src/VBox/Devices/Audio/alsa_stubs.c

    r73160 r73161  
    3636    }
    3737
     38PROXY_STUB(snd_lib_error_set_handler, int, (snd_lib_error_handler_t handler),
     39           (handler))
     40PROXY_STUB(snd_strerror, const char *, (int errnum), (errnum))
     41
    3842PROXY_STUB(snd_device_name_hint, int,
    3943           (int card, const char *iface, void ***hints),
    … …  
    4650           (hint, id))
    4751
     52/*
     53 * PCM
     54 */
     55
     56PROXY_STUB(snd_pcm_avail_update, snd_pcm_sframes_t, (snd_pcm_t *pcm),
     57           (pcm))
     58PROXY_STUB(snd_pcm_close, int, (snd_pcm_t *pcm), (pcm))
     59PROXY_STUB(snd_pcm_delay, int, (snd_pcm_t *pcm, snd_pcm_sframes_t *frames),
     60           (pcm, frames))
     61PROXY_STUB(snd_pcm_nonblock, int, (snd_pcm_t *pcm, int *onoff),
     62           (pcm, onoff))
     63PROXY_STUB(snd_pcm_drain, int, (snd_pcm_t *pcm),
     64           (pcm))
     65PROXY_STUB(snd_pcm_drop, int, (snd_pcm_t *pcm), (pcm))
     66PROXY_STUB(snd_pcm_open, int,
     67           (snd_pcm_t **pcm, const char *name, snd_pcm_stream_t stream, int mode),
     68           (pcm, name, stream, mode))
     69PROXY_STUB(snd_pcm_prepare, int, (snd_pcm_t *pcm), (pcm))
     70PROXY_STUB(snd_pcm_readi, snd_pcm_sframes_t,
     71           (snd_pcm_t *pcm, void *buffer, snd_pcm_uframes_t size),
     72           (pcm, buffer, size))
     73PROXY_STUB(snd_pcm_resume, int, (snd_pcm_t *pcm), (pcm))
     74PROXY_STUB(snd_pcm_state, snd_pcm_state_t, (snd_pcm_t *pcm), (pcm))
     75PROXY_STUB(snd_pcm_writei, snd_pcm_sframes_t,
     76           (snd_pcm_t *pcm, const void *buffer, snd_pcm_uframes_t size),
     77           (pcm, buffer, size))
     78PROXY_STUB(snd_pcm_start, int, (snd_pcm_t *pcm), (pcm))
     79
     80/*
     81 * HW
     82 */
     83
     84PROXY_STUB(snd_pcm_hw_params, int,
     85           (snd_pcm_t *pcm, snd_pcm_hw_params_t *params),
     86           (pcm, params))
    4887PROXY_STUB(snd_pcm_hw_params_any, int,
    4988           (snd_pcm_t *pcm, snd_pcm_hw_params_t *params),
    5089           (pcm, params))
    51 PROXY_STUB(snd_pcm_close, int, (snd_pcm_t *pcm), (pcm))
    52 PROXY_STUB(snd_pcm_avail_update, snd_pcm_sframes_t, (snd_pcm_t *pcm),
    53            (pcm))
    54 PROXY_STUB(snd_pcm_nonblock, int, (snd_pcm_t *pcm, int *onoff),
    55            (pcm, onoff))
    56 PROXY_STUB(snd_pcm_delay, int, (snd_pcm_t *pcm, snd_pcm_sframes_t *frames),
    57            (pcm, frames))
    58 PROXY_STUB(snd_pcm_drain, int, (snd_pcm_t *pcm),
    59            (pcm))
    60 PROXY_STUB(snd_pcm_hw_params_set_channels_near, int,
    61            (snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val),
    62            (pcm, params, val))
    63 PROXY_STUB(snd_pcm_hw_params_set_period_time_near, int,
    64            (snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir),
    65            (pcm, params, val, dir))
    66 PROXY_STUB(snd_pcm_prepare, int, (snd_pcm_t *pcm), (pcm))
    67 PROXY_STUB(snd_pcm_sw_params_sizeof, size_t, (void), ())
    68 PROXY_STUB(snd_pcm_hw_params_set_period_size_near, int,
    69            (snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val, int *dir),
    70            (pcm, params, val, dir))
     90PROXY_STUB(snd_pcm_hw_params_get_buffer_size, int,
     91           (const snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val),
     92           (params, val))
     93PROXY_STUB(snd_pcm_hw_params_get_buffer_size_min, int,
     94           (const snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val),
     95           (params, val))
    7196PROXY_STUB(snd_pcm_hw_params_get_period_size, int,
    7297           (const snd_pcm_hw_params_t *params, snd_pcm_uframes_t *frames, int *dir),
    7398           (params, frames, dir))
    74 PROXY_STUB(snd_pcm_hw_params, int,
    75            (snd_pcm_t *pcm, snd_pcm_hw_params_t *params),
    76            (pcm, params))
    77 PROXY_STUB(snd_pcm_hw_params_sizeof, size_t, (void), ())
    78 PROXY_STUB(snd_pcm_state, snd_pcm_state_t, (snd_pcm_t *pcm), (pcm))
    79 PROXY_STUB(snd_pcm_open, int,
    80            (snd_pcm_t **pcm, const char *name, snd_pcm_stream_t stream, int mode),
    81            (pcm, name, stream, mode))
    82 PROXY_STUB(snd_lib_error_set_handler, int, (snd_lib_error_handler_t handler),
    83            (handler))
    84 PROXY_STUB(snd_pcm_sw_params, int,
    85            (snd_pcm_t *pcm, snd_pcm_sw_params_t *params),
    86            (pcm, params))
    8799PROXY_STUB(snd_pcm_hw_params_get_period_size_min, int,
    88100           (const snd_pcm_hw_params_t *params, snd_pcm_uframes_t *frames, int *dir),
    89101           (params, frames, dir))
    90 PROXY_STUB(snd_pcm_writei, snd_pcm_sframes_t,
    91            (snd_pcm_t *pcm, const void *buffer, snd_pcm_uframes_t size),
    92            (pcm, buffer, size))
    93 PROXY_STUB(snd_pcm_readi, snd_pcm_sframes_t,
    94            (snd_pcm_t *pcm, void *buffer, snd_pcm_uframes_t size),
    95            (pcm, buffer, size))
    96 PROXY_STUB(snd_strerror, const char *, (int errnum), (errnum))
    97 PROXY_STUB(snd_pcm_start, int, (snd_pcm_t *pcm), (pcm))
    98 PROXY_STUB(snd_pcm_drop, int, (snd_pcm_t *pcm), (pcm))
    99 PROXY_STUB(snd_pcm_resume, int, (snd_pcm_t *pcm), (pcm))
    100 PROXY_STUB(snd_pcm_hw_params_get_buffer_size, int,
    101            (const snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val),
    102            (params, val))
    103102PROXY_STUB(snd_pcm_hw_params_set_rate_near, int,
    104103           (snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir),
    … …  
    113112           (snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val),
    114113           (pcm, params, val))
    115 PROXY_STUB(snd_pcm_hw_params_get_buffer_size_min, int,
    116            (const snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val),
    117            (params, val))
     114PROXY_STUB(snd_pcm_hw_params_set_channels_near, int,
     115           (snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val),
     116           (pcm, params, val))
     117PROXY_STUB(snd_pcm_hw_params_set_period_size_near, int,
     118           (snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val, int *dir),
     119           (pcm, params, val, dir))
     120PROXY_STUB(snd_pcm_hw_params_set_period_time_near, int,
     121           (snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir),
     122           (pcm, params, val, dir))
     123PROXY_STUB(snd_pcm_hw_params_sizeof, size_t, (void), ())
    118124PROXY_STUB(snd_pcm_hw_params_set_format, int,
    119125           (snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_format_t val),
    120126           (pcm, params, val))
     127
     128/*
     129 * SW
     130 */
     131
     132PROXY_STUB(snd_pcm_sw_params, int,
     133           (snd_pcm_t *pcm, snd_pcm_sw_params_t *params),
     134           (pcm, params))
    121135PROXY_STUB(snd_pcm_sw_params_current, int,
    122136           (snd_pcm_t *pcm, snd_pcm_sw_params_t *params),
    123137           (pcm, params))
     138PROXY_STUB(snd_pcm_sw_params_set_avail_min, int,
     139           (snd_pcm_t *pcm, snd_pcm_sw_params_t *params, snd_pcm_uframes_t val),
     140           (pcm, params, val))
    124141PROXY_STUB(snd_pcm_sw_params_set_start_threshold, int,
    125142           (snd_pcm_t *pcm, snd_pcm_sw_params_t *params, snd_pcm_uframes_t val),
    126143           (pcm, params, val))
    127 PROXY_STUB(snd_pcm_sw_params_set_avail_min, int,
    128            (snd_pcm_t *pcm, snd_pcm_sw_params_t *params, snd_pcm_uframes_t val),
    129            (pcm, params, val))
     144PROXY_STUB(snd_pcm_sw_params_sizeof, size_t, (void), ())
    130145
    131146typedef struct
    … …  
    138153static SHARED_FUNC SharedFuncs[] =
    139154{
     155    ELEMENT(snd_lib_error_set_handler),
     156    ELEMENT(snd_strerror),
     157
    140158    ELEMENT(snd_device_name_hint),
    141159    ELEMENT(snd_device_name_get_hint),
    142160    ELEMENT(snd_device_name_free_hint),
    143161
    144     ELEMENT(snd_pcm_hw_params_any),
     162    ELEMENT(snd_pcm_avail_update),
    145163    ELEMENT(snd_pcm_close),
    146164    ELEMENT(snd_pcm_delay),
    147165    ELEMENT(snd_pcm_drain),
    148     ELEMENT(snd_pcm_avail_update),
     166    ELEMENT(snd_pcm_drop),
    149167    ELEMENT(snd_pcm_nonblock),
     168    ELEMENT(snd_pcm_open),
     169    ELEMENT(snd_pcm_prepare),
     170    ELEMENT(snd_pcm_resume),
     171    ELEMENT(snd_pcm_state),
     172
     173    ELEMENT(snd_pcm_readi),
     174    ELEMENT(snd_pcm_start),
     175    ELEMENT(snd_pcm_writei),
     176
     177    ELEMENT(snd_pcm_hw_params),
     178    ELEMENT(snd_pcm_hw_params_any),
     179    ELEMENT(snd_pcm_hw_params_sizeof),
     180    ELEMENT(snd_pcm_hw_params_get_buffer_size),
     181    ELEMENT(snd_pcm_hw_params_get_buffer_size_min),
     182    ELEMENT(snd_pcm_hw_params_get_period_size_min),
     183    ELEMENT(snd_pcm_hw_params_set_access),
     184    ELEMENT(snd_pcm_hw_params_set_buffer_size_near),
     185    ELEMENT(snd_pcm_hw_params_set_buffer_time_near),
    150186    ELEMENT(snd_pcm_hw_params_set_channels_near),
     187    ELEMENT(snd_pcm_hw_params_set_format),
     188    ELEMENT(snd_pcm_hw_params_get_period_size),
     189    ELEMENT(snd_pcm_hw_params_set_period_size_near),
    151190    ELEMENT(snd_pcm_hw_params_set_period_time_near),
    152     ELEMENT(snd_pcm_prepare),
    153     ELEMENT(snd_pcm_sw_params_sizeof),
    154     ELEMENT(snd_pcm_hw_params_set_period_size_near),
    155     ELEMENT(snd_pcm_hw_params_get_period_size),
    156     ELEMENT(snd_pcm_hw_params),
    157     ELEMENT(snd_pcm_hw_params_sizeof),
    158     ELEMENT(snd_pcm_state),
    159     ELEMENT(snd_pcm_open),
    160     ELEMENT(snd_lib_error_set_handler),
     191    ELEMENT(snd_pcm_hw_params_set_rate_near),
     192
    161193    ELEMENT(snd_pcm_sw_params),
    162     ELEMENT(snd_pcm_hw_params_get_period_size_min),
    163     ELEMENT(snd_pcm_writei),
    164     ELEMENT(snd_pcm_readi),
    165     ELEMENT(snd_strerror),
    166     ELEMENT(snd_pcm_start),
    167     ELEMENT(snd_pcm_drop),
    168     ELEMENT(snd_pcm_resume),
    169     ELEMENT(snd_pcm_hw_params_get_buffer_size),
    170     ELEMENT(snd_pcm_hw_params_set_rate_near),
    171     ELEMENT(snd_pcm_hw_params_set_access),
    172     ELEMENT(snd_pcm_hw_params_set_buffer_time_near),
    173     ELEMENT(snd_pcm_hw_params_set_buffer_size_near),
    174     ELEMENT(snd_pcm_hw_params_get_buffer_size_min),
    175     ELEMENT(snd_pcm_hw_params_set_format),
    176194    ELEMENT(snd_pcm_sw_params_current),
    177195    ELEMENT(snd_pcm_sw_params_set_start_threshold),
    178     ELEMENT(snd_pcm_sw_params_set_avail_min)
     196    ELEMENT(snd_pcm_sw_params_set_avail_min),
     197    ELEMENT(snd_pcm_sw_params_sizeof),
    179198};
    180199#undef ELEMENT
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette