diff options
author | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2013-08-01 08:28:16 +0200 |
---|---|---|
committer | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2013-08-01 08:28:16 +0200 |
commit | 3b236d176dbebddad6fcbae74d0990ecfb0412d0 (patch) | |
tree | e50857d5f87f1b50c370a4c8de19d1091a3303fc | |
parent | 94df9ef79723273914cc5fcb0f917f9e3d2bb97a (diff) | |
download | mpv-3b236d176dbebddad6fcbae74d0990ecfb0412d0.tar.bz2 mpv-3b236d176dbebddad6fcbae74d0990ecfb0412d0.tar.xz |
vo_corevideo: move to C from Objective-C
This file was alredy written in C. The only remaining part was the file
exension and `#import`s.
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | video/out/vo_corevideo.c (renamed from video/out/vo_corevideo.m) | 24 | ||||
-rw-r--r-- | video/out/vo_corevideo.h | 28 |
3 files changed, 12 insertions, 42 deletions
@@ -76,7 +76,7 @@ SOURCES-$(SDL2) += video/out/vo_sdl.c SOURCES-$(COREAUDIO) += audio/out/ao_coreaudio.c \ audio/out/ao_coreaudio_utils.c \ audio/out/ao_coreaudio_properties.c -SOURCES-$(COREVIDEO) += video/out/vo_corevideo.m +SOURCES-$(COREVIDEO) += video/out/vo_corevideo.c SOURCES-$(DIRECT3D) += video/out/vo_direct3d.c \ video/out/w32_common.c SOURCES-$(DSOUND) += audio/out/ao_dsound.c diff --git a/video/out/vo_corevideo.m b/video/out/vo_corevideo.c index cb60fef95d..cf89dc78c2 100644 --- a/video/out/vo_corevideo.m +++ b/video/out/vo_corevideo.c @@ -19,23 +19,21 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include <QuartzCore/QuartzCore.h> #include <assert.h> -#import "vo_corevideo.h" +#include "talloc.h" +#include "video/out/vo.h" +#include "sub/sub.h" +#include "core/m_option.h" -// mplayer includes -#import "talloc.h" -#import "vo.h" -#import "sub/sub.h" -#import "core/m_option.h" +#include "video/csputils.h" +#include "video/vfcap.h" +#include "video/mp_image.h" -#import "video/csputils.h" -#import "video/vfcap.h" -#import "video/mp_image.h" - -#import "gl_common.h" -#import "gl_osd.h" -#import "cocoa_common.h" +#include "gl_common.h" +#include "gl_osd.h" +#include "cocoa_common.h" struct quad { GLfloat lowerLeft[2]; diff --git a/video/out/vo_corevideo.h b/video/out/vo_corevideo.h deleted file mode 100644 index cfb86621bc..0000000000 --- a/video/out/vo_corevideo.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * CoreVideo video output driver - * - * Copyright (c) 2005 Nicolas Plourde <nicolasplourde@gmail.com> - * - * This file is part of MPlayer. - * - * MPlayer 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. - * - * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#ifndef MPLAYER_VO_COREVIDEO_H -#define MPLAYER_VO_COREVIDEO_H - -#import <QuartzCore/QuartzCore.h> - -#endif /* MPLAYER_VO_COREVIDEO_H */ |