diff options
author | wm4 <wm4@nowhere> | 2012-11-05 17:02:04 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2012-11-12 20:06:14 +0100 |
commit | d4bdd0473d6f43132257c9fb3848d829755167a3 (patch) | |
tree | 8021c2f7da1841393c8c832105e20cd527826d6c /libvo/cocoa_common.h | |
parent | bd48deba77bd5582c5829d6fe73a7d2571088aba (diff) | |
download | mpv-d4bdd0473d6f43132257c9fb3848d829755167a3.tar.bz2 mpv-d4bdd0473d6f43132257c9fb3848d829755167a3.tar.xz |
Rename directories, move files (step 1 of 2) (does not compile)
Tis drops the silly lib prefixes, and attempts to organize the tree in
a more logical way. Make the top-level directory less cluttered as
well.
Renames the following directories:
libaf -> audio/filter
libao2 -> audio/out
libvo -> video/out
libmpdemux -> demux
Split libmpcodecs:
vf* -> video/filter
vd*, dec_video.* -> video/decode
mp_image*, img_format*, ... -> video/
ad*, dec_audio.* -> audio/decode
libaf/format.* is moved to audio/ - this is similar to how mp_image.*
is located in video/.
Move most top-level .c/.h files to core. (talloc.c/.h is left on top-
level, because it's external.) Park some of the more annoying files
in compat/. Some of these are relicts from the time mplayer used
ffmpeg internals.
sub/ is not split, because it's too much of a mess (subtitle code is
mixed with OSD display and rendering).
Maybe the organization of core is not ideal: it mixes playback core
(like mplayer.c) and utility helpers (like bstr.c/h). Should the need
arise, the playback core will be moved somewhere else, while core
contains all helper and common code.
Diffstat (limited to 'libvo/cocoa_common.h')
-rw-r--r-- | libvo/cocoa_common.h | 55 |
1 files changed, 0 insertions, 55 deletions
diff --git a/libvo/cocoa_common.h b/libvo/cocoa_common.h deleted file mode 100644 index 079e497441..0000000000 --- a/libvo/cocoa_common.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Cocoa OpenGL Backend - * - * 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_COMMON_H -#define MPLAYER_COCOA_COMMON_H - -#include "video_out.h" - -struct vo_cocoa_state; - -bool vo_cocoa_gui_running(void); -void *vo_cocoa_glgetaddr(const char *s); - -int vo_cocoa_init(struct vo *vo); -void vo_cocoa_uninit(struct vo *vo); - -void vo_cocoa_update_xinerama_info(struct vo *vo); - -int vo_cocoa_change_attributes(struct vo *vo); -int vo_cocoa_create_window(struct vo *vo, uint32_t d_width, - uint32_t d_height, uint32_t flags, - int gl3profile); - -void vo_cocoa_swap_buffers(struct vo *vo); -int vo_cocoa_check_events(struct vo *vo); -void vo_cocoa_fullscreen(struct vo *vo); -void vo_cocoa_ontop(struct vo *vo); -void vo_cocoa_pause(struct vo *vo); -void vo_cocoa_resume(struct vo *vo); - -// returns an int to conform to the gl extensions from other platforms -int vo_cocoa_swap_interval(int enabled); - -void *vo_cocoa_cgl_context(struct vo *vo); -void *vo_cocoa_cgl_pixel_format(struct vo *vo); - -int vo_cocoa_cgl_color_size(struct vo *vo); - -#endif /* MPLAYER_COCOA_COMMON_H */ |