Changeset 5a6cc679 in mainline for uspace/app/wavplay/main.c


Ignore:
Timestamp:
2018-01-31T02:21:24Z (8 years ago)
Author:
Jenda <jenda.jzqk73@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
a0a9cc2
Parents:
132ab5d1
Message:

Merge commit '50f19b7ee8e94570b5c63896736c4eb49cfa18db' into forwardport

Not all ints are converted to errno_t in xhci tree yet, however it compiles and works :)

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/app/wavplay/main.c

    r132ab5d1 r5a6cc679  
    5757 * @return Error code.
    5858 */
    59 static int hplay_ctx(hound_context_t *ctx, const char *filename)
     59static errno_t hplay_ctx(hound_context_t *ctx, const char *filename)
    6060{
    6161        printf("Hound context playback: %s\n", filename);
    … …  
    7676        pcm_format_t format;
    7777        const char *error;
    78         int ret = wav_parse_header(&header, NULL, NULL, &format.channels,
     78        errno_t ret = wav_parse_header(&header, NULL, NULL, &format.channels,
    7979            &format.sampling_rate, &format.sample_format, &error);
    8080        if (ret != EOK) {
    … …  
    118118 * @return Error code
    119119 */
    120 static int hplay(const char *filename)
     120static errno_t hplay(const char *filename)
    121121{
    122122        printf("Hound playback: %s\n", filename);
    … …  
    137137        pcm_format_t format;
    138138        const char *error;
    139         int ret = wav_parse_header(&header, NULL, NULL, &format.channels,
     139        errno_t ret = wav_parse_header(&header, NULL, NULL, &format.channels,
    140140            &format.sampling_rate, &format.sample_format, &error);
    141141        if (ret != EOK) {
    … …  
    197197 * @return Error code.
    198198 */
    199 static int play_wrapper(void *arg)
     199static errno_t play_wrapper(void *arg)
    200200{
    201201        assert(arg);
    202202        fib_play_t *p = arg;
    203         const int ret = hplay_ctx(p->ctx, p->file);
     203        const errno_t ret = hplay_ctx(p->ctx, p->file);
    204204        atomic_dec(p->count);
    205205        free(arg);
    … …  
    289289                        return 1;
    290290                }
    291                 const int ret = hound_context_connect_target(hound_ctx,
     291                const errno_t ret = hound_context_connect_target(hound_ctx,
    292292                    HOUND_DEFAULT_TARGET);
    293293                if (ret != EOK) {
Note: See TracChangeset for help on using the changeset viewer.