Changeset 1433ecda in mainline for uspace/srv/audio


Ignore:
Timestamp:
2018-04-04T15:42:37Z (8 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
2c4e1cc
Parents:
47b2d7e3
Message:

Fix cstyle: make ccheck-fix and commit only files where all the changes are good.

Location:
uspace/srv/audio/hound
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • uspace/srv/audio/hound/audio_data.h

    r47b2d7e3 r1433ecda  
    6767} audio_pipe_t;
    6868
    69 audio_data_t * audio_data_create(const void *data, size_t size,
     69audio_data_t *audio_data_create(const void *data, size_t size,
    7070    pcm_format_t format);
    7171void audio_data_addref(audio_data_t *adata);

  • uspace/srv/audio/hound/audio_device.c

    r47b2d7e3 r1433ecda  
    5454static errno_t device_source_connection_callback(audio_source_t *source, bool new);
    5555static void device_event_callback(cap_call_handle_t icall_handle, ipc_call_t *icall, void *arg);
    56 static errno_t device_check_format(audio_sink_t* sink);
     56static errno_t device_check_format(audio_sink_t *sink);
    5757static errno_t get_buffer(audio_device_t *dev);
    5858static errno_t release_buffer(audio_device_t *dev);
    … …  
    118118 *         capable of capturing audio.
    119119 */
    120 audio_source_t * audio_device_get_source(audio_device_t *dev)
     120audio_source_t *audio_device_get_source(audio_device_t *dev)
    121121{
    122122        assert(dev);
    … …  
    134134 *         capable of audio playback.
    135135 */
    136 audio_sink_t * audio_device_get_sink(audio_device_t *dev)
     136audio_sink_t *audio_device_get_sink(audio_device_t *dev)
    137137{
    138138        assert(dev);
    … …  
    153153 * connections.
    154154 */
    155 static errno_t device_sink_connection_callback(audio_sink_t* sink, bool new)
     155static errno_t device_sink_connection_callback(audio_sink_t *sink, bool new)
    156156{
    157157        assert(sink);
    … …  
    275275                cap_call_handle_t chandle = async_get_call(&call);
    276276                async_answer_0(chandle, EOK);
    277                 switch(IPC_GET_IMETHOD(call)) {
     277                switch (IPC_GET_IMETHOD(call)) {
    278278                case PCM_EVENT_FRAMES_PLAYED:
    279279                        getuptime(&time1);
    … …  
    327327 * @return Error code.
    328328 */
    329 static errno_t device_check_format(audio_sink_t* sink)
     329static errno_t device_check_format(audio_sink_t *sink)
    330330{
    331331        assert(sink);

  • uspace/srv/audio/hound/audio_device.h

    r47b2d7e3 r1433ecda  
    7171
    7272/** Linked list instance helper */
    73 static inline audio_device_t * audio_device_list_instance(link_t *l)
     73static inline audio_device_t *audio_device_list_instance(link_t *l)
    7474{
    7575        return l ? list_get_instance(l, audio_device_t, link) : NULL;
    … …  
    7878errno_t audio_device_init(audio_device_t *dev, service_id_t id, const char *name);
    7979void audio_device_fini(audio_device_t *dev);
    80 audio_source_t * audio_device_get_source(audio_device_t *dev);
    81 audio_sink_t * audio_device_get_sink(audio_device_t *dev);
     80audio_source_t *audio_device_get_source(audio_device_t *dev);
     81audio_sink_t *audio_device_get_sink(audio_device_t *dev);
    8282errno_t audio_device_recorded_data(audio_device_t *dev, void **base, size_t *size);
    8383errno_t audio_device_available_buffer(audio_device_t *dev, void **base, size_t *size);

  • uspace/srv/audio/hound/audio_sink.c

    r47b2d7e3 r1433ecda  
    134134 * @return Error code.
    135135 */
    136 void audio_sink_mix_inputs(audio_sink_t *sink, void* dest, size_t size)
     136void audio_sink_mix_inputs(audio_sink_t *sink, void *dest, size_t size)
    137137{
    138138        assert(sink);

  • uspace/srv/audio/hound/audio_sink.h

    r47b2d7e3 r1433ecda  
    7272 * @return pointer to a sink structure, NULL on failure.
    7373 */
    74 static inline audio_sink_t * audio_sink_list_instance(link_t *l)
     74static inline audio_sink_t *audio_sink_list_instance(link_t *l)
    7575{
    7676        return l ? list_get_instance(l, audio_sink_t, link) : NULL;
    … …  
    8484void audio_sink_fini(audio_sink_t *sink);
    8585errno_t audio_sink_set_format(audio_sink_t *sink, const pcm_format_t *format);
    86 void audio_sink_mix_inputs(audio_sink_t *sink, void* dest, size_t size);
     86void audio_sink_mix_inputs(audio_sink_t *sink, void *dest, size_t size);
    8787
    8888#endif

  • uspace/srv/audio/hound/audio_source.h

    r47b2d7e3 r1433ecda  
    6565 * @return pointer to a source structure, NULL on failure.
    6666 */
    67 static inline audio_source_t * audio_source_list_instance(link_t *l)
     67static inline audio_source_t *audio_source_list_instance(link_t *l)
    6868{
    6969        return l ? list_get_instance(l, audio_source_t, link) : NULL;

  • uspace/srv/audio/hound/connection.h

    r47b2d7e3 r1433ecda  
    6666 * @return pointer to a connection structure, NULL on failure.
    6767 */
    68 static inline connection_t * connection_from_source_list(link_t *l)
     68static inline connection_t *connection_from_source_list(link_t *l)
    6969{
    7070        return l ? list_get_instance(l, connection_t, source_link) : NULL;
    … …  
    7676 * @return pointer to a connection structure, NULL on failure.
    7777 */
    78 static inline connection_t * connection_from_hound_list(link_t *l)
     78static inline connection_t *connection_from_hound_list(link_t *l)
    7979{
    8080        return l ? list_get_instance(l, connection_t, hound_link) : NULL;

  • uspace/srv/audio/hound/hound.c

    r47b2d7e3 r1433ecda  
    111111}
    112112
    113 static errno_t hound_disconnect_internal(hound_t *hound, const char* source_name, const char* sink_name);
     113static errno_t hound_disconnect_internal(hound_t *hound, const char *source_name, const char *sink_name);
    114114
    115115/**
    … …  
    287287        if (ret != EOK) {
    288288                log_debug("Failed to initialize new audio device: %s",
    289                         str_error(ret));
     289                    str_error(ret));
    290290                free(dev);
    291291                return ret;
    … …  
    517517 * @return Error code.
    518518 */
    519 errno_t hound_connect(hound_t *hound, const char* source_name, const char* sink_name)
     519errno_t hound_connect(hound_t *hound, const char *source_name, const char *sink_name)
    520520{
    521521        assert(hound);
    … …  
    526526            audio_source_list_instance(list_first(&hound->sources));
    527527        if (str_cmp(source_name, "default") != 0)
    528             source = find_source_by_name(&hound->sources, source_name);
     528                source = find_source_by_name(&hound->sources, source_name);
    529529
    530530        audio_sink_t *sink =
    531531            audio_sink_list_instance(list_first(&hound->sinks));
    532532        if (str_cmp(sink_name, "default") != 0)
    533             sink = find_sink_by_name(&hound->sinks, sink_name);
     533                sink = find_sink_by_name(&hound->sinks, sink_name);
    534534
    535535        if (!source || !sink) {
    … …  
    556556 * @return Error code.
    557557 */
    558 errno_t hound_disconnect(hound_t *hound, const char* source_name, const char* sink_name)
     558errno_t hound_disconnect(hound_t *hound, const char *source_name, const char *sink_name)
    559559{
    560560        assert(hound);
    … …  
    574574 * This function has to be called with the list_guard lock held.
    575575 */
    576 static errno_t hound_disconnect_internal(hound_t *hound, const char* source_name,
    577     const char* sink_name)
     576static errno_t hound_disconnect_internal(hound_t *hound, const char *source_name,
     577    const char *sink_name)
    578578{
    579579        assert(hound);
    … …  
    585585                if (str_cmp(connection_source_name(conn), source_name) == 0 ||
    586586                    str_cmp(connection_sink_name(conn), sink_name) == 0) {
    587                     log_debug("Removing %s -> %s", connection_source_name(conn),
    588                         connection_sink_name(conn));
    589                     list_remove(it);
    590                     connection_destroy(conn);
     587                        log_debug("Removing %s -> %s", connection_source_name(conn),
     588                            connection_sink_name(conn));
     589                        list_remove(it);
     590                        connection_destroy(conn);
    591591                }
    592592        }
Note: See TracChangeset for help on using the changeset viewer.