diff options
author | wm4 <wm4@mplayer2.org> | 2012-04-29 07:16:09 +0200 |
---|---|---|
committer | wm4 <wm4@mplayer2.org> | 2012-04-29 10:01:28 +0200 |
commit | 97ac824124fc5cdfbd9ac74156b79c098bce09c6 (patch) | |
tree | 2c924403e2fb619ec57ee0933cd12d32ef1bb62a /osdep/cocoa_events.h | |
parent | 87f4cafe9c0881743d1117c2e8cd7e3376e33302 (diff) | |
parent | f64a4e9931428de0f308f6ed0a0144edb8ce9619 (diff) | |
download | mpv-97ac824124fc5cdfbd9ac74156b79c098bce09c6.tar.bz2 mpv-97ac824124fc5cdfbd9ac74156b79c098bce09c6.tar.xz |
Merge remote-tracking branch 'origin/master'
Conflicts:
bstr.c
bstr.h
libvo/cocoa_common.m
libvo/gl_common.c
libvo/video_out.c
mplayer.c
screenshot.c
sub/subassconvert.c
Merge of cocoa_common.m done by pigoz.
Picking my version of screenshot.c. The fix in commit aadf1002f8a will
be redone in a follow-up commit, as the original commit causes too many
conflicts with the work done locally in this branch, and other work in
progress.
Diffstat (limited to 'osdep/cocoa_events.h')
-rw-r--r-- | osdep/cocoa_events.h | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/osdep/cocoa_events.h b/osdep/cocoa_events.h new file mode 100644 index 0000000000..3f0e775e03 --- /dev/null +++ b/osdep/cocoa_events.h @@ -0,0 +1,30 @@ +/* + * Cocoa Event Handling + * + * This file is part of mplayer2. + * + * mplayer2 is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * mplayer2 is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with mplayer2. If not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef MPLAYER_COCOA_EVENTS_H +#define MPLAYER_COCOA_EVENTS_H + +#include "input/input.h" + +void cocoa_events_init(struct input_ctx *ictx, + void (*read_all_fd_events)(struct input_ctx *ictx, int time)); +void cocoa_events_uninit(void); +void cocoa_events_read_all_events(struct input_ctx *ictx, int time); + +#endif /* MPLAYER_COCOA_EVENTS_H */ |