← Back to branch summary

~ubuntu-branches/ubuntu/vivid/mpv/vivid

« back to all changes in this revision

Viewing changes to input/input.c

  • Committer: Package Import Robot
  • Author(s): Logan Rosen
  • Date: 2014-12-22 19:08:25 UTC
  • mfrom: (28.1.3 vivid-proposed)
  • Revision ID: package-import@ubuntu.com-20141222190825-bdtz8aiwvv65wpmi
Tags: 0.7.2-1ubuntu1
debian/rules: Disable altivec on ppc64el again, as it FTBFS with it.

Show diffs side-by-side

added added

removed removed

Lines of Context:
input/input.c
445
445
        }
446
446
        if (s->flags & MP_INPUT_EXCLUSIVE)
447
447
            break;
 
448
        if (best_bind && (s->flags & MP_INPUT_ON_TOP))
 
449
            break;
448
450
    }
449
451
 
450
452
    return best_bind;
1019
1021
    if (!name || !name[0])
1020
1022
        return; // parse_config() changes semantics with restrict_section==empty
1021
1023
    input_lock(ictx);
 
1024
    // Delete:
 
1025
    struct cmd_bind_section *bs = get_bind_section(ictx, bstr0(name));
 
1026
    remove_binds(bs, builtin);
1022
1027
    if (contents) {
 
1028
        // Redefine:
1023
1029
        parse_config(ictx, builtin, bstr0(contents), location, name);
1024
1030
    } else {
1025
1031
        // Disable:
1026
1032
        mp_input_disable_section(ictx, name);
1027
 
        // Delete:
1028
 
        struct cmd_bind_section *bs = get_bind_section(ictx, bstr0(name));
1029
 
        remove_binds(bs, builtin);
1030
1033
    }
1031
1034
    input_unlock(ictx);
1032
1035
}