From 245773e56954a926033293210c781e5fb71eb651 Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Mon, 9 Jan 2012 19:27:43 +0200 Subject: cleanup: remove left over access_mpcontext.h (from GUI) access_mpcontext.h and the declared functions in mplayer.c were only used by the now deleted internal GUI. Remove the unused header and functions. --- access_mpcontext.h | 30 ------------------------------ mplayer.c | 31 ------------------------------- 2 files changed, 61 deletions(-) delete mode 100644 access_mpcontext.h diff --git a/access_mpcontext.h b/access_mpcontext.h deleted file mode 100644 index 4b866f255f..0000000000 --- a/access_mpcontext.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * 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_ACCESS_MPCONTEXT_H -#define MPLAYER_ACCESS_MPCONTEXT_H - -struct MPContext; -void *mpctx_get_video_out(struct MPContext *mpctx); -void *mpctx_get_demuxer(struct MPContext *mpctx); -void *mpctx_get_playtree_iter(struct MPContext *mpctx); -void *mpctx_get_mixer(struct MPContext *mpctx); -int mpctx_get_global_sub_size(struct MPContext *mpctx); -int mpctx_get_osd_function(struct MPContext *mpctx); - -#endif /* MPLAYER_ACCESS_MPCONTEXT_H */ diff --git a/mplayer.c b/mplayer.c index 78199499e8..44c980f6f8 100644 --- a/mplayer.c +++ b/mplayer.c @@ -62,7 +62,6 @@ #include "m_option.h" #include "m_config.h" #include "mplayer.h" -#include "access_mpcontext.h" #include "m_property.h" #include "libavutil/avstring.h" @@ -348,36 +347,6 @@ int use_filename_title; #include "metadata.h" -void *mpctx_get_video_out(MPContext *mpctx) -{ - return mpctx->video_out; -} - -void *mpctx_get_demuxer(MPContext *mpctx) -{ - return mpctx->demuxer; -} - -void *mpctx_get_playtree_iter(MPContext *mpctx) -{ - return mpctx->playtree_iter; -} - -void *mpctx_get_mixer(MPContext *mpctx) -{ - return &mpctx->mixer; -} - -int mpctx_get_global_sub_size(MPContext *mpctx) -{ - return mpctx->global_sub_size; -} - -int mpctx_get_osd_function(MPContext *mpctx) -{ - return mpctx->osd_function; -} - static float get_relative_time(struct MPContext *mpctx) { unsigned int new_time = GetTimer(); -- cgit v1.2.3